From 19e52f35ee7a05738499a83cf4ce08252ff3fa57 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Thu, 2 Dec 2010 00:19:05 -0300 Subject: [PATCH] camerabin2: remove unused code General cleanup, removing unused bits --- gst/camerabin2/gstcamerabin-enum.c | 39 -------------------------------------- gst/camerabin2/gstcamerabin-enum.h | 32 ------------------------------- 2 files changed, 71 deletions(-) diff --git a/gst/camerabin2/gstcamerabin-enum.c b/gst/camerabin2/gstcamerabin-enum.c index bf13890..ba09dcf 100644 --- a/gst/camerabin2/gstcamerabin-enum.c +++ b/gst/camerabin2/gstcamerabin-enum.c @@ -20,45 +20,6 @@ #include "gstcamerabin-enum.h" -#define C_FLAGS(v) ((guint) v) - -static void -register_gst_camerabin_flags (GType * id) -{ - static const GFlagsValue values[] = { - {C_FLAGS (GST_CAMERABIN_FLAG_SOURCE_RESIZE), - "Enable source crop and scale", "source-resize"}, - {C_FLAGS (GST_CAMERABIN_FLAG_SOURCE_COLOR_CONVERSION), - "Enable colorspace conversion for video source", - "source-colorspace-conversion"}, - {C_FLAGS (GST_CAMERABIN_FLAG_VIEWFINDER_COLOR_CONVERSION), - "Enable colorspace conversion for viewfinder", - "viewfinder-colorspace-conversion"}, - {C_FLAGS (GST_CAMERABIN_FLAG_VIEWFINDER_SCALE), - "Enable scale for viewfinder", "viewfinder-scale"}, - {C_FLAGS (GST_CAMERABIN_FLAG_AUDIO_CONVERSION), - "Enable audio conversion for video capture", "audio-conversion"}, - {C_FLAGS (GST_CAMERABIN_FLAG_DISABLE_AUDIO), - "Disable audio elements for video capture", "disable-audio"}, - {C_FLAGS (GST_CAMERABIN_FLAG_IMAGE_COLOR_CONVERSION), - "Enable colorspace conversion for still image", - "image-colorspace-conversion"}, - {0, NULL, NULL} - }; - *id = g_flags_register_static ("GstCameraBinFlags", values); -} - -GType -gst_camerabin_flags_get_type (void) -{ - static GType id; - static GOnce once = G_ONCE_INIT; - - g_once (&once, (GThreadFunc) register_gst_camerabin_flags, &id); - return id; -} - - GType gst_camerabin_mode_get_type (void) { diff --git a/gst/camerabin2/gstcamerabin-enum.h b/gst/camerabin2/gstcamerabin-enum.h index 436263c..299e05c 100644 --- a/gst/camerabin2/gstcamerabin-enum.h +++ b/gst/camerabin2/gstcamerabin-enum.h @@ -81,38 +81,6 @@ enum /** - * GstCameraBinFlags: - * @GST_CAMERABIN_FLAG_SOURCE_RESIZE: enable video crop and scale - * after capture - * @GST_CAMERABIN_FLAG_SOURCE_COLOR_CONVERSION: enable conversion - * of native video format by enabling ffmpegcolorspace - * @GST_CAMERABIN_FLAG_VIEWFINDER_COLOR_CONVERSION: enable color - * conversion for viewfinder element - * @GST_CAMERABIN_FLAG_VIEWFINDER_SCALE: enable scaling in - * viewfinder element retaining aspect ratio - * @GST_CAMERABIN_FLAG_AUDIO_CONVERSION: enable audioconvert and - * audioresample elements - * @GST_CAMERABIN_FLAG_DISABLE_AUDIO: disable audio elements - * @GST_CAMERABIN_FLAG_IMAGE_COLOR_CONVERSION: enable color - * conversion for image output element - * - * Extra flags to configure the behaviour of the sinks. - */ -typedef enum { - GST_CAMERABIN_FLAG_SOURCE_RESIZE = (1 << 0), - GST_CAMERABIN_FLAG_SOURCE_COLOR_CONVERSION = (1 << 1), - GST_CAMERABIN_FLAG_VIEWFINDER_COLOR_CONVERSION = (1 << 2), - GST_CAMERABIN_FLAG_VIEWFINDER_SCALE = (1 << 3), - GST_CAMERABIN_FLAG_AUDIO_CONVERSION = (1 << 4), - GST_CAMERABIN_FLAG_DISABLE_AUDIO = (1 << 5), - GST_CAMERABIN_FLAG_IMAGE_COLOR_CONVERSION = (1 << 6) -} GstCameraBinFlags; - -#define GST_TYPE_CAMERABIN_FLAGS (gst_camerabin_flags_get_type()) -GType gst_camerabin_flags_get_type (void); - - -/** * GstCameraBinMode: * @MODE_IMAGE: image capture * @MODE_VIDEO: video capture -- 2.7.4