ext/musepack/: Fix seeking in musepack files (it's still incredibly slow, but I don't think that is our plugin's faul...

Original commit message from CVS:
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_base_init),
(gst_musepackdec_class_init), (gst_musepackdec_init),
(gst_musepackdec_send_newsegment),
(gst_musepackdec_handle_seek_event), (gst_musepackdec_src_event),
(gst_musepackdec_src_query), (gst_musepackdec_src_convert),
(gst_musepack_stream_init), (gst_musepackdec_sink_activate_pull),
(gst_musepackdec_loop), (gst_musepackdec_change_state):
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.c: (gst_musepack_reader_peek),
(gst_musepack_reader_seek), (gst_musepack_reader_tell),
(gst_musepack_reader_get_size):
* ext/musepack/gstmusepackreader.h:
Fix seeking in musepack files (it's still incredibly slow, but I
don't think that is our plugin's fault). Clean up code and get
rid of old cruft. Post tags with all kind of neat information like
replay gain and such on the bus, if it is available. Add a
'musepackdec' debug category.

1 files changed, 6 insertions, 16 deletions

diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index 3743519c..52105b8a 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -21,9 +21,7 @@
 #define __GST_MUSEPACK_DEC_H__
 
 #include <gst/gst.h>
-//#include <gst/bytestream/bytestream.h>
 #include <mpcdec/mpcdec.h>
-//#include "gstmusepackreader.h"
 
 G_BEGIN_DECLS
 
@@ -37,7 +35,7 @@ G_BEGIN_DECLS
                             GstMusepackDecClass))
 #define GST_IS_MUSEPACK_DEC(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MUSEPACK_DEC))
-#define GST_IS_MUSEPACK_DEC_CLASS(obj) \
+#define GST_IS_MUSEPACK_DEC_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MUSEPACK_DEC))
 
 typedef struct _GstMusepackDec {
@@ -45,7 +43,6 @@ typedef struct _GstMusepackDec {
 
   /* pads */
   GstPad *srcpad, *sinkpad;
-  //  GstByteStream *bs;
   guint64 offset;
 
   /* MUSEPACK_DEC object */
@@ -53,15 +50,12 @@ typedef struct _GstMusepackDec {
   mpc_reader *r;
   gboolean init;
 
-  /* bytes-per-sample */
-  int bps, rate;
+  /* bytes per sample and sample rate */
+  guint       bps;
+  guint       rate;
 
-  /* position and length, in samples */
-  guint64 pos, len;
-
-  /* seeks */
-  gdouble flush_pending, seek_pending, eos;
-  guint64 seek_time;
+  /* currently configured segment, in samples (DEFAULT format) */
+  GstSegment  segment;
 } GstMusepackDec;
 
 typedef struct _GstMusepackDecClass {
@@ -70,10 +64,6 @@ typedef struct _GstMusepackDecClass {
 
 GType gst_musepackdec_get_type (void);
 
-extern gboolean gst_musepackdec_src_convert (GstPad * pad,
-                                             GstFormat src_format,
-                                             gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
-
 G_END_DECLS
 
 #endif /* __GST_MUSEPACK_DEC_H__ */