[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/core MadAudioReader.cpp
From: |
Ben Levitt |
Subject: |
[Traverso-commit] traverso/src/core MadAudioReader.cpp |
Date: |
Wed, 25 Jul 2007 06:29:43 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/07/25 06:29:43
Modified files:
src/core : MadAudioReader.cpp
Log message:
Fix a bug added to mp3 file opening during AudioReader cleanup
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MadAudioReader.cpp?cvsroot=traverso&r1=1.14&r2=1.15
Patches:
Index: MadAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MadAudioReader.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MadAudioReader.cpp 24 Jul 2007 18:05:10 -0000 1.14
+++ MadAudioReader.cpp 25 Jul 2007 06:29:43 -0000 1.15
@@ -485,14 +485,6 @@
initDecoderInternal();
- if (m_length <= 0) {
- d->handle->cleanup();
- delete d->handle;
- delete d;
- d = 0;
- return;
- }
-
switch( d->firstHeader.mode ) {
case MAD_MODE_SINGLE_CHANNEL:
m_channels = 1;
@@ -503,6 +495,15 @@
}
m_length = countFrames();
+
+ if (m_length <= 0) {
+ d->handle->cleanup();
+ delete d->handle;
+ delete d;
+ d = 0;
+ return;
+ }
+
m_rate = d->firstHeader.samplerate;
for (int c = 0; c < m_channels; c++) {