diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
| commit | bc89fe0147c04b67141936d109c00dfd4d69cc4b (patch) | |
| tree | 544ff450c40fe1f43853a8420228a26f27f1eafb /libs/ardour/audioengine.cc | |
| parent | 30daaebaa2d90d6b0e8673143ccc3cacd7bd1753 (diff) | |
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audioengine.cc')
| -rw-r--r-- | libs/ardour/audioengine.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 788017555a..8b5d4ba42c 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -132,7 +132,7 @@ _thread_init_callback (void *arg) knows about it. */ - PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096); + PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096); MIDI::JACK_MidiPort::set_process_thread (pthread_self()); } @@ -922,8 +922,6 @@ AudioEngine::halted (void *arg) ae->_buffer_size = 0; ae->_frame_rate = 0; - cerr << "!!! HALTED !!!\n"; - if (was_running) { ae->Halted(); /* EMIT SIGNAL */ } @@ -1318,7 +1316,7 @@ AudioEngine::reconnect_to_jack () if (Config->get_jack_time_master()) { jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); - } + } if (jack_activate (_jack) == 0) { _running = true; |