From 7625eba238ccba645cfbd3d5b6917f1277442045 Mon Sep 17 00:00:00 2001 From: "Robert J. Gebis" Date: Fri, 13 Jan 2023 16:56:27 -0600 Subject: [PATCH] MacOS M1 (Venture) build warning fixes Changed x64 to arm64 output architecture for Mac M1 Fixed few "warning: missing field __opaque initializer" warnings Updated CMakeList.txt from 2.8 to 3.0 minimal to supress cmake warning Changed LIQUID to Liquid cmake package detection --- CMakeLists.txt | 4 ++-- cmake/Modules/FindLiquid.cmake | 2 +- external/rtaudio/RtAudio.cpp | 2 -- src/AppFrame.cpp | 4 ++-- src/audio/AudioSinkThread.cpp | 2 +- src/audio/AudioThread.cpp | 2 +- src/demod/DemodulatorPreThread.cpp | 2 +- src/demod/DemodulatorThread.cpp | 2 +- src/sdr/SDRPostThread.cpp | 2 +- src/visual/SpectrumCanvas.cpp | 2 +- src/visual/SpectrumCanvas.h | 2 +- 11 files changed, 12 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdeea24..4ca81bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 3.0) project (CubicSDR) @@ -142,7 +142,7 @@ endmacro(configure_files_recurse) if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) MESSAGE( "64 bit compiler detected" ) SET( EX_PLATFORM 64 ) - SET( EX_PLATFORM_NAME "x64" ) + SET( EX_PLATFORM_NAME "${CMAKE_SYSTEM_PROCESSOR}" ) else( CMAKE_SIZEOF_VOID_P EQUAL 8 ) MESSAGE( "32 bit compiler detected" ) SET( EX_PLATFORM 32 ) diff --git a/cmake/Modules/FindLiquid.cmake b/cmake/Modules/FindLiquid.cmake index 5ce9d0d..14e9c08 100644 --- a/cmake/Modules/FindLiquid.cmake +++ b/cmake/Modules/FindLiquid.cmake @@ -17,6 +17,6 @@ find_library (LIQUID_LIBRARIES NAMES liquid) # handle the QUIETLY and REQUIRED arguments and set LIQUID_FOUND to TRUE if # all listed variables are TRUE include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (LIQUID DEFAULT_MSG LIQUID_LIBRARIES LIQUID_INCLUDES) +find_package_handle_standard_args (Liquid DEFAULT_MSG LIQUID_LIBRARIES LIQUID_INCLUDES) #mark_as_advanced (LIQUID_LIBRARIES LIQUID_INCLUDES) diff --git a/external/rtaudio/RtAudio.cpp b/external/rtaudio/RtAudio.cpp index 40fb6a9..6cc6773 100644 --- a/external/rtaudio/RtAudio.cpp +++ b/external/rtaudio/RtAudio.cpp @@ -990,9 +990,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne AudioDeviceID id = deviceList[ device ]; // Setup for stream mode. - bool isInput = false; if ( mode == INPUT ) { - isInput = true; property.mScope = kAudioDevicePropertyScopeInput; } else diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index 6c643ef..5bbc605 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -1631,7 +1631,6 @@ bool AppFrame::actionOnMenuAudioSampleRate(wxCommandEvent& event) { auto outputDevices = wxGetApp().getDemodMgr().getOutputDevices(); - int i = 0; for (auto & outputDevice : outputDevices) { int menu_id = wxID_AUDIO_BANDWIDTH_BASE + wxID_AUDIO_DEVICE_MULTIPLIER * outputDevice.first; @@ -1649,7 +1648,6 @@ bool AppFrame::actionOnMenuAudioSampleRate(wxCommandEvent& event) { j++; } - i++; } } @@ -1980,6 +1978,8 @@ bool AppFrame::actionOnMenuRig(wxCommandEvent &event) { wxGetApp().stopRig(); wxGetApp().initRig(rigModel, rigPort, rigSerialRate); } +#else + (void)event; // Suppres build warning #endif return bManaged; diff --git a/src/audio/AudioSinkThread.cpp b/src/audio/AudioSinkThread.cpp index bdfd43c..f723ecf 100644 --- a/src/audio/AudioSinkThread.cpp +++ b/src/audio/AudioSinkThread.cpp @@ -17,7 +17,7 @@ void AudioSinkThread::run() { #ifdef __APPLE__ pthread_t tID = pthread_self(); // ID of this thread int priority = sched_get_priority_max(SCHED_RR) - 1; - sched_param prio = { priority }; // scheduling priority of thread + sched_param prio = { priority, {0}}; // scheduling priority of thread pthread_setschedparam(tID, SCHED_RR, &prio); #endif diff --git a/src/audio/AudioThread.cpp b/src/audio/AudioThread.cpp index e337ec5..178fe58 100644 --- a/src/audio/AudioThread.cpp +++ b/src/audio/AudioThread.cpp @@ -472,7 +472,7 @@ void AudioThread::run() { #ifdef __APPLE__ pthread_t tID = pthread_self(); // ID of this thread int priority = sched_get_priority_max(SCHED_RR) - 1; - sched_param prio = { priority }; // scheduling priority of thread + sched_param prio = { priority, {0}}; // scheduling priority of thread pthread_setschedparam(tID, SCHED_RR, &prio); #endif diff --git a/src/demod/DemodulatorPreThread.cpp b/src/demod/DemodulatorPreThread.cpp index 3ea517f..5a57f85 100644 --- a/src/demod/DemodulatorPreThread.cpp +++ b/src/demod/DemodulatorPreThread.cpp @@ -55,7 +55,7 @@ void DemodulatorPreThread::run() { #ifdef __APPLE__ pthread_t tID = pthread_self(); // ID of this thread int priority = sched_get_priority_max( SCHED_FIFO) - 1; - sched_param prio = {priority}; // scheduling priority of thread + sched_param prio = {priority, {0}}; // scheduling priority of thread pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif diff --git a/src/demod/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp index 20b8595..a5b3694 100644 --- a/src/demod/DemodulatorThread.cpp +++ b/src/demod/DemodulatorThread.cpp @@ -70,7 +70,7 @@ void DemodulatorThread::run() { #ifdef __APPLE__ pthread_t tID = pthread_self(); // ID of this thread int priority = sched_get_priority_max( SCHED_FIFO )-1; - sched_param prio = {priority}; // scheduling priority of thread + sched_param prio = {priority, {0}}; // scheduling priority of thread pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp index 29390f6..9c4d703 100644 --- a/src/sdr/SDRPostThread.cpp +++ b/src/sdr/SDRPostThread.cpp @@ -153,7 +153,7 @@ void SDRPostThread::run() { #ifdef __APPLE__ pthread_t tID = pthread_self(); // ID of this thread int priority = sched_get_priority_max( SCHED_FIFO); - sched_param prio = {priority}; // scheduling priority of thread + sched_param prio = {priority, {0}}; // scheduling priority of thread pthread_setschedparam(tID, SCHED_FIFO, &prio); #endif diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp index 3071e89..0b5c607 100644 --- a/src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp @@ -180,7 +180,7 @@ bool SpectrumCanvas::getUseDBOfs() { return spectrumPanel.getUseDBOffset(); } -void SpectrumCanvas::setView(long long center_freq_in, int bandwidth_in) { +void SpectrumCanvas::setView(long long center_freq_in, long long bandwidth_in) { bwChange += bandwidth_in-bandwidth; #define BW_RESET_TH 400000 if (bwChange > BW_RESET_TH || bwChange < -BW_RESET_TH) { diff --git a/src/visual/SpectrumCanvas.h b/src/visual/SpectrumCanvas.h index bbe7586..a281357 100644 --- a/src/visual/SpectrumCanvas.h +++ b/src/visual/SpectrumCanvas.h @@ -39,7 +39,7 @@ public: void setUseDBOfs(bool showDb); bool getUseDBOfs(); - void setView(long long center_freq_in, int bandwidth_in); + void setView(long long center_freq_in, long long bandwidth_in) override; void disableView() override; void setScaleFactorEnabled(bool en);