Update XCode project settings #40

Duration/src/DurationController.cpp

@@ -708,6 +708,10 @@ void DurationController::handleOscIn(){
 				ofLogError("Duration:OSC") << "Set audio clip failed, incorrectly formatted arguments. \n usage /duration/audioclip filepath:string ";
 			}
 		}
+		// Allow resending track information
+		else if(m.getAddress() == "/duration/sendinfo"){
+			sendInfoMessage();
+		}
 	}
 }
 
@@ -1231,7 +1235,7 @@ void DurationController::draw(ofEventArgs& args){
 	if(needsSave || timeline.hasUnsavedChanges()){
 		ofPushStyle();
 		ofSetColor(200,20,0, 40);
-		ofFill();
+		ofFill();
 		ofxUIRectangle r = *saveButton->getRect();
 		ofRect(r.x,r.y,r.width,r.height);
 		ofPopStyle();
@@ -1420,7 +1424,7 @@ void DurationController::loadProject(string projectPath, string projectName, boo
 
     timeline.removeFromThread();
     headers.clear(); //smart pointers will call destructor
-    timeline.reset();
+    timeline.reset();
     timeline.setup();
 
 	if(audioTrack != NULL){

Duration/src/main.cpp

@@ -1,15 +1,47 @@
-#include "ofMain.h"
-#include "ofApp.h"
-
-//========================================================================
-int main( ){
-
-	ofSetupOpenGL(1300,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofSetWindowTitle("Duration");
-	ofRunApp( new ofApp());
-
-}
+/**
+ * Duration
+ * Standalone timeline for Creative Code
+ *
+ * Copyright (c) 2012 James George
+ * Development Supported by YCAM InterLab http://interlab.ycam.jp/en/
+ * http://jamesgeorge.org + http://flightphase.com
+ * http://github.com/obviousjim + http://github.com/flightphase
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+
+#include "ofApp.h"
+#include "ofAppGlutWindow.h"
+//--------------------------------------------------------------
+#ifdef TARGET_WIN32
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd){
+#else
+int main(){
+#endif
+	ofAppGlutWindow window; // create a window
+	// set width, height, mode (OF_WINDOW or OF_FULLSCREEN)
+	ofSetupOpenGL(&window, 1300, 768, OF_WINDOW);
+	ofSetWindowTitle("Duration");
+	ofRunApp(new ofApp()); // start the app
+}

Duration/src/ofApp.cpp

@@ -103,4 +103,4 @@ void ofApp::gotMessage(ofMessage msg){
 //--------------------------------------------------------------
 void ofApp::dragEvent(ofDragInfo dragInfo){
 
-}
+}

Duration/src/ofApp.h

@@ -53,4 +53,4 @@ class ofApp : public ofBaseApp{
     void gotMessage(ofMessage msg);
 
 	DurationController controller;
-};
+};

README.md

@@ -382,7 +382,13 @@ Duration's OSC input is always listening for you to tell it what to do next.
         <td>Audio Clip</td>
         <td>/duration/audioclip</td>
         <td>ClipPath (String)</td>
-        <td>Loads the sound clip into the Audio track. The Audio track must alrady be present in the current project</td>
+        <td>Loads the sound clip into the Audio track. The Audio track must already be present in the current project</td>
+    </tr>
+    <tr>
+        <td>Info</td>
+        <td>/duration/sendinfo</td>
+        <td>-</td>
+        <td>Resends the /duration/info information</td>
     </tr>
 
 </table>

README_JP.md

@@ -379,6 +379,12 @@ Durationは、常にOSCインプットからのメッセージを使って操作
         <td>クリップのパス(String)</td>
         <td>オーディオトラックにサウンドクリップを読み込みます。指定をする際には、プロジェクトにオーディオトラックが存在している必要があります。</td>
     </tr>
+    <tr>
+        <td></td>
+        <td>/duration/sendinfo</td>
+        <td>-</td>
+        <td></td>
+    </tr>
 
 </table>