$Id$
*/
+#include "midi++/port.h"
+#include "midi++/manager.h"
+#include "evoral/midi_events.h"
#include "ardour/ticker.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
+#include "ardour/debug.h"
#ifdef DEBUG_MIDI_CLOCK
#include <iostream>
using namespace std;
#endif
-namespace ARDOUR
-{
-
+using namespace ARDOUR;
-void Ticker::set_session(Session& s)
+void Ticker::set_session (Session* s)
{
- _session = &s;
+ SessionHandlePtr::set_session (s);
- if (_session) {
- _session->tick.connect(mem_fun (*this, &Ticker::tick));
- _session->GoingAway.connect(mem_fun (*this, &Ticker::going_away));
- }
+ if (_session) {
+ _session->tick.connect_same_thread (_session_connections, boost::bind (&Ticker::tick, this, _1, _2, _3));
+ }
}
-void MidiClockTicker::set_session(Session& s)
+void MidiClockTicker::set_session (Session* s)
{
- Ticker::set_session(s);
+ Ticker::set_session (s);
if (_session) {
- _session->MIDIClock_PortChanged.connect(
- mem_fun (*this, &MidiClockTicker::update_midi_clock_port));
- _session->TransportStateChange.connect(
- mem_fun (*this, &MidiClockTicker::transport_state_changed));
- _session->PositionChanged.connect(
- mem_fun (*this, &MidiClockTicker::position_changed));
- _session->TransportLooped.connect(
- mem_fun (*this, &MidiClockTicker::transport_looped));
+ _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
+ _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1));
+ _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this));
update_midi_clock_port();
}
}
+void
+MidiClockTicker::session_going_away ()
+{
+ SessionHandlePtr::session_going_away();
+ _midi_port = 0;
+}
+
void MidiClockTicker::update_midi_clock_port()
{
- _midi_port = _session->midi_clock_port();
+ _midi_port = MIDI::Manager::instance()->midi_clock_output_port();
}
void MidiClockTicker::transport_state_changed()
return;
}
- float speed = _session->transport_speed();
- nframes_t position = _session->transport_frame();
+ float speed = _session->transport_speed();
+ framepos_t position = _session->transport_frame();
#ifdef DEBUG_MIDI_CLOCK
cerr << "Transport state change, speed:" << speed << "position:" << position<< " play loop " << _session->get_play_loop() << endl;
#endif
tick(position, *((ARDOUR::BBT_Time *) 0), *((Timecode::Time *)0));
}
-void MidiClockTicker::position_changed(nframes_t position)
+void MidiClockTicker::position_changed (framepos_t position)
{
#ifdef DEBUG_MIDI_CLOCK
cerr << "Position changed:" << position << endl;
// adjust _last_tick, so that the next MIDI clock message is sent
// in due time (and the tick interval is still constant)
- nframes_t elapsed_since_last_tick = loop_location->end() - _last_tick;
+ framecnt_t elapsed_since_last_tick = loop_location->end() - _last_tick;
_last_tick = loop_location->start() - elapsed_since_last_tick;
}
-void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
+void MidiClockTicker::tick (const framepos_t& transport_frames, const BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
{
-#ifdef WITH_JACK_MIDI
- if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f)
+ 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::JACK_MidiPort*>(_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;
+ framecnt_t next_tick_offset = framecnt_t(next_tick) - transport_frames;
#ifdef DEBUG_MIDI_CLOCK
cerr << "Transport:" << transport_frames
<< ":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);
_last_tick = next_tick;
}
-#endif // WITH_JACK_MIDI
}
-double MidiClockTicker::one_ppqn_in_frames(nframes_t transport_position)
+double MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
{
const Tempo& current_tempo = _session->tempo_map().tempo_at(transport_position);
const Meter& current_meter = _session->tempo_map().meter_at(transport_position);
return frames_per_quarter_note / double (_ppqn);
}
-void MidiClockTicker::send_midi_clock_event(nframes_t offset)
+void MidiClockTicker::send_midi_clock_event (pframes_t offset)
{
if (!_midi_port) {
return;
}
-#ifdef WITH_JACK_MIDI
- assert (MIDI::JACK_MidiPort::is_process_thread());
-#endif // WITH_JACK_MIDI
-#ifdef DEBUG_MIDI_CLOCK
- cerr << "Tick with offset " << offset << endl;
-#endif // DEBUG_MIDI_CLOCK
+ DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1", offset));
+
static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };
- _midi_port->write(_midi_clock_tick, 1, offset);
+ _midi_port->write (_midi_clock_tick, 1, offset);
}
-void MidiClockTicker::send_start_event(nframes_t offset)
+void MidiClockTicker::send_start_event (pframes_t offset)
{
if (!_midi_port) {
return;
}
static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
- _midi_port->write(_midi_clock_tick, 1, offset);
+ _midi_port->write (_midi_clock_tick, 1, offset);
}
-void MidiClockTicker::send_continue_event(nframes_t offset)
+void MidiClockTicker::send_continue_event (pframes_t offset)
{
if (!_midi_port) {
return;
}
static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
- _midi_port->write(_midi_clock_tick, 1, offset);
+ _midi_port->write (_midi_clock_tick, 1, offset);
}
-void MidiClockTicker::send_stop_event(nframes_t offset)
+void MidiClockTicker::send_stop_event (pframes_t offset)
{
if (!_midi_port) {
return;
}
static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
- _midi_port->write(_midi_clock_tick, 1, offset);
+ _midi_port->write (_midi_clock_tick, 1, offset);
}
-}
+
projects / ardour.git / blobdiff