Skip to content

renamed slide player #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nitin710 merged 2 commits into from
Apr 15, 2026
Merged

renamed slide player #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e36e66e
renamed slide player
nitin710 Apr 15, 2026
bf160c2
version bump to v1.16.5
nitin710 Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-all-on-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-all-on-win.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions EmotiBitInstaller/EmotiBitInstaller.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}"

Expand Down
0 SlidePlayer/.clang-format → EmotiBitSlidePlayer/.clang-format
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/.clang-tidy → EmotiBitSlidePlayer/.clang-tidy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions SlidePlayer/CMakeLists.txt → EmotiBitSlidePlayer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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 ────────────────────────────
Expand Down
0 SlidePlayer/Doxyfile → EmotiBitSlidePlayer/Doxyfile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion SlidePlayer/SlidePlayer.sln → EmotiBitSlidePlayer/EmotiBitSlidePlayer.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion SlidePlayer/SlidePlayer.vcxproj → ...itSlidePlayer/EmotiBitSlidePlayer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{7FD42DF7-442E-479A-BA76-D0022F99702A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>SlidePlayer</RootNamespace>
<RootNamespace>EmotiBitSlidePlayer</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
0 SlidePlayer/SlidePlayer.vcxproj.filters → ...layer/EmotiBitSlidePlayer.vcxproj.filters
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions ...yer/SlidePlayer.xcodeproj/project.pbxproj → ...iBitSlidePlayer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down Expand Up @@ -603,7 +603,7 @@
E42962AA2163EDD300A6A9E2 /* openFrameworks */,
BB4B014C10F69532006C3DED /* addons */,
6948EE371B920CB800B5AC1A /* local_addons */,
E4B69B5B0A3A1756003C02F2 /* SlidePlayerDebug.app */,
E4B69B5B0A3A1756003C02F2 /* EmotiBitSlidePlayerDebug.app */,
);
sourceTree = "<group>";
};
Expand All @@ -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 */,
Expand All @@ -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 */
Expand All @@ -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;
Expand All @@ -672,7 +672,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
E4B69B5A0A3A1756003C02F2 /* SlidePlayer */,
E4B69B5A0A3A1756003C02F2 /* EmotiBitSlidePlayer */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand Down
24 changes: 12 additions & 12 deletions ...roj/xcshareddata/xcschemes/Debug.xcscheme → ...roj/xcshareddata/xcschemes/Debug.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -31,9 +31,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
Expand All @@ -54,9 +54,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -71,9 +71,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
24 changes: 12 additions & 12 deletions ...j/xcshareddata/xcschemes/Release.xcscheme → ...j/xcshareddata/xcschemes/Release.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -31,9 +31,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
Expand All @@ -54,9 +54,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
Expand All @@ -71,9 +71,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
BuildableName = "SlidePlayer.app"
BlueprintName = "SlidePlayer"
ReferencedContainer = "container:SlidePlayer.xcodeproj">
BuildableName = "EmotiBitSlidePlayer.app"
BlueprintName = "EmotiBitSlidePlayer"
ReferencedContainer = "container:EmotiBitSlidePlayer.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
0 SlidePlayer/Makefile → EmotiBitSlidePlayer/Makefile
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/Project.xcconfig → EmotiBitSlidePlayer/Project.xcconfig
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/README.md → EmotiBitSlidePlayer/README.md
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/addons.make → EmotiBitSlidePlayer/addons.make
View file
Open in desktop
File renamed without changes.
0 ...bin/data/emotibitSlidePlayerSettings.json → ...bin/data/emotibitSlidePlayerSettings.json
View file
Open in desktop
File renamed without changes.
0 ...des/default_slides/default_background.png → ...des/default_slides/default_background.png
View file
Open in desktop
File renamed without changes
0 ...es/default_slides/default_intro_slide.png → ...es/default_slides/default_intro_slide.png
View file
Open in desktop
File renamed without changes
0 ...xample_slides/set-1/set_1-Intro_slide.png → ...xample_slides/set-1/set_1-Intro_slide.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-1/set_1-slide_1.png → ...ta/example_slides/set-1/set_1-slide_1.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-1/set_1-slide_2.png → ...ta/example_slides/set-1/set_1-slide_2.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-1/set_1-slide_3.png → ...ta/example_slides/set-1/set_1-slide_3.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-1/set_1-slide_4.png → ...ta/example_slides/set-1/set_1-slide_4.png
View file
Open in desktop
File renamed without changes
0 ...example_slides/set-2/set_2-background.png → ...example_slides/set-2/set_2-background.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-2/set_2-slide_1.png → ...ta/example_slides/set-2/set_2-slide_1.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-2/set_2-slide_2.png → ...ta/example_slides/set-2/set_2-slide_2.png
View file
Open in desktop
File renamed without changes
0 ...ta/example_slides/set-2/set_2-slide_3.png → ...ta/example_slides/set-2/set_2-slide_3.png
View file
Open in desktop
File renamed without changes
0 SlidePlayer/compile_flags.txt → EmotiBitSlidePlayer/compile_flags.txt
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/config.make → EmotiBitSlidePlayer/config.make
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/icon.rc → EmotiBitSlidePlayer/icon.rc
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/openFrameworks-Info.plist → ...iBitSlidePlayer/openFrameworks-Info.plist
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/src/main.cpp → EmotiBitSlidePlayer/src/main.cpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions SlidePlayer/src/ofApp.cpp → EmotiBitSlidePlayer/src/ofApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down Expand Up @@ -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: "
Expand Down
0 SlidePlayer/src/ofApp.h → EmotiBitSlidePlayer/src/ofApp.h
View file
Open in desktop
File renamed without changes.
0 SlidePlayer/tests/test_parseSettings.cpp → ...tSlidePlayer/tests/test_parseSettings.cpp
View file
Open in desktop
File renamed without changes.
0 ...ePlayer/tests/test_updateCurrentState.cpp → ...ePlayer/tests/test_updateCurrentState.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/BUILD_AND_RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/ofxEmotiBitVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//#include <string>
#include "ofMain.h"

const std::string ofxEmotiBitVersion = "1.16.4";
const std::string ofxEmotiBitVersion = "1.16.5";

static const char SOFTWARE_VERSION_PREFIX = 'v';

Expand Down
Loading