summaryrefslogtreecommitdiff
path: root/muse2/muse/driver
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2012-11-17 12:02:30 +0000
committerTim E. Real <termtech@rogers.com>2012-11-17 12:02:30 +0000
commit92800b0f31abb9182d717edd4e921cdb0c74464d (patch)
tree034642c799cb58514720583f4386f86c37f87b54 /muse2/muse/driver
parent09ac0c4c9a32cdba453812c4ac1199414fcc2719 (diff)
Added: Auto-start Jack upon MusE startup. Command-line disable switch -J added.
Diffstat (limited to 'muse2/muse/driver')
-rw-r--r--muse2/muse/driver/jack.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index 05d47955..f3e6be20 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -431,8 +431,12 @@ bool initJackAudio()
// }
//if (i == 5)
// return true;
+
+ int opts = JackNullOption;
+ if(MusEGlobal::noAutoStartJack)
+ opts |= JackNoStartServer;
jack_status_t status;
- jack_client_t* client = jack_client_open("MusE", JackNoStartServer, &status);
+ jack_client_t* client = jack_client_open("MusE", (jack_options_t)opts, &status);
if (!client) {
if (status & JackServerStarted)
printf("jack server started...\n");