diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-09 12:57:29 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-12-09 12:57:29 +0000 |
| commit | 9c7ceecaeaa1cc19528089b34dea1d78b70208ff (patch) | |
| tree | 7b0064cbd7644bf1edab772ebb8cc1f0daea3b16 /ext/dvdnav/dvdnavsrc.c | |
| parent | d7628e1bb41b5865317ca11f35fd9ee20d9d96d8 (diff) | |
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.
Diffstat (limited to 'ext/dvdnav/dvdnavsrc.c')
| -rw-r--r-- | ext/dvdnav/dvdnavsrc.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c index 57598817..4667edc6 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: |