diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2018-09-22 08:48:41 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2018-09-22 08:48:41 +0100 |
| commit | a3a156520d59c1731775a521a62f9d0f605f0a96 (patch) | |
| tree | ff94bf1b846a77d4eddf80c9555cc559b9110284 /libs/ardour/midi_clock_slave.cc | |
| parent | 0354dbdfe95d7c9ea1156cb23de038020ac73bf4 (diff) | |
Remove some namespace ambiguity
There are a couple of places where we're using both MIDI namespace as well as ARDOUR namespace (both of which declare 'pframes_t)
Diffstat (limited to 'libs/ardour/midi_clock_slave.cc')
| -rw-r--r-- | libs/ardour/midi_clock_slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index 93ca9059ef..04fa259519 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -114,7 +114,7 @@ MIDIClock_TransportMaster::speed_and_position (double& speed, samplepos_t& pos, } void -MIDIClock_TransportMaster::pre_process (pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos) +MIDIClock_TransportMaster::pre_process (MIDI::pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos) { /* Read and parse incoming MIDI */ |