Changeset 372 for dsfilters/demux_mpc/src/mpc_filter.cpp

Timestamp:

12/15/07 17:04:51 (16 years ago)

Author:

radscorpion

Message:

Seeking fixes. Splitter now registers mediatypes

File:

• dsfilters/demux_mpc/src/mpc_filter.cpp (modified) (6 diffs)

dsfilters/demux_mpc/src/mpc_filter.cpp

@@ -338 +338 @@
                                 if (output.GetCount() <= 0) break;
                                 if (output[0]->IsConnected() == FALSE) break;
+                                int     delivered = 0;
 
                                 do {
 
                                         // are we supposed to abort ?
-                                        if (ev_abort.Check()) { 
-                                                ret = 0; 
+                                        if (ev_abort.Check()) {
                                                 break; 
                                         }
 
                                         ret = file->ReadAudioPacket(&packet, &current_sample);
+                                        if (ret == -2) {
+                                                // end of stream
+                                                if (!ev_abort.Check()) {
+                                                        output[0]->DoEndOfStream();
+                                                }
+                                                break;
+                                        } else
                                         if (ret < 0) {
-                                                // end of stream
                                                 break;
                                         } else {
@@ -359 +365 @@
 
                                                 // deliver packet
-                                                output[0]->DeliverPacket(packet);
+                                                hr = output[0]->DeliverPacket(packet);
+                                                if (FAILED(hr)) break;
+
+                                                delivered++;
                                         }
 
                                 } while (!CheckRequest(&cmd2));
-
-                                // end of stream
-                                if (ret == -1) {
-                                        output[0]->DoEndOfStream();
-                                }
-
                         }
                         break;
@@ -484 +487 @@
         if (reader) reader->BeginFlush();
 
-        for (int i=0; i<output.GetCount(); i++) {
-                CMPCOutputPin   *pin = output[i];
-                if (pin->IsConnected()) {
-                        // abort
-                        if (m_State != State_Stopped) {
-                                if (pin->ThreadExists()) {
-                                        pin->ev_abort.Set();
-                                        pin->DeliverBeginFlush();
-                                        pin->CallWorker(CMD_STOP);
-                                        pin->FlushQueue();
-                                }
+        CMPCOutputPin   *pin = output[0];
+        FILTER_STATE    state = m_State;
+
+        if (pin->IsConnected()) {
+                // abort
+                if (state != State_Stopped) {
+                        if (pin->ThreadExists()) {
+                                pin->ev_abort.Set();
+                                pin->DeliverBeginFlush();
+
+                                pin->CallWorker(CMD_STOP);
+                                pin->FlushQueue();
                         }
                 }
         }
 
-        for (int i=0; i<output.GetCount(); i++) {
-                CMPCOutputPin   *pin = output[i];
-                if (pin->IsConnected()) {
-                        if (m_State != State_Stopped) {
-                                if (pin->ThreadExists()) {
-                                        pin->ev_abort.Reset();
-                                        pin->DeliverEndFlush();
-                                }
+        if (reader) reader->EndFlush();
+
+        if (pin->IsConnected()) {
+                if (state != State_Stopped) {
+                        if (pin->ThreadExists()) {
+                                pin->ev_abort.Reset();
+                                pin->DeliverEndFlush();
                         }
-                        pin->DoNewSegment(rtCurrent, rtStop, rate);
-                }
+                }
+                pin->DoNewSegment(rtCurrent, rtStop, rate);
         }
 
@@ -515 +518 @@
                 CallWorker(CMD_STOP);
         }
-        if (reader) reader->EndFlush();
 
         // seek the file
@@ -528 +530 @@
         }
 
-        for (int i=0; i<output.GetCount(); i++) {
-                CMPCOutputPin   *pin = output[i];
-
-                // we only care about connected pins
-                if (pin->IsConnected()) {
-                        if (m_State != State_Stopped) {
-                                // spustime aj jeho thread
-                                if (pin->ThreadExists()) {
-                                        pin->CallWorker(CMD_RUN);
-                                }
+        if (pin->IsConnected()) {
+                if (state != State_Stopped) {
+                        // spustime aj jeho thread
+                        if (pin->ThreadExists()) {
+                                pin->FlushQueue();
+                                pin->CallWorker(CMD_RUN);
                         }
                 }
@@ -594 +592 @@
 
                 if (reader) reader->EndFlush();
+                ev_abort.Reset();
         }