Changeset 372 for dsfilters/demux_mpc/src/mpc_file.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_file.cpp (modified) (4 diffs)

dsfilters/demux_mpc/src/mpc_file.cpp

@@ -271 +271 @@
         do {
                 ret = packet->Load(reader);
-                if (ret < 0) return ret;
+                if (ret < 0) {
+                        return ret;
+                }
 
                 switch (packet->key) {
@@ -282 +284 @@
                                 return 0;                       // we got one
                         }
-                case MPC_KEY('S','E'):  return -1;                      // end of stream
+                case MPC_KEY('S','E'):
+                        {
+                                return -2;
+                        }
+                        break;
                 }
 
@@ -375 +381 @@
 
         // end of stream
-        if (file_position >= avail) return -1;
-
-        ret = reader->GetKey(key_val);                                  if (ret < 0) return ret;
-        ret = reader->GetSizeElm(size_val, size_len);   if (ret < 0) return ret;
+        if (file_position >= avail) {
+                return -2;
+        }
+
+        ret = reader->GetKey(key_val);                                  
+        if (ret < 0) {
+                return ret;
+        }
+        ret = reader->GetSizeElm(size_val, size_len);   
+        if (ret < 0) {
+                return ret;
+        }
+
         // if the key is not valid, quit
-        if (!reader->KeyValid(key_val)) return -1;
+        if (!reader->KeyValid(key_val)) {
+                return -1;
+        }
         key = key_val;
 
@@ -391 +408 @@
         // roll back the bytes
         reader->Seek(file_position);
-        ret = reader->Read(packet, packet_size);                if (ret < 0) return ret;
-
-        return 0;
-}
-
-
+        ret = reader->Read(packet, packet_size);                
+        if (ret < 0) {
+                return ret;
+        }
+
+        return 0;
+}
+
+