diff options
author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-30 19:44:24 +0000 |
---|---|---|
committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-12-30 19:44:24 +0000 |
commit | ca21a5ac7b43d01e2548bcd871e601f3e4e38dfe (patch) | |
tree | 0171e8d10800dc0694cf6a1b077e13ac16bc0d83 /libs/ardour/ardour/ticker.h | |
parent | c5f9501e501f7444060d1b4a4fb368336ff697be (diff) |
Wrap some Jack_MidiPort stuff in #ifdefs to solve dylib errors on OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@4361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/ticker.h')
-rw-r--r-- | libs/ardour/ardour/ticker.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 2ecf65d3a7..1241d14c11 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -53,7 +53,7 @@ class MidiClockTicker : public Ticker { /// Singleton private: - MidiClockTicker() : _jack_port(0), _ppqn(24), _last_tick(0.0) {}; + MidiClockTicker() : _midi_port(0), _ppqn(24), _last_tick(0.0) {}; MidiClockTicker( const MidiClockTicker& ); MidiClockTicker& operator= (const MidiClockTicker&); @@ -71,7 +71,7 @@ public: const SMPTE::Time& transport_smpte); void set_session(Session& s); - void going_away() { _jack_port = 0; Ticker::going_away(); } + void going_away() { _midi_port = 0; Ticker::going_away(); } /// slot for the signal session::MIDIClock_PortChanged void update_midi_clock_port(); @@ -89,9 +89,9 @@ public: void set_ppqn(int ppqn) { _ppqn = ppqn; } private: - MIDI::JACK_MidiPort* _jack_port; - int _ppqn; - double _last_tick; + MIDI::Port* _midi_port; + int _ppqn; + double _last_tick; double one_ppqn_in_frames(nframes_t transport_position); |