Mercurial > hg > svcore

changeset 1043:fe39581d249b cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More type-size adjustments
author Chris Cannam
date Wed, 04 Mar 2015 19:08:21 +0000
parents 16dc7307d43a
children 31f01931b781 10055a284716
files base/ViewManagerBase.h data/fileio/OggVorbisFileReader.cpp data/fileio/OggVorbisFileReader.h
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/base/ViewManagerBase.h	Wed Mar 04 13:52:48 2015 +0000
+++ b/base/ViewManagerBase.h	Wed Mar 04 19:08:21 2015 +0000
@@ -37,15 +37,15 @@
 
     virtual void setAudioPlaySource(AudioPlaySource *source) = 0;
 
-    virtual int alignPlaybackFrameToReference(int) const = 0;
-    virtual int alignReferenceToPlaybackFrame(int) const = 0;
+    virtual sv_frame_t alignPlaybackFrameToReference(sv_frame_t) const = 0;
+    virtual sv_frame_t alignReferenceToPlaybackFrame(sv_frame_t) const = 0;
 
     virtual const MultiSelection &getSelection() const = 0;
     virtual const MultiSelection::SelectionList &getSelections() const = 0;
-    virtual int constrainFrameToSelection(int frame) const = 0;
+    virtual sv_frame_t constrainFrameToSelection(sv_frame_t frame) const = 0;
 
     virtual Selection getContainingSelection
-    (int frame, bool defaultToFollowing) const = 0;
+    (sv_frame_t frame, bool defaultToFollowing) const = 0;
 
     virtual bool getPlayLoopMode() const = 0;
     virtual bool getPlaySelectionMode() const = 0;
--- a/data/fileio/OggVorbisFileReader.cpp	Wed Mar 04 13:52:48 2015 +0000
+++ b/data/fileio/OggVorbisFileReader.cpp	Wed Mar 04 19:08:21 2015 +0000
@@ -144,15 +144,15 @@
     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
     FishSound *fs = reader->m_fishSound;
 
-    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+    fish_sound_prepare_truncation(fs, packet->granulepos, int(packet->e_o_s));
     fish_sound_decode(fs, packet->packet, packet->bytes);
 
     reader->m_bytesRead += packet->bytes;
 
     // The number of bytes read by this function is smaller than
     // the file size because of the packet headers
-    int p = lrint(double(reader->m_bytesRead) * 114 /
-                  double(reader->m_fileSize));
+    int p = int(lrint(double(reader->m_bytesRead) * 114 /
+                      double(reader->m_fileSize)));
     if (p > 99) p = 99;
     reader->m_completion = p;
     reader->progress(p);
--- a/data/fileio/OggVorbisFileReader.h	Wed Mar 04 13:52:48 2015 +0000
+++ b/data/fileio/OggVorbisFileReader.h	Wed Mar 04 19:08:21 2015 +0000
@@ -79,8 +79,8 @@
     OGGZ *m_oggz;
     FishSound *m_fishSound;
     ProgressReporter *m_reporter;
-    int m_fileSize;
-    int m_bytesRead;
+    sv_frame_t m_fileSize;
+    sv_frame_t m_bytesRead;
     bool m_commentsRead;
     bool m_cancelled;
     int m_completion;