fix breakage for optimized build caused by semantically critical statement inside...

[ardour.git] / libs / ardour / butler.cc

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 5ff4dfcd4dff6b7213ffd2dfe5f7bfc02eefa0c9..db1b316368e7d1b0fc3f4cb5e6ba72a48cefc33f 100644 (file)
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -24,7 +24,6 @@
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "ardour/butler.h"
-#include "ardour/crossfade.h"
 #include "ardour/io.h"
 #include "ardour/midi_diskstream.h"
 #include "ardour/session.h"
@@ -86,8 +85,6 @@ Butler::start_thread()
 
        MidiDiskstream::set_readahead_frames ((framecnt_t) (Config->get_midi_readahead() * rate));
 
-       Crossfade::set_buffer_size (audio_dstream_playback_buffer_size);
-
        should_run = false;
 
        if (pipe (request_pipe)) {
@@ -179,9 +176,6 @@ Butler::thread_work ()
 
                                        switch ((Request::Type) req) {
 
-                                       case Request::Wake:
-                                               break;
-
                                        case Request::Run:
                                                should_run = true;
                                                break;
@@ -317,7 +311,7 @@ restart:
 
 
                {
-                       Glib::Mutex::Lock lm (request_lock);
+                       Glib::Threads::Mutex::Lock lm (request_lock);
 
                        if (should_run && (disk_work_outstanding || transport_work_requested())) {
 //                             for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
@@ -355,7 +349,7 @@ Butler::summon ()
 void
 Butler::stop ()
 {
-       Glib::Mutex::Lock lm (request_lock);
+       Glib::Threads::Mutex::Lock lm (request_lock);
        char c = Request::Pause;
        (void) ::write (request_pipe[1], &c, 1);
        paused.wait(request_lock);
@@ -364,8 +358,8 @@ Butler::stop ()
 void
 Butler::wait_until_finished ()
 {
-       Glib::Mutex::Lock lm (request_lock);
-       char c = Request::Wake;
+       Glib::Threads::Mutex::Lock lm (request_lock);
+       char c = Request::Pause;
        (void) ::write (request_pipe[1], &c, 1);
        paused.wait(request_lock);
 }