From 91850f0eb4ab9f63bc6582d042d5495ea1968031 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Jul 2010 00:16:36 +0000 Subject: Remove non-JACK midi++ ports. git-svn-id: svn://localhost/ardour2/branches/3.0@7377 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/ticker.h | 5 ++++- libs/ardour/audioengine.cc | 10 +++++----- libs/ardour/midi_clock_slave.cc | 1 - libs/ardour/midi_ui.cc | 4 +--- libs/ardour/session.cc | 4 ++-- libs/ardour/ticker.cc | 13 +++++-------- 6 files changed, 17 insertions(+), 20 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index e133ad5d23..f5cda677ed 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -19,7 +19,6 @@ */ -#include "midi++/jack.h" #include "pbd/signals.h" #include "ardour/types.h" @@ -29,6 +28,10 @@ #ifndef TICKER_H_ #define TICKER_H_ +namespace MIDI { + class Port; +} + namespace ARDOUR { diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index b9ec8e465b..33a76fa7b4 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -32,7 +32,7 @@ #include "pbd/stacktrace.h" #include "pbd/unknown_type.h" -#include "midi++/jack.h" +#include "midi++/port.h" #include "midi++/mmc.h" #include "midi++/manager.h" @@ -147,7 +147,7 @@ _thread_init_callback (void * /*arg*/) SessionEvent::create_per_thread_pool (X_("Audioengine"), 512); - MIDI::JACK_MidiPort::set_process_thread (pthread_self()); + MIDI::Port::set_process_thread (pthread_self()); MIDI::MachineControl::set_sending_thread (pthread_self ()); } @@ -263,7 +263,7 @@ AudioEngine::stop (bool forever) } else { jack_deactivate (_priv_jack); Stopped(); /* EMIT SIGNAL */ - MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */ + MIDI::Port::JackHalted (); /* EMIT SIGNAL */ } } @@ -1074,7 +1074,7 @@ AudioEngine::halted (void *arg) if (was_running) { ae->Halted(""); /* EMIT SIGNAL */ - MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */ + MIDI::Port::JackHalted (); /* EMIT SIGNAL */ } } @@ -1358,7 +1358,7 @@ AudioEngine::disconnect_from_jack () if (_running) { _running = false; Stopped(); /* EMIT SIGNAL */ - MIDI::JACK_MidiPort::JackHalted (); /* EMIT SIGNAL */ + MIDI::Port::JackHalted (); /* EMIT SIGNAL */ } return 0; diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index c4ee65dd6b..a1682127d8 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -28,7 +28,6 @@ #include "pbd/pthread_utils.h" #include "midi++/port.h" -#include "midi++/jack.h" #include "ardour/debug.h" #include "ardour/slave.h" diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index be13209513..5d9407d579 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -104,9 +104,7 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port) if (ioc & IO_IN) { - if (port->must_drain_selectable()) { - CrossThreadChannel::drain (port->selectable()); - } + CrossThreadChannel::drain (port->selectable()); DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", port->name())); nframes64_t now = _session.engine().frame_time(); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 4fdcb6f5f9..dd6a453080 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -98,7 +98,7 @@ #include "ardour/utils.h" #include "ardour/graph.h" -#include "midi++/jack.h" +#include "midi++/port.h" #include "midi++/mmc.h" #include "i18n.h" @@ -645,7 +645,7 @@ Session::hookup_io () /* Tell all IO objects to connect themselves together */ IO::enable_connecting (); - MIDI::JACK_MidiPort::MakeConnections (); + MIDI::Port::MakeConnections (); /* Now reset all panners */ diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index dbe81ae32c..4327e25c72 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -18,6 +18,8 @@ $Id$ */ +#include "midi++/port.h" +#include "evoral/midi_events.h" #include "ardour/ticker.h" #include "ardour/session.h" #include "ardour/tempo.h" @@ -138,9 +140,6 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /* if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) return; - MIDI::JACK_MidiPort* jack_port = dynamic_cast(_midi_port); - assert(jack_port); - while (true) { double next_tick = _last_tick + one_ppqn_in_frames(transport_frames); nframes_t next_tick_offset = nframes_t(next_tick) - transport_frames; @@ -150,11 +149,11 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /* << ":Last tick time:" << _last_tick << ":" << ":Next tick time:" << next_tick << ":" << "Offset:" << next_tick_offset << ":" - << "cycle length:" << jack_port->nframes_this_cycle() + << "cycle length:" << _midi_port->nframes_this_cycle() << endl; #endif - if (next_tick_offset >= jack_port->nframes_this_cycle()) + if (next_tick_offset >= _midi_port->nframes_this_cycle()) return; send_midi_clock_event(next_tick_offset); @@ -183,9 +182,7 @@ void MidiClockTicker::send_midi_clock_event(nframes_t offset) return; } -#ifdef WITH_JACK_MIDI - assert (MIDI::JACK_MidiPort::is_process_thread()); -#endif // WITH_JACK_MIDI + assert (MIDI::Port::is_process_thread()); #ifdef DEBUG_MIDI_CLOCK cerr << "Tick with offset " << offset << endl; #endif // DEBUG_MIDI_CLOCK -- cgit v1.2.3