From 9c7ceecaeaa1cc19528089b34dea1d78b70208ff Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 9 Dec 2004 12:57:29 +0000 Subject: [PATCH] Synchronize property names where not yet the case. Devices are now device=X, other versions are deprecated (but still... Original commit message from CVS: * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_class_init), (cdparanoia_set_property), (cdparanoia_get_property): * ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_class_init), (dvdnavsrc_set_property), (dvdnavsrc_get_property): * ext/dvdread/dvdreadsrc.c: (dvdreadsrc_class_init), (dvdreadsrc_init), (dvdreadsrc_set_property), (dvdreadsrc_get_property): * sys/vcd/vcdsrc.c: (gst_vcdsrc_class_init), (gst_vcdsrc_set_property), (gst_vcdsrc_get_property): Synchronize property names where not yet the case. Devices are now device=X, other versions are deprecated (but still exist). Also use g_free() unconditionally. * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init), (setup_source), (gst_play_base_bin_get_property): Expose source. --- ChangeLog | 18 ++++++++++++++++++ ext/dvdnav/dvdnavsrc.c | 12 +++++++++--- ext/dvdread/dvdreadsrc.c | 14 ++++++++++---- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff83685dc3..2ef92519ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2004-12-09 Ronald S. Bultje + + * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_class_init), + (cdparanoia_set_property), (cdparanoia_get_property): + * ext/dvdnav/dvdnavsrc.c: (dvdnavsrc_class_init), + (dvdnavsrc_set_property), (dvdnavsrc_get_property): + * ext/dvdread/dvdreadsrc.c: (dvdreadsrc_class_init), + (dvdreadsrc_init), (dvdreadsrc_set_property), + (dvdreadsrc_get_property): + * sys/vcd/vcdsrc.c: (gst_vcdsrc_class_init), + (gst_vcdsrc_set_property), (gst_vcdsrc_get_property): + Synchronize property names where not yet the case. Devices are + now device=X, other versions are deprecated (but still exist). + Also use g_free() unconditionally. + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init), + (setup_source), (gst_play_base_bin_get_property): + Expose source. + 2004-12-09 Thomas Vander Stichele * configure.ac: move GCONF macro outside conditional for the am diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c index 57598817b3..4667edc637 100644 --- a/ext/dvdnav/dvdnavsrc.c +++ b/ext/dvdnav/dvdnavsrc.c @@ -183,6 +183,7 @@ enum { ARG_0, ARG_LOCATION, + ARG_DEVICE, ARG_STREAMINFO, ARG_BUTTONINFO, ARG_TITLE_STRING, @@ -323,8 +324,12 @@ dvdnavsrc_class_init (DVDNavSrcClass * klass) klass->user_op = dvdnavsrc_user_op; g_object_class_install_property (gobject_class, ARG_LOCATION, - g_param_spec_string ("location", "location", "location", + g_param_spec_string ("location", "Location", + "DVD device location (deprecated; use device)", NULL, G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, ARG_DEVICE, + g_param_spec_string ("device", "Device", + "DVD device location", NULL, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, ARG_TITLE_STRING, g_param_spec_string ("title_string", "title string", "DVD title string", NULL, G_PARAM_READABLE)); @@ -440,11 +445,11 @@ dvdnavsrc_set_property (GObject * object, guint prop_id, switch (prop_id) { case ARG_LOCATION: + case ARG_DEVICE: /* the element must be stopped in order to do this */ /*g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */ - if (src->location) - g_free (src->location); + g_free (src->location); /* clear the filename if we get a NULL (is that possible?) */ if (g_value_get_string (value) == NULL) src->location = g_strdup ("/dev/dvd"); @@ -507,6 +512,7 @@ dvdnavsrc_get_property (GObject * object, guint prop_id, switch (prop_id) { case ARG_LOCATION: + case ARG_DEVICE: g_value_set_string (value, src->location); break; case ARG_STREAMINFO: diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index ba1d96bd2c..c3ca850046 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -96,6 +96,7 @@ enum { ARG_0, ARG_LOCATION, + ARG_DEVICE, ARG_TITLE, ARG_CHAPTER, ARG_ANGLE @@ -188,8 +189,12 @@ dvdreadsrc_class_init (DVDReadSrcClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LOCATION, - g_param_spec_string ("location", "location", "location", + g_param_spec_string ("location", "Location", + "DVD device location (deprecated; use device)", NULL, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEVICE, + g_param_spec_string ("device", "Device", + "DVD device location", NULL, G_PARAM_READWRITE)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TITLE, g_param_spec_int ("title", "title", "title", 0, G_MAXINT, 0, G_PARAM_READWRITE)); @@ -229,7 +234,7 @@ dvdreadsrc_init (DVDReadSrc * dvdreadsrc) dvdreadsrc_get_formats); gst_element_add_pad (GST_ELEMENT (dvdreadsrc), dvdreadsrc->priv->srcpad); - dvdreadsrc->priv->location = g_strdup ("/dev/cdrom"); + dvdreadsrc->priv->location = g_strdup ("/dev/dvd"); dvdreadsrc->priv->new_seek = TRUE; dvdreadsrc->priv->new_cell = TRUE; dvdreadsrc->priv->title = 0; @@ -269,11 +274,11 @@ dvdreadsrc_set_property (GObject * object, guint prop_id, const GValue * value, switch (prop_id) { case ARG_LOCATION: + case ARG_DEVICE: /* the element must be stopped in order to do this */ /*g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */ - if (priv->location) - g_free (priv->location); + g_free (priv->location); /* clear the filename if we get a NULL (is that possible?) */ if (g_value_get_string (value) == NULL) priv->location = g_strdup ("/dev/dvd"); @@ -313,6 +318,7 @@ dvdreadsrc_get_property (GObject * object, guint prop_id, GValue * value, priv = src->priv; switch (prop_id) { + case ARG_DEVICE: case ARG_LOCATION: g_value_set_string (value, priv->location); break;