mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

camerabin: fix setting mute when video bin elements haven't been created

Browse source
This commit is contained in:
Lasse Laukkanen 2009-06-23 13:01:13 +03:00 committed by Stefan Kost
parent 8a39d28002
commit 18e7091238
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/camerabin/camerabinvideo.c
View file

@ -184,6 +184,8 @@ gst_camerabin_video_init (GstCameraBinVideo * vid,
vid->pending_eos = NULL; vid->pending_eos = NULL;
vid->mute = ARG_DEFAULT_MUTE;
/* Create src and sink ghost pads */ /* Create src and sink ghost pads */
vid->sinkpad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK); vid->sinkpad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK);
gst_element_add_pad (GST_ELEMENT (vid), vid->sinkpad); gst_element_add_pad (GST_ELEMENT (vid), vid->sinkpad);
@ -629,6 +631,8 @@ gst_camerabin_video_create_elements (GstCameraBinVideo * vid)
GST_WARNING_OBJECT (vid, "unable to add volume element"); GST_WARNING_OBJECT (vid, "unable to add volume element");
/* gst_camerabin_try_add_element() destroyed the element */ /* gst_camerabin_try_add_element() destroyed the element */
vid->volume = NULL; vid->volume = NULL;
} else {
g_object_set (vid->volume, "mute", vid->mute, NULL);
} }
/* Add user set or default audio encoder element */ /* Add user set or default audio encoder element */
@ -732,8 +736,11 @@ gst_camerabin_video_destroy_elements (GstCameraBinVideo * vid)
void void
gst_camerabin_video_set_mute (GstCameraBinVideo * vid, gboolean mute) gst_camerabin_video_set_mute (GstCameraBinVideo * vid, gboolean mute)
{ {
if (vid && vid->volume) { g_return_if_fail (vid != NULL);
GST_DEBUG_OBJECT (vid, "setting mute %s", mute ? "on" : "off");
GST_DEBUG_OBJECT (vid, "setting mute %s", mute ? "on" : "off");
vid->mute = mute;
if (vid->volume) {
g_object_set (vid->volume, "mute", mute, NULL); g_object_set (vid->volume, "mute", mute, NULL);
} }
} }
@ -800,12 +807,13 @@ gst_camerabin_video_set_audio_src (GstCameraBinVideo * vid,
gboolean gboolean
gst_camerabin_video_get_mute (GstCameraBinVideo * vid) gst_camerabin_video_get_mute (GstCameraBinVideo * vid)
{ {
gboolean mute = ARG_DEFAULT_MUTE; g_return_val_if_fail (vid != NULL, FALSE);
if (vid && vid->volume) { if (vid->volume) {
g_object_get (vid->volume, "mute", &mute, NULL); g_object_get (vid->volume, "mute", &vid->mute, NULL);
} }
return mute;
return vid->mute;
} }
GstElement * GstElement *

8
gst/camerabin/camerabinvideo.h
View file

@ -24,24 +24,19 @@
#include <gst/gstbin.h> #include <gst/gstbin.h>
G_BEGIN_DECLS G_BEGIN_DECLS
//#define USE_TIMEOVERLAY 1 //#define USE_TIMEOVERLAY 1
#define ARG_DEFAULT_MUTE FALSE #define ARG_DEFAULT_MUTE FALSE
#define GST_TYPE_CAMERABIN_VIDEO (gst_camerabin_video_get_type()) #define GST_TYPE_CAMERABIN_VIDEO (gst_camerabin_video_get_type())
#define GST_CAMERABIN_VIDEO_CAST(obj) ((GstCameraBinVideo*)(obj)) #define GST_CAMERABIN_VIDEO_CAST(obj) ((GstCameraBinVideo*)(obj))
#define GST_CAMERABIN_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CAMERABIN_VIDEO,GstCameraBinVideo)) #define GST_CAMERABIN_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CAMERABIN_VIDEO,GstCameraBinVideo))
#define GST_CAMERABIN_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CAMERABIN_VIDEO,GstCameraBinVideoClass)) #define GST_CAMERABIN_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CAMERABIN_VIDEO,GstCameraBinVideoClass))
#define GST_IS_CAMERABIN_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CAMERABIN_VIDEO)) #define GST_IS_CAMERABIN_VIDEO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CAMERABIN_VIDEO))
#define GST_IS_CAMERABIN_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CAMERABIN_VIDEO)) #define GST_IS_CAMERABIN_VIDEO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CAMERABIN_VIDEO))
/** /**
* GstCameraBinVideo: * GstCameraBinVideo:
* *
* The opaque #GstCameraBinVideo structure. * The opaque #GstCameraBinVideo structure.
*/ */
typedef struct _GstCameraBinVideo GstCameraBinVideo; typedef struct _GstCameraBinVideo GstCameraBinVideo;
typedef struct _GstCameraBinVideoClass GstCameraBinVideoClass; typedef struct _GstCameraBinVideoClass GstCameraBinVideoClass;
@ -86,6 +81,8 @@ struct _GstCameraBinVideo
GstElement *muxer; /* Muxer */ GstElement *muxer; /* Muxer */
GstEvent *pending_eos; GstEvent *pending_eos;
gboolean mute;
}; };
struct _GstCameraBinVideoClass struct _GstCameraBinVideoClass
@ -132,5 +129,4 @@ GstElement *gst_camerabin_video_get_muxer (GstCameraBinVideo * vid);
GstElement *gst_camerabin_video_get_audio_src (GstCameraBinVideo * vid); GstElement *gst_camerabin_video_get_audio_src (GstCameraBinVideo * vid);
G_END_DECLS G_END_DECLS
#endif /* #ifndef __CAMERABIN_VIDEO_H__ */ #endif /* #ifndef __CAMERABIN_VIDEO_H__ */