bump version

Author: charlesneimog

.github/workflows/c-cpp.yml

@@ -1,4 +1,3 @@
----
 name: Compile Binaries
 on:
   # push:
@@ -13,7 +12,7 @@ on:
 
 env:
   LIBNAME: OpenScofo
-  LIBVERSION: 0.1.5
+  LIBVERSION: 0.1.6
 permissions:
   contents: write
 jobs:
@@ -169,11 +168,9 @@ jobs:
           # assets
           mkdir -p SuperCollider/assets
           cp Tests/assets/* SuperCollider/assets/
+
       - name: Upload Emscripten Build
         if: runner.os == 'Linux'
-        with:
-          name: SuperCollider-${{env.LIBNAME}}-${{env.LIBVERSION}}-${{ runner.os }}
-          path: SuperCollider
         run: |
           mkdir -p Emscripten
           mkdir -p Emscripten
@@ -222,7 +219,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ env.LIBVERSION }}-alpha
-          name: ${{ env.LIBNAME }} v${{ env.LIBVERSION }}
+          name: ${{ env.LIBNAME }} v${{ env.LIBVERSION }}-alpha
           target_commitish: ${{ github.sha }}
           files: |
             release_assets/*.zip

CMakeLists.txt

@@ -1,5 +1,7 @@
-cmake_minimum_required(VERSION 3.25)
-project(OpenScofo VERSION 0.1.5)
+cmake_minimum_required(VERSION 3.30)
+project(OpenScofo VERSION 0.1.6 LANGUAGES C CXX
+        HOMEPAGE_URL "https://charlesneimog.github.io/OpenScofo/" 
+        DESCRIPTION "OpenScofo is a Open Source Score Follower designed for contemporary music")
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -11,6 +13,8 @@ set(BUILD_EXAMPLES OFF)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
 set(TREE_SITTER_VERSION "v0.26.6")
 
+add_definitions(-DOPENSCOFO_VERSION="${PROJECT_VERSION}-alpha")
+
 if(EMSCRIPTEN)
     message(STATUS "Emscripten compilation")
     set(CMAKE_CXX_FLAGS
@@ -132,7 +136,7 @@ if(NOT EXISTS "${OSCOFO_ONLINE_EDITOR_WASM}" OR ${UPDATE_OSCOFO_LANGUAGE})
 
     # Download archive if missing
     if(NOT EXISTS "${TS_ARCHIVE}")
-        file(DOWNLOAD "${TS_URL}" "${TS_ARCHIVE}" SHOW_PROGRESS STATUS download_status)
+        file(DOWNLOAD "${TS_URL}" "${TS_ARCHIVE}" STATUS download_status)
         list(GET download_status 0 status_code)
         if(NOT status_code EQUAL 0)
             message(FATAL_ERROR "Failed to download web-tree-sitter archive")
@@ -220,7 +224,6 @@ list(APPEND ScofoSrc Sources/OpenScofo/OpenScofo.cpp)
 add_library(OpenScofo STATIC ${ScofoSrc})
 
 target_include_directories(OpenScofo PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Sources/OpenScofo")
-target_compile_definitions(OpenScofo PUBLIC OPENSCOFO_VERSION="${PROJECT_VERSION}")
 set_target_properties(OpenScofo PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(OpenScofo PUBLIC fftw3 tree-sitter score_parser onnx spdlog onsetsds)
 

Sources/Wrappers/SuperCollider/OpenScofo.cpp

@@ -70,12 +70,11 @@ struct ScOpenScofo : public SCUnit {
                 continue;
             }
 
-            const auto begin = std::find_if_not(item.begin(), item.end(), [](unsigned char c) {
-                return std::isspace(c) != 0;
-            });
+            const auto begin =
+                std::find_if_not(item.begin(), item.end(), [](unsigned char c) { return std::isspace(c) != 0; });
             const auto end = std::find_if_not(item.rbegin(), item.rend(), [](unsigned char c) {
-                return std::isspace(c) != 0;
-            }).base();
+                                 return std::isspace(c) != 0;
+                             }).base();
 
             if (begin < end) {
                 std::string descriptorId(begin, end);
@@ -113,8 +112,8 @@ struct ScOpenScofo : public SCUnit {
             m_LastDescValid = true;
         }
 
-        OpenScofo::Description desc = (m_FollowScore && m_OScofo->ScoreIsLoaded()) ? m_OScofo->GetDescription()
-                                                                                      : m_LastDesc;
+        OpenScofo::Description desc =
+            (m_FollowScore && m_OScofo->ScoreIsLoaded()) ? m_OScofo->GetDescription() : m_LastDesc;
 
         const auto descriptor = m_OScofo->GetDescriptorsEnum(descriptorId);
         if (descriptor == OpenScofo::Descriptors::INVALID || descriptor == OpenScofo::Descriptors::ONNX) {
@@ -126,7 +125,7 @@ struct ScOpenScofo : public SCUnit {
         case OpenScofo::Descriptors::CHROMA:
         case OpenScofo::Descriptors::MELOGRAM:
         case OpenScofo::Descriptors::MAGNITUDE:
-        case OpenScofo::Descriptors::POWER: {
+        case OpenScofo::Descriptors::POWERARRAY: {
             auto &arrayValues = m_OScofo->GetDescriptionArray(desc, descriptor);
             values.assign(arrayValues.begin(), arrayValues.end());
             return true;
@@ -274,6 +273,5 @@ PluginLoad(OpenScofoUGens) {
     DefineUnitCmd("OpenScofo", "getDescriptor", (UnitCmdFunc)&cmdGetDescriptor);
     DefineUnitCmd("OpenScofo", "loadOnnxModel", (UnitCmdFunc)&cmdLoadOnnxModel);
 
-    Print("\nOpenScofo version %d.%d.%d (build on %s), by Charles K. Neimog\n\n", OSCOFO_VERSION_MAJOR,
-          OSCOFO_VERSION_MINOR, OSCOFO_VERSION_PATCH, OSCOFO_BUILD_TIME);
+    printf("\nOpenScofo version %s (%s), by Charles K. Neimog\n\n", OPENSCOFO_VERSION, OSCOFO_BUILD_TIME);
 }

Sources/Wrappers/SuperCollider/examples/1-score-follow.scd

@@ -2,8 +2,8 @@
 s.waitForBoot {
     var repoRoot = PathName(thisProcess.nowExecutingPath).pathOnly;
 
-    ~audioPath = (repoRoot +/+ "../assets/bwv-1013.wav").standardizePath;
-    ~scorePath = (repoRoot +/+ "../assets/bwv-1013.txt").standardizePath;
+	~audioPath = "/home/neimog/Documents/Git/OpenScofo/Tests/assets/bwv-1013.wav";
+    ~scorePath = "/home/neimog/Documents/Git/OpenScofo/Tests/assets/bwv-1013.txt";
     ~lastEvent = -1;
 
     ~sndBuf = Buffer.read(s, ~audioPath);