Changeset 10 for trunk/src/streaminfo.c

Timestamp:

08/12/06 16:35:51 (18 years ago)

Author:

zorg

Message:

Update to 1.2.3 trunk

File:

• trunk/src/streaminfo.c (modified) (5 diffs)

trunk/src/streaminfo.c

@@ -57 +57 @@
 {
     memset(si, 0, sizeof(mpc_streaminfo));
-}
-
-// read information from SV8 header
-// not yet implemented
-static mpc_int32_t
-streaminfo_read_header_sv8(mpc_streaminfo * si, mpc_reader * fp)
-{
-    (void) si;
-    (void) fp;
-    return 0;
 }
 
@@ -143 +133 @@
 
 // read information from SV4-SV6 header
+#ifdef MPC_SUPPORT_SV456
 static mpc_int32_t
 streaminfo_read_header_sv6(mpc_streaminfo * si, mpc_uint32_t HeaderData[8])
@@ -199 +190 @@
     return ERROR_CODE_OK;
 }
-
+#endif
 // reads file header and tags
 mpc_int32_t
@@ -235 +226 @@
         // stream version 8
         if ((si->stream_version & 15) >= 8) {
-            Error = streaminfo_read_header_sv8(si, r);
+            return ERROR_CODE_INVALIDSV;
         }
         // stream version 7
         else if ((si->stream_version & 15) == 7) {
             Error = streaminfo_read_header_sv7(si, HeaderData);
-        }
-    }
-    else {
+            if (Error != ERROR_CODE_OK) return Error;
+        }
+    } else {
+#ifdef MPC_SUPPORT_SV456
         // stream version 4-6
         Error = streaminfo_read_header_sv6(si, HeaderData);
+#else
+        return ERROR_CODE_INVALIDSV;
+#endif
     }
 
@@ -259 +254 @@
     }
 
-    return Error;
+    return ERROR_CODE_OK;
 }