ardour/livetrax
13
0
Fork 0
Code

Respond to MMC even when synced to JACK. Fixes #3700.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8495 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-10 22:48:25 +00:00
parent ffccaaf0bb
commit ed72df29b7
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/session_midi.cc
View File

@ -93,7 +93,7 @@ Session::setup_midi_control ()
void
Session::spp_start (Parser &, framepos_t /*timestamp*/)
{
if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) {
if (Config->get_mmc_control ()) {
request_transport_speed (1.0);
}
}
@ -115,7 +115,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);
}
}
@ -326,7 +326,9 @@ Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
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();
@ -342,7 +344,6 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
}
}
}
}
/** Send MTC Full Frame message (complete Timecode time) for the start of this cycle.
* This resets the MTC code, the next quarter frame message that is sent will be