diff -r 5505e8908944 -r 71e347f905f2 gst_plugins_symbian/gst/devsound/gstdevsoundsink.h --- a/gst_plugins_symbian/gst/devsound/gstdevsoundsink.h Fri Jan 22 09:59:59 2010 +0200 +++ b/gst_plugins_symbian/gst/devsound/gstdevsoundsink.h Fri Mar 19 09:35:09 2010 +0200 @@ -28,7 +28,6 @@ #ifndef __GST_DEVSOUNDSINK_H__ #define __GST_DEVSOUNDSINK_H__ - #include #include @@ -41,7 +40,7 @@ #define GST_IS_DEVSOUND_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEVSOUND_SINK)) #define GST_IS_DEVSOUND_SINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEVSOUND_SINK)) - +//#define AV_SYNC typedef struct _GstDevsoundSink GstDevsoundSink; typedef struct _GstDevsoundSinkClass GstDevsoundSinkClass; @@ -49,51 +48,55 @@ typedef struct _GstDevsoundUpdate GstDevsoundUpdate; struct _GstDevsoundUpdate{ -gboolean channelsupdate; -gboolean rateupdate; -gboolean volumeupdate; -gboolean volumerampupdate; -gboolean leftbalanceupdate; -gboolean rightbalanceupdate; -gboolean preferenceupdate; -gboolean priorityupdate; -gboolean fourccupdate; -gboolean outputupdate; + gboolean channelsupdate; + gboolean rateupdate; + gboolean volumeupdate; + gboolean volumerampupdate; + gboolean leftbalanceupdate; + gboolean rightbalanceupdate; + gboolean preferenceupdate; + gboolean priorityupdate; + gboolean fourccupdate; + gboolean outputupdate; }; struct _GstDevsoundSink { - GstBaseSink sink; - - void *handle; - void *dataptr; - gchar *device; - gint bytes_per_sample; - GstCaps *probed_caps; + GstBaseSink sink; - GstDevsoundUpdate pending; + void *handle; + void *dataptr; + gchar *device; + gint bytes_per_sample; + GstCaps *probed_caps; + + GstDevsoundUpdate pending; - //properties - gint channels; - gint rate; - gint volume; - gint volumeramp; - gint maxvolume; - gint leftbalance; - gint rightbalance; - gint priority; - gint preference; - gint samplesplayed; - gint output; - gulong fourcc; - gchar *mimetype; - GList *fmt; - gboolean framemodereq; - gboolean g711cng; - gboolean ilbccng; + //properties + gint channels; + gint rate; + gint volume; + gint volumeramp; + gint maxvolume; + gint leftbalance; + gint rightbalance; + gint priority; + gint preference; + gint output; + gulong fourcc; + gchar *mimetype; + GList *fmt; + + gboolean eosreceived; + +#ifdef AV_SYNC + gboolean timeplayedavailable; + gulong time_or_samples_played; + GstClock *clock; /* The clock for this element. */ +#endif /*AV_SYNC*/ }; struct _GstDevsoundSinkClass { - GstBaseSinkClass parent_class; + GstBaseSinkClass parent_class; }; GType gst_devsound_sink_get_type(void); @@ -101,3 +104,4 @@ G_END_DECLS #endif /* __GST_DEVSOUNDSINK_H__ */ +