[Traverso-commit] traverso/src/core FlacAudioReader.cpp MadAudioR...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/07/24 18:05:10

Modified files:
        src/core       : FlacAudioReader.cpp MadAudioReader.cpp 

Log message:
        Oops, -1 is not a valid nframes_t value

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FlacAudioReader.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MadAudioReader.cpp?cvsroot=traverso&r1=1.13&r2=1.14

Patches:
Index: FlacAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FlacAudioReader.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- FlacAudioReader.cpp 24 Jul 2007 17:57:05 -0000      1.10
+++ FlacAudioReader.cpp 24 Jul 2007 18:05:10 -0000      1.11
@@ -389,14 +389,14 @@
                                        PERROR("process_single() error\n");
                                        m_flac->reset();
                                        seek(m_readPos);
-                                       return -1;
+                                       return 0;
                                }
                        }
                        else {
                                PERROR("flac_state() = %d\n", 
int(m_flac->get_state()));
                                m_flac->reset();
                                seek(m_readPos);
-                               return -1;
+                               return 0;
                        }
 #else
                        if (m_flac->get_state() == 
FLAC__STREAM_DECODER_END_OF_STREAM) {
@@ -409,14 +409,14 @@
                                        PERROR("process_single() error\n");
                                        m_flac->reset();
                                        seek(m_readPos);
-                                       return -1;
+                                       return 0;
                                }
                        }
                        else {
                                PERROR("flac_state() = %d\n", 
int(m_flac->get_state()));
                                m_flac->reset();
                                seek(m_readPos);
-                               return -1;
+                               return 0;
                        }
 #endif
                }

Index: MadAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MadAudioReader.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- MadAudioReader.cpp  24 Jul 2007 17:57:05 -0000      1.13
+++ MadAudioReader.cpp  24 Jul 2007 18:05:10 -0000      1.14
@@ -799,12 +799,12 @@
                        // this fills the output buffer
                        if (!createPcmSamples(d->handle->madSynth)) {
                                PERROR("createPcmSamples");
-                               return -1;
+                               return 0;
                        }
                }
                else if (d->handle->inputError()) {
                        PERROR("inputError");
-                       return -1;
+                       return 0;
                }
        }