1 files changed, 12 insertions, 8 deletions

diff --git a/core/multimedia/opieplayer/libmad/decoder.h b/core/multimedia/opieplayer/libmad/decoder.h
index dbacc1a..f34150d 100644
--- a/core/multimedia/opieplayer/libmad/decoder.h
+++ b/core/multimedia/opieplayer/libmad/decoder.h
@@ -1,3 +1,3 @@
 /*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
  * Copyright (C) 2000-2001 Robert Leslie
@@ -34,6 +34,6 @@ enum mad_decoder_mode {
 enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,
-  MAD_FLOW_STOP     = 0x0010,
-  MAD_FLOW_BREAK    = 0x0011,
-  MAD_FLOW_IGNORE   = 0x0020
+          MAD_FLOW_CONTINUE = 0x0000,/* continue normally */
+          MAD_FLOW_STOP     = 0x0010,/* stop decoding normally */
+          MAD_FLOW_BREAK    = 0x0011,/* stop decoding and signal an error */
+          MAD_FLOW_IGNORE   = 0x0020/* ignore the current frame */
 };
@@ -61,3 +61,4 @@ struct mad_decoder {
   enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *, struct mad_frame *);
+  enum mad_flow (*filter_func)(void *,
+                               struct mad_stream const *, struct mad_frame *);
   enum mad_flow (*output_func)(void *,
@@ -71,3 +72,5 @@ void mad_decoder_init(struct mad_decoder *, void *,
                       enum mad_flow (*)(void *, struct mad_header const *),
-                      enum mad_flow (*)(void *, struct mad_frame *),
+                      enum mad_flow (*)(void *,
+                                        struct mad_stream const *,
+                                        struct mad_frame *),
                       enum mad_flow (*)(void *,
@@ -81,3 +84,4 @@ int mad_decoder_finish(struct mad_decoder *);
 
-# define mad_decoder_options(decoder, opts)  ((decoder)->options = (opts))
+# define mad_decoder_options(decoder, opts)  \
+    ((void) ((decoder)->options = (opts)))