add std:: to clarify use of llabs on OS X
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Sep 2013 21:43:55 +0000 (17:43 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 2 Sep 2013 21:45:04 +0000 (17:45 -0400)
libs/ardour/audio_diskstream.cc
libs/ardour/audio_track.cc
libs/ardour/midi_track.cc

index b9ce987c876ae50243ea59fea63eed7ee4ec4715..35153b7fde731997bb2e0d6f6f3c0bba6ceb5db3 100644 (file)
@@ -925,7 +925,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
        boost::shared_ptr<ChannelList> c = channels.reader();
 
        for (chan = c->begin(); chan != c->end(); ++chan) {
-               (*chan)->playback_buf->increment_read_ptr (llabs(distance));
+               (*chan)->playback_buf->increment_read_ptr (std::llabs(distance));
        }
 
        if (first_recordable_frame < max_framepos) {
index 0530dbfce93abd16b1ef1e7e9827dd3495ad812d..2e697a95cc6b6d2e98906ad2bfabd16daaef4986 100644 (file)
@@ -315,7 +315,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        if (!lm.locked()) {
                boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
                framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-               if (can_internal_playback_seek(llabs(playback_distance))) {
+               if (can_internal_playback_seek(std::llabs(playback_distance))) {
                        /* TODO should declick */
                        internal_playback_seek(playback_distance);
                }
index f88c331c2ca8a0e7b171b7f1a4aea9a5f9ac7ba9..7dff7ac639768ae1bfc13292ecbe2c1d4fce356c 100644 (file)
@@ -321,7 +321,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
        if (!lm.locked()) {
                boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
                framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-               if (can_internal_playback_seek(llabs(playback_distance))) {
+               if (can_internal_playback_seek(std::llabs(playback_distance))) {
                        /* TODO should declick, and/or note-off */
                        internal_playback_seek(playback_distance);
                }