diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-23 14:45:25 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-23 14:45:25 +0000 |
| commit | 5701e846db35810e932631ad32742576791a8895 (patch) | |
| tree | 54748d20799177ca5aaf321e77fb036108222a9d /ext/speex/gstspeexdec.h | |
| parent | 3b494824c00a059358bfd95a79e43c4abb19fcbf (diff) | |
Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1.
Original commit message from CVS:
* configure.ac:
* ext/speex/gstspeexdec.h:
* ext/speex/gstspeexenc.h:
Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1.
Fix detection code in configure.ac
Diffstat (limited to 'ext/speex/gstspeexdec.h')
| -rw-r--r-- | ext/speex/gstspeexdec.h | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h index f0cd61c0..f60a679e 100644 --- a/ext/speex/gstspeexdec.h +++ b/ext/speex/gstspeexdec.h @@ -21,7 +21,6 @@ #ifndef __GST_SPEEXDEC_H__ #define __GST_SPEEXDEC_H__ - #include <gst/gst.h> #include <speex/speex.h> #include <speex/speex_callbacks.h> @@ -32,7 +31,6 @@ extern "C" { #endif /* __cplusplus */ - #define GST_TYPE_SPEEXDEC \ (gst_speex_dec_get_type()) #define GST_SPEEXDEC(obj) \ @@ -50,25 +48,30 @@ typedef struct _GstSpeexDecClass GstSpeexDecClass; #define DEC_MAX_FRAME_SIZE 2000 struct _GstSpeexDec { - GstElement element; + GstElement element; /* pads */ - GstPad *sinkpad,*srcpad; - - void *state; - SpeexStereoState stereo; - const SpeexMode * mode; - SpeexHeader *header; - SpeexCallback callback; - SpeexBits bits; - - gfloat output[DEC_MAX_FRAME_SIZE]; - - gboolean enh; - - gint frame_size; - guint64 samples_out; - guint64 packetno; + GstPad *sinkpad, + *srcpad; + + void *state; + SpeexStereoState stereo; +#ifdef SPEEX_1_0 + SpeexMode *mode; +#else + const SpeexMode *mode; +#endif + SpeexHeader *header; + SpeexCallback callback; + SpeexBits bits; + + gfloat output[DEC_MAX_FRAME_SIZE]; + + gboolean enh; + + gint frame_size; + guint64 samples_out; + guint64 packetno; }; struct _GstSpeexDecClass { |