Changeset 2236 for branches/undo/src/gui/src/main.cpp

Timestamp:

07/01/11 21:09:04 (23 months ago)

Author:

wolke

Message:

add first step of jack session implementation

Files:

• branches/undo/src/gui/src/main.cpp (modified) (5 diffs)

branches/undo/src/gui/src/main.cpp

@@ -35 +35 @@
 #include <hydrogen/LashClient.h>
 #endif
+#ifdef H2CORE_HAVE_JACKSESSION
+#include <jack/session.h>
+#endif
 
 #include <hydrogen/midiMap.h>
@@ -58 +61 @@
         {"driver", required_argument, NULL, 'd'},
         {"song", required_argument, NULL, 's'},
+#ifdef H2CORE_HAVE_JACKSESSION
+        {"session-id", required_argument, NULL, 'S'},
+#endif
         {"playlist", required_argument, NULL, 'p'},
         {"version", 0, NULL, 'v'},
@@ -166 +172 @@
                 // Deal with the options
                 QString songFilename;
+#ifdef H2CORE_HAVE_JACKSESSION
+                QString sessionId;
+#endif
                 QString playlistFilename;
                 bool bNoSplash = false;
@@ -189 +198 @@
                                         songFilename = QString::fromLocal8Bit(optarg);
                                         break;
+#ifdef H2CORE_HAVE_JACKSESSION
+                                case 'S':
+                                        sessionId = QString::fromLocal8Bit(optarg);
+                                        break;
+#endif
 
                                 case 'p':
@@ -452 +466 @@
         std::cout << "   -d, --driver AUDIODRIVER - Use the selected audio driver (jack, alsa, oss)" << std::endl;
         std::cout << "   -s, --song FILE - Load a song (*.h2song) at startup" << std::endl;
+
+#ifdef H2CORE_HAVE_JACKSESSION
+        std::cout << "   -S, --session-id ID - Start a JackSessionHandler session" << std::endl;
+#endif
+
         std::cout << "   -p, --playlist FILE - Load a playlist (*.h2playlist) at startup" << std::endl; 
         std::cout << "   -k, --kit drumkit_name - Load a drumkit at startup" << std::endl;