diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:21:32 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:21:32 -0400 |
commit | 60da662affe9ade1db4ecb988006a1293cce49b4 (patch) | |
tree | 2ebef5202700087d65a2fbf2eea8bf41ed6ea377 | |
parent | 5cf1f7f3b28abd36f9390014016def94f4e1468d (diff) | |
parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) |
Merge branch 'master' into windows
-rw-r--r-- | libs/ardour/session_state.cc | 14 | ||||
-rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 4 | ||||
-rw-r--r-- | libs/backends/jack/jack_connection.cc | 6 | ||||
-rw-r--r-- | wscript | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 88a8a2ae04..2d91bdd4c2 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -178,13 +178,6 @@ Session::pre_engine_init (string fullpath) set_history_depth (Config->get_history_depth()); - if (how_many_dsp_threads () > 1) { - /* For now, only create the graph if we are using >1 DSP threads, as - it is a bit slower than the old code with 1 thread. - */ - _process_graph.reset (new Graph (*this)); - } - /* default: assume simple stereo speaker configuration */ _speakers->setup_default_speakers (2); @@ -218,6 +211,13 @@ Session::post_engine_init () set_block_size (_engine.samples_per_cycle()); set_frame_rate (_engine.sample_rate()); + if (how_many_dsp_threads () > 1) { + /* For now, only create the graph if we are using >1 DSP threads, as + it is a bit slower than the old code with 1 thread. + */ + _process_graph.reset (new Graph (*this)); + } + n_physical_outputs = _engine.n_physical_outputs (); n_physical_inputs = _engine.n_physical_inputs (); diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index c9bc2ad8ac..b3dbdcae71 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -44,8 +44,6 @@ using namespace ARDOUR; using namespace PBD; using std::string; using std::vector; -using std::cerr; -using std::endl; #define GET_PRIVATE_JACK_POINTER(localvar) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; } #define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; } @@ -780,7 +778,7 @@ JACKAudioBackend::_latency_callback (jack_latency_callback_mode_t mode, void* ar int JACKAudioBackend::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize) { - GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0); + GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); ThreadData* td = new ThreadData (this, f, stacksize); if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack), diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc index da0127c584..07af4b8ade 100644 --- a/libs/backends/jack/jack_connection.cc +++ b/libs/backends/jack/jack_connection.cc @@ -32,6 +32,8 @@ using namespace ARDOUR; using namespace PBD; using std::string; using std::vector; +using std::cerr; +using std::endl; static void jack_halted_callback (void* arg) { @@ -137,7 +139,7 @@ JackConnection::close () { GET_PRIVATE_JACK_POINTER_RET (_jack, -1); - if (_priv_jack) { + if (_priv_jack) { int ret = jack_client_close (_priv_jack); _jack = 0; Disconnected (""); /* EMIT SIGNAL */ @@ -151,6 +153,7 @@ void JackConnection::halted_callback () { _jack = 0; + cerr << "JACK HALTED\n"; Disconnected (""); } @@ -158,6 +161,7 @@ void JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason) { _jack = 0; + cerr << "JACK HALTED: " << reason << endl; Disconnected (reason); } @@ -148,6 +148,8 @@ def set_compiler_flags (conf,opt): conf.env['build_target'] = 'i386' elif re.search("powerpc", cpu) != None: conf.env['build_target'] = 'powerpc' + elif re.search("arm", cpu) != None: + conf.env['build_target'] = 'arm' else: conf.env['build_target'] = 'i686' else: |