Merge pull request #313 from cjcliffe/optimizations_and_fixes

Optimizations and fixes

CMakeLists.txt

@@ -38,6 +38,12 @@ ADD_DEFINITIONS(
 ENDIF()
 ENDIF()
 
+SET (ENABLE_FFTW3 OFF CACHE BOOL "Use fftw3 instead of liquid-dsp internal fft.")
+IF(ENABLE_FFTW3)
+    ADD_DEFINITIONS(
+        -DUSE_FFTW3=1
+    )
+ENDIF()
 
 set(USE_HAMLIB OFF CACHE BOOL "Support hamlib for radio control functions.")
 
@@ -114,9 +120,11 @@ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/${EX_PLATFORM_
 
 IF (MSVC) 
 	include_directories ("${PROJECT_SOURCE_DIR}/external/wglext")
-	SET(FFTW_INCLUDES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/" CACHE STRING "FFTW Include Directory")
+    IF(ENABLE_FFTW3)
-	SET(FFTW_LIBRARIES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.lib" CACHE STRING "FFTW Library")
+    	SET(FFTW_INCLUDES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/" CACHE STRING "FFTW Include Directory")
-	SET(FFTW_DLL "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.dll" CACHE STRING "FFTW DLL")
+    	SET(FFTW_LIBRARIES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.lib" CACHE STRING "FFTW Library")
+    	SET(FFTW_DLL "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.dll" CACHE STRING "FFTW DLL")
+    ENDIF()
 	SET(LIQUID_INCLUDES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/include/" CACHE STRING "Liquid-DSP include directory")
 	SET(LIQUID_LIBRARIES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.lib" CACHE STRING "Liquid-DSP Library")
 	SET(LIQUID_DLL "${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.dll" CACHE STRING "Liquid-DSP DLL")
@@ -128,12 +136,16 @@ ELSE (MSVC)
 ENDIF(MSVC)
 
 find_package(OpenGL REQUIRED)
-#IF (NOT WIN32)
+
-find_package(FFTW REQUIRED)
+IF(ENABLE_FFTW3)
+    find_package(FFTW REQUIRED)
+    include_directories(${FFTW_INCLUDES})
+    SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${FFTW_LIBRARIES})
+ENDIF()
+
 find_package(Liquid REQUIRED)
-include_directories(${LIQUID_INCLUDES} ${FFTW_INCLUDES})
+include_directories(${LIQUID_INCLUDES})
-SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES} ${FFTW_LIBRARIES})
+SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES})
-#ENDIF()
 
 find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED)
 set(wxWidgets_CONFIGURATION mswu)
@@ -198,7 +210,10 @@ IF (UNIX AND NOT APPLE)
     SET(USE_AUDIO_ALSA OFF CACHE BOOL "Use ALSA Audio")
     SET(USE_AUDIO_OSS OFF CACHE BOOL "Use OSS Audio")
   
-    SET(FFTW_LIB fftw3f)
+    IF(ENABLE_FFTW3)
+        SET(FFTW_LIB fftw3f)
+    ENDIF()
+
     SET(LIQUID_LIB liquid)
     SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} dl)
 
@@ -238,9 +253,12 @@ ENDIF(USE_AUDIO_OSS)
 ENDIF(UNIX AND NOT APPLE)
 
 IF (APPLE)
-    SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.10")
+    SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.9")
+  
+    IF(ENABLE_FFTW3)
+        SET(FFTW_LIB fftw3f)
+    ENDIF()
 
-    SET(FFTW_LIB fftw3f)
     SET(LIQUID_LIB liquid)
     link_directories(/usr/local/lib)
     link_directories(/opt/local/lib)
@@ -560,11 +578,16 @@ IF (NOT BUNDLE_APP)
     configure_files(${PROJECT_SOURCE_DIR}/font ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.png")
     configure_files(${PROJECT_SOURCE_DIR}/icon ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} CubicSDR.ico)
 	IF(MSVC)	
-		configure_files(${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll")
+        IF(ENABLE_FFTW3)
+            configure_files(${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll")
+        ENDIF()
 		configure_files(${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll")
 	ENDIF()
     add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
-    target_link_libraries(CubicSDR ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
+    IF(ENABLE_FFTW3)
+        target_link_libraries(CubicSDR ${FFTW_LIB})
+    ENDIF()
+    target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
 ENDIF (NOT BUNDLE_APP)
 
 IF (MSVC)
@@ -582,7 +605,7 @@ ENDIF(MSVC)
 IF (APPLE)
     ADD_DEFINITIONS(
         -DHAVE_TYPE_TRAITS=1
-        -mmacosx-version-min=10.10
+        -mmacosx-version-min=10.9
     )
 ENDIF(APPLE)
 
@@ -624,7 +647,11 @@ IF (APPLE AND BUNDLE_APP)
         MACOSX_PACKAGE_LOCATION Resources
     )
 
-    target_link_libraries(CubicSDR ${LIQUID_LIB} ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
+    IF(ENABLE_FFTW3)
+        target_link_libraries(CubicSDR ${FFTW_LIB})    
+    ENDIF()
+    
+    target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
     SET_TARGET_PROPERTIES(CubicSDR PROPERTIES
         MACOSX_BUNDLE TRUE
         MACOSX_BUNDLE_INFO_STRING "CubicSDR Open-Source Software-Defined Radio Application"
@@ -779,9 +806,15 @@ IF (WIN32 AND NOT BUILD_INSTALLER)
 	
     INSTALL(TARGETS CubicSDR DESTINATION bin)
 	INSTALL(FILES 		
-		${FFTW_DLL}
 		${LIQUID_DLL}
 	DESTINATION bin)
+
+    IF(ENABLE_FFTW3)
+    	INSTALL(FILES 		
+    		${FFTW_DLL}
+    	DESTINATION bin)
+    ENDIF()
+
     INSTALL(FILES 
 		${CUBICSDR_RESOURCES}
 		${PROJECT_SOURCE_DIR}/src/CubicSDR.png
@@ -817,10 +850,15 @@ IF (WIN32 AND BUILD_INSTALLER)
 	install(FILES 
         ${CUBICSDR_RESOURCES}
         ${PROJECT_SOURCE_DIR}/icon/CubicSDR.ico
-		${FFTW_DLL}
 		${LIQUID_DLL}
 		DESTINATION .)
 
+    IF(ENABLE_FFTW3)
+    	install(FILES 
+    		${FFTW_DLL}
+        DESTINATION .)
+    ENDIF()
+        
 	IF (BUNDLE_SOAPY_MODS)
 		ADD_DEFINITIONS(
 			-DBUNDLE_SOAPY_MODS=1
@@ -854,7 +892,10 @@ ENDIF (WIN32 AND BUILD_INSTALLER)
 IF (UNIX AND NOT APPLE AND BUILD_DEB) 
     set(CPACK_GENERATOR DEB)
 	set(CPACK_PACKAGE_NAME "CubicSDR")
-	SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libfftw3-single3, libwxgtk3.0-0, libpulse0")
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libwxgtk3.0-0, libpulse0")
+    IF(ENABLE_FFTW3)
+    	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libfftw3-single3")    
+    ENDIF()
  	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Charles J. Cliffe <cj@cubicproductions.com>")
 	SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "CubicSDR Software Defined Radio application v${CUBICSDR_VERSION}")
 	SET(CPACK_DEBIAN_PACKAGE_SECTION "comm")

README.md

@@ -10,7 +10,6 @@ Utilizes:
 --------
   - liquid-dsp (http://liquidsdr.org/ -- https://github.com/jgaeddert/liquid-dsp)
   - SoapySDR (http://www.pothosware.com/ -- https://github.com/pothosware/SoapySDR)
-  - FFTW (http://www.fftw.org/ -- https://github.com/FFTW/fftw3)
   - RtAudio (http://www.music.mcgill.ca/~gary/rtaudio/ -- http://github.com/thestk/rtaudio/)
   - LodePNG (http://lodev.org/lodepng/)
   - BMFont (http://www.angelcode.com/ -- http://www.angelcode.com/products/bmfont/)
@@ -19,6 +18,11 @@ Utilizes:
   - wxWidgets (https://www.wxwidgets.org/)
   - CMake (http://www.cmake.org/)
 
+Optional Libs:
+--------
+  - FFTW (http://www.fftw.org/ -- https://github.com/FFTW/fftw3)
+  - hamlib (https://sourceforge.net/p/hamlib/wiki/Hamlib/ -- https://sourceforge.net/p/hamlib/code/ci/master/tree/)
+
 Features and Status:
 --------------------
   - Please see the issues on GitHub or visit https://github.com/cjcliffe/CubicSDR/wiki/CubicSDR-Roadmap-and-Ideas for more information.

cmake/Modules/CMakeParseArguments.cmake

@@ -1,161 +0,0 @@
-#.rst:
-# CMakeParseArguments
-# -------------------
-#
-#
-#
-# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords>
-# <multi_value_keywords> args...)
-#
-# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions
-# for parsing the arguments given to that macro or function.  It
-# processes the arguments and defines a set of variables which hold the
-# values of the respective options.
-#
-# The <options> argument contains all options for the respective macro,
-# i.e.  keywords which can be used when calling the macro without any
-# value following, like e.g.  the OPTIONAL keyword of the install()
-# command.
-#
-# The <one_value_keywords> argument contains all keywords for this macro
-# which are followed by one value, like e.g.  DESTINATION keyword of the
-# install() command.
-#
-# The <multi_value_keywords> argument contains all keywords for this
-# macro which can be followed by more than one value, like e.g.  the
-# TARGETS or FILES keywords of the install() command.
-#
-# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the
-# keywords listed in <options>, <one_value_keywords> and
-# <multi_value_keywords> a variable composed of the given <prefix>
-# followed by "_" and the name of the respective keyword.  These
-# variables will then hold the respective value from the argument list.
-# For the <options> keywords this will be TRUE or FALSE.
-#
-# All remaining arguments are collected in a variable
-# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see
-# whether your macro was called with unrecognized parameters.
-#
-# As an example here a my_install() macro, which takes similar arguments
-# as the real install() command:
-#
-# ::
-#
-#    function(MY_INSTALL)
-#      set(options OPTIONAL FAST)
-#      set(oneValueArgs DESTINATION RENAME)
-#      set(multiValueArgs TARGETS CONFIGURATIONS)
-#      cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}"
-#                            "${multiValueArgs}" ${ARGN} )
-#      ...
-#
-#
-#
-# Assume my_install() has been called like this:
-#
-# ::
-#
-#    my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub)
-#
-#
-#
-# After the cmake_parse_arguments() call the macro will have set the
-# following variables:
-#
-# ::
-#
-#    MY_INSTALL_OPTIONAL = TRUE
-#    MY_INSTALL_FAST = FALSE (this option was not used when calling my_install()
-#    MY_INSTALL_DESTINATION = "bin"
-#    MY_INSTALL_RENAME = "" (was not used)
-#    MY_INSTALL_TARGETS = "foo;bar"
-#    MY_INSTALL_CONFIGURATIONS = "" (was not used)
-#    MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL"
-#
-#
-#
-# You can then continue and process these variables.
-#
-# Keywords terminate lists of values, e.g.  if directly after a
-# one_value_keyword another recognized keyword follows, this is
-# interpreted as the beginning of the new option.  E.g.
-# my_install(TARGETS foo DESTINATION OPTIONAL) would result in
-# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION
-# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
-
-#=============================================================================
-# Copyright 2010 Alexander Neundorf <neundorf@kde.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-if(__CMAKE_PARSE_ARGUMENTS_INCLUDED)
-  return()
-endif()
-set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
-
-
-function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
-  # first set all result variables to empty/FALSE
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
-    set(${prefix}_${arg_name})
-  endforeach()
-
-  foreach(option ${_optionNames})
-    set(${prefix}_${option} FALSE)
-  endforeach()
-
-  set(${prefix}_UNPARSED_ARGUMENTS)
-
-  set(insideValues FALSE)
-  set(currentArgName)
-
-  # now iterate over all arguments and fill the result variables
-  foreach(currentArg ${ARGN})
-    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword
-
-    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1)
-      if(insideValues)
-        if("${insideValues}" STREQUAL "SINGLE")
-          set(${prefix}_${currentArgName} ${currentArg})
-          set(insideValues FALSE)
-        elseif("${insideValues}" STREQUAL "MULTI")
-          list(APPEND ${prefix}_${currentArgName} ${currentArg})
-        endif()
-      else()
-        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
-      endif()
-    else()
-      if(NOT ${optionIndex} EQUAL -1)
-        set(${prefix}_${currentArg} TRUE)
-        set(insideValues FALSE)
-      elseif(NOT ${singleArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "SINGLE")
-      elseif(NOT ${multiArgIndex} EQUAL -1)
-        set(currentArgName ${currentArg})
-        set(${prefix}_${currentArgName})
-        set(insideValues "MULTI")
-      endif()
-    endif()
-
-  endforeach()
-
-  # propagate the result variables to the caller:
-  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
-    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
-  endforeach()
-  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)
-
-endfunction()

cmake/Modules/FindPackageHandleStandardArgs.cmake

@@ -1,382 +0,0 @@
-#.rst:
-# FindPackageHandleStandardArgs
-# -----------------------------
-#
-#
-#
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name> ...  )
-#
-# This function is intended to be used in FindXXX.cmake modules files.
-# It handles the REQUIRED, QUIET and version-related arguments to
-# find_package().  It also sets the <packagename>_FOUND variable.  The
-# package is considered found if all variables <var1>...  listed contain
-# valid results, e.g.  valid filepaths.
-#
-# There are two modes of this function.  The first argument in both
-# modes is the name of the Find-module where it is called (in original
-# casing).
-#
-# The first simple mode looks like this:
-#
-# ::
-#
-#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(<name>
-#       (DEFAULT_MSG|"Custom failure message") <var1>...<varN> )
-#
-# If the variables <var1> to <varN> are all valid, then
-# <UPPERCASED_NAME>_FOUND will be set to TRUE.  If DEFAULT_MSG is given
-# as second argument, then the function will generate itself useful
-# success and error messages.  You can also supply a custom error
-# message for the failure case.  This is not recommended.
-#
-# The second mode is more powerful and also supports version checking:
-#
-# ::
-#
-#     FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME
-#       [FOUND_VAR <resultVar>]
-#       [REQUIRED_VARS <var1>...<varN>]
-#       [VERSION_VAR   <versionvar>]
-#       [HANDLE_COMPONENTS]
-#       [CONFIG_MODE]
-#       [FAIL_MESSAGE "Custom failure message"] )
-#
-# In this mode, the name of the result-variable can be set either to
-# either <UPPERCASED_NAME>_FOUND or <OriginalCase_Name>_FOUND using the
-# FOUND_VAR option.  Other names for the result-variable are not
-# allowed.  So for a Find-module named FindFooBar.cmake, the two
-# possible names are FooBar_FOUND and FOOBAR_FOUND.  It is recommended
-# to use the original case version.  If the FOUND_VAR option is not
-# used, the default is <UPPERCASED_NAME>_FOUND.
-#
-# As in the simple mode, if <var1> through <varN> are all valid,
-# <packagename>_FOUND will be set to TRUE.  After REQUIRED_VARS the
-# variables which are required for this package are listed.  Following
-# VERSION_VAR the name of the variable can be specified which holds the
-# version of the package which has been found.  If this is done, this
-# version will be checked against the (potentially) specified required
-# version used in the find_package() call.  The EXACT keyword is also
-# handled.  The default messages include information about the required
-# version and the version which has been actually found, both if the
-# version is ok or not.  If the package supports components, use the
-# HANDLE_COMPONENTS option to enable handling them.  In this case,
-# find_package_handle_standard_args() will report which components have
-# been found and which are missing, and the <packagename>_FOUND variable
-# will be set to FALSE if any of the required components (i.e.  not the
-# ones listed after OPTIONAL_COMPONENTS) are missing.  Use the option
-# CONFIG_MODE if your FindXXX.cmake module is a wrapper for a
-# find_package(...  NO_MODULE) call.  In this case VERSION_VAR will be
-# set to <NAME>_VERSION and the macro will automatically check whether
-# the Config module was found.  Via FAIL_MESSAGE a custom failure
-# message can be specified, if this is not used, the default message
-# will be displayed.
-#
-# Example for mode 1:
-#
-# ::
-#
-#     find_package_handle_standard_args(LibXml2  DEFAULT_MSG
-#       LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR)
-#
-#
-#
-# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and
-# LIBXML2_INCLUDE_DIR are valid.  Then also LIBXML2_FOUND is set to
-# TRUE.  If it is not found and REQUIRED was used, it fails with
-# FATAL_ERROR, independent whether QUIET was used or not.  If it is
-# found, success will be reported, including the content of <var1>.  On
-# repeated Cmake runs, the same message won't be printed again.
-#
-# Example for mode 2:
-#
-# ::
-#
-#     find_package_handle_standard_args(LibXslt
-#       FOUND_VAR LibXslt_FOUND
-#       REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS
-#       VERSION_VAR LibXslt_VERSION_STRING)
-#
-# In this case, LibXslt is considered to be found if the variable(s)
-# listed after REQUIRED_VAR are all valid, i.e.  LibXslt_LIBRARIES and
-# LibXslt_INCLUDE_DIRS in this case.  The result will then be stored in
-# LibXslt_FOUND .  Also the version of LibXslt will be checked by using
-# the version contained in LibXslt_VERSION_STRING.  Since no
-# FAIL_MESSAGE is given, the default messages will be printed.
-#
-# Another example for mode 2:
-#
-# ::
-#
-#     find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4)
-#     find_package_handle_standard_args(Automoc4  CONFIG_MODE)
-#
-# In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4
-# NO_MODULE) and adds an additional search directory for automoc4.  Here
-# the result will be stored in AUTOMOC4_FOUND.  The following
-# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper
-# success/error message.
-
-#=============================================================================
-# Copyright 2007-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
-
-# internal helper macro
-macro(_FPHSA_FAILURE_MESSAGE _msg)
-  if (${_NAME}_FIND_REQUIRED)
-    message(FATAL_ERROR "${_msg}")
-  else ()
-    if (NOT ${_NAME}_FIND_QUIETLY)
-      message(STATUS "${_msg}")
-    endif ()
-  endif ()
-endmacro()
-
-
-# internal helper macro to generate the failure message when used in CONFIG_MODE:
-macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-  # <name>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
-  if(${_NAME}_CONFIG)
-    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
-  else()
-    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
-    # List them all in the error message:
-    if(${_NAME}_CONSIDERED_CONFIGS)
-      set(configsText "")
-      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
-      math(EXPR configsCount "${configsCount} - 1")
-      foreach(currentConfigIndex RANGE ${configsCount})
-        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
-        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
-        set(configsText "${configsText}    ${filename} (version ${version})\n")
-      endforeach()
-      if (${_NAME}_NOT_FOUND_MESSAGE)
-        set(configsText "${configsText}    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
-      endif()
-      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
-
-    else()
-      # Simple case: No Config-file was found at all:
-      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
-    endif()
-  endif()
-endmacro()
-
-
-function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-
-# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in
-# new extended or in the "old" mode:
-  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
-  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
-  set(multiValueArgs REQUIRED_VARS)
-  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
-  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
-
-  if(${INDEX} EQUAL -1)
-    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
-    set(FPHSA_REQUIRED_VARS ${ARGN})
-    set(FPHSA_VERSION_VAR)
-  else()
-
-    CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
-
-    if(FPHSA_UNPARSED_ARGUMENTS)
-      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
-    endif()
-
-    if(NOT FPHSA_FAIL_MESSAGE)
-      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
-    endif()
-  endif()
-
-# now that we collected all arguments, process them
-
-  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
-    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
-  endif()
-
-  # In config-mode, we rely on the variable <package>_CONFIG, which is set by find_package()
-  # when it successfully found the config-file, including version checking:
-  if(FPHSA_CONFIG_MODE)
-    list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
-    list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
-    set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
-  endif()
-
-  if(NOT FPHSA_REQUIRED_VARS)
-    message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
-  endif()
-
-  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
-
-  string(TOUPPER ${_NAME} _NAME_UPPER)
-  string(TOLOWER ${_NAME} _NAME_LOWER)
-
-  if(FPHSA_FOUND_VAR)
-    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
-      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
-    else()
-      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
-    endif()
-  else()
-    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
-  endif()
-
-  # collect all variables which were not found, so they can be printed, so the
-  # user knows better what went wrong (#6375)
-  set(MISSING_VARS "")
-  set(DETAILS "")
-  # check if all passed variables are valid
-  unset(${_FOUND_VAR})
-  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
-    if(NOT ${_CURRENT_VAR})
-      set(${_FOUND_VAR} FALSE)
-      set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
-    else()
-      set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
-    endif()
-  endforeach()
-  if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE")
-    set(${_FOUND_VAR} TRUE)
-  endif()
-
-  # component handling
-  unset(FOUND_COMPONENTS_MSG)
-  unset(MISSING_COMPONENTS_MSG)
-
-  if(FPHSA_HANDLE_COMPONENTS)
-    foreach(comp ${${_NAME}_FIND_COMPONENTS})
-      if(${_NAME}_${comp}_FOUND)
-
-        if(NOT DEFINED FOUND_COMPONENTS_MSG)
-          set(FOUND_COMPONENTS_MSG "found components: ")
-        endif()
-        set(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}")
-
-      else()
-
-        if(NOT DEFINED MISSING_COMPONENTS_MSG)
-          set(MISSING_COMPONENTS_MSG "missing components: ")
-        endif()
-        set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}")
-
-        if(${_NAME}_FIND_REQUIRED_${comp})
-          set(${_FOUND_VAR} FALSE)
-          set(MISSING_VARS "${MISSING_VARS} ${comp}")
-        endif()
-
-      endif()
-    endforeach()
-    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
-    set(DETAILS "${DETAILS}[c${COMPONENT_MSG}]")
-  endif()
-
-  # version handling:
-  set(VERSION_MSG "")
-  set(VERSION_OK TRUE)
-  set(VERSION ${${FPHSA_VERSION_VAR}})
-
-  # check with DEFINED here as the requested or found version may be "0"
-  if (DEFINED ${_NAME}_FIND_VERSION)
-    if(DEFINED ${FPHSA_VERSION_VAR})
-
-      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
-        # count the dots in the version string
-        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${VERSION}")
-        # add one dot because there is one dot more than there are components
-        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
-        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
-          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
-          # is at most 4 here. Therefore a simple lookup table is used.
-          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
-            set(_VERSION_REGEX "[^.]*")
-          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
-            set(_VERSION_REGEX "[^.]*\\.[^.]*")
-          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
-            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
-          else ()
-            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
-          endif ()
-          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${VERSION}")
-          unset(_VERSION_REGEX)
-          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
-            set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-            set(VERSION_OK FALSE)
-          else ()
-            set(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
-          endif ()
-          unset(_VERSION_HEAD)
-        else ()
-          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL VERSION)
-            set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-            set(VERSION_OK FALSE)
-          else ()
-            set(VERSION_MSG "(found suitable exact version \"${VERSION}\")")
-          endif ()
-        endif ()
-        unset(_VERSION_DOTS)
-
-      else()     # minimum version specified:
-        if (${_NAME}_FIND_VERSION VERSION_GREATER VERSION)
-          set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
-          set(VERSION_OK FALSE)
-        else ()
-          set(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
-        endif ()
-      endif()
-
-    else()
-
-      # if the package was not found, but a version was given, add that to the output:
-      if(${_NAME}_FIND_VERSION_EXACT)
-         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
-      else()
-         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
-      endif()
-
-    endif()
-  else ()
-    if(VERSION)
-      set(VERSION_MSG "(found version \"${VERSION}\")")
-    endif()
-  endif ()
-
-  if(VERSION_OK)
-    set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]")
-  else()
-    set(${_FOUND_VAR} FALSE)
-  endif()
-
-
-  # print the result:
-  if (${_FOUND_VAR})
-    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
-  else ()
-
-    if(FPHSA_CONFIG_MODE)
-      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
-    else()
-      if(NOT VERSION_OK)
-        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
-      else()
-        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}")
-      endif()
-    endif()
-
-  endif ()
-
-  set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE)
-
-endfunction()

cmake/Modules/FindPackageMessage.cmake

@@ -1,57 +0,0 @@
-#.rst:
-# FindPackageMessage
-# ------------------
-#
-#
-#
-# FIND_PACKAGE_MESSAGE(<name> "message for user" "find result details")
-#
-# This macro is intended to be used in FindXXX.cmake modules files.  It
-# will print a message once for each unique find result.  This is useful
-# for telling the user where a package was found.  The first argument
-# specifies the name (XXX) of the package.  The second argument
-# specifies the message to display.  The third argument lists details
-# about the find result so that if they change the message will be
-# displayed again.  The macro also obeys the QUIET argument to the
-# find_package command.
-#
-# Example:
-#
-# ::
-#
-#   if(X11_FOUND)
-#     FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}"
-#       "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]")
-#   else()
-#    ...
-#   endif()
-
-#=============================================================================
-# Copyright 2008-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-function(FIND_PACKAGE_MESSAGE pkg msg details)
-  # Avoid printing a message repeatedly for the same find result.
-  if(NOT ${pkg}_FIND_QUIETLY)
-    string(REPLACE "\n" "" details "${details}")
-    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
-    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
-      # The message has not yet been printed.
-      message(STATUS "${msg}")
-
-      # Save the find details in the cache to avoid printing the same
-      # message again.
-      set("${DETAILS_VAR}" "${details}"
-        CACHE INTERNAL "Details about finding ${pkg}")
-    endif()
-  endif()
-endfunction()

cmake/buildAppImage.sh.in

@@ -12,12 +12,11 @@ mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/
 cp -R /usr/local/lib/SoapySDR ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/
 mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib
 
-pushd .
-cd ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/ 
-find . -type f -exec sed -i -e 's|/usr|././|g' {} \; 
-popd
 
-IGNORE_PKG="libc6.* libusb.* libgcc.* libstd.* libudev.* libgtk.* libgdk.* libx.* libpango.* libglib.* libgl.* libcairo.* libfont.* libatk.* libwayland.* libthai.* libpixman.* zlib.* libpcre.* libice.* libuuid.* libpulse.* libjson.* libdbus.* libatspi.* libharf.* libselinux.* libmir.* libboost-system.* libprotobuf.* libdatrie.* libsystem.* libwrap.* libsndfile.* libasync.* libgraphite.* liblzma.* libgcrypt.* libflac.* libvorbis.* libgpg.* libogg.* libsm6 libpng.* libexpat.* libdrm.* libffi.* libfreetype.* libboost-filesystem.*"
+IGNORE_PKG="libc6.* libusb.* libgcc.* libstd.* libudev.* libgtk.* libgdk.* libx.* libpango.* libglib.* libgl.* libcairo.* libfont.* libatk.* libwayland.* libthai.* libpixman.* zlib.* libpcre.* libice.* libuuid.* libpulse.* libjson.* libdbus.* libatspi.* libharf.* libselinux.* libmir.* libboost-system.* libprotobuf.* libdatrie.* libsystem.* libwrap.* libsndfile.* libasync.* libgraphite.* liblzma.* libgcrypt.* libflac.* libvorbis.* libgpg.* libogg.* libsm6 libpng.* libexpat.* libdrm.* libffi.* libfreetype.* libboost-filesystem.* libmirsdr.*"
+
+IGNORE_LIB="^.*libmirsdr.*"
+
 
 for f in `find ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/local/lib/SoapySDR/modules/ -type f` ${CMAKE_CURRENT_BINARY_DIR}/${EX_PLATFORM_NAME}/CubicSDR
 do
@@ -26,8 +25,17 @@ do
 		echo "Checking what package owns $l: "
 		OWNER_PKG=`apt-file --package-only find $l`
 		SKIP_PKG=0
-		if [ "$OWNER_PKG" = "" ]; then
+
-			echo "$l has no package, copying to AppDir.."
+		for i in $IGNORE_LIB
+		do
+			if [[ $l =~ $i ]]; then
+				echo "Ignoring lib $l matching explicit library ignore regex $i"
+				SKIP_PKG=1
+			fi
+		done
+
+		if [ "$OWNER_PKG" = "" ] && [ $SKIP_PKG = 0 ]; then
+			echo "*** $l has no package, copying to AppDir.."
 			cp $l ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib/
 			SKIP_PKG=1
 		fi
@@ -39,14 +47,20 @@ do
 				SKIP_PKG=1
 			fi
 		done
+
 		if [ $SKIP_PKG = 0 ]; then
 			#SO_FILE=`echo $l | sed 's/\.so\.[^\.]*$//'`.so
-			echo "$OWNER_PKG not in ignore list, copying $l to AppDir.."
+			echo "*** $OWNER_PKG not in ignore list, copying $l to AppDir.."
 			cp $l ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/lib/
 		fi
 	done
 done
 
+pushd .
+cd ${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.AppDir/usr/ 
+find . -type f -exec sed -i -e 's|/usr|././|g' {} \; 
+popd
+
 pushd .
 cd ${CMAKE_CURRENT_BINARY_DIR}
 ${APPIMAGEKIT_APPASSIST} CubicSDR.AppDir CubicSDR

src/AppConfig.cpp

@@ -199,6 +199,7 @@ AppConfig::AppConfig() : configName("") {
     winH.store(0);
     winMax.store(false);
     showTips.store(true);
+    lowPerfMode.store(false);
     themeId.store(0);
     snap.store(1);
     centerFreq.store(100000000);
@@ -265,6 +266,14 @@ bool AppConfig::getShowTips() {
     return showTips.load();
 }
 
+void AppConfig::setLowPerfMode(bool show) {
+    lowPerfMode.store(show);
+}
+
+bool AppConfig::getLowPerfMode() {
+    return lowPerfMode.load();
+}
+
 wxRect *AppConfig::getWindow() {
     wxRect *r = NULL;
     if (winH.load() && winW.load()) {
@@ -360,6 +369,7 @@ bool AppConfig::save() {
 
         *window_node->newChild("max") = winMax.load();
         *window_node->newChild("tips") = showTips.load();
+        *window_node->newChild("low_perf_mode") = lowPerfMode.load();
         *window_node->newChild("theme") = themeId.load();
         *window_node->newChild("snap") = snap.load();
         *window_node->newChild("center_freq") = centerFreq.load();
@@ -444,7 +454,7 @@ bool AppConfig::load() {
 
     if (cfg.rootNode()->hasAnother("window")) {
         int x,y,w,h;
-        int max,tips;
+        int max,tips,lpm;
         
         DataNode *win_node = cfg.rootNode()->getNext("window");
         
@@ -470,6 +480,11 @@ bool AppConfig::load() {
             showTips.store(tips?true:false);
         }
 
+        if (win_node->hasAnother("low_perf_mode")) {
+            win_node->getNext("low_perf_mode")->element()->get(lpm);
+            lowPerfMode.store(lpm?true:false);
+        }
+
         if (win_node->hasAnother("theme")) {
             int theme;
             win_node->getNext("theme")->element()->get(theme);

src/AppConfig.h

@@ -73,6 +73,9 @@ public:
     void setShowTips(bool show);
     bool getShowTips();
 
+    void setLowPerfMode(bool lpm);
+    bool getLowPerfMode();
+    
     void setTheme(int themeId);
     int getTheme();
 
@@ -127,7 +130,7 @@ private:
     std::string configName;
     std::map<std::string, DeviceConfig *> deviceConfig;
     std::atomic_int winX,winY,winW,winH;
-    std::atomic_bool winMax, showTips;
+    std::atomic_bool winMax, showTips, lowPerfMode;
     std::atomic_int themeId;
     std::atomic_llong snap;
     std::atomic_llong centerFreq;

src/AppFrame.cpp

@@ -55,7 +55,9 @@ AppFrame::AppFrame() :
     wxBoxSizer *demodScopeTray = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *demodTunerTray = new wxBoxSizer(wxHORIZONTAL);
 
-    int attribList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
+//    int attribList[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0 };
+    wxGLAttributes attribList;
+    attribList.PlatformDefaults().RGBA().DoubleBuffer().EndList();
 
     mainSplitter = new wxSplitterWindow( this, wxID_MAIN_SPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH | wxSP_LIVE_UPDATE );
     mainSplitter->SetSashGravity(10.0/37.0);
@@ -603,6 +605,14 @@ void AppFrame::updateDeviceParams() {
     showTipMenuItem = newSettingsMenu->AppendCheckItem(wxID_SET_TIPS, "Show Hover Tips");
     showTipMenuItem->Check(wxGetApp().getConfig()->getShowTips());
 
+    lowPerfMode = wxGetApp().getConfig()->getLowPerfMode();
+    lowPerfMenuItem = newSettingsMenu->AppendCheckItem(wxID_LOW_PERF, "Reduce CPU Usage");
+    if (lowPerfMode) {
+        lowPerfMenuItem->Check(true);
+    }
+
+    newSettingsMenu->AppendSeparator();
+
     newSettingsMenu->Append(wxID_SET_FREQ_OFFSET, "Frequency Offset");
 
     if (devInfo->hasCORR(SOAPY_SDR_RX, 0)) {
@@ -625,6 +635,10 @@ void AppFrame::updateDeviceParams() {
     SoapySDR::ArgInfoList::const_iterator args_i;
     settingArgs = soapyDev->getSettingInfo();
 
+    if (settingArgs.size()) {
+        newSettingsMenu->AppendSeparator();
+    }
+    
     for (args_i = settingArgs.begin(); args_i != settingArgs.end(); args_i++) {
         SoapySDR::ArgInfo arg = (*args_i);
         std::string currentVal = soapyDev->readSetting(arg.key);
@@ -779,6 +793,21 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
                 wxGetApp().setDevice(dev);
             }
         }
+    } else if (event.GetId() == wxID_LOW_PERF) {
+        lowPerfMode = lowPerfMenuItem->IsChecked();
+        wxGetApp().getConfig()->setLowPerfMode(lowPerfMode);
+
+//        long srate = wxGetApp().getSampleRate();
+//        if (srate > CHANNELIZER_RATE_MAX && lowPerfMode) {
+//            if (wxGetApp().getSpectrumProcessor()->getFFTSize() != 1024) {
+//                setMainWaterfallFFTSize(1024);
+//            }
+//        } else if (srate > CHANNELIZER_RATE_MAX) {
+//            if (wxGetApp().getSpectrumProcessor()->getFFTSize() != 2048) {
+//                setMainWaterfallFFTSize(2048);
+//            }
+//        }
+
     } else if (event.GetId() == wxID_SET_TIPS ) {
         if (wxGetApp().getConfig()->getShowTips()) {
             wxGetApp().getConfig()->setShowTips(false);
@@ -1460,9 +1489,13 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
 #endif
     
     if (!this->IsActive()) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(25));
+        std::this_thread::sleep_for(std::chrono::milliseconds(30));
     } else {
-        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        if (lowPerfMode) {
+            std::this_thread::sleep_for(std::chrono::milliseconds(30));
+        } else {
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
     }
     
     event.RequestMore();
@@ -1608,7 +1641,7 @@ bool AppFrame::loadSession(std::string fileName) {
 
             DataNode *demodTypeNode = demod->hasAnother("type")?demod->getNext("type"):nullptr;
             
-            if (demodTypeNode->element()->getDataType() == DATA_INT) {
+            if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_INT) {
                 int legacyType = *demodTypeNode;
                 int legacyStereo = demod->hasAnother("stereo") ? (int) *demod->getNext("stereo") : 0;
                 switch (legacyType) {   // legacy demod ID
@@ -1630,7 +1663,7 @@ bool AppFrame::loadSession(std::string fileName) {
                     case 16: type = "I/Q"; break;
                     default: type = "FM"; break;
                 }
-            } else if (demodTypeNode->element()->getDataType() == DATA_STRING) {
+            } else if (demodTypeNode && demodTypeNode->element()->getDataType() == DATA_STRING) {
                 demodTypeNode->element()->get(type);
             }
 

src/AppFrame.h

@@ -31,6 +31,7 @@
 #define wxID_SDR_DEVICES 2008
 #define wxID_AGC_CONTROL 2009
 #define wxID_SDR_START_STOP 2010
+#define wxID_LOW_PERF 2011
 
 #define wxID_MAIN_SPLITTER 2050
 #define wxID_VIS_SPLITTER 2051
@@ -134,6 +135,7 @@ private:
     wxMenu *sampleRateMenu;
     wxMenuItem *agcMenuItem;
     wxMenuItem *iqSwapMenuItem;
+    wxMenuItem *lowPerfMenuItem;
     wxMenu *settingsMenu;
     SoapySDR::ArgInfoList settingArgs;
     int settingsIdMax;
@@ -152,6 +154,8 @@ private:
     ModemArgInfoList newModemArgs;
 	wxMenuItem *showTipMenuItem;
 
+    bool lowPerfMode;
+    
 #ifdef USE_HAMLIB
     void enableRig();
     void disableRig();

src/audio/AudioThread.cpp

@@ -20,11 +20,13 @@ AudioThread::AudioThread() : IOThread(),
 	outputDevice.store(-1);
     gain.store(1.0);
 
-    boundThreads.store(new std::vector<AudioThread *>);
+    vBoundThreads = new std::vector<AudioThread *>;
+    boundThreads.store(vBoundThreads);
 }
 
 AudioThread::~AudioThread() {
-    delete boundThreads.load();
+    boundThreads.store(nullptr);
+    delete vBoundThreads;
 }
 
 void AudioThread::bindThread(AudioThread *other) {

src/audio/AudioThread.h

@@ -100,5 +100,6 @@ public:
     static void deviceCleanup();
     static void setDeviceSampleRate(int deviceId, int sampleRate);
     std::atomic<std::vector<AudioThread *> *> boundThreads;
+    std::vector<AudioThread *> *vBoundThreads;
 };
 

src/demod/DemodulatorInstance.cpp

@@ -137,17 +137,23 @@ bool DemodulatorInstance::isTerminated() {
 
         switch (cmd.cmd) {
         case DemodulatorThreadCommand::DEMOD_THREAD_CMD_AUDIO_TERMINATED:
-            t_Audio->join();
+            if (t_Audio) {
-            audioTerminated = true;
+                t_Audio->join();
-            delete t_Audio;
+                audioTerminated = true;
+                delete t_Audio;
+                t_Audio = nullptr;
+            }
             break;
         case DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_TERMINATED:
-#ifdef __APPLE__
+            if (t_Demod) {
-            pthread_join(t_Demod, NULL);
+                #ifdef __APPLE__
-#else
+                pthread_join(t_Demod, nullptr);
-            t_Demod->join();
+                #else
-            delete t_Demod;
+                t_Demod->join();
-#endif
+                delete t_Demod;
+                #endif
+                t_Demod = nullptr;
+            }
 #if ENABLE_DIGITAL_LAB
             if (activeOutput) {
                 closeOutput();
@@ -156,13 +162,16 @@ bool DemodulatorInstance::isTerminated() {
             demodTerminated = true;
             break;
         case DemodulatorThreadCommand::DEMOD_THREAD_CMD_DEMOD_PREPROCESS_TERMINATED:
-#ifdef __APPLE__
+            if (t_PreDemod) {
-            pthread_join(t_PreDemod, NULL);
+                #ifdef __APPLE__
-#else
+                pthread_join(t_PreDemod, NULL);
-            t_PreDemod->join();
+                #else
-            delete t_PreDemod;
+                t_PreDemod->join();
-#endif
+                delete t_PreDemod;
-            preDemodTerminated = true;
+                #endif
+                preDemodTerminated = true;
+                t_PreDemod = nullptr;
+            }
             break;
         default:
             break;

src/demod/DemodulatorWorkerThread.cpp

@@ -84,7 +84,7 @@ void DemodulatorWorkerThread::run() {
             
             float As = 60.0f;         // stop-band attenuation [dB]
             
-            if (result.sampleRate && result.bandwidth) {
+            if (cModem && result.sampleRate && result.bandwidth) {
                 result.bandwidth = cModem->checkSampleRate(result.bandwidth, makeDemod?demodCommand.audioSampleRate:filterCommand.audioSampleRate);
                 result.iqResampleRatio = (double) (result.bandwidth) / (double) result.sampleRate;
                 result.iqResampler = msresamp_crcf_create(result.iqResampleRatio, As);

src/forms/SDRDevices/SDRDevices.fbp

@@ -307,7 +307,7 @@
                                         <property name="permission">none</property>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxEXPAND|wxALIGN_RIGHT</property>
+                                            <property name="flag">wxEXPAND</property>
                                             <property name="proportion">1</property>
                                             <object class="wxTreeCtrl" expanded="0">
                                                 <property name="BottomDockable">1</property>

src/forms/SDRDevices/SDRDevicesForm.cpp

@@ -28,7 +28,7 @@ devFrame::devFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
 	devTree = new wxTreeCtrl( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE );
 	devTree->Enable( false );
 	
-	bSizer6->Add( devTree, 1, wxEXPAND|wxALIGN_RIGHT, 5 );
+	bSizer6->Add( devTree, 1, wxEXPAND, 5 );
 	
 	m_panel4 = new wxPanel( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;

src/panel/SpectrumPanel.cpp

@@ -224,6 +224,13 @@ void SpectrumPanel::drawPanelContents() {
     }
     
     for (double m = -1.0 + mhzStart, mMax = 1.0 + ((mhzStart>0)?mhzStart:-mhzStart); m <= mMax; m += mhzStep) {
+        if (m < -1.0) {
+            currentMhz += mhzVisualStep;
+            continue;
+        }
+        if (m > 1.0) {
+            break;
+        }
         label << std::fixed << currentMhz;
         
         double fractpart, intpart;
@@ -247,7 +254,7 @@ void SpectrumPanel::drawPanelContents() {
         
         glColor4f(ThemeMgr::mgr.currentTheme->text.r, ThemeMgr::mgr.currentTheme->text.g, ThemeMgr::mgr.currentTheme->text.b,1.0);
         
-        GLFont::getFont(fontEnumSize).drawString(label.str(), m, hPos, fontSize, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+        GLFont::getFont(fontEnumSize).drawString(label.str(), m, hPos, fontSize, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
         
         label.str(std::string());
         

src/process/ScopeVisualProcessor.cpp

@@ -2,24 +2,46 @@
 #include <cstring>
 #include <string>
 
-ScopeVisualProcessor::ScopeVisualProcessor(): outputBuffers("ScopeVisualProcessorBuffers"), fftInData(NULL), fftwOutput(NULL), fftw_plan(NULL), maxScopeSamples(1024) {
+ScopeVisualProcessor::ScopeVisualProcessor(): outputBuffers("ScopeVisualProcessorBuffers") {
     scopeEnabled.store(true);
     spectrumEnabled.store(true);
     fft_average_rate = 0.65;
 	fft_ceil_ma = fft_ceil_maa = 0;
 	fft_floor_ma = fft_floor_maa = 0;
+    maxScopeSamples = 1024;
+#if USE_FFTW3
+    fftInData = nullptr;
+    fftwOutput = nullptr;
+    fftw_plan = nullptr;
+#else
+    fftInData = nullptr;
+    fftOutput = nullptr;
+    fftPlan = nullptr;
+#endif
 }
 
 ScopeVisualProcessor::~ScopeVisualProcessor() {
-    /*if (fftInData) {
+#if USE_FFTW3
+    if (fftw_plan) {
+        fftwf_destroy_plan(fftw_plan);
+    }
+    if (fftInData) {
         free(fftInData);
     }
     if (fftwOutput) {
         free(fftwOutput);
-    }*/
-    if (fftw_plan) {
-        fftwf_destroy_plan(fftw_plan);
     }
+#else
+    if (fftPlan) {
+        fft_destroy_plan(fftPlan);
+    }
+    if (fftInData) {
+        free(fftInData);
+    }
+    if (fftOutput) {
+        free(fftOutput);
+    }
+#endif
 }
 
 
@@ -27,6 +49,7 @@ void ScopeVisualProcessor::setup(int fftSize_in) {
     fftSize = fftSize_in;
     desiredInputSize = fftSize;
 
+#if USE_FFTW3
     if (fftInData) {
         free(fftInData);
     }
@@ -39,9 +62,20 @@ void ScopeVisualProcessor::setup(int fftSize_in) {
         fftwf_destroy_plan(fftw_plan);
     }
     fftw_plan = fftwf_plan_dft_r2c_1d(fftSize, fftInData, fftwOutput, FFTW_ESTIMATE);
-    //(fftSize, fftInData, fftwOutput, 0);
+#else
-    //(fftSize, fftwInput, fftwOutput, FFTW_R2HC, FFTW_ESTIMATE);
+    if (fftInData) {
-    
+        free(fftInData);
+    }
+    fftInData = (liquid_float_complex*) malloc(sizeof(liquid_float_complex) * fftSize);
+    if (fftOutput) {
+        free(fftOutput);
+    }
+    fftOutput = (liquid_float_complex*) malloc(sizeof(liquid_float_complex) * fftSize);
+    if (fftPlan) {
+        fft_destroy_plan(fftPlan);
+    }
+    fftPlan = fft_create_plan(fftSize, fftInData, fftOutput, LIQUID_FFT_FORWARD, 0);
+#endif
 }
 
 void ScopeVisualProcessor::setScopeEnabled(bool scopeEnable) {
@@ -130,6 +164,7 @@ void ScopeVisualProcessor::process() {
         if (spectrumEnabled) {
             iMax = audioInputData->data.size();
 
+#if USE_FFTW3
             if (audioInputData->channels==1) {
                 for (i = 0; i < fftSize; i++) {
                     if (i < iMax) {
@@ -148,6 +183,29 @@ void ScopeVisualProcessor::process() {
                     }
                 }
             }
+#else
+            if (audioInputData->channels==1) {
+                for (i = 0; i < fftSize; i++) {
+                    if (i < iMax) {
+                        fftInData[i].real = audioInputData->data[i];
+                        fftInData[i].imag = 0;
+                    } else {
+                        fftInData[i].real = 0;
+                    }
+                }
+            } else if (audioInputData->channels==2) {
+                iMax = iMax/2;
+                for (i = 0; i < fftSize; i++) {
+                    if (i < iMax) {
+                        fftInData[i].real = audioInputData->data[i] + audioInputData->data[iMax+i];
+                        fftInData[i].imag = 0;
+                    } else {
+                        fftInData[i].real = 0;
+                        fftInData[i].imag = 0;
+                    }
+                }
+            }
+#endif
             
             renderData = outputBuffers.getBuffer();
 
@@ -157,8 +215,6 @@ void ScopeVisualProcessor::process() {
             
             audioInputData->decRefCount();
 
-            fftwf_execute(fftw_plan);
-            
             float fft_ceil = 0, fft_floor = 1;
             
             if (fft_result.size() < (fftSize/2)) {
@@ -167,11 +223,22 @@ void ScopeVisualProcessor::process() {
                 fft_result_maa.resize((fftSize/2));
             }
 
+#if USE_FFTW3
+            fftwf_execute(fftw_plan);
+            
             for (i = 0; i < (fftSize/2); i++) {
                 float a = fftwOutput[i][0];
                 float b = fftwOutput[i][1];
                 fft_result[i] = sqrt( a * a + b * b);
             }
+#else
+            fft_execute(fftPlan);
+            for (i = 0; i < (fftSize/2); i++) {
+                float a = fftOutput[i].real;
+                float b = fftOutput[i].imag;
+                fft_result[i] = sqrt( a * a + b * b);
+            }
+#endif
             
             for (i = 0; i < (fftSize/2); i++) {
                 fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * fft_average_rate;

src/process/ScopeVisualProcessor.h

@@ -2,9 +2,12 @@
 
 #include "VisualProcessor.h"
 #include "AudioThread.h"
-#include "fftw3.h"
 #include "ScopePanel.h"
 
+#if USE_FFTW3
+#include "fftw3.h"
+#endif
+
 class ScopeRenderData: public ReferenceCounter {
 public:
 	std::vector<float> waveform_points;
@@ -33,9 +36,16 @@ protected:
     std::atomic_bool scopeEnabled;
     std::atomic_bool spectrumEnabled;
     
+#if USE_FFTW3
     float *fftInData;
     fftwf_complex *fftwOutput;
     fftwf_plan fftw_plan;
+#else
+    liquid_float_complex *fftInData;
+    liquid_float_complex *fftOutput;
+    fftplan fftPlan;
+#endif
+    
     unsigned int fftSize;
     int desiredInputSize;
     unsigned int maxScopeSamples;

src/process/SpectrumVisualProcessor.cpp

@@ -2,7 +2,26 @@
 #include "CubicSDR.h"
 
 
-SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisualProcessorBuffers"), lastInputBandwidth(0), lastBandwidth(0), fftwInput(NULL), fftwOutput(NULL), fftInData(NULL), fftLastData(NULL), lastDataSize(0), fftw_plan(NULL), resampler(NULL), resamplerRatio(0) {
+SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisualProcessorBuffers") {
+    lastInputBandwidth = 0;
+    lastBandwidth = 0;
+    lastDataSize = 0;
+    resampler = nullptr;
+    resamplerRatio = 0;
+
+#if USE_FFTW3
+    fftwInput = nullptr;
+    fftwOutput = nullptr;
+    fftInData = nullptr;
+    fftLastData = nullptr;
+    fftw_plan = nullptr;
+#else
+    fftInput = nullptr;
+    fftOutput = nullptr;
+    fftInData = nullptr;
+    fftLastData = nullptr;
+    fftPlan = nullptr;
+#endif
     
     is_view.store(false);
     fftSize.store(0);
@@ -23,6 +42,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : outputBuffers("SpectrumVisu
     lastView = false;
     peakHold.store(false);
     peakReset.store(false);
+    
 }
 
 SpectrumVisualProcessor::~SpectrumVisualProcessor() {
@@ -102,6 +122,7 @@ void SpectrumVisualProcessor::setup(unsigned int fftSize_in) {
     fftSizeInternal = fftSize_in * SPECTRUM_VZM;
     lastDataSize = 0;
 
+#if USE_FFTW3
     int memSize = sizeof(fftwf_complex) * fftSizeInternal;
     
     if (fftwInput) {
@@ -136,6 +157,39 @@ void SpectrumVisualProcessor::setup(unsigned int fftSize_in) {
         fftwf_destroy_plan(fftw_plan);
     }
     fftw_plan = fftwf_plan_dft_1d(fftSizeInternal, fftwInput, fftwOutput, FFTW_FORWARD, FFTW_ESTIMATE);
+#else
+    int memSize = sizeof(liquid_float_complex) * fftSizeInternal;
+    
+    if (fftInput) {
+        free(fftInput);
+    }
+    fftInput = (liquid_float_complex*)malloc(memSize);
+    memset(fftInput,0,memSize);
+    
+    if (fftInData) {
+        free(fftInData);
+    }
+    fftInData = (liquid_float_complex*)malloc(memSize);
+    memset(fftInput,0,memSize);
+    
+    if (fftLastData) {
+        free(fftLastData);
+    }
+    fftLastData = (liquid_float_complex*)malloc(memSize);
+    memset(fftInput,0,memSize);
+    
+    if (fftOutput) {
+        free(fftOutput);
+    }
+    fftOutput = (liquid_float_complex*)malloc(memSize);
+    memset(fftInput,0,memSize);
+    
+    if (fftPlan) {
+        fft_destroy_plan(fftPlan);
+    }
+    fftPlan = fft_create_plan(fftSizeInternal, fftInput, fftOutput, LIQUID_FFT_FORWARD, 0);
+#endif
+    
     busy_run.unlock();
 }
 
@@ -147,6 +201,14 @@ void SpectrumVisualProcessor::setFFTSize(unsigned int fftSize_in) {
     fftSizeChanged.store(true);
 }
 
+unsigned int SpectrumVisualProcessor::getFFTSize() {
+    if (fftSizeChanged.load()) {
+        return newFFTSize;
+    }
+    return fftSize.load();
+}
+
+
 void SpectrumVisualProcessor::setHideDC(bool hideDC) {
     this->hideDC.store(hideDC);
 }
@@ -311,6 +373,7 @@ void SpectrumVisualProcessor::process() {
             
             msresamp_crcf_execute(resampler, &shiftBuffer[0], desired_input_size, &resampleBuffer[0], &num_written);
             
+#if USE_FFTW3
             if (num_written < fftSizeInternal) {
                 for (unsigned int i = 0; i < num_written; i++) {
                     fftInData[i][0] = resampleBuffer[i].real;
@@ -326,10 +389,19 @@ void SpectrumVisualProcessor::process() {
                     fftInData[i][1] = resampleBuffer[i].imag;
                 }
             }
+#else
+            if (num_written < fftSizeInternal) {
+                memcpy(fftInData, resampleBuffer.data(), num_written * sizeof(liquid_float_complex));
+                memset(&(fftInData[num_written]), 0, (fftSizeInternal-num_written) * sizeof(liquid_float_complex));
+            } else {
+                memcpy(fftInData, resampleBuffer.data(), fftSizeInternal * sizeof(liquid_float_complex));
+            }
+#endif
         } else {
             this->desiredInputSize.store(fftSizeInternal);
 
             num_written = data->size();
+#if USE_FFTW3
             if (data->size() < fftSizeInternal) {
                 for (size_t i = 0, iMax = data->size(); i < iMax; i++) {
                     fftInData[i][0] = (*data)[i].real;
@@ -345,10 +417,19 @@ void SpectrumVisualProcessor::process() {
                     fftInData[i][1] = (*data)[i].imag;
                 }
             }
+#else
+            if (data->size() < fftSizeInternal) {
+                memcpy(fftInData, data->data(), data->size() * sizeof(liquid_float_complex));
+                memset(&fftInData[data->size()], 0, (fftSizeInternal - data->size()) * sizeof(liquid_float_complex));
+            } else {
+                memcpy(fftInData, data->data(), fftSizeInternal * sizeof(liquid_float_complex));
+            }
+#endif
         }
         
         bool execute = false;
 
+#if USE_FFTW3
         if (num_written >= fftSizeInternal) {
             execute = true;
             memcpy(fftwInput, fftInData, fftSizeInternal * sizeof(fftwf_complex));
@@ -370,6 +451,29 @@ void SpectrumVisualProcessor::process() {
                 execute = true;
             }
         }
+#else
+        if (num_written >= fftSizeInternal) {
+            execute = true;
+            memcpy(fftInput, fftInData, fftSizeInternal * sizeof(liquid_float_complex));
+            memcpy(fftLastData, fftInput, fftSizeInternal * sizeof(liquid_float_complex));
+            
+        } else {
+            if (lastDataSize + num_written < fftSizeInternal) { // priming
+                unsigned int num_copy = fftSizeInternal - lastDataSize;
+                if (num_written > num_copy) {
+                    num_copy = num_written;
+                }
+                memcpy(fftLastData, fftInData, num_copy * sizeof(liquid_float_complex));
+                lastDataSize += num_copy;
+            } else {
+                unsigned int num_last = (fftSizeInternal - num_written);
+                memcpy(fftInput, fftLastData + (lastDataSize - num_last), num_last * sizeof(liquid_float_complex));
+                memcpy(fftInput + num_last, fftInData, num_written * sizeof(liquid_float_complex));
+                memcpy(fftLastData, fftInput, fftSizeInternal * sizeof(liquid_float_complex));
+                execute = true;
+            }
+        }
+#endif
         
         if (execute) {
             SpectrumVisualData *output = outputBuffers.getBuffer();
@@ -385,10 +489,11 @@ void SpectrumVisualProcessor::process() {
                 output->spectrum_hold_points.resize(0);
             }
             
-            fftwf_execute(fftw_plan);
-            
             float fft_ceil = 0, fft_floor = 1;
 
+#if USE_FFTW3
+            fftwf_execute(fftw_plan);
+            
             for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) {
                 float a = fftwOutput[i][0];
                 float b = fftwOutput[i][1];
@@ -401,6 +506,22 @@ void SpectrumVisualProcessor::process() {
                 fft_result[i] = (z);
                 fft_result[fftSizeInternal / 2 + i] = (c);
             }
+#else
+            fft_execute(fftPlan);
+            
+            for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) {
+                float a = fftOutput[i].real;
+                float b = fftOutput[i].imag;
+                float c = sqrt(a * a + b * b);
+                
+                float x = fftOutput[fftSizeInternal / 2 + i].real;
+                float y = fftOutput[fftSizeInternal / 2 + i].imag;
+                float z = sqrt(x * x + y * y);
+                
+                fft_result[i] = (z);
+                fft_result[fftSizeInternal / 2 + i] = (c);
+            }
+#endif
             
             if (newResampler && lastView) {
                 if (bwDiff < 0) {

src/process/SpectrumVisualProcessor.h

@@ -2,9 +2,12 @@
 
 #include "VisualProcessor.h"
 #include "DemodDefs.h"
-#include "fftw3.h"
 #include <cmath>
 
+#if USE_FFTW3
+#include "fftw3.h"
+#endif
+
 #define SPECTRUM_VZM 2
 #define PEAK_RESET_COUNT 30
 
@@ -44,6 +47,7 @@ public:
     
     void setup(unsigned int fftSize);
     void setFFTSize(unsigned int fftSize);
+    unsigned int getFFTSize();
     void setHideDC(bool hideDC);
     
     void setScaleFactor(float sf);
@@ -64,9 +68,15 @@ private:
     long lastBandwidth;
     bool lastView;
 
+#if USE_FFTW3
     fftwf_complex *fftwInput, *fftwOutput, *fftInData, *fftLastData;
-    unsigned int lastDataSize;
     fftwf_plan fftw_plan;
+#else
+    liquid_float_complex *fftInput, *fftOutput, *fftInData, *fftLastData;
+    fftplan fftPlan;
+#endif
+
+    unsigned int lastDataSize;
     
     double fft_ceil_ma, fft_ceil_maa;
     double fft_floor_ma, fft_floor_maa;

src/sdr/SDRPostThread.cpp

@@ -184,7 +184,9 @@ void SDRPostThread::run() {
             }
         }
 
-        data_in->decRefCount();
+        if (data_in) {
+            data_in->decRefCount();   
+        }
 
         bool doUpdate = false;
         for (size_t j = 0; j < nRunDemods; j++) {

src/ui/UITestCanvas.cpp

@@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLeftWindow)
 EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow)
 wxEND_EVENT_TABLE()
 
-UITestCanvas::UITestCanvas(wxWindow *parent, int *attribList) :
+UITestCanvas::UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-InteractiveCanvas(parent, attribList) {
+InteractiveCanvas(parent, dispAttrs) {
     
     glContext = new UITestContext(this, &wxGetApp().GetContext(this));
 }

src/ui/UITestCanvas.h

@@ -10,12 +10,11 @@
 #include "UITestContext.h"
 #include "MouseTracker.h"
 
-#include "fftw3.h"
 #include "Timer.h"
 
 class UITestCanvas: public InteractiveCanvas {
 public:
-    UITestCanvas(wxWindow *parent, int *attribList = NULL);
+    UITestCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~UITestCanvas();
     
 private:

src/ui/UITestContext.cpp

@@ -63,8 +63,8 @@ void UITestContext::Draw() {
 }
 
 void UITestContext::DrawEnd() {
-    glFlush();
+//    glFlush();
     
-    CheckGLError();
+//    CheckGLError();
 }
 

src/util/GLFont.cpp

@@ -3,6 +3,8 @@
 #include <iostream>
 #include <fstream>
 #include <algorithm>
+#include "cubic_math.h"
+
 
 #ifdef _MSC_VER
 #include <windows.h>
@@ -27,6 +29,9 @@ static std::string getExePath(void)
 #define RES_FOLDER ""
 #endif
 
+GLFontStringCache::GLFontStringCache() {
+    gc = 0;
+}
 
 GLFont GLFont::fonts[GLFONT_MAX];
 
@@ -122,7 +127,7 @@ int GLFontChar::getIndex() {
 }
 
 GLFont::GLFont() :
-        lineHeight(0), base(0), imageWidth(0), imageHeight(0), loaded(false), texId(0) {
+        lineHeight(0), base(0), imageWidth(0), imageHeight(0), loaded(false), texId(0), gcCounter(0) {
 
 }
 
@@ -423,8 +428,8 @@ float GLFont::getStringWidth(std::string str, float size, float viewAspect) {
     return width;
 }
 
-void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy) {
+// Draw string, immediate
-
+void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign, Align vAlign, int vpx, int vpy, bool cacheable) {
     
     pxHeight *= 2;
     
@@ -435,6 +440,43 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A
         vpy = vp[3];
     }
     
+    if (cacheable) {
+        gcCounter++;
+
+        std::lock_guard<std::mutex> lock(cache_busy);
+        
+        if (gcCounter > 50) {
+            doCacheGC();
+            gcCounter = 0;
+        }
+        
+        GLFontStringCache *fc = nullptr;
+
+        std::map<std::string, GLFontStringCache * >::iterator cache_iter;
+        
+        std::stringstream sscacheIdx;
+        
+        sscacheIdx << vpx << "." << vpy << "." << pxHeight << "." << str;
+        
+        std::string cacheIdx(sscacheIdx.str());
+        
+        cache_iter = stringCache.find(cacheIdx);
+        if (cache_iter != stringCache.end()) {
+            fc = cache_iter->second;
+            fc->gc = 0;
+        }
+        
+        if (fc == nullptr) {
+//            std::cout << "cache miss" << std::endl;
+            fc = cacheString(str, pxHeight, vpx, vpy);
+            stringCache[cacheIdx] = fc;
+        }
+
+        drawCacheString(fc, xpos, ypos, hAlign, vAlign);
+        
+        return;
+    }
+    
     float size = (float) pxHeight / (float) vpy;
     float viewAspect = (float) vpx / (float) vpy;
     float msgWidth = getStringWidth(str, size, viewAspect);
@@ -499,6 +541,9 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A
         glTranslatef(fchar->getAspect() + advx, 0.0, 0.0);
     }
 
+    glVertexPointer(2, GL_FLOAT, 0, nullptr);
+    glTexCoordPointer(2, GL_FLOAT, 0, nullptr);
+
     glDisableClientState(GL_VERTEX_ARRAY);
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
     glPopMatrix();
@@ -508,6 +553,140 @@ void GLFont::drawString(std::string str, float xpos, float ypos, int pxHeight, A
     glDisable(GL_TEXTURE_2D);
 }
 
+// Draw cached GLFontCacheString
+void GLFont::drawCacheString(GLFontStringCache *fc, float xpos, float ypos, Align hAlign, Align vAlign) {
+    
+    float size = (float) fc->pxHeight / (float) fc->vpy;
+    
+    glPushMatrix();
+    glTranslatef(xpos, ypos, 0.0f);
+    
+    switch (vAlign) {
+        case GLFONT_ALIGN_TOP:
+            glTranslatef(0.0, -size, 0.0);
+            break;
+        case GLFONT_ALIGN_CENTER:
+            glTranslatef(0.0, -size/2.0, 0.0);
+            break;
+        default:
+            break;
+    }
+    
+    switch (hAlign) {
+        case GLFONT_ALIGN_RIGHT:
+            glTranslatef(-fc->msgWidth, 0.0, 0.0);
+            break;
+        case GLFONT_ALIGN_CENTER:
+            glTranslatef(-fc->msgWidth / 2.0, 0.0, 0.0);
+            break;
+        default:
+            break;
+    }
+    
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, texId);
+    
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+    glVertexPointer(2, GL_FLOAT, 0, &fc->gl_vertices[0]);
+    glTexCoordPointer(2, GL_FLOAT, 0, &fc->gl_uv[0]);
+    
+    glDrawArrays(GL_QUADS, 0, 4 * fc->drawlen);
+    
+    glVertexPointer(2, GL_FLOAT, 0, nullptr);
+    glTexCoordPointer(2, GL_FLOAT, 0, nullptr);
+
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+    
+    glPopMatrix();
+
+    glDisable(GL_BLEND);
+    glDisable(GL_TEXTURE_2D);
+}
+
+// Compile optimized GLFontCacheString
+GLFontStringCache *GLFont::cacheString(std::string str, int pxHeight, int vpx, int vpy) {
+    GLFontStringCache *fc = new GLFontStringCache;
+    
+    fc->pxHeight = pxHeight;
+    fc->vpx = vpx;
+    fc->vpy = vpy;
+    
+    float size = (float) pxHeight / (float) vpy;
+    float viewAspect = (float) vpx / (float) vpy;
+    
+    fc->msgWidth = getStringWidth(str, size, viewAspect);
+
+    int nChar = 0;
+    for (int i = 0, iMax = str.length(); i < iMax; i++) {
+        int charId = str.at(i);
+
+        if (characters.find(charId) == characters.end()) {
+            continue;
+        }
+        nChar++;
+    }
+    
+    fc->drawlen = nChar;
+    fc->gl_vertices.resize(nChar*8);
+    fc->gl_uv.resize(nChar*8);
+    
+    
+    CubicVR::mat4 trans = CubicVR::mat4::scale(size / viewAspect, size, 1.0f);
+    
+    int c = 0;
+    for (int i = 0, iMax = str.length(); i < iMax; i++) {
+        int charId = str.at(i);
+        
+        if (characters.find(charId) == characters.end()) {
+            continue;
+        }
+        
+        GLFontChar *fchar = characters[charId];
+        
+        float ofsx = (float) fchar->getXOffset() / (float) imageWidth;
+        float advx = (float) fchar->getXAdvance() / (float) imageWidth;
+        
+        if (charId == 32) {
+            advx = characters['_']->getAspect();
+        }
+        
+        // freeze transform to buffer
+        trans *= CubicVR::mat4::translate(ofsx, 0.0, 0.0);
+        int charIdx = fchar->getIndex();
+        for (int j = 0; j < 8; j+=2) {
+            CubicVR::vec3 pt(gl_vertices[charIdx + j],gl_vertices[charIdx + j + 1], 0.0);
+            pt = CubicVR::mat4::multiply(trans, pt, true);
+            fc->gl_vertices[c * 8 + j] = pt[0];
+            fc->gl_vertices[c * 8 + j + 1] = pt[1];
+            fc->gl_uv[c * 8 + j] = gl_uv[charIdx + j];
+            fc->gl_uv[c * 8 + j + 1] = gl_uv[charIdx + j + 1];
+        }
+        trans *= CubicVR::mat4::translate(fchar->getAspect() + advx, 0.0, 0.0);
+        c++;
+    }
+    
+    return fc;
+}
+
+void GLFont::doCacheGC() {
+    std::map<std::string, GLFontStringCache * >::iterator cache_iter;
+    
+    for (cache_iter = stringCache.begin(); cache_iter != stringCache.end(); cache_iter++) {
+        cache_iter->second->gc--;
+    }
+    for (cache_iter = stringCache.begin(); cache_iter != stringCache.end(); cache_iter++) {
+        if (cache_iter->second->gc < -10) {
+//            std::cout << "gc'd " << cache_iter->first << std::endl;
+            stringCache.erase(cache_iter);
+            return;
+        }
+    }
+}
 
 
 GLFont &GLFont::getFont(GLFontSize esize) {

src/util/GLFont.h

@@ -3,11 +3,25 @@
 #include <map>
 #include <string>
 #include <sstream>
+#include <mutex>
+#include <atomic>
 #include "lodepng.h"
 #include "wx/glcanvas.h"
 #include "wx/filename.h"
 #include "wx/stdpaths.h"
 
+class GLFontStringCache {
+public:
+    GLFontStringCache();
+    int drawlen;
+    int vpx, vpy;
+    int pxHeight;
+    float msgWidth;
+    std::atomic_int gc;
+    std::vector<float> gl_vertices;
+    std::vector<float> gl_uv;
+};
+
 class GLFontChar {
 public:
     GLFontChar();
@@ -66,12 +80,18 @@ public:
     bool isLoaded();
 
     float getStringWidth(std::string str, float size, float viewAspect);
-    void drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign = GLFONT_ALIGN_LEFT, Align vAlign = GLFONT_ALIGN_TOP, int vpx=0, int vpy=0);
+    void drawString(std::string str, float xpos, float ypos, int pxHeight, Align hAlign = GLFONT_ALIGN_LEFT, Align vAlign = GLFONT_ALIGN_TOP, int vpx=0, int vpy=0, bool cacheable = false);
 
     static GLFont fonts[GLFONT_MAX];
     static GLFont &getFont(GLFontSize esize);
 
+    GLFontStringCache *cacheString(std::string str, int pxHeight, int vpx, int vpy);
+    void drawCacheString(GLFontStringCache *fc, float xpos, float ypos, Align hAlign, Align vAlign);
+
+    void doCacheGC();
 private:
+    std::map<std::string, GLFontStringCache * > stringCache;
+    
     std::string nextParam(std::istringstream &str);
     std::string getParamKey(std::string param_str);
     std::string getParamValue(std::string param_str);
@@ -90,4 +110,6 @@ private:
     std::string imageFile;
     std::string fontFileSource;
     GLuint texId;
+    int gcCounter;
+    std::mutex cache_busy;
 };

src/visual/GainCanvas.cpp

@@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(GainCanvas::OnMouseLeftWindow)
 EVT_ENTER_WINDOW(GainCanvas::OnMouseEnterWindow)
 wxEND_EVENT_TABLE()
 
-GainCanvas::GainCanvas(wxWindow *parent, int *attribList) :
+GainCanvas::GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        InteractiveCanvas(parent, attribList) {
+        InteractiveCanvas(parent, dispAttrs) {
 
     glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
     bgPanel.setCoordinateSystem(GLPanel::GLPANEL_Y_UP);

src/visual/GainCanvas.h

@@ -11,7 +11,6 @@
 #include "GLPanel.h"
 #include "PrimaryGLContext.h"
 
-#include "fftw3.h"
 #include "Timer.h"
 
 class GainInfo {
@@ -28,7 +27,7 @@ public:
 
 class GainCanvas: public InteractiveCanvas {
 public:
-    GainCanvas(wxWindow *parent, int *attribList = NULL);
+    GainCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~GainCanvas();
 
     void setHelpTip(std::string tip);

src/visual/InteractiveCanvas.cpp

@@ -17,8 +17,8 @@
 
 #include <wx/numformatter.h>
 
-InteractiveCanvas::InteractiveCanvas(wxWindow *parent, int *attribList) :
+InteractiveCanvas::InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        wxGLCanvas(parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize,
+        wxGLCanvas(parent, dispAttrs ,wxID_ANY, wxDefaultPosition, wxDefaultSize,
         wxFULL_REPAINT_ON_RESIZE), parent(parent), shiftDown(false), altDown(false), ctrlDown(false), centerFreq(0), bandwidth(0), lastBandwidth(0), isView(
         false) {
     mouseTracker.setTarget(this);

src/visual/InteractiveCanvas.h

@@ -8,7 +8,7 @@
 
 class InteractiveCanvas: public wxGLCanvas {
 public:
-    InteractiveCanvas(wxWindow *parent, int *attribList = NULL);
+    InteractiveCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~InteractiveCanvas();
 
     long long getFrequencyAt(float x);

src/visual/MeterCanvas.cpp

@@ -27,8 +27,8 @@ EVT_LEAVE_WINDOW(MeterCanvas::OnMouseLeftWindow)
 EVT_ENTER_WINDOW(MeterCanvas::OnMouseEnterWindow)
 wxEND_EVENT_TABLE()
 
-MeterCanvas::MeterCanvas(wxWindow *parent, int *attribList) :
+MeterCanvas::MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        InteractiveCanvas(parent, attribList), level(0), level_min(0), level_max(1), inputValue(0), userInputValue(0), showUserInput(true) {
+        InteractiveCanvas(parent, dispAttrs), level(0), level_min(0), level_max(1), inputValue(0), userInputValue(0), showUserInput(true) {
 
     glContext = new MeterContext(this, &wxGetApp().GetContext(this));
 }

src/visual/MeterCanvas.h

@@ -10,12 +10,11 @@
 #include "MeterContext.h"
 #include "MouseTracker.h"
 
-#include "fftw3.h"
 #include "Timer.h"
 
 class MeterCanvas: public InteractiveCanvas {
 public:
-    MeterCanvas(wxWindow *parent, int *attribList = NULL);
+    MeterCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~MeterCanvas();
 
     void setLevel(float level_in);

src/visual/MeterContext.cpp

@@ -44,8 +44,8 @@ void MeterContext::Draw(float r, float g, float b, float a, float level) {
 }
 
 void MeterContext::DrawEnd() {
-    glFlush();
+//    glFlush();
 
-    CheckGLError();
+//    CheckGLError();
 }
 

src/visual/ModeSelectorCanvas.cpp

@@ -24,8 +24,8 @@ EVT_LEAVE_WINDOW(ModeSelectorCanvas::OnMouseLeftWindow)
 EVT_ENTER_WINDOW(ModeSelectorCanvas::OnMouseEnterWindow)
 wxEND_EVENT_TABLE()
 
-ModeSelectorCanvas::ModeSelectorCanvas(wxWindow *parent, int *attribList) :
+ModeSelectorCanvas::ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-InteractiveCanvas(parent, attribList), numChoices(0), currentSelection(-1), toggleMode(false), inputChanged(false), padX(4.0), padY(4.0), highlightOverride(false) {
+InteractiveCanvas(parent, dispAttrs), numChoices(0), currentSelection(-1), toggleMode(false), inputChanged(false), padX(4.0), padY(4.0), highlightOverride(false) {
 
     glContext = new ModeSelectorContext(this, &wxGetApp().GetContext(this));
     

src/visual/ModeSelectorCanvas.h

@@ -10,7 +10,6 @@
 #include "ModeSelectorContext.h"
 #include "MouseTracker.h"
 
-#include "fftw3.h"
 #include "Timer.h"
 
 class ModeSelectorMode {
@@ -25,7 +24,7 @@ public:
 
 class ModeSelectorCanvas: public InteractiveCanvas {
 public:
-    ModeSelectorCanvas(wxWindow *parent, int *attribList = NULL);
+    ModeSelectorCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~ModeSelectorCanvas();
 
     int getHoveredSelection();

src/visual/ModeSelectorContext.cpp

@@ -66,8 +66,8 @@ void ModeSelectorContext::DrawSelector(std::string label, int c, int cMax, bool
 }
 
 void ModeSelectorContext::DrawEnd() {
-    glFlush();
+//    glFlush();
 
-    CheckGLError();
+//    CheckGLError();
 }
 

src/visual/PrimaryGLContext.cpp

@@ -166,11 +166,11 @@ void PrimaryGLContext::DrawDemodInfo(DemodulatorInstance *demod, RGBA4f color, l
     }
     
     if (demod->getDemodulatorType() == "USB") {
-        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER);
+        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_LEFT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
     } else if (demod->getDemodulatorType() == "LSB") {
-        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER);
+        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
     } else {
-        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+        GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodLabel, uxPos, hPos, 16, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
     }
 
     glDisable(GL_BLEND);
@@ -381,9 +381,9 @@ void PrimaryGLContext::DrawDemod(DemodulatorInstance *demod, RGBA4f color, long
 
     glColor3f(0, 0, 0);
     GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5) + xOfs, -1.0 + hPos - yOfs, 16, demodAlign,
-            GLFont::GLFONT_ALIGN_CENTER);
+            GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
     glColor3f(1, 1, 1);
-    GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5), -1.0 + hPos, 16, demodAlign, GLFont::GLFONT_ALIGN_CENTER);
+    GLFont::getFont(GLFont::GLFONT_SIZE16).drawString(demodStr, 2.0 * (uxPos - 0.5), -1.0 + hPos, 16, demodAlign, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
 
     glDisable(GL_BLEND);
 
@@ -483,9 +483,9 @@ void PrimaryGLContext::BeginDraw(float r, float g, float b) {
 }
 
 void PrimaryGLContext::EndDraw() {
-    glFlush();
+//    glFlush();
 
-    CheckGLError();
+//    CheckGLError();
 }
 
 void PrimaryGLContext::setHoverAlpha(float hoverAlpha) {

src/visual/ScopeCanvas.cpp

@@ -28,7 +28,7 @@ EVT_LEAVE_WINDOW(ScopeCanvas::OnMouseLeftWindow)
 EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
 wxEND_EVENT_TABLE()
 
-ScopeCanvas::ScopeCanvas(wxWindow *parent, int *attribList) : InteractiveCanvas(parent, attribList), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
+ScopeCanvas::ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) : InteractiveCanvas(parent, dispAttrs), ppmMode(false), ctr(0), ctrTarget(0), dragAccel(0), helpTip("") {
 
     glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
     inputData.set_max_num_items(2);

src/visual/ScopeCanvas.h

@@ -10,12 +10,11 @@
 #include "ScopeVisualProcessor.h"
 #include "ScopePanel.h"
 #include "SpectrumPanel.h"
-#include "fftw3.h"
 #include "InteractiveCanvas.h"
 
 class ScopeCanvas: public InteractiveCanvas {
 public:
-    ScopeCanvas(wxWindow *parent, int *attribList = NULL);
+    ScopeCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~ScopeCanvas();
 
     void setDeviceName(std::string device_name);

src/visual/ScopeContext.cpp

@@ -35,9 +35,9 @@ void ScopeContext::DrawTunerTitles(bool ppmMode) {
 
     glColor3f(0.65, 0.65, 0.65);
 
-    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(ppmMode?"Device PPM":"Frequency", -0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
-    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Bandwidth", 0.0, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Bandwidth", 0.0, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
-    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER);
+    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString("Center Frequency", 0.66, -1.0+hPos, 12, GLFont::GLFONT_ALIGN_CENTER, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
 }
 
 void ScopeContext::DrawDeviceName(std::string deviceName) {
@@ -47,13 +47,13 @@ void ScopeContext::DrawDeviceName(std::string deviceName) {
     float hPos = (float) (viewHeight - 20) / viewHeight;
 
     glColor3f(0.65, 0.65, 0.65);
-    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(deviceName.c_str(), 1.0, hPos, 12, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER);
+    GLFont::getFont(GLFont::GLFONT_SIZE12).drawString(deviceName.c_str(), 1.0, hPos, 12, GLFont::GLFONT_ALIGN_RIGHT, GLFont::GLFONT_ALIGN_CENTER, 0, 0, true);
 }
 
 void ScopeContext::DrawEnd() {
-    glFlush();
+//    glFlush();
 
-    CheckGLError();
+//    CheckGLError();
 }
 
 void ScopeContext::DrawDivider() {

src/visual/SpectrumCanvas.cpp

@@ -29,8 +29,8 @@ EVT_RIGHT_DOWN(SpectrumCanvas::OnMouseRightDown)
 EVT_RIGHT_UP(SpectrumCanvas::OnMouseRightReleased)
 wxEND_EVENT_TABLE()
 
-SpectrumCanvas::SpectrumCanvas(wxWindow *parent, int *attribList) :
+SpectrumCanvas::SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        InteractiveCanvas(parent, attribList), waterfallCanvas(NULL) {
+        InteractiveCanvas(parent, dispAttrs), waterfallCanvas(NULL) {
 
     glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
 

src/visual/SpectrumCanvas.h

@@ -13,7 +13,7 @@ class WaterfallCanvas;
 
 class SpectrumCanvas: public InteractiveCanvas {
 public:
-    SpectrumCanvas(wxWindow *parent, int *attribList = NULL);
+    SpectrumCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~SpectrumCanvas();
 
     void attachWaterfallCanvas(WaterfallCanvas *canvas_in);

src/visual/TuningCanvas.cpp

@@ -30,8 +30,8 @@ EVT_MOUSEWHEEL(TuningCanvas::OnMouseWheelMoved)
 //EVT_KEY_UP(TuningCanvas::OnKeyUp)
 wxEND_EVENT_TABLE()
 
-TuningCanvas::TuningCanvas(wxWindow *parent, int *attribList) :
+TuningCanvas::TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        InteractiveCanvas(parent, attribList), dragAccum(0), uxDown(0), top(false), bottom(false), freq(-1), bw(-1), center(-1), halfBand(false) {
+        InteractiveCanvas(parent, dispAttrs), dragAccum(0), uxDown(0), top(false), bottom(false), freq(-1), bw(-1), center(-1), halfBand(false) {
 
     glContext = new TuningContext(this, &wxGetApp().GetContext(this));
 

src/visual/TuningCanvas.h

@@ -10,7 +10,6 @@
 #include "TuningContext.h"
 #include "MouseTracker.h"
 
-#include "fftw3.h"
 #include "Timer.h"
 
 class TuningCanvas: public InteractiveCanvas {
@@ -18,7 +17,7 @@ public:
     enum ActiveState {
         TUNING_HOVER_NONE, TUNING_HOVER_FREQ, TUNING_HOVER_BW, TUNING_HOVER_PPM, TUNING_HOVER_CENTER
     };
-    TuningCanvas(wxWindow *parent, int *attribList = NULL);
+    TuningCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     ~TuningCanvas();
 
     void setHelpTip(std::string tip);

src/visual/TuningContext.cpp

@@ -59,9 +59,9 @@ void TuningContext::Draw(float r, float g, float b, float a, float p1, float p2)
 }
 
 void TuningContext::DrawEnd() {
-    glFlush();
+//    glFlush();
 
-    CheckGLError();
+//    CheckGLError();
 }
 
 void TuningContext::DrawTuner(long long freq, int count, float displayPos, float displayWidth) {

src/visual/WaterfallCanvas.cpp

@@ -34,8 +34,8 @@ EVT_ENTER_WINDOW(WaterfallCanvas::OnMouseEnterWindow)
 EVT_MOUSEWHEEL(WaterfallCanvas::OnMouseWheelMoved)
 wxEND_EVENT_TABLE()
 
-WaterfallCanvas::WaterfallCanvas(wxWindow *parent, int *attribList) :
+WaterfallCanvas::WaterfallCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs) :
-        InteractiveCanvas(parent, attribList), dragState(WF_DRAG_NONE), nextDragState(WF_DRAG_NONE), fft_size(0), new_fft_size(0), waterfall_lines(0),
+        InteractiveCanvas(parent, dispAttrs), dragState(WF_DRAG_NONE), nextDragState(WF_DRAG_NONE), fft_size(0), new_fft_size(0), waterfall_lines(0),
         dragOfs(0), mouseZoom(1), zoom(1), freqMoving(false), freqMove(0.0), hoverAlpha(1.0) {
 
     glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));

src/visual/WaterfallCanvas.h

@@ -18,7 +18,7 @@ public:
         WF_DRAG_NONE, WF_DRAG_BANDWIDTH_LEFT, WF_DRAG_BANDWIDTH_RIGHT, WF_DRAG_FREQUENCY, WF_DRAG_RANGE
     };
 
-    WaterfallCanvas(wxWindow *parent, int *attribList = NULL);
+    WaterfallCanvas(wxWindow *parent, const wxGLAttributes& dispAttrs);
     void setup(unsigned int fft_size_in, int waterfall_lines_in);
     void setFFTSize(unsigned int fft_size_in);
     ~WaterfallCanvas();