From 1992b0c7e3335dae05408b62b0a9188922440bb6 Mon Sep 17 00:00:00 2001
From: Paul-Licameli <paul.licameli@gmail.com>
Date: Sun, 19 Apr 2015 07:27:33 -0400
Subject: [PATCH] Fix a compilation warning, make some member functions const

---
 src/NoteTrack.cpp | 2 +-
 src/Track.cpp     | 4 ++--
 src/Track.h       | 2 +-
 src/WaveTrack.cpp | 2 +-
 src/WaveTrack.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp
index 6af6cf698..b3a5bef23 100644
--- a/src/NoteTrack.cpp
+++ b/src/NoteTrack.cpp
@@ -218,7 +218,7 @@ void NoteTrack::WarpAndTransposeNotes(double t0, double t1,
    Alg_iterator iter(mSeq, false);
    iter.begin();
    Alg_event_ptr event;
-   while ((event = iter.next()) && event->time < t1) {
+   while (0 != (event = iter.next()) && event->time < t1) {
       if (event->is_note() && event->time >= t0 &&
           // Allegro data structure does not restrict channels to 16.
           // Since there is not way to select more than 16 channels,
diff --git a/src/Track.cpp b/src/Track.cpp
index 58b815881..ae91bd270 100644
--- a/src/Track.cpp
+++ b/src/Track.cpp
@@ -270,7 +270,7 @@ void Track::ReorderList(bool resize)
 }
 #endif
 
-bool Track::IsSyncLockSelected()
+bool Track::IsSyncLockSelected() const
 {
 #ifdef EXPERIMENTAL_SYNC_LOCK
    AudacityProject *p = GetActiveProject();
@@ -278,7 +278,7 @@ bool Track::IsSyncLockSelected()
       return false;
 
    SyncLockedTracksIterator git(mList);
-   Track *t = git.First(this);
+   Track *t = git.First(const_cast<Track*>(this));
 
    if (!t) {
       // Not in a sync-locked group.
diff --git a/src/Track.h b/src/Track.h
index 6a6446837..47dc5dd50 100644
--- a/src/Track.h
+++ b/src/Track.h
@@ -206,7 +206,7 @@ class AUDACITY_DLL_API Track: public XMLTagHandler
    virtual double GetEndTime() const = 0;
 
    // Checks if sync-lock is on and any track in its sync-lock group is selected.
-   bool IsSyncLockSelected();
+   bool IsSyncLockSelected() const;
 };
 
 struct TrackListNode
diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp
index 5b0771cac..6e0645549 100644
--- a/src/WaveTrack.cpp
+++ b/src/WaveTrack.cpp
@@ -1631,7 +1631,7 @@ AUDACITY_DLL_API sampleCount WaveTrack::TimeToLongSamples(double t0) const
    return (sampleCount)floor(t0 * mRate + 0.5);
 }
 
-double WaveTrack::LongSamplesToTime(sampleCount pos)
+double WaveTrack::LongSamplesToTime(sampleCount pos) const
 {
    return ((double)pos) / mRate;
 }
diff --git a/src/WaveTrack.h b/src/WaveTrack.h
index 019f9379c..2c1af3054 100644
--- a/src/WaveTrack.h
+++ b/src/WaveTrack.h
@@ -303,7 +303,7 @@ class AUDACITY_DLL_API WaveTrack: public Track {
     * @param pos The time number of samples from the start of the track to convert.
     * @return The time in seconds.
     */
-   double LongSamplesToTime(sampleCount pos);
+   double LongSamplesToTime(sampleCount pos) const;
 
    // Get access to the clips in the tracks. This is used by
    // track artists and also by TrackPanel when sliding...it would