smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

Remove some namespace ambiguity

Browse source 
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:
John Emmas 2018-09-22 08:48:41 +01:00
parent 0354dbdfe9
commit a3a156520d
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ltc_slave.cc
View file

@ -510,7 +510,7 @@ LTC_TransportMaster::speed_and_position (double& speed, samplepos_t& pos, sample
}
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);
sampleoffset_t skip = now - (monotonic_cnt + nframes);

2
libs/ardour/midi_clock_slave.cc
View file

@ -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 */

2
libs/ardour/mtc_slave.cc
View file

@ -130,7 +130,7 @@ MTC_TransportMaster::set_session (Session *s)
}
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 */