[Traverso-commit] traverso/src/core ReadSource.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/09 19:52:59

Modified files:
        src/core       : ReadSource.cpp 

Log message:
        * Fix useResampling logic :D 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.68&r2=1.69

Patches:
Index: ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- ReadSource.cpp      9 Oct 2007 18:49:29 -0000       1.68
+++ ReadSource.cpp      9 Oct 2007 19:52:59 -0000       1.69
@@ -221,7 +221,6 @@
        
        bool useResampling = config().get_property("Conversion", 
"DynamicResampling", false).toBool();
        
-       if (useResampling) {
                int converter_type;
                converter_type = config().get_property("Conversion", 
"RTResamplingConverterType", 2).toInt();
                
@@ -229,18 +228,16 @@
                //converter_type = config().get_property("Conversion", 
"ExportResamplingConverterType", 0).toInt();
                m_audioReader = new ResampleAudioReader(m_fileName, 
m_decodertype);
                
-               if (m_audioReader->is_valid()) {
-                       set_output_rate(audiodevice().get_sample_rate());
-                       m_audioReader->set_converter_type(converter_type);
-               } else {
+       if (!m_audioReader->is_valid()) {
                        PERROR("ReadSource:: audio reader is not valid! (reader 
channel count: %d, nframes: %d", m_audioReader->get_num_channels(), 
m_audioReader->get_nframes());
                        delete m_audioReader;
                        m_audioReader = 0;
-               }
+               return COULD_NOT_OPEN_FILE;
        }
        
-       if (m_audioReader == 0) {
-               return COULD_NOT_OPEN_FILE;
+       if (useResampling) {
+               set_output_rate(audiodevice().get_sample_rate());
+               m_audioReader->set_converter_type(converter_type);
        }
        
        // (re)set the decoder type
@@ -412,6 +409,7 @@
 {
        int readFrames = file_read(buffer, m_rbFileReadPos, cnt);
        m_rbFileReadPos.add_frames(readFrames, m_outputRate);
+//     printf("file %s: readFrames, cnt: %d, %d\n", QS_C(m_fileName), 
readFrames, cnt);
 
        return readFrames;
 }