diff --git a/.github/workflows/build-all-on-macos.yml b/.github/workflows/build-all-on-macos.yml index 9c16511..dc60a1e 100644 --- a/.github/workflows/build-all-on-macos.yml +++ b/.github/workflows/build-all-on-macos.yml @@ -74,8 +74,8 @@ jobs: working-directory: ${{ vars.OFXEMOTIBIT_DIR }} run: | echo "current working directory" && pwd - cd SlidePlayer - xcodebuild -project SlidePlayer.xcodeproj -scheme Release + cd EmotiBitSlidePlayer + xcodebuild -project EmotiBitSlidePlayer.xcodeproj -scheme Release upload-artifact-macos: needs: [build-oscilloscope-macos, build-dataparser-macos, build-firmwareinstaller-macos, build-slideplayer-macos] if: github.ref == 'refs/heads/dev' @@ -98,7 +98,7 @@ jobs: mv EmotiBitOscilloscope/bin/EmotiBitOscilloscope.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }} mv EmotiBitDataParser/bin/EmotiBitDataParser.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }} mv EmotiBitFirmwareInstaller/bin/EmotiBitFirmwareInstaller.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }} - mv SlidePlayer/bin/SlidePlayer.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }} + mv EmotiBitSlidePlayer/bin/EmotiBitSlidePlayer.app stageRelease/EmotiBitSoftware-macos-${{ steps.get_version.outputs.version }} - name: copy SiLabs drivers working-directory: ${{ vars.ADDONS_DIR }} run: | diff --git a/.github/workflows/build-all-on-win.yaml b/.github/workflows/build-all-on-win.yaml index d74e6d9..f4d3b26 100644 --- a/.github/workflows/build-all-on-win.yaml +++ b/.github/workflows/build-all-on-win.yaml @@ -84,8 +84,8 @@ jobs: working-directory: ${{ vars.OFXEMOTIBIT_DIR }} run: | echo "current working directory" && pwd - cd SlidePlayer - MSBuild SlidePlayer.sln -t:Build -p:Configuration=Release + cd EmotiBitSlidePlayer + MSBuild EmotiBitSlidePlayer.sln -t:Build -p:Configuration=Release build-installer-windows: needs: [build-oscilloscope-windows, build-dataparser-windows, build-firmwareinstaller-windows, build-slideplayer-windows] if: github.ref == 'refs/heads/dev' diff --git a/EmotiBitInstaller/EmotiBitInstaller.iss b/EmotiBitInstaller/EmotiBitInstaller.iss index 32d1118..b013209 100644 --- a/EmotiBitInstaller/EmotiBitInstaller.iss +++ b/EmotiBitInstaller/EmotiBitInstaller.iss @@ -58,11 +58,11 @@ Source: "..\EmotiBitFirmwareInstaller\bin\data\exec\win\*"; DestDir: "{app}\Emot Source: "..\EmotiBitFirmwareInstaller\bin\data\instructions\*.jpg"; DestDir: "{app}\EmotiBit FirmwareInstaller\data\instructions" ; EmotiBit SlidePlayer -Source: "..\SlidePlayer\bin\SlidePlayer.exe"; DestDir: "{app}\SlidePlayer" -Source: "..\SlidePlayer\bin\*.dll"; DestDir: "{app}\SlidePlayer" -Source: "..\SlidePlayer\bin\data\emotibitSlidePlayerSettings.json"; DestDir: "{app}\SlidePlayer\data" +Source: "..\EmotiBitSlidePlayer\bin\EmotiBitSlidePlayer.exe"; DestDir: "{app}\EmotiBit SlidePlayer" +Source: "..\EmotiBitSlidePlayer\bin\*.dll"; DestDir: "{app}\EmotiBit SlidePlayer" +Source: "..\EmotiBitSlidePlayer\bin\data\emotibitSlidePlayerSettings.json"; DestDir: "{app}\EmotiBit SlidePlayer\data" ; Example slides -Source: "..\SlidePlayer\bin\data\example_slides\*"; DestDir: "{app}\SlidePlayer\data\example_slides"; Flags: recursesubdirs +Source: "..\EmotiBitSlidePlayer\bin\data\example_slides\*"; DestDir: "{app}\EmotiBit SlidePlayer\data\example_slides"; Flags: recursesubdirs ; VC++ 2017 Redistributable Source: "redist\vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall @@ -75,7 +75,7 @@ Source: "..\EmotiBitIcons\icoFiles\EmotiBitLogo.ico"; DestDir: "{app}" Name: "{group}\EmotiBit Oscilloscope"; Filename: "{app}\EmotiBit Oscilloscope\EmotiBitOscilloscope.exe"; WorkingDir: "{app}\EmotiBit Oscilloscope" Name: "{group}\EmotiBit DataParser"; Filename: "{app}\EmotiBit DataParser\EmotiBitDataParser.exe"; WorkingDir: "{app}\EmotiBit DataParser" Name: "{group}\EmotiBit FirmwareInstaller"; Filename: "{app}\EmotiBit FirmwareInstaller\EmotiBitFirmwareInstaller.exe"; WorkingDir: "{app}\EmotiBit FirmwareInstaller" -Name: "{group}\SlidePlayer"; Filename: "{app}\SlidePlayer\SlidePlayer.exe"; WorkingDir: "{app}\SlidePlayer" +Name: "{group}\EmotiBit SlidePlayer"; Filename: "{app}\EmotiBit SlidePlayer\EmotiBitSlidePlayer.exe"; WorkingDir: "{app}\EmotiBit SlidePlayer" [Run] ; Install VC++ 2017 Redistributable if not already installed @@ -87,7 +87,7 @@ Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/passive /norestart"; StatusMs Type: filesandordirs; Name: "{app}\EmotiBit Oscilloscope" Type: filesandordirs; Name: "{app}\EmotiBit DataParser" Type: filesandordirs; Name: "{app}\EmotiBit FirmwareInstaller" -Type: filesandordirs; Name: "{app}\SlidePlayer" +Type: filesandordirs; Name: "{app}\EmotiBit SlidePlayer" ; Delete the parent EmotiBit folder if empty after above deletions Type: dirifempty; Name: "{app}" diff --git a/SlidePlayer/.clang-format b/EmotiBitSlidePlayer/.clang-format similarity index 100% rename from SlidePlayer/.clang-format rename to EmotiBitSlidePlayer/.clang-format diff --git a/SlidePlayer/.clang-tidy b/EmotiBitSlidePlayer/.clang-tidy similarity index 100% rename from SlidePlayer/.clang-tidy rename to EmotiBitSlidePlayer/.clang-tidy diff --git a/SlidePlayer/CMakeLists.txt b/EmotiBitSlidePlayer/CMakeLists.txt similarity index 97% rename from SlidePlayer/CMakeLists.txt rename to EmotiBitSlidePlayer/CMakeLists.txt index ea4f5f8..98e1bdf 100644 --- a/SlidePlayer/CMakeLists.txt +++ b/EmotiBitSlidePlayer/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20) set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "Minimum macOS version") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -project(SlidePlayer) +project(EmotiBitSlidePlayer) # ── Shared OF + addon modules ───────────────────────────────────────────────── set(_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") @@ -28,7 +28,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ) set_target_properties(${PROJECT_NAME} PROPERTIES - MACOSX_BUNDLE_BUNDLE_NAME "SlidePlayer" + MACOSX_BUNDLE_BUNDLE_NAME "EmotiBitSlidePlayer" ) # ── Copy settings + slides to app bundle Resources ──────────────────────────── diff --git a/SlidePlayer/Doxyfile b/EmotiBitSlidePlayer/Doxyfile similarity index 100% rename from SlidePlayer/Doxyfile rename to EmotiBitSlidePlayer/Doxyfile diff --git a/SlidePlayer/SlidePlayer.sln b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.sln similarity index 92% rename from SlidePlayer/SlidePlayer.sln rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.sln index bfa935f..29133d6 100644 --- a/SlidePlayer/SlidePlayer.sln +++ b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlidePlayer", "SlidePlayer.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EmotiBitSlidePlayer", "EmotiBitSlidePlayer.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}" EndProject diff --git a/SlidePlayer/SlidePlayer.vcxproj b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.vcxproj similarity index 99% rename from SlidePlayer/SlidePlayer.vcxproj rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.vcxproj index 6f65d44..e1c9a8d 100644 --- a/SlidePlayer/SlidePlayer.vcxproj +++ b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.vcxproj @@ -26,7 +26,7 @@ {7FD42DF7-442E-479A-BA76-D0022F99702A} Win32Proj - SlidePlayer + EmotiBitSlidePlayer diff --git a/SlidePlayer/SlidePlayer.vcxproj.filters b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.vcxproj.filters similarity index 100% rename from SlidePlayer/SlidePlayer.vcxproj.filters rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.vcxproj.filters diff --git a/SlidePlayer/SlidePlayer.xcodeproj/project.pbxproj b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/project.pbxproj similarity index 99% rename from SlidePlayer/SlidePlayer.xcodeproj/project.pbxproj rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/project.pbxproj index e7e1a76..db87a84 100644 --- a/SlidePlayer/SlidePlayer.xcodeproj/project.pbxproj +++ b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ E42963712163EDD300A6A9E2 /* ofFmodSoundPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofFmodSoundPlayer.h; path = ../../../libs/openFrameworks/sound/ofFmodSoundPlayer.h; sourceTree = SOURCE_ROOT; }; E42963722163EDD300A6A9E2 /* ofSoundBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ofSoundBuffer.cpp; path = ../../../libs/openFrameworks/sound/ofSoundBuffer.cpp; sourceTree = SOURCE_ROOT; }; E42963732163EDD300A6A9E2 /* ofSoundBaseTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ofSoundBaseTypes.h; path = ../../../libs/openFrameworks/sound/ofSoundBaseTypes.h; sourceTree = SOURCE_ROOT; }; - E4B69B5B0A3A1756003C02F2 /* SlidePlayerDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SlidePlayerDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmotiBitSlidePlayerDebug.app; sourceTree = BUILT_PRODUCTS_DIR; }; E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; }; E4B69E1E0A3A1BDC003C02F2 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; }; E4B69E1F0A3A1BDC003C02F2 /* ofApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; }; @@ -603,7 +603,7 @@ E42962AA2163EDD300A6A9E2 /* openFrameworks */, BB4B014C10F69532006C3DED /* addons */, 6948EE371B920CB800B5AC1A /* local_addons */, - E4B69B5B0A3A1756003C02F2 /* SlidePlayerDebug.app */, + E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */, ); sourceTree = ""; }; @@ -628,9 +628,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - E4B69B5A0A3A1756003C02F2 /* SlidePlayer */ = { + E4B69B5A0A3A1756003C02F2 /* EmotiBitSlidePlayer */ = { isa = PBXNativeTarget; - buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "SlidePlayer" */; + buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBitSlidePlayer" */; buildPhases = ( E42962A92163ECCD00A6A9E2 /* ShellScript */, E4B69B580A3A1756003C02F2 /* Sources */, @@ -644,9 +644,9 @@ ); dependencies = ( ); - name = SlidePlayer; + name = EmotiBitSlidePlayer; productName = myOFApp; - productReference = E4B69B5B0A3A1756003C02F2 /* SlidePlayerDebug.app */; + productReference = E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -657,7 +657,7 @@ attributes = { LastUpgradeCheck = 0600; }; - buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "SlidePlayer" */; + buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBitSlidePlayer" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -672,7 +672,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - E4B69B5A0A3A1756003C02F2 /* SlidePlayer */, + E4B69B5A0A3A1756003C02F2 /* EmotiBitSlidePlayer */, ); }; /* End PBXProject section */ @@ -964,7 +964,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "SlidePlayer" */ = { + E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "EmotiBitSlidePlayer" */ = { isa = XCConfigurationList; buildConfigurations = ( E4B69B4E0A3A1720003C02F2 /* Debug */, @@ -974,7 +974,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "SlidePlayer" */ = { + E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "EmotiBitSlidePlayer" */ = { isa = XCConfigurationList; buildConfigurations = ( E4B69B600A3A1757003C02F2 /* Debug */, diff --git a/SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme similarity index 78% rename from SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme index c8b2824..57212aa 100644 --- a/SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme +++ b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -31,9 +31,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -54,9 +54,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> diff --git a/SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme similarity index 78% rename from SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme rename to EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme index d05b120..7f18b3f 100644 --- a/SlidePlayer/SlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme +++ b/EmotiBitSlidePlayer/EmotiBitSlidePlayer.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -31,9 +31,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -54,9 +54,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "EmotiBitSlidePlayer.app" + BlueprintName = "EmotiBitSlidePlayer" + ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj"> diff --git a/SlidePlayer/Makefile b/EmotiBitSlidePlayer/Makefile similarity index 100% rename from SlidePlayer/Makefile rename to EmotiBitSlidePlayer/Makefile diff --git a/SlidePlayer/Project.xcconfig b/EmotiBitSlidePlayer/Project.xcconfig similarity index 100% rename from SlidePlayer/Project.xcconfig rename to EmotiBitSlidePlayer/Project.xcconfig diff --git a/SlidePlayer/README.md b/EmotiBitSlidePlayer/README.md similarity index 100% rename from SlidePlayer/README.md rename to EmotiBitSlidePlayer/README.md diff --git a/SlidePlayer/addons.make b/EmotiBitSlidePlayer/addons.make similarity index 100% rename from SlidePlayer/addons.make rename to EmotiBitSlidePlayer/addons.make diff --git a/SlidePlayer/bin/data/emotibitSlidePlayerSettings.json b/EmotiBitSlidePlayer/bin/data/emotibitSlidePlayerSettings.json similarity index 100% rename from SlidePlayer/bin/data/emotibitSlidePlayerSettings.json rename to EmotiBitSlidePlayer/bin/data/emotibitSlidePlayerSettings.json diff --git a/SlidePlayer/bin/data/example_slides/default_slides/default_background.png b/EmotiBitSlidePlayer/bin/data/example_slides/default_slides/default_background.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/default_slides/default_background.png rename to EmotiBitSlidePlayer/bin/data/example_slides/default_slides/default_background.png diff --git a/SlidePlayer/bin/data/example_slides/default_slides/default_intro_slide.png b/EmotiBitSlidePlayer/bin/data/example_slides/default_slides/default_intro_slide.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/default_slides/default_intro_slide.png rename to EmotiBitSlidePlayer/bin/data/example_slides/default_slides/default_intro_slide.png diff --git a/SlidePlayer/bin/data/example_slides/set-1/set_1-Intro_slide.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-Intro_slide.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-1/set_1-Intro_slide.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-Intro_slide.png diff --git a/SlidePlayer/bin/data/example_slides/set-1/set_1-slide_1.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_1.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-1/set_1-slide_1.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_1.png diff --git a/SlidePlayer/bin/data/example_slides/set-1/set_1-slide_2.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_2.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-1/set_1-slide_2.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_2.png diff --git a/SlidePlayer/bin/data/example_slides/set-1/set_1-slide_3.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_3.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-1/set_1-slide_3.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_3.png diff --git a/SlidePlayer/bin/data/example_slides/set-1/set_1-slide_4.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_4.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-1/set_1-slide_4.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-1/set_1-slide_4.png diff --git a/SlidePlayer/bin/data/example_slides/set-2/set_2-background.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-background.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-2/set_2-background.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-background.png diff --git a/SlidePlayer/bin/data/example_slides/set-2/set_2-slide_1.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_1.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-2/set_2-slide_1.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_1.png diff --git a/SlidePlayer/bin/data/example_slides/set-2/set_2-slide_2.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_2.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-2/set_2-slide_2.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_2.png diff --git a/SlidePlayer/bin/data/example_slides/set-2/set_2-slide_3.png b/EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_3.png similarity index 100% rename from SlidePlayer/bin/data/example_slides/set-2/set_2-slide_3.png rename to EmotiBitSlidePlayer/bin/data/example_slides/set-2/set_2-slide_3.png diff --git a/SlidePlayer/compile_flags.txt b/EmotiBitSlidePlayer/compile_flags.txt similarity index 100% rename from SlidePlayer/compile_flags.txt rename to EmotiBitSlidePlayer/compile_flags.txt diff --git a/SlidePlayer/config.make b/EmotiBitSlidePlayer/config.make similarity index 100% rename from SlidePlayer/config.make rename to EmotiBitSlidePlayer/config.make diff --git a/SlidePlayer/icon.rc b/EmotiBitSlidePlayer/icon.rc similarity index 100% rename from SlidePlayer/icon.rc rename to EmotiBitSlidePlayer/icon.rc diff --git a/SlidePlayer/openFrameworks-Info.plist b/EmotiBitSlidePlayer/openFrameworks-Info.plist similarity index 100% rename from SlidePlayer/openFrameworks-Info.plist rename to EmotiBitSlidePlayer/openFrameworks-Info.plist diff --git a/SlidePlayer/src/main.cpp b/EmotiBitSlidePlayer/src/main.cpp similarity index 100% rename from SlidePlayer/src/main.cpp rename to EmotiBitSlidePlayer/src/main.cpp diff --git a/SlidePlayer/src/ofApp.cpp b/EmotiBitSlidePlayer/src/ofApp.cpp similarity index 99% rename from SlidePlayer/src/ofApp.cpp rename to EmotiBitSlidePlayer/src/ofApp.cpp index 713b056..88c9956 100644 --- a/SlidePlayer/src/ofApp.cpp +++ b/EmotiBitSlidePlayer/src/ofApp.cpp @@ -23,7 +23,7 @@ void ofApp::ensureSettingsFile() ofFilePath::join( ofFilePath::join(ofFilePath::getUserHomeDir(), "Documents"), "EmotiBit"), - "SlidePlayer"); + "EmotiBitSlidePlayer"); std::string target_path = ofFilePath::join(docs_dir, settings_file_name_); if (!ofFile(target_path).exists()) { @@ -122,7 +122,7 @@ bool ofApp::parseSettings(const Json::Value& settings) ofFilePath::join(ofFilePath::getUserHomeDir(), "Documents"), "EmotiBit"), - "SlidePlayer"), + "EmotiBitSlidePlayer"), "log"); std::cerr << "Warning: log file directory not specified. Using default: " diff --git a/SlidePlayer/src/ofApp.h b/EmotiBitSlidePlayer/src/ofApp.h similarity index 100% rename from SlidePlayer/src/ofApp.h rename to EmotiBitSlidePlayer/src/ofApp.h diff --git a/SlidePlayer/tests/test_parseSettings.cpp b/EmotiBitSlidePlayer/tests/test_parseSettings.cpp similarity index 100% rename from SlidePlayer/tests/test_parseSettings.cpp rename to EmotiBitSlidePlayer/tests/test_parseSettings.cpp diff --git a/SlidePlayer/tests/test_updateCurrentState.cpp b/EmotiBitSlidePlayer/tests/test_updateCurrentState.cpp similarity index 100% rename from SlidePlayer/tests/test_updateCurrentState.cpp rename to EmotiBitSlidePlayer/tests/test_updateCurrentState.cpp diff --git a/docs/BUILD_AND_RELEASE.md b/docs/BUILD_AND_RELEASE.md index 23ca864..3f7d023 100644 --- a/docs/BUILD_AND_RELEASE.md +++ b/docs/BUILD_AND_RELEASE.md @@ -39,7 +39,7 @@ PR dev → master (merged) | EmotiBitOscilloscope | Xcode (Release-x86_64) | MSBuild (Release) | make | | EmotiBitDataParser | Xcode (Release) | MSBuild (Release) | make | | EmotiBitFirmwareInstaller | Xcode (Release) | MSBuild (Release) | — | -| SlidePlayer | Xcode (Release) | MSBuild (Release) | — | +| EmotiBitSlidePlayer | Xcode (Release) | MSBuild (Release) | — | Linux builds are CI health-checks only — no release artifacts are produced. diff --git a/src/ofxEmotiBitVersion.h b/src/ofxEmotiBitVersion.h index 4834fd9..95b61d5 100644 --- a/src/ofxEmotiBitVersion.h +++ b/src/ofxEmotiBitVersion.h @@ -2,7 +2,7 @@ //#include #include "ofMain.h" -const std::string ofxEmotiBitVersion = "1.16.4"; +const std::string ofxEmotiBitVersion = "1.16.5"; static const char SOFTWARE_VERSION_PREFIX = 'v';