[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/akode/lib
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-10-28 10:28:19
Message-ID: 1130495299.878451.1150.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 475131 by carewolf:

Fix bug that made very short samples silent


 M  +2 -6      buffered_decoder.cpp  


--- trunk/kdesupport/akode/lib/buffered_decoder.cpp #475130:475131
@@ -43,7 +43,6 @@
                    , running(false)
                    , state(Closed)
                    , halt(false)
-                   , done(true)
                    , seek_pos(-1) {};
     AudioBuffer *buffer;
     Decoder *decoder;
@@ -54,7 +53,7 @@
     BufferedDecoderStatus state;
 
     // Thread controls
-    volatile bool halt, done;
+    volatile bool halt;
     volatile long seek_pos;
     pthread_t thread;
 };
@@ -84,7 +83,6 @@
         }
     }
 
-    d->done = true;
     d->buffer->setEOF();
 
     return (void*)0;
@@ -122,7 +120,6 @@
     if (d->state != Open) return;
 
     d->halt = false;
-    d->done = false;
     d->seek_pos = -1;
 
     d->buffer->reset();
@@ -149,7 +146,6 @@
         d->halt = true;
         pthread_join(d->thread, 0);
         d->running = false;
-        assert(d->done);
     }
 
     d->state = Open;
@@ -197,7 +193,7 @@
 }
 
 bool BufferedDecoder::eof() {
-    return d->done || (d->buffer && d->buffer->eof());
+    return d->buffer && d->buffer->eof();
 }
 
 bool BufferedDecoder::error() {
[prev in list] [next in list] [prev in thread] [next in thread]