diff -r 567bb019e3e3 -r 7e817e7e631c gst_plugins_good/gst/wavparse/gstwavparse.h --- a/gst_plugins_good/gst/wavparse/gstwavparse.h Tue Aug 31 15:30:33 2010 +0300 +++ b/gst_plugins_good/gst/wavparse/gstwavparse.h Wed Sep 01 12:16:41 2010 +0100 @@ -24,8 +24,11 @@ #include -#include "gst/riff/riff-ids.h" -#include "gst/riff/riff-read.h" +#include +#include +#include +#include + #include G_BEGIN_DECLS @@ -44,7 +47,7 @@ typedef enum { GST_WAVPARSE_START, GST_WAVPARSE_HEADER, - GST_WAVPARSE_DATA + GST_WAVPARSE_DATA, } GstWavParseState; typedef struct _GstWavParse GstWavParse; @@ -66,8 +69,7 @@ * the format for sure */ GstCaps *caps; GstTagList *tags; - GstEvent *close_segment; - GstEvent *start_segment; + GstEvent *newsegment; /* WAVE decoding state */ GstWavParseState state; @@ -77,16 +79,11 @@ /* useful audio data */ guint16 depth; - guint32 rate; + gint rate; guint16 channels; guint16 blockalign; guint16 width; - guint32 av_bps; - guint32 fact; - - /* real bps used or 0 when no bitrate is known */ guint32 bps; - gboolean vbr; guint bytes_per_sample; @@ -97,9 +94,7 @@ /* offset/length of data part */ guint64 datastart; guint64 datasize; - /* duration in time */ - guint64 duration; - + /* pending seek */ GstEvent *seek_event; @@ -111,11 +106,9 @@ /* configured segment, start/stop expressed in time */ GstSegment segment; gboolean segment_running; - + /* for late pad configuration */ gboolean first; - /* discont after seek */ - gboolean discont; }; struct _GstWavParseClass {