diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-09-05 10:10:45 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-05 10:10:45 +0100 |
| commit | d9994c10b4215939b4513826d8d690a6d243b42e (patch) | |
| tree | 6249b53c43f4b6e563e8c0ddf1a8f47e47889898 /libs/ardour | |
| parent | a64f7fe28cfcd50414c956baba7371b971c6bc85 (diff) | |
'libs/ardour' - Revert 'std::llabs' to 'llabs' until we find a platform-neutral solution (MOTE - 'llabs' and '::llabs' are being used successfully in other parts of Ardour)
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/audio_track.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_track.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index c7853a8785..622a42edf2 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -923,7 +923,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 (std::llabs(distance)); + (*chan)->playback_buf->increment_read_ptr (llabs(distance)); } if (first_recordable_frame < max_framepos) { diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 2e697a95cc..0530dbfce9 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -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(std::llabs(playback_distance))) { + if (can_internal_playback_seek(llabs(playback_distance))) { /* TODO should declick */ internal_playback_seek(playback_distance); } diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 579e54df3a..6a998de90e 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -320,7 +320,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(std::llabs(playback_distance))) { + if (can_internal_playback_seek(llabs(playback_distance))) { /* TODO should declick, and/or note-off */ internal_playback_seek(playback_distance); } |