explicit checks for all components of the LV2 stack

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

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index f09722f31c6bd5130f9a807390f8f55fef923af3..caceebf8535cb095ebfdf0c3f8e14a487999572a 100644 (file)
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -38,16 +38,13 @@
 
 #include "timecode/time.h"
 
-#include "ardour/configuration.h"
-#include "ardour/debug.h"
-#include "ardour/audioengine.h"
-#include "ardour/session.h"
 #include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/debug.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/session.h"
 #include "ardour/slave.h"
-#include "ardour/cycles.h"
 
 #include "i18n.h"
 
@@ -91,23 +88,23 @@ Session::setup_midi_control ()
 }
 
 void
-Session::spp_start (Parser &, framepos_t /*timestamp*/)
+Session::spp_start ()
 {
-       if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) {
+       if (Config->get_mmc_control ()) {
                request_transport_speed (1.0);
        }
 }
 
 void
-Session::spp_continue (Parser& ignored, framepos_t timestamp)
+Session::spp_continue ()
 {
-       spp_start (ignored, timestamp);
+       spp_start ();
 }
 
 void
-Session::spp_stop (Parser&, framepos_t /*timestamp*/)
+Session::spp_stop ()
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                request_stop ();
        }
 }
@@ -115,7 +112,7 @@ Session::spp_stop (Parser&, framepos_t /*timestamp*/)
 void
 Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control() && (!config.get_external_sync() || (config.get_sync_source() != JACK))) {
+       if (Config->get_mmc_control ()) {
                request_transport_speed (1.0);
        }
 }
@@ -123,7 +120,7 @@ Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                maybe_enable_record();
        }
 }
@@ -160,7 +157,7 @@ Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_exit (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                disable_record (false);
        }
 }
@@ -168,7 +165,7 @@ Session::mmc_record_exit (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_stop (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                request_stop ();
        }
 }
@@ -176,7 +173,7 @@ Session::mmc_stop (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_pause (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
 
                /* We support RECORD_PAUSE, so the spec says that
                   we must interpret PAUSE like RECORD_PAUSE if
@@ -196,7 +193,7 @@ static bool step_queued = false;
 void
 Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 {
-       if (!Config->get_mmc_control()) {
+       if (!Config->get_mmc_control ()) {
                return;
        }
 
@@ -235,7 +232,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
             << endl;
 #endif
 
-       request_transport_speed (step_speed);
+       request_transport_speed_nonzero (step_speed);
        last_mmc_step = now;
 
        if (!step_queued) {
@@ -251,7 +248,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 void
 Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                request_transport_speed(-8.0f);
        }
 }
@@ -259,7 +256,7 @@ Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_fast_forward (MIDI::MachineControl &/*mmc*/)
 {
-       if (Config->get_mmc_control()) {
+       if (Config->get_mmc_control ()) {
                request_transport_speed(8.0f);
        }
 }
@@ -267,7 +264,7 @@ Session::mmc_fast_forward (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 {
-       if (!Config->get_mmc_control()) {
+       if (!Config->get_mmc_control ()) {
                return;
        }
 
@@ -308,7 +305,7 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 void
 Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
 {
-       if (!Config->get_mmc_control()) {
+       if (!Config->get_mmc_control ()) {
                return;
        }
 
@@ -317,28 +314,29 @@ Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
        }
 
        if (forw) {
-               request_transport_speed (speed);
+               request_transport_speed_nonzero (speed);
        } else {
-               request_transport_speed (-speed);
+               request_transport_speed_nonzero (-speed);
        }
 }
 
 void
 Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 {
-       if (Config->get_mmc_control()) {
+       if (!Config->get_mmc_control ()) {
+               return;
+       }
 
-               RouteList::iterator i;
-               boost::shared_ptr<RouteList> r = routes.reader();
+       RouteList::iterator i;
+       boost::shared_ptr<RouteList> r = routes.reader();
 
-               for (i = r->begin(); i != r->end(); ++i) {
-                       AudioTrack *at;
+       for (i = r->begin(); i != r->end(); ++i) {
+               AudioTrack *at;
 
-                       if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
-                               if (trk == at->remote_control_id()) {
-                                       at->set_record_enabled (enabled, &mmc);
-                                       break;
-                               }
+               if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
+                       if (trk == at->remote_control_id()) {
+                               at->set_record_enabled (enabled, &mmc);
+                               break;
                        }
                }
        }
@@ -360,7 +358,7 @@ Session::send_full_time_code (framepos_t const t)
 
        _send_timecode_update = false;
 
-       if (!Config->get_send_mtc() || _slave) {
+       if (_engine.freewheeling() || !Config->get_send_mtc() || _slave) {
                return 0;
        }
 
@@ -378,7 +376,7 @@ Session::send_full_time_code (framepos_t const t)
        }
 
        // Compensate for audio latency
-       outbound_mtc_timecode_frame += _worst_output_latency;
+       outbound_mtc_timecode_frame += worst_playback_latency();
        next_quarter_frame_to_send = 0;
 
        // Sync slave to the same Timecode time as we are on
@@ -400,6 +398,7 @@ Session::send_full_time_code (framepos_t const t)
                return -1;
        }
 
+       _pframes_since_last_mtc = 0;
        return 0;
 }
 
@@ -413,7 +412,7 @@ Session::send_full_time_code (framepos_t const t)
 int
 Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
 {
-       if (_slave || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
+       if (_engine.freewheeling() || _slave || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
                // cerr << "(MTC) Not sending MTC\n";
                return 0;
        }
@@ -533,14 +532,10 @@ Session::mmc_step_timeout ()
 
        /* slow it down */
 
-       request_transport_speed (_transport_speed * 0.75);
+       request_transport_speed_nonzero (_transport_speed * 0.75);
        return true;
 }
 
-/*---------------------------------------------------------------------------
-  MIDI THREAD
-  ---------------------------------------------------------------------------*/
-
 int
 Session::start_midi_thread ()
 {
@@ -549,12 +544,3 @@ Session::start_midi_thread ()
        return 0;
 }
 
-void
-Session::terminate_midi_thread ()
-{
-       if (midi_control_ui) {
-               midi_control_ui->quit ();
-       }
-}
-
-