[Traverso-commit] traverso/src/audiofileio/decode AbstractAudioRe...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/11 14:30:43

Modified files:
        src/audiofileio/decode: AbstractAudioReader.cpp 
                                ResampleAudioReader.cpp 
                                ResampleAudioReader.h 

Log message:
        compile warning fix, change function signature to be more meaningful

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/ResampleAudioReader.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/ResampleAudioReader.h?cvsroot=traverso&r1=1.6&r2=1.7

Patches:
Index: AbstractAudioReader.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AbstractAudioReader.cpp     10 Sep 2007 21:22:44 -0000      1.6
+++ AbstractAudioReader.cpp     11 Sep 2007 14:30:43 -0000      1.7
@@ -138,7 +138,7 @@
                        newReader = new MadAudioReader(filename);
                }
                if (newReader && !newReader->is_valid()) {
-                       PERROR("new %s reader is invalid! (channels: %d, 
frames: %d)", (const char *)(newReader->decoder_type().toUtf8()), 
newReader->get_num_channels(), newReader->get_length());
+                       PERROR("new %s reader is invalid! (channels: %d, 
frames: %d)", (const char *)(newReader->decoder_type().toUtf8()), 
newReader->get_num_channels(), newReader->get_nframes());
                        delete newReader;
                        newReader = 0;
                }
@@ -167,7 +167,7 @@
        }
        
        if (newReader && !newReader->is_valid()) {
-               PERROR("new %s reader is invalid! (channels: %d, frames: %d)", 
(const char *)(newReader->decoder_type().toUtf8()), 
newReader->get_num_channels(), newReader->get_length());
+               PERROR("new %s reader is invalid! (channels: %d, frames: %d)", 
(const char *)(newReader->decoder_type().toUtf8()), 
newReader->get_num_channels(), newReader->get_nframes());
                delete newReader;
                newReader = 0;
        }

Index: ResampleAudioReader.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/ResampleAudioReader.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ResampleAudioReader.cpp     10 Sep 2007 21:22:44 -0000      1.9
+++ ResampleAudioReader.cpp     11 Sep 2007 14:30:43 -0000      1.10
@@ -147,7 +147,7 @@
                return;
        }
        m_outputRate = rate;
-       m_nframes = file_to_song_frame(m_reader->get_nframes());
+       m_nframes = file_to_resampled_frame(m_reader->get_nframes());
 }
 
 
@@ -163,7 +163,7 @@
        
        reset();
        
-       return m_reader->seek(song_to_file_frame(start));
+       return m_reader->seek(resampled_to_file_frame(start));
 }
 
 
@@ -183,7 +183,7 @@
        nframes_t bufferUsed;
        nframes_t framesRead;
        
-       nframes_t fileCnt = song_to_file_frame(frameCount);
+       nframes_t fileCnt = resampled_to_file_frame(frameCount);
        
        if (frameCount && !fileCnt) {
                fileCnt = 1;
@@ -271,7 +271,7 @@
 }
 
 
-nframes_t ResampleAudioReader::song_to_file_frame(nframes_t frame)
+nframes_t ResampleAudioReader::resampled_to_file_frame(nframes_t frame)
 {
        Q_ASSERT(m_reader);
        
@@ -285,7 +285,7 @@
 }
 
 
-nframes_t ResampleAudioReader::file_to_song_frame(nframes_t frame)
+nframes_t ResampleAudioReader::file_to_resampled_frame(nframes_t frame)
 {
        Q_ASSERT(m_reader);
        

Index: ResampleAudioReader.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/ResampleAudioReader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ResampleAudioReader.h       17 Aug 2007 00:13:27 -0000      1.6
+++ ResampleAudioReader.h       11 Sep 2007 14:30:43 -0000      1.7
@@ -47,8 +47,8 @@
        bool seek_private(nframes_t start);
        nframes_t read_private(DecodeBuffer* buffer, nframes_t frameCount);
        
-       nframes_t song_to_file_frame(nframes_t frame);
-       nframes_t file_to_song_frame(nframes_t frame);
+       nframes_t resampled_to_file_frame(nframes_t frame);
+       nframes_t file_to_resampled_frame(nframes_t frame);
        
        bool                    m_valid;
        AbstractAudioReader*    m_reader;