- Better state change function

Original commit message from CVS:
- Better state change function
- fail when negotiation was not performed
- removed properties that are implied by caps
- only open device in negotiation

1 files changed, 15 insertions, 25 deletions

diff --git a/ext/esd/esdsink.h b/ext/esd/esdsink.h
index e29e9f7c..de1564ea 100644
--- a/ext/esd/esdsink.h
+++ b/ext/esd/esdsink.h
@@ -23,42 +23,35 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GST_TYPE_ESDSINK \
   (gst_esdsink_get_type())
 #define GST_ESDSINK(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ESDSINK,GstEsdsink))
 #define GST_ESDSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ESDSINK,GstEsdsink))
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ESDSINK,GstEsdsinkClass))
 #define GST_IS_ESDSINK(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDSINK))
 #define GST_IS_ESDSINK_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDSINK))
 
-typedef enum {
-  GST_ESDSINK_OPEN            = GST_ELEMENT_FLAG_LAST,
-  GST_ESDSINK_FLAG_LAST       = GST_ELEMENT_FLAG_LAST+2,
-} GstEsdSinkFlags;
-
 typedef struct _GstEsdsink GstEsdsink;
 typedef struct _GstEsdsinkClass GstEsdsinkClass;
 
 struct _GstEsdsink {
-  GstElement element;
-
-  GstPad *sinkpad;
-
-  gboolean mute;
-  int fd;
-  gint format;
-  gint depth;
-  gint channels;
-  gint frequency;
-  gchar* host;
+  GstElement 	 element;
+
+  GstPad 	*sinkpad;
+
+  gboolean 	 mute;
+  int 		 fd;
+  gint 		 format;
+  gint 		 depth;
+  gint 		 channels;
+  gint 		 frequency;
+  gboolean 	 negotiated;
+  gchar		*host;
 };
 
 struct _GstEsdsinkClass {
@@ -68,9 +61,6 @@ struct _GstEsdsinkClass {
 GType gst_esdsink_get_type(void);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GST_ESDSINK_H__ */