Changeset 2236

Timestamp:

07/01/11 21:09:04 (2 years ago)

Author:

wolke

Message:

add first step of jack session implementation

Location:

branches/undo

Files:

• CMakeLists.txt (modified) (4 diffs)
• src/core/include/hydrogen/config.h.in (modified) (1 diff)
• src/gui/src/main.cpp (modified) (5 diffs)

branches/undo/CMakeLists.txt

@@ -35 +35 @@
     OPTION(WANT_SHARED      "Build the core library shared." ON)
 ENDIF()
-OPTION(WANT_LIBARCHIVE  "Enable use of libarchive instead of libtar" OFF)
-OPTION(WANT_LADSPA      "Enable use of LADSPA plugins" ON)
-OPTION(WANT_OSS         "Include OSS (Open Sound System) support" OFF)
-OPTION(WANT_ALSA        "Include ALSA (Advanced Linux Sound Architecture) support" OFF)
-OPTION(WANT_JACK        "Include JACK (Jack Audio Connection Kit) support" ON)
-OPTION(WANT_PORTAUDIO   "Include PortAudio support" OFF)
-OPTION(WANT_PORTMIDI    "Include PortMidi support" OFF)
-OPTION(WANT_LASH        "Include LASH (Linux Audio Session Handler) support" OFF)
-OPTION(WANT_LRDF        "Include LRDF (Lightweight Resource Description Framework with special support for LADSPA plugins) support" OFF)
-OPTION(WANT_RUBBERBAND  "Include RUbberBand (Audio Time Stretcher Library) support" OFF)
+OPTION(WANT_LIBARCHIVE   "Enable use of libarchive instead of libtar" OFF)
+OPTION(WANT_LADSPA       "Enable use of LADSPA plugins" ON)
+OPTION(WANT_JACKSESSION "Enable use of Jack-Session-Handler" OFF)
+OPTION(WANT_OSS          "Include OSS (Open Sound System) support" OFF)
+OPTION(WANT_ALSA         "Include ALSA (Advanced Linux Sound Architecture) support" OFF)
+OPTION(WANT_JACK         "Include JACK (Jack Audio Connection Kit) support" ON)
+OPTION(WANT_PORTAUDIO    "Include PortAudio support" OFF)
+OPTION(WANT_PORTMIDI     "Include PortMidi support" OFF)
+OPTION(WANT_LASH         "Include LASH (Linux Audio Session Handler) support" OFF)
+OPTION(WANT_LRDF         "Include LRDF (Lightweight Resource Description Framework with special support for LADSPA plugins) support" OFF)
+OPTION(WANT_RUBBERBAND   "Include RUbberBand (Audio Time Stretcher Library) support" OFF)
 IF(APPLE)
     OPTION(WANT_COREAUDIO   "Include CoreAudio support" ON)
@@ -137 +138 @@
 FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
 FIND_HELPER(JACK jack jack/jack.h jack)
+FIND_HELPER(JACKSESSION jack jack/session.h jack)
 IF(APPLE)
     FIND_LIBRARY(AUDIOUNIT_LIBRARY AudioUnit)
@@ -162 +164 @@
 # COMPUTE H2CORE_HAVE_xxx xxx_STATUS_REPORT
 #
-SET(STATUS_LIST LIBSNDFILE LIBTAR LIBARCHIVE LADSPA ALSA OSS JACK COREAUDIO COREMIDI PORTAUDIO PORTMIDI LASH LRDF RUBBERBAND )
+SET(STATUS_LIST LIBSNDFILE LIBTAR LIBARCHIVE LADSPA ALSA OSS JACK JACKSESSION COREAUDIO COREMIDI PORTAUDIO PORTMIDI LASH LRDF RUBBERBAND )
 FOREACH( _pkg ${STATUS_LIST})
     COMPUTE_PKGS_FLAGS(${_pkg})
@@ -202 +204 @@
 * ${_escape}[1;35mOSS${_escape}[0m                          : ${OSS_STATUS}
 * ${_escape}[1;35mJACK${_escape}[0m                         : ${JACK_STATUS}
+* ${_escape}[1;35mJACKSESSION${_escape}[0m                  : ${JACKSESSION_STATUS}
 * ${_escape}[1;35mCoreAudio${_escape}[0m                    : ${COREAUDIO_STATUS}
 * ${_escape}[1;35mCoreMidi${_escape}[0m                     : ${COREMIDI_STATUS}

branches/undo/src/core/include/hydrogen/config.h.in

@@ -50 +50 @@
 #cmakedefine H2CORE_HAVE_LASH
 #endif
+#ifndef H2CORE_HAVE_JACKSESSION
+#cmakedefine H2CORE_HAVE_JACKSESSION
+#endif
 #ifndef H2CORE_HAVE_PORTAUDIO
 #cmakedefine H2CORE_HAVE_PORTAUDIO

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;