try not thinning when loading old-school automation lists

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

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index df1abba5ddbd1f70d9d4ecd384ba57240b341cb5..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,7 +88,7 @@ Session::setup_midi_control ()
 }
 
 void
-Session::spp_start (Parser &, framepos_t /*timestamp*/)
+Session::spp_start ()
 {
        if (Config->get_mmc_control ()) {
                request_transport_speed (1.0);
@@ -99,13 +96,13 @@ Session::spp_start (Parser &, framepos_t /*timestamp*/)
 }
 
 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 ()) {
                request_stop ();
@@ -332,10 +329,10 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 
        RouteList::iterator i;
        boost::shared_ptr<RouteList> r = routes.reader();
-       
+
        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);
@@ -361,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;
        }
 
@@ -415,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;
        }
@@ -539,10 +536,6 @@ Session::mmc_step_timeout ()
        return true;
 }
 
-/*---------------------------------------------------------------------------
-  MIDI THREAD
-  ---------------------------------------------------------------------------*/
-
 int
 Session::start_midi_thread ()
 {
@@ -551,12 +544,3 @@ Session::start_midi_thread ()
        return 0;
 }
 
-void
-Session::terminate_midi_thread ()
-{
-       if (midi_control_ui) {
-               midi_control_ui->quit ();
-       }
-}
-
-