Auto stash before merge of "magSlideShowSource" and "kr15h/master"

.gitignore

@@ -105,3 +105,11 @@ Desktop.ini
 *.log
 *.sql
 *.sqlite
+
+example/cmake-build-debug/
+
+example/\.idea/
+
+example/cmake-build-release/
+
+example/example\.xcodeproj/xcshareddata/xcschemes/

example/CMakeLists.txt

@@ -4,6 +4,7 @@
 # ===================== CMake Settings ===================
 # ========================================================
 cmake_minimum_required( VERSION 3.3 )
+
 project( openframeworks )
 
 # ========================================================
@@ -17,21 +18,23 @@ set( APP_NAME   example_ofxPiMapper )
 set( OF_DIRECTORY_BY_USER "../../.." )
 
 # --------------------- Source Files ---------------------
+
+file(   GLOB_RECURSE
+        APP_SRC
+        "src/*.cpp"
+        )
+
 set( ${APP_NAME}_SOURCE_FILES
-        src/main.cpp
+        ${APP_SRC} )
-        src/ofApp.cpp
-        src/CrossSource.cpp
-        src/CustomSource.cpp
-        src/Settings.cpp)
 
 
 # ------------------------ AddOns  -----------------------
 set( OFX_ADDONS_ACTIVE
-                ofxXmlSettings
+        ofxXmlSettings
-                ofxGui
+        ofxGui
-                ofxPiMapper
+        ofxPiMapper
-                ofxIO
+#        ofxIO
-                )
+        )
 
 # =========================================================================
 # ============================== OpenFrameworks ===========================

example/addons.make

@@ -1,4 +1,3 @@
+ofxGui
 ofxPiMapper
 ofxXmlSettings
-ofxGui
-ofxOMXPlayer

example/example.xcodeproj/xcshareddata/xcschemes/example Debug.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,21 +38,17 @@
             ReferencedContainer = "container:example.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
+      <BuildableProductRunnable>
-         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
@@ -65,13 +61,12 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Debug"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
+      <BuildableProductRunnable>
-         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"

example/example.xcodeproj/xcshareddata/xcschemes/example Release.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Release">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,21 +38,17 @@
             ReferencedContainer = "container:example.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
+      <BuildableProductRunnable>
-         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"
@@ -65,13 +61,12 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
+      <BuildableProductRunnable>
-         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4B69B5A0A3A1756003C02F2"

example/openFrameworks-Info.plist

@@ -6,8 +6,6 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>${ICON}</string>
 	<key>CFBundleIdentifier</key>
 	<string>cc.openFrameworks.ofapp</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -18,5 +16,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>CFBundleIconFile</key>
+	<string>${ICON}</string>
 </dict>
 </plist>

example/src/magSlideShowSource.cpp

@@ -192,6 +192,7 @@ bool magSlideShowSource::createFromFolderContents(std::string path)
 
 bool magSlideShowSource::loadSlideShow(std::string slideShowXmlPath)
 {
+
 	return false;
 }