diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-31 20:11:15 -0400 |
| commit | 6a436fd826d1c9d88b60287696cc0836ccce35aa (patch) | |
| tree | 460a08b4d46359b6b168ece26f592c75fc2fe41f /libs/ardour/session_midi.cc | |
| parent | bb59def1ca8a21f915cf636dd1e54957df981656 (diff) | |
| parent | 4dc74ae2ea13d2e5a8b481961d507df1ff98df97 (diff) | |
fix merge conflict from 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 5b5554be7c..e4fd58dedc 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -44,6 +44,7 @@ #include "ardour/midi_ui.h" #include "ardour/session.h" #include "ardour/slave.h" +#include "ardour/ticker.h" #include "i18n.h" @@ -580,6 +581,19 @@ Session::mmc_step_timeout () return true; } +/*********************************************************************** + OUTBOUND SYSTEM COMMON STUFF +**********************************************************************/ + + +void +Session::send_song_position_pointer (framepos_t t) +{ + if (midi_clock) { + midi_clock->position_changed (t); + } +} + int Session::start_midi_thread () { |