mirror of https://github.com/f4exb/sdrangel.git
Compare commits
7 Commits
c24c2f3924
...
7563d33980
Author | SHA1 | Date |
---|---|---|
dforsi | 7563d33980 | |
Daniele Forsi | b4ec43e4aa | |
Daniele Forsi | f4b2dfc0a9 | |
Daniele Forsi | f72574d1ad | |
Daniele Forsi | 230c461204 | |
Edouard Griffiths | dac9b9a5b3 | |
Daniele Forsi | 90e917f666 |
|
@ -456,7 +456,7 @@ elseif(ANDROID)
|
|||
set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")
|
||||
|
||||
set(FFMPEG_FOUND ON CACHE INTERNAL "")
|
||||
set(FFMEG_SKIP_CHECK ON CACHE INTERNAL "")
|
||||
set(FFMPEG_SKIP_CHECK ON CACHE INTERNAL "")
|
||||
set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
||||
set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
|
||||
set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
||||
|
|
|
@ -234,7 +234,7 @@ if(NOT SERVER_MODE)
|
|||
if(WIN32)
|
||||
add_subdirectory(demoddatv)
|
||||
else()
|
||||
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
|
||||
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMPEG_SKIP_CHECK)
|
||||
message(STATUS "Include demoddatv")
|
||||
add_subdirectory(demoddatv)
|
||||
else()
|
||||
|
|
|
@ -198,9 +198,9 @@ MapGUI::MapGUI(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *featur
|
|||
m_polygonMapModel(this),
|
||||
m_polylineMapModel(this),
|
||||
m_beacons(nullptr),
|
||||
m_beaconDialog(this, this),
|
||||
m_ibpBeaconDialog(this, this),
|
||||
m_radioTimeDialog(this, this),
|
||||
m_beaconDialog(this),
|
||||
m_ibpBeaconDialog(this),
|
||||
m_radioTimeDialog(this),
|
||||
m_cesium(nullptr),
|
||||
m_legend(nullptr),
|
||||
m_nasaWidget(nullptr),
|
||||
|
@ -2507,17 +2507,20 @@ void MapGUI::on_displaySettings_clicked()
|
|||
void MapGUI::on_beacons_clicked()
|
||||
{
|
||||
m_beaconDialog.show();
|
||||
m_beaconDialog.raise();
|
||||
}
|
||||
|
||||
void MapGUI::on_ibpBeacons_clicked()
|
||||
{
|
||||
m_ibpBeaconDialog.show();
|
||||
m_ibpBeaconDialog.raise();
|
||||
}
|
||||
|
||||
void MapGUI::on_radiotime_clicked()
|
||||
{
|
||||
m_radioTimeDialog.updateTable();
|
||||
m_radioTimeDialog.show();
|
||||
m_radioTimeDialog.raise();
|
||||
}
|
||||
|
||||
QString MapGUI::getDataDir()
|
||||
|
|
Loading…
Reference in New Issue