ardour/livetrax
13
0
Fork 0
Code

'libs/ardour' - Clarify ambiguous symbols (needs to be checked)

Browse Source
This commit is contained in:
John Emmas 2013-09-18 10:11:54 +01:00
parent 10047037be
commit dc3288565b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/async_midi_port.cc
View File

@ -60,7 +60,7 @@ AsyncMIDIPort::~AsyncMIDIPort ()
}
void
AsyncMIDIPort::flush_output_fifo (pframes_t nframes)
AsyncMIDIPort::flush_output_fifo (MIDI::pframes_t nframes)
{
RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0 } };
size_t written;
@ -91,7 +91,7 @@ AsyncMIDIPort::flush_output_fifo (pframes_t nframes)
}
void
AsyncMIDIPort::cycle_start (pframes_t nframes)
AsyncMIDIPort::cycle_start (MIDI::pframes_t nframes)
{
_currently_in_cycle = true;
MidiPort::cycle_start (nframes);
@ -124,7 +124,7 @@ AsyncMIDIPort::cycle_start (pframes_t nframes)
}
void
AsyncMIDIPort::cycle_end (pframes_t nframes)
AsyncMIDIPort::cycle_end (MIDI::pframes_t nframes)
{
if (ARDOUR::Port::sends_output()) {
/* move any additional data from output FIFO into the port
@ -163,7 +163,7 @@ AsyncMIDIPort::drain (int check_interval_usecs)
if (vec.len[0] + vec.len[1] >= output_fifo.bufsize() - 1) {
break;
}
usleep (check_interval_usecs);
Glib::usleep (check_interval_usecs);
}
}
@ -283,7 +283,7 @@ AsyncMIDIPort::read (MIDI::byte *, size_t)
}
void
AsyncMIDIPort::parse (framecnt_t)
AsyncMIDIPort::parse (MIDI::framecnt_t)
{
MIDI::byte buf[1];

2
libs/ardour/ltc_slave.cc
View File

@ -150,7 +150,7 @@ LTC_Slave::reset()
}
void
LTC_Slave::parse_ltc(const pframes_t nframes, const Sample* const in, const framecnt_t posinfo)
LTC_Slave::parse_ltc(const ARDOUR::pframes_t nframes, const Sample* const in, const ARDOUR::framecnt_t posinfo)
{
pframes_t i;
unsigned char sound[8192];

2
libs/ardour/session_midi.cc
View File

@ -348,7 +348,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
* @param t time to send.
*/
int
Session::send_full_time_code (framepos_t const t, pframes_t nframes)
Session::send_full_time_code (framepos_t const t, MIDI::pframes_t nframes)
{
/* This function could easily send at a given frame offset, but would
* that be useful? Does ardour do sub-block accurate locating? [DR] */