diff options
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/buffer_manager.cc | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index adce954a91..848439ccd1 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -772,6 +772,8 @@ MixerStrip::edit_output_configuration () } else { output_selector->present (); } + + output_selector->set_keep_above (true); } void @@ -786,6 +788,8 @@ MixerStrip::edit_input_configuration () } else { input_selector->present (); } + + input_selector->set_keep_above (true); } gint diff --git a/libs/ardour/buffer_manager.cc b/libs/ardour/buffer_manager.cc index e3bc2cb97c..e66c4a8dee 100644 --- a/libs/ardour/buffer_manager.cc +++ b/libs/ardour/buffer_manager.cc @@ -31,9 +31,6 @@ RingBufferNPT<ThreadBuffers*>* BufferManager::thread_buffers = 0; std::list<ThreadBuffers*>* BufferManager::thread_buffers_list = 0; Glib::StaticMutex BufferManager::rb_mutex = GLIBMM_STATIC_MUTEX_INIT; -using std::cerr; -using std::endl; - void BufferManager::init (uint32_t size) { @@ -48,7 +45,6 @@ BufferManager::init (uint32_t size) thread_buffers->write (&ts, 1); thread_buffers_list->push_back (ts); } - cerr << "Initialized thread buffers, readable count now " << thread_buffers->read_space() << endl; } @@ -59,7 +55,6 @@ BufferManager::get_thread_buffers () ThreadBuffers* tbp; if (thread_buffers->read (&tbp, 1) == 1) { - cerr << "Got thread buffers, readable count now " << thread_buffers->read_space() << endl; return tbp; } @@ -71,7 +66,6 @@ BufferManager::put_thread_buffers (ThreadBuffers* tbp) { Glib::Mutex::Lock em (rb_mutex); thread_buffers->write (&tbp, 1); - cerr << "Put back thread buffers, readable count now " << thread_buffers->read_space() << endl; } void |