zynaddsubfx

commit 6babf69e5fa9e1eb90d19e374a529c2837959267
parent cacc27eb61e08e6a4698ed03a2d605d3b6178457
Author: fundamental <[email protected]>
Date:   Fri, 12 Mar 2010 13:58:57 -0500

Merge branch 'master' into nio

Conflicts:
	ChangeLog
	src/main.cpp

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/main.cpp
 | 
22
+++++++++++-----------

2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -982,3 +982,7 @@
 	    - General Code Cleanup
 	    - Adding OpenGL linking for proper compiles
 
+14 Jan 2010 (Mark McCurry)
+	    - Fixed No UI Flag "-U" as it was previously partially initializing
+	      the gui
+
diff --git a/src/main.cpp b/src/main.cpp
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
              << endl;
 #endif
 #endif
-#if OS == WINDOWS
+#if OS_WINDOWS
         cout
         <<
         "\nWARNING: On Windows systems, only short comandline parameters works."
@@ -504,10 +504,6 @@ int main(int argc, char *argv[])
         }
         else {
             master->applyparameters();
-#ifndef DISABLE_GUI
-            if(noui == 0)
-                ui->refresh_master_ui();
-#endif
             cout << "Master file loaded." << endl;
         }
     }
@@ -522,17 +518,17 @@ int main(int argc, char *argv[])
         }
         else {
             master->part[loadtopart]->applyparameters();
-#ifndef DISABLE_GUI
-            if(noui == 0)
-                ui->refresh_master_ui();
-#endif
             cout << "Instrument file loaded." << endl;
         }
     }
 
 
-    if(noui == 0)
+#ifndef DISABLE_GUI
+    if(noui == 0) {
+        ui = new MasterUI(master, &Pexitprogram);
         pthread_create(&thr3, NULL, thread3, NULL);
+    }
+#endif
 
 //    pthread_create(&thr4, NULL, thread4, NULL);
 #ifdef WINMIDIIN
@@ -540,7 +536,11 @@ int main(int argc, char *argv[])
 #endif
 
     while(Pexitprogram == 0) {
-		os_sleep(100000);
+#ifdef OS_LINUX
+        usleep(100000);
+#elif OS_WINDOWS
+        Sleep(100);
+#endif
     }
 
 #ifdef WINMIDIIN