mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin2: Changing how some properties work

Browse source 
Some properties (like viewfinder-filter) only are taken into use
on NULL->READY transitions and the get/set property was returning
the currently in use value, instead of the last set.

This is bad, as after setting 'a' to 'x', you expect that getting 'a'
will return 'x'. This patch fixes it.

If needed, later we could add current-* properties that are readonly
and get the current value in use.
This commit is contained in:
Thiago Santos 2011-05-11 18:35:40 -03:00
parent a36edbc1ab
commit 0b02e595f3
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/camerabin2/gstcamerabin2.c
View file

@ -466,12 +466,14 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
g_object_class_install_property (object_class, PROP_CAMERA_SRC, g_object_class_install_property (object_class, PROP_CAMERA_SRC,
g_param_spec_object ("camera-src", "Camera source", g_param_spec_object ("camera-src", "Camera source",
"The camera source element to be used", "The camera source element to be used. It is only taken into use on"
" the next null to ready transition",
GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_AUDIO_SRC, g_object_class_install_property (object_class, PROP_AUDIO_SRC,
g_param_spec_object ("audio-src", "Audio source", g_param_spec_object ("audio-src", "Audio source",
"The audio source element to be used on video recordings", "The audio source element to be used on video recordings. It is only"
" taken into use on the next null to ready transition",
GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_MUTE_AUDIO, g_object_class_install_property (object_class, PROP_MUTE_AUDIO,
@ -565,7 +567,8 @@ gst_camera_bin_class_init (GstCameraBinClass * klass)
g_object_class_install_property (object_class, PROP_VIEWFINDER_SINK, g_object_class_install_property (object_class, PROP_VIEWFINDER_SINK,
g_param_spec_object ("viewfinder-sink", "Viewfinder sink", g_param_spec_object ("viewfinder-sink", "Viewfinder sink",
"The video sink of the viewfinder.", "The video sink of the viewfinder. It is only taken into use"
" on the next null to ready transition",
GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_TYPE_ELEMENT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
@ -1496,10 +1499,10 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
} }
break; break;
case PROP_CAMERA_SRC: case PROP_CAMERA_SRC:
g_value_set_object (value, camera->src); g_value_set_object (value, camera->user_src);
break; break;
case PROP_AUDIO_SRC: case PROP_AUDIO_SRC:
g_value_set_object (value, camera->audio_src); g_value_set_object (value, camera->user_audio_src);
break; break;
case PROP_MUTE_AUDIO:{ case PROP_MUTE_AUDIO:{
gboolean mute; gboolean mute;
@ -1596,16 +1599,16 @@ gst_camera_bin_get_property (GObject * object, guint prop_id,
} }
break; break;
case PROP_VIDEO_FILTER: case PROP_VIDEO_FILTER:
if (camera->video_filter) if (camera->user_video_filter)
g_value_set_object (value, camera->video_filter); g_value_set_object (value, camera->user_video_filter);
break; break;
case PROP_IMAGE_FILTER: case PROP_IMAGE_FILTER:
if (camera->image_filter) if (camera->user_image_filter)
g_value_set_object (value, camera->image_filter); g_value_set_object (value, camera->user_image_filter);
break; break;
case PROP_VIEWFINDER_FILTER: case PROP_VIEWFINDER_FILTER:
if (camera->viewfinder_filter) if (camera->user_viewfinder_filter)
g_value_set_object (value, camera->viewfinder_filter); g_value_set_object (value, camera->user_viewfinder_filter);
break; break;
case PROP_PREVIEW_FILTER: case PROP_PREVIEW_FILTER:
if (camera->preview_filter) if (camera->preview_filter)