diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
| commit | 616f2a0370a10dcc7372a95f6bca9f5a45698980 (patch) | |
| tree | b07badccad237cc66d0668482ad65cedefdee23f /libs/ardour/session_midi.cc | |
| parent | 499b7fcfa9f3e8535a4500143a9d7af7b67c6984 (diff) | |
| parent | 38e4f7bd1ba2ec9ae37dbb384da449f894cd8564 (diff) | |
fix conflicts after merge with master
Diffstat (limited to 'libs/ardour/session_midi.cc')
| -rw-r--r-- | libs/ardour/session_midi.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 50a7178f1b..d137e5167c 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -45,6 +45,7 @@ #include "ardour/midi_ui.h" #include "ardour/session.h" #include "ardour/slave.h" +#include "ardour/ticker.h" #include "i18n.h" @@ -581,6 +582,19 @@ Session::mmc_step_timeout () return true; } +/*********************************************************************** + OUTBOUND SYSTEM COMMON STUFF +**********************************************************************/ + + +void +Session::send_song_position_pointer (framepos_t t) +{ + if (midi_clock) { + /* Do nothing for the moment */ + } +} + int Session::start_midi_thread () { |