improved momory allocation, cmake installers

Author: newdigate

cmake/teensy_sampleflashloader.cmake.in

@@ -0,0 +1,9 @@
+set(teensy_sampleflashloader_VERSION "@teensy_sampleflashloader_VERSION@")
+set(teensy_sampleflashloader_LIBS teensy_sampleflashloader -L@LIB_INSTALL_DIR@)
+
+@PACKAGE_INIT@
+
+set_and_check(teensy_sampleflashloader_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
+set_and_check(teensy_sampleflashloader_DIR "@LIB_INSTALL_DIR@")
+
+check_required_components(teensy_sampleflashloader)

cmake/uninstall.cmake

@@ -0,0 +1,24 @@
+set(MANIFEST "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")
+
+if(NOT EXISTS ${MANIFEST})
+    message(FATAL_ERROR "Cannot find install manifest: '${MANIFEST}'")
+endif()
+
+file(STRINGS ${MANIFEST} files)
+foreach(file ${files})
+    if(EXISTS ${file})
+        message(STATUS "Removing file: '${file}'")
+
+        exec_program(
+                ${CMAKE_COMMAND} ARGS "-E remove ${file}"
+                OUTPUT_VARIABLE stdout
+                RETURN_VALUE result
+        )
+
+        if(NOT "${result}" STREQUAL 0)
+            message(FATAL_ERROR "Failed to remove file: '${file}'.")
+        endif()
+    else()
+        MESSAGE(STATUS "File '${file}' does not exist.")
+    endif()
+endforeach(file)

examples/loadsample/CMakeLists.txt

@@ -1,6 +1,26 @@
 cmake_minimum_required(VERSION 3.5)
 project(example_loadsample)
 
-teensy_include_directories(../../src)
-teensy_add_executable(loadsample loadsample.cpp)
-teensy_target_link_libraries(loadsample Audio  sampleflashloader TeensyVariablePlayback   SD SdFat  SPI SerialFlash  Wire  cores)
+
+if (NOT DEFINED TEENSY_VERSION)
+    set(CMAKE_CXX_STANDARD 17)
+
+    find_package(teensy_x86_stubs)
+    include_directories(${teensy_x86_stubs_INCLUDE_DIR})
+
+    find_package(teensy_audio_x86_stubs)
+    include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
+
+    find_package(teensy_x86_sd_stubs)
+    include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
+
+    find_package(teensy_variable_playback)
+    include_directories(${teensy_variable_playback_INCLUDE_DIR})
+
+    include_directories(../../src)
+    add_executable(loadsample loadsample.cpp)
+else()
+    teensy_include_directories(../../src)
+    teensy_add_executable(loadsample loadsample.cpp)
+    teensy_target_link_libraries(loadsample Audio  sampleflashloader TeensyVariablePlayback   SD SdFat  SPI SerialFlash  Wire  cores)
+endif ()

src/CMakeLists.linux.cmake.in

@@ -0,0 +1,52 @@
+message("building for linux...")
+add_definitions(-DBUILD_FOR_LINUX)
+SET(teensy_sampleflashloader_VERSION 1.0.0)
+set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/teensy_sampleflashloader/)
+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/teensy_sampleflashloader )
+
+find_package(teensy_x86_stubs)
+include_directories(${teensy_x86_stubs_INCLUDE_DIR})
+
+find_package(teensy_audio_x86_stubs)
+include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
+
+find_package(teensy_x86_sd_stubs)
+include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
+
+add_library(teensy_sampleflashloader STATIC
+        ${HEADERS}
+        ${SOURCES}
+        )
+
+set_target_properties(teensy_sampleflashloader PROPERTIES PUBLIC_HEADER "${HEADERS}")
+set_target_properties(teensy_sampleflashloader PROPERTIES LINKER_LANGUAGE C)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(../cmake/teensy_sampleflashloader.cmake.in
+        ${CMAKE_CURRENT_BINARY_DIR}/teensy_sampleflashloaderConfig.cmake
+        INSTALL_DESTINATION ${LIB_INSTALL_DIR}/teensy_sampleflashloader/cmake
+        PATH_VARS)
+
+write_basic_package_version_file(
+        ${CMAKE_CURRENT_BINARY_DIR}/teensy_sampleflashloaderConfigVersion.cmake
+        VERSION ${teensy_sampleflashloader_VERSION}
+        COMPATIBILITY SameMajorVersion )
+
+install(TARGETS teensy_sampleflashloader DESTINATION
+        LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+        ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+        PUBLIC_HEADER DESTINATION "include/teensy_sampleflashloader"
+        )
+
+install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/teensy_sampleflashloaderConfig.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/teensy_sampleflashloaderConfigVersion.cmake
+        ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/uninstall.cmake
+        DESTINATION "lib/cmake/teensy_sampleflashloader" )
+
+##
+# copied from: https://gist.github.com/royvandam/3033428
+# Add uninstall target
+# Requirements: Copy the uninstall.cmake file to the appropriate CMAKE_MODULE_PATH.
+add_custom_target(uninstall
+        "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake")

src/CMakeLists.txt

@@ -1,7 +1,11 @@
 cmake_minimum_required(VERSION 3.5)
 project(sampleflashloader)
 
-set(SOURCES flashloader.cpp dualheapasyncflashloader.cpp)
+set(SOURCES flashloader.cpp dualheapasyncflashloader.cpp )
 set(HEADERS flashloader.h dualheapasyncflashloader.h audiosample.h audiochunkheap.h TeensyAudioFlashLoader.h)
 
-teensy_add_library(sampleflashloader ${SOURCES})
+if (NOT DEFINED TEENSY_VERSION)
+    include(CMakeLists.linux.cmake.in)
+else()
+    teensy_add_library(sampleflashloader ${SOURCES})
+endif()

src/audiochunkheap.h

@@ -47,7 +47,12 @@ namespace newdigate {
         audiosample *allocate(unsigned int size) {
             if (size < _remainder) {
                 auto result = new audiosample();
-                result->sampledata = (__int16_t *) (_start + _offset);
+#ifdef BUILD_FOR_LINUX
+                result->sampledata = new int16_t[size];
+#else
+                result->sampledata = (int16_t *) (_start + _offset);
+#endif
+
                 result->samplesize = size;
                 result->handle = _index;
                 _index++;

src/flashloader.cpp

@@ -25,9 +25,6 @@ namespace newdigate {
 
     audiosample * flashloader::loadSample(const char *filename ) {
         Serial.printf("Reading %s\n", filename);
-        unsigned s = ((-_lastPointer) % 512)-4;
-        Serial.printf("Align size: %x\n", s);
-        auto* align = (unsigned*)extmem_malloc (s);
 
         File f = SD.open(filename, O_READ);
         if (f) {
@@ -37,11 +34,15 @@ namespace newdigate {
             if (f.size() < _bytes_available) {
                 noInterrupts();
                 uint32_t total_read = 0;
-                auto *data = (uint32_t*)extmem_malloc( size);
-                _lastPointer = (uint32_t)data;
+#ifdef BUILD_FOR_LINUX
+                auto data = new int16_t[size/2];
+#else
+                auto data = static_cast<int16_t *>(extmem_malloc(size));
+#endif
+
                 memset(data, 0, size + 4);
 
-                int8_t *index = (int8_t*)data + 4;
+                auto *index = reinterpret_cast<uint8_t *>(data);
                 while (f.available()) {
                     size_t bytesRead = f.read(index, flashloader_default_sd_buffersize);
                     if (bytesRead == -1)
@@ -53,12 +54,12 @@ namespace newdigate {
                 interrupts();
                 _bytes_available -= total_read;
 
-                audiosample *sample = new audiosample();
-                sample->sampledata = (int16_t*)data;
+                auto *sample = new audiosample();
+                sample->sampledata = data;
                 sample->samplesize = f.size();
                 _samples.push_back(sample);
 
-                Serial.printf("\tsample start %x\n", (uint32_t)data);
+                Serial.printf("\tsample start %x\n", data);
                 Serial.printf("\tsample size %d\n", sample->samplesize);
                 Serial.printf("\tavailable: %d\n", _bytes_available);
 
@@ -84,7 +85,11 @@ namespace newdigate {
             if (f.size() < _bytes_available) {
                 noInterrupts();
                 uint32_t total_read = 0;
+#ifdef BUILD_FOR_LINUX
+                auto *data = new uint32_t[size + 4];
+#else
                 auto *data = (uint32_t*)extmem_malloc( size + 4);
+#endif
                 memset(data, 0, size + 4);
                 //data[0] = (01 << 24) | size; // format == 01 PCM
                 data[0] = (0x81 << 24) | (size / 2); // format == 01 PCM

src/flashloader.h

@@ -53,7 +53,12 @@ namespace newdigate {
         void clearSamples() {
             AudioNoInterrupts();
             for (auto && sample : _samples){
+#ifdef BUILD_FOR_LINUX
+                delete [] sample->sampledata;
+                delete sample;
+#else
                 extmem_free(sample->sampledata);
+#endif
                 _bytes_available += sample->samplesize;
             }
             _samples.clear();