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

avoid llabs ambiguity

Browse source 
(old gcc has a built-in)
This commit is contained in:
Robin Gareus 2015-07-23 13:06:43 +02:00
parent 723f9fb950
commit 2524115992
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/audio_diskstream.cc
View file

@ -962,7 +962,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
boost::shared_ptr<ChannelList> c = channels.reader(); boost::shared_ptr<ChannelList> c = channels.reader();
for (chan = c->begin(); chan != c->end(); ++chan) { for (chan = c->begin(); chan != c->end(); ++chan) {
(*chan)->playback_buf->increment_read_ptr (llabs(distance)); (*chan)->playback_buf->increment_read_ptr (::llabs(distance));
} }
if (first_recordable_frame < max_framepos) { if (first_recordable_frame < max_framepos) {

2
libs/ardour/audio_track.cc
View file

@ -329,7 +329,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
if (!lm.locked()) { if (!lm.locked()) {
boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream(); boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes); framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
if (can_internal_playback_seek(llabs(playback_distance))) { if (can_internal_playback_seek(::llabs(playback_distance))) {
/* TODO should declick */ /* TODO should declick */
internal_playback_seek(playback_distance); internal_playback_seek(playback_distance);
} }

2
libs/ardour/ltc_slave.cc
View file

@ -610,7 +610,7 @@ LTC_Slave::approximate_current_delta() const
} else { } else {
snprintf(delta, sizeof(delta), "\u0394<span foreground=\"%s\" face=\"monospace\" >%s%s%lld</span>sm", snprintf(delta, sizeof(delta), "\u0394<span foreground=\"%s\" face=\"monospace\" >%s%s%lld</span>sm",
sync_lock_broken ? "red" : "green", sync_lock_broken ? "red" : "green",
LEADINGZERO(llabs(current_delta)), PLUSMINUS(-current_delta), llabs(current_delta)); LEADINGZERO(::llabs(current_delta)), PLUSMINUS(-current_delta), ::llabs(current_delta));
} }
return std::string(delta); return std::string(delta);
} }

2
libs/ardour/midi_track.cc
View file

@ -356,7 +356,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
if (!lm.locked()) { if (!lm.locked()) {
boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream(); boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes); framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
if (can_internal_playback_seek(llabs(playback_distance))) { if (can_internal_playback_seek(::llabs(playback_distance))) {
/* TODO should declick, and/or note-off */ /* TODO should declick, and/or note-off */
internal_playback_seek(playback_distance); internal_playback_seek(playback_distance);
} }

2
libs/timecode/src/time.cc
View file

@ -770,7 +770,7 @@ sample_to_timecode (
if (!use_offset) { if (!use_offset) {
timecode.negative = (sample < 0); timecode.negative = (sample < 0);
offset_sample = llabs(sample); offset_sample = ::llabs(sample);
} else { } else {
if (offset_is_negative) { if (offset_is_negative) {
offset_sample = sample + offset_samples; offset_sample = sample + offset_samples;