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)
This commit is contained in:
parent
0354dbdfe9
commit
a3a156520d
@ -510,7 +510,7 @@ LTC_TransportMaster::speed_and_position (double& speed, samplepos_t& pos, sample
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
LTC_TransportMaster::pre_process (pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos)
|
LTC_TransportMaster::pre_process (ARDOUR::pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos)
|
||||||
{
|
{
|
||||||
Sample* in = (Sample*) AudioEngine::instance()->port_engine().get_buffer (_port->port_handle(), nframes);
|
Sample* in = (Sample*) AudioEngine::instance()->port_engine().get_buffer (_port->port_handle(), nframes);
|
||||||
sampleoffset_t skip = now - (monotonic_cnt + nframes);
|
sampleoffset_t skip = now - (monotonic_cnt + nframes);
|
||||||
|
@ -114,7 +114,7 @@ MIDIClock_TransportMaster::speed_and_position (double& speed, samplepos_t& pos,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
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 */
|
/* Read and parse incoming MIDI */
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ MTC_TransportMaster::set_session (Session *s)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MTC_TransportMaster::pre_process (pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos)
|
MTC_TransportMaster::pre_process (MIDI::pframes_t nframes, samplepos_t now, boost::optional<samplepos_t> session_pos)
|
||||||
{
|
{
|
||||||
/* Read and parse incoming MIDI */
|
/* Read and parse incoming MIDI */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user