put automation list into or out of Touch mode before adding an automation watch,...

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index ef3899bf2f125cef513ed7cd061247f444f4a81d..69d232079ca79fa988f305f901eea064bd1668e6 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -78,8 +78,6 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
        , port_remove_in_progress (false)
        , m_meter_thread (0)
        , _main_thread (0)
-       , _ltc_input ()
-       , _ltc_output ()
        , ports (new Ports)
 {
        _instance = this; /* singleton */
@@ -91,34 +89,11 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
        }
 
        Port::set_engine (this);
-
-#ifdef HAVE_LTC
-       _ltc_input = register_port (DataType::AUDIO, _("LTC in"), true);
-
-       /* register_port() would allocate buffers and pass a shadow copy
-        * which is subject to ardour's route buffering behavioud and
-        * not suitable for generating LTC independent of transport state.
-        */
-       _ltc_output.reset(new AudioPort ("LTC out", Port::IsOutput));
-
-       /* As of October 2012, the LTC source port is the only thing that needs
-        * to care about Config parameters, so don't bother to listen if we're
-        * not doing LTC stuff. This might change if other parameters show up
-        * in the future that we need to care about with or without LTC.
-        */
-
-       Config->ParameterChanged.connect_same_thread (config_connection, boost::bind (&AudioEngine::parameter_changed, this, _1));
-#endif
 }
 
 AudioEngine::~AudioEngine ()
 {
        config_connection.disconnect ();
-#ifdef HAVE_LTC
-       if (_ltc_output && _ltc_output->jack_port()) {
-               jack_port_disconnect (_jack, _ltc_output->jack_port());
-       }
-#endif
 
        {
                Glib::Threads::Mutex::Lock tm (_process_lock);
@@ -234,9 +209,6 @@ AudioEngine::start ()
                        _running = true;
                        _has_run = true;
                        Running(); /* EMIT SIGNAL */
-
-                       reconnect_ltc ();
-
                } else {
                        // error << _("cannot activate JACK client") << endmsg;
                }
@@ -549,15 +521,6 @@ AudioEngine::process_callback (pframes_t nframes)
        }
 
        if (_session == 0) {
-#ifdef HAVE_LTC
-               // silence LTC
-               jack_default_audio_sample_t *out;
-               boost::shared_ptr<Port> ltcport = ltc_output_port();
-               if (ltcport && ltcport->jack_port()) {
-                       out = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);
-                       if (out) memset(out, 0, nframes * sizeof(jack_default_audio_sample_t));
-               }
-#endif
 
                if (!_freewheeling) {
                        MIDI::Manager::instance()->cycle_start(nframes);
@@ -1513,8 +1476,6 @@ AudioEngine::reconnect_to_jack ()
 
        MIDI::Manager::instance()->reconnect ();
 
-       reconnect_ltc ();
-
        Running (); /* EMIT SIGNAL*/
 
        start_metering_thread ();
@@ -1659,29 +1620,3 @@ AudioEngine::destroy ()
        _instance = 0;
 }
 
-void
-AudioEngine::parameter_changed (const std::string& s)
-{
-       if (s == "ltc-source-port") {
-               reconnect_ltc ();
-       }
-       else if (s == "ltc-sink-port") {
-               // TODO
-       }
-
-}
-
-void
-AudioEngine::reconnect_ltc ()
-{
-       if (_ltc_input) {
-
-               string src = Config->get_ltc_source_port();
-
-               _ltc_input->disconnect_all ();
-
-               if (src != _("None") && !src.empty())  {
-                       _ltc_input->connect (src);
-               }
-       }
-}