cmake cleanup

Author: pschatzmann

CMakeLists.txt

@@ -3,9 +3,12 @@ cmake_minimum_required(VERSION 3.0)
 # set the project name
 project(arduino-audio-tools)
 
+include(FetchContent)
+
 add_library(arduino-audio-tools INTERFACE)
 
-option(BUILD_TESTS "Build all tests automatically" OFF)
+#option(BUILD_TESTS "Build all tests automatically" OFF)
+option(ADD_STD_LIB "Add Standard Desktop Libraries" ON)
 
 
 # make include directory available to calling projects 
@@ -18,8 +21,22 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/" # source directory
     PATTERN "*.h" # select header files
 )
 
-if (BUILD_TESTS)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
-else()
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests EXCLUDE_FROM_ALL)
+# Add basic libraries necessary for desktop build
+if (ADD_STD_LIB)
+
+    FetchContent_Declare(portaudio GIT_REPOSITORY "https://github.com/PortAudio/portaudio.git" GIT_TAG v19.7.0 )
+    FetchContent_GetProperties(portaudio)
+    if(NOT portaudio_POPULATED)
+        FetchContent_Populate(portaudio)
+        add_subdirectory(${portaudio_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/portaudio)
+    endif()
+
+    # Build with Linux Arduino Emulator
+    FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
+    FetchContent_GetProperties(arduino_emulator)
+    if(NOT arduino_emulator_POPULATED)
+        FetchContent_Populate(arduino_emulator)
+        add_subdirectory(${arduino_emulator_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/emulator)
+    endif()
+
 endif()

examples/examples-desktop/generator/CMakeLists.txt

@@ -25,11 +25,8 @@ option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 # endif()
 
 # Build with arduino-audio-tools
-FetchContent_Declare(arduino_audio_tools GIT_REPOSITORY "https://github.com/pschatzmann/arduino-audio-tools.git" GIT_TAG main )
-FetchContent_GetProperties(arduino_audio_tools)
-if(NOT arduino_audio_tools_POPULATED)
-    FetchContent_Populate(arduino_audio_tools)
-    add_subdirectory(${arduino_audio_tools_SOURCE_DIR})
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_BINARY_DIR}/arduino-audio-tools )
 endif()
 
 # build sketch as executable

examples/examples-desktop/mp3/CMakeLists.txt

@@ -8,28 +8,8 @@ set (DCMAKE_CXX_FLAGS "-Werror")
 include(FetchContent)
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 
-# # Build with Portaudio 
-# FetchContent_Declare(portaudio GIT_REPOSITORY "https://github.com/PortAudio/portaudio.git" GIT_TAG master )
-# FetchContent_GetProperties(portaudio)
-# if(NOT portaudio_POPULATED)
-#     FetchContent_Populate(portaudio)
-#     add_subdirectory(${portaudio_SOURCE_DIR})
-# endif()
-
-# # Build with Linux Arduino Emulator
-# FetchContent_Declare(arduino_emulator GIT_REPOSITORY "https://github.com/pschatzmann/Arduino-Emulator.git" GIT_TAG main )
-# FetchContent_GetProperties(arduino_emulator)
-# if(NOT arduino_emulator_POPULATED)
-#     FetchContent_Populate(arduino_emulator)
-#     add_subdirectory(${arduino_emulator_SOURCE_DIR})
-# endif()
-
-# Build with arduino-audio-tools
-FetchContent_Declare(arduino_audio_tools GIT_REPOSITORY "https://github.com/pschatzmann/arduino-audio-tools.git" GIT_TAG main )
-FetchContent_GetProperties(arduino_audio_tools)
-if(NOT arduino_audio_tools_POPULATED)
-    FetchContent_Populate(arduino_audio_tools)
-    add_subdirectory(${arduino_audio_tools_SOURCE_DIR})
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_BINARY_DIR}/arduino-audio-tools )
 endif()
 
 # Build with libhelix

examples/examples-desktop/ogg/CMakeLists.txt

@@ -95,7 +95,7 @@ struct OpusEncoderSettings : public OpusSettings {
   /// 0, 1
   int use_dtx = -1;
   /// 5,   10,  20,  40, 80, 120, 160, 200, 240
-  int frame_sizes_ms_x2 = 10; /* x2 to avoid 2.5 ms */
+  int frame_sizes_ms_x2 = -1; /* x2 to avoid 2.5 ms */
 };
 
 /**

examples/examples-desktop/ogg/README.md

@@ -257,7 +257,7 @@ class OggContainerEncoder : public AudioEncoder {
   /// Writes Ogg Packet
   virtual size_t write(const void *in_ptr, size_t in_size) override {
     if (!is_open || p_print == nullptr) return 0;
-    LOGD("write: %u", in_size);
+    LOGD("write: %d", (int) in_size);
 
     op.packet = (uint8_t *)in_ptr;
     op.bytes = in_size;
@@ -294,10 +294,10 @@ class OggContainerEncoder : public AudioEncoder {
   AudioBaseInfo cfg;
 
   virtual bool writePacket(ogg_packet &op, int flag = 0) {
-    LOGD("writePacket: %u", op.bytes);
+    LOGD("writePacket: %d", (int) op.bytes);
     long result = oggz_write_feed(p_oggz, &op, serialno, flag, NULL);
     if (result < 0) {
-      LOGE("oggz_write_feed: %d", result);
+      LOGE("oggz_write_feed: %d", (int) result);
       return false;
     }
     return true;
@@ -327,7 +327,7 @@ class OggContainerEncoder : public AudioEncoder {
 
   // Final Stream Callback
   static size_t ogg_io_write(void *user_handle, void *buf, size_t n) {
-    LOGD("ogg_io_write: %u", n);
+    LOGD("ogg_io_write: %d", (int) n);
     OggContainerEncoder *self = (OggContainerEncoder *)user_handle;
     if (self == nullptr) {
       LOGE("self is null");

src/AudioCodecs/CodecOpus.h

@@ -40,7 +40,6 @@ class PortAudioStream : public AudioStreamX {
     public:
         PortAudioStream() {
             LOGD(LOG_METHOD);
-            this->buffer_size = buffer_size;
         }
 
         ~PortAudioStream(){

src/AudioCodecs/ContainerOgg.h

@@ -349,13 +349,13 @@ class DynamicMemoryStream : public AudioStreamX {
   }
 
   /// Intializes the processing
-  virtual bool begin(){
+  virtual bool begin() override {
     clear();
     temp_audio.resize(default_buffer_size);
     return true;
   }
 
-  virtual void end() {
+  virtual void end() override {
     clear();
   }
 
@@ -648,7 +648,7 @@ class NullStream : public BufferedStream {
   }
 
   /// Define object which need to be notified if the basinfo is changing
-  void setNotifyAudioChange(AudioBaseInfoDependent &bi) {}
+  void setNotifyAudioChange(AudioBaseInfoDependent &bi) override {}
 
   void setAudioInfo(AudioBaseInfo info) override {}
 
@@ -933,7 +933,7 @@ class VolumeStream : public AudioStreamX {
             return c;
         }
 
-        bool begin(AudioBaseInfo cfg){
+        bool begin(AudioBaseInfo cfg)  {
           VolumeStreamConfig cfg1;
           cfg1.channels = cfg.channels;
           cfg1.sample_rate = cfg.sample_rate;
@@ -943,7 +943,7 @@ class VolumeStream : public AudioStreamX {
           return begin(cfg1);
         }
 
-        void end() {
+        void end() override {
             is_active = false;
         }
 

src/AudioLibs/PortAudioStream.h

@@ -84,7 +84,7 @@ class ChannelFormatConverterStreamT : public AudioStreamX {
         buffer.resize(result_samples);
         result = converter.convert((uint8_t*)buffer.data(),(uint8_t*) in_data, size);
         if (result!=result_samples*sizeof(T)){
-          LOGE("size %d -> result: %d - expeced: %d", size, result, result_samples*sizeof(T));
+          LOGE("size %d -> result: %d - expeced: %d", (int) size, (int) result, (int) result_samples*sizeof(T));
         }
         return result;
     }