summaryrefslogtreecommitdiff
path: root/common/JackLibAPI.cpp
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-08-20 07:31:02 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2007-08-20 07:31:02 +0000
commite8fcf232588d73d0176e86e5bf5f7e7171b8e78c (patch)
tree7bf729f6288aff5956c219f8896faccbb206500b /common/JackLibAPI.cpp
parent62ff24405d5067f0576faaabf10c20eef69b4ca4 (diff)
downloadjack2-e8fcf232588d73d0176e86e5bf5f7e7171b8e78c.tar.gz
Automatic server launch
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1516 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'common/JackLibAPI.cpp')
-rw-r--r--common/JackLibAPI.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 76880e77..b09198ff 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -21,10 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "JackDebugClient.h"
#include "JackLibClient.h"
#include "JackChannel.h"
-#include "JackGraphManager.h"
#include "JackLibGlobals.h"
#include "JackGlobals.h"
-#include "varargs.h"
+#include "JackServerLaunch.h"
using namespace Jack;
@@ -86,6 +85,14 @@ static jack_client_t* jack_client_open_aux(const char* client_name, jack_options
}
JackLibGlobals::Init(); // jack library initialisation
+
+#ifndef WIN32
+ if (try_start_server(&va, options, status)) {
+ jack_error("jack server is not running or cannot be started");
+ JackLibGlobals::Destroy(); // jack library destruction
+ return 0;
+ }
+#endif
#ifdef __CLIENTDEBUG__
JackClient* client = new JackDebugClient(new JackLibClient(GetSynchroTable())); // Debug mode