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.
This commit is contained in:
Tim-Philipp Müller 2006-03-06 13:15:04 +00:00
parent 13cd0b0626
commit d1323179c9
3 changed files with 17 additions and 13 deletions

View file

@ -1,3 +1,9 @@
2006-03-06 Tim-Philipp Müller <tim at centricular dot net>
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.c: (gst_musepack_reader_peek):
Forgot those two.
2006-03-06 Tim-Philipp Müller <tim at centricular dot net> 2006-03-06 Tim-Philipp Müller <tim at centricular dot net>
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_base_init), * ext/musepack/gstmusepackdec.c: (gst_musepackdec_base_init),

View file

@ -39,23 +39,20 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MUSEPACK_DEC)) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_MUSEPACK_DEC))
typedef struct _GstMusepackDec { typedef struct _GstMusepackDec {
GstElement element; GstElement element;
/* pads */ GstPad *srcpad;
GstPad *srcpad, *sinkpad; GstPad *sinkpad;
guint64 offset; guint64 offset;
/* MUSEPACK_DEC object */ /* MUSEPACK_DEC object */
mpc_decoder *d; mpc_decoder *d;
mpc_reader *r; mpc_reader *r;
gboolean init;
/* bytes per sample and sample rate */ gint bps; /* bytes per sample */ /* ATOMIC */
guint bps; gint rate; /* sample rate */ /* ATOMIC */
guint rate;
/* currently configured segment, in samples (DEFAULT format) */ GstSegment segment; /* configured segment in samples (DEFAULT format) */
GstSegment segment;
} GstMusepackDec; } GstMusepackDec;
typedef struct _GstMusepackDecClass { typedef struct _GstMusepackDecClass {

View file

@ -62,7 +62,8 @@ gst_musepack_reader_peek (void *this, void *ptr, mpc_int32_t size)
if (read < size) { if (read < size) {
GST_WARNING_OBJECT (musepackdec, "Short read: got only %u bytes of %u " 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)); */ /* GST_ELEMENT_ERROR (musepackdec, RESOURCE, READ, (NULL), (NULL)); */
} }