From d1323179c9ae217ac3e9c30d8581dbc41cc567a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 6 Mar 2006 13:15:04 +0000
Subject: ext/musepack/: Forgot those two.

Original commit message from CVS:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.c: (gst_musepack_reader_peek):
Forgot those two.
---
 ext/musepack/gstmusepackdec.h    | 21 +++++++++------------
 ext/musepack/gstmusepackreader.c |  3 ++-
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'ext/musepack')

diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index 52105b8a0..35baced0f 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -39,23 +39,20 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MUSEPACK_DEC))
 
 typedef struct _GstMusepackDec {
-  GstElement element;
+  GstElement    element;
 
-  /* pads */
-  GstPad *srcpad, *sinkpad;
-  guint64 offset;
+  GstPad       *srcpad;
+  GstPad       *sinkpad;
+  guint64       offset;
 
   /* MUSEPACK_DEC object */
-  mpc_decoder *d;
-  mpc_reader *r;
-  gboolean init;
+  mpc_decoder  *d;
+  mpc_reader   *r;
 
-  /* bytes per sample and sample rate */
-  guint       bps;
-  guint       rate;
+  gint          bps;     /* bytes per sample */ /* ATOMIC */
+  gint          rate;    /* sample rate      */ /* ATOMIC */
 
-  /* currently configured segment, in samples (DEFAULT format) */
-  GstSegment  segment;
+  GstSegment    segment; /* configured segment in samples (DEFAULT format) */
 } GstMusepackDec;
 
 typedef struct _GstMusepackDecClass {
diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index a801f7cc3..d98f48f67 100644
--- a/ext/musepack/gstmusepackreader.c
+++ b/ext/musepack/gstmusepackreader.c
@@ -62,7 +62,8 @@ gst_musepack_reader_peek (void *this, void *ptr, mpc_int32_t size)
 
   if (read < size) {
     GST_WARNING_OBJECT (musepackdec, "Short read: got only %u bytes of %u "
-        "bytes requested", read, size);
+        "bytes requested at offset %" G_GINT64_FORMAT, read, size,
+        musepackdec->offset);
     /* GST_ELEMENT_ERROR (musepackdec, RESOURCE, READ, (NULL), (NULL)); */
   }
 
-- 
cgit v1.2.1