totem r6259 - in trunk: . src src/backend
- From: pwithnall svn gnome org
- To: svn-commits-list gnome org
- Subject: totem r6259 - in trunk: . src src/backend
- Date: Wed, 15 Apr 2009 06:44:12 +0000 (UTC)
Author: pwithnall
Date: Wed Apr 15 06:44:11 2009
New Revision: 6259
URL: http://svn.gnome.org/viewvc/totem?rev=6259&view=rev
Log:
2009-04-15 Philip Withnall <philip tecnocode co uk>
* src/backend/bacon-video-widget-common.c
(bacon_video_widget_common_get_vis_quality):
* src/backend/bacon-video-widget-common.h:
* src/backend/bacon-video-widget-gst-0.10.c
(bacon_video_widget_set_audio_out_type),
(bacon_video_widget_dvd_event),
(bacon_video_widget_set_visuals_quality),
(bacon_video_widget_set_aspect_ratio),
(bvw_get_color_balance_channel),
(bacon_video_widget_get_video_property),
(bacon_video_widget_set_video_property), (get_metadata_type_name),
(bacon_video_widget_get_metadata_string),
(bacon_video_widget_get_metadata_int),
(bacon_video_widget_get_metadata_bool),
(bacon_video_widget_get_metadata):
* src/backend/bacon-video-widget-xine.c
(bacon_video_widget_dvd_event), (bacon_video_widget_realize),
(bacon_video_widget_new), (bacon_video_widget_set_visuals_quality),
(bacon_video_widget_set_aspect_ratio),
(bacon_video_widget_get_video_property),
(bacon_video_widget_set_video_property),
(bacon_video_widget_set_audio_out_type),
(bacon_video_widget_get_metadata_string),
(bacon_video_widget_get_metadata_int),
(bacon_video_widget_get_metadata_bool),
(bacon_video_widget_get_metadata):
* src/backend/bacon-video-widget.h:
* src/totem-object.c:
* src/totem-preferences.c (audio_out_menu_changed),
(totem_setup_preferences):
* src/totem-video-indexer.c (totem_print_string),
(totem_print_int): Standardise BaconVideoWidget's enums to be in the
"Bvw" namespace. (Helps: #577961)
Modified:
trunk/ChangeLog
trunk/src/backend/bacon-video-widget-common.c
trunk/src/backend/bacon-video-widget-common.h
trunk/src/backend/bacon-video-widget-gst-0.10.c
trunk/src/backend/bacon-video-widget-xine.c
trunk/src/backend/bacon-video-widget.h
trunk/src/totem-object.c
trunk/src/totem-preferences.c
trunk/src/totem-video-indexer.c
Modified: trunk/src/backend/bacon-video-widget-common.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-common.c (original)
+++ trunk/src/backend/bacon-video-widget-common.c Wed Apr 15 06:44:11 2009
@@ -58,7 +58,7 @@
}
gboolean
-bacon_video_widget_common_get_vis_quality (VisualsQuality q,
+bacon_video_widget_common_get_vis_quality (BvwVisualsQuality q,
int *height, int *fps)
{
g_return_val_if_fail (height != NULL, FALSE);
Modified: trunk/src/backend/bacon-video-widget-common.h
==============================================================================
--- trunk/src/backend/bacon-video-widget-common.h (original)
+++ trunk/src/backend/bacon-video-widget-common.h Wed Apr 15 06:44:11 2009
@@ -41,7 +41,7 @@
};
gboolean bacon_video_widget_common_can_direct_seek (BaconVideoWidgetCommon *com);
-gboolean bacon_video_widget_common_get_vis_quality (VisualsQuality q,
+gboolean bacon_video_widget_common_get_vis_quality (BvwVisualsQuality q,
int *height,
int *fps);
Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c (original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c Wed Apr 15 06:44:11 2009
@@ -129,7 +129,7 @@
struct BaconVideoWidgetPrivate
{
- BaconVideoWidgetAspectRatio ratio_type;
+ BvwAspectRatio ratio_type;
GstElement *play;
GstXOverlay *xoverlay; /* protect with lock */
@@ -163,7 +163,7 @@
GList *vis_plugins_list;
gboolean show_vfx;
gboolean vis_changed;
- VisualsQuality visq;
+ BvwVisualsQuality visq;
gchar *vis_element_name;
GstElement *audio_capsfilter;
@@ -188,7 +188,7 @@
gchar *media_device;
- BaconVideoWidgetAudioOutType speakersetup;
+ BvwAudioOutType speakersetup;
gint connection_speed;
GstMessageType ignore_messages_mask;
@@ -2368,7 +2368,7 @@
gst_object_unref (pad);
}
-BaconVideoWidgetAudioOutType
+BvwAudioOutType
bacon_video_widget_get_audio_out_type (BaconVideoWidget *bvw)
{
g_return_val_if_fail (bvw != NULL, -1);
@@ -2379,7 +2379,7 @@
gboolean
bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
- BaconVideoWidgetAudioOutType type)
+ BvwAudioOutType type)
{
g_return_val_if_fail (bvw != NULL, FALSE);
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
@@ -2960,7 +2960,7 @@
void
bacon_video_widget_dvd_event (BaconVideoWidget * bvw,
- BaconVideoWidgetDVDEvent type)
+ BvwDVDEvent type)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3537,7 +3537,7 @@
void
bacon_video_widget_set_visuals_quality (BaconVideoWidget * bvw,
- VisualsQuality quality)
+ BvwVisualsQuality quality)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3574,7 +3574,7 @@
void
bacon_video_widget_set_aspect_ratio (BaconVideoWidget *bvw,
- BaconVideoWidgetAspectRatio ratio)
+ BvwAspectRatio ratio)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3583,7 +3583,7 @@
got_video_size (bvw);
}
-BaconVideoWidgetAspectRatio
+BvwAspectRatio
bacon_video_widget_get_aspect_ratio (BaconVideoWidget *bvw)
{
g_return_val_if_fail (bvw != NULL, 0);
@@ -3660,7 +3660,7 @@
/* Search for the color balance channel corresponding to type and return it. */
static GstColorBalanceChannel *
bvw_get_color_balance_channel (GstColorBalance * color_balance,
- BaconVideoWidgetVideoProperty type)
+ BvwVideoProperty type)
{
const GList *channels;
@@ -3684,7 +3684,7 @@
int
bacon_video_widget_get_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty type)
+ BvwVideoProperty type)
{
int ret;
@@ -3737,7 +3737,7 @@
void
bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty type,
+ BvwVideoProperty type,
int value)
{
g_return_if_fail (bvw != NULL);
@@ -4107,7 +4107,7 @@
}
static struct _metadata_map_info {
- BaconVideoWidgetMetadataType type;
+ BvwMetadataType type;
const gchar *str;
} metadata_str_map[] = {
{ BVW_INFO_TITLE, "title" },
@@ -4131,7 +4131,7 @@
};
static const gchar *
-get_metadata_type_name (BaconVideoWidgetMetadataType type)
+get_metadata_type_name (BvwMetadataType type)
{
guint i;
for (i = 0; i < G_N_ELEMENTS (metadata_str_map); ++i) {
@@ -4238,7 +4238,7 @@
static void
bacon_video_widget_get_metadata_string (BaconVideoWidget * bvw,
- BaconVideoWidgetMetadataType type,
+ BvwMetadataType type,
GValue * value)
{
char *string = NULL;
@@ -4365,7 +4365,7 @@
static void
bacon_video_widget_get_metadata_int (BaconVideoWidget * bvw,
- BaconVideoWidgetMetadataType type,
+ BvwMetadataType type,
GValue * value)
{
int integer = 0;
@@ -4447,7 +4447,7 @@
static void
bacon_video_widget_get_metadata_bool (BaconVideoWidget * bvw,
- BaconVideoWidgetMetadataType type,
+ BvwMetadataType type,
GValue * value)
{
gboolean boolean = FALSE;
@@ -4579,7 +4579,7 @@
void
bacon_video_widget_get_metadata (BaconVideoWidget * bvw,
- BaconVideoWidgetMetadataType type,
+ BvwMetadataType type,
GValue * value)
{
g_return_if_fail (bvw != NULL);
Modified: trunk/src/backend/bacon-video-widget-xine.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-xine.c (original)
+++ trunk/src/backend/bacon-video-widget-xine.c Wed Apr 15 06:44:11 2009
@@ -157,7 +157,7 @@
xine_post_t *vis;
GList *visuals;
char *queued_vis;
- VisualsQuality quality;
+ BvwVisualsQuality quality;
/* Seeking stuff */
int seeking;
@@ -174,7 +174,7 @@
int xpos, ypos;
guint tick_id;
double volume;
- BaconVideoWidgetAudioOutType audio_out_type;
+ BvwAudioOutType audio_out_type;
gint64 stream_length;
int zoom;
@@ -990,7 +990,7 @@
}
void
-bacon_video_widget_dvd_event (BaconVideoWidget *bvw, BaconVideoWidgetDVDEvent type)
+bacon_video_widget_dvd_event (BaconVideoWidget *bvw, BvwDVDEvent type)
{
xine_event_t event;
@@ -1235,7 +1235,7 @@
if (bvw->priv->ao_driver != NULL
&& bvw->priv->ao_driver_none == FALSE)
{
- BaconVideoWidgetAudioOutType type;
+ BvwAudioOutType type;
if (bvw->priv->vis_name == NULL)
bvw->priv->vis_name = g_strdup ("goom");
@@ -1764,7 +1764,7 @@
/* load the output drivers */
if (type == BVW_USE_TYPE_AUDIO)
{
- BaconVideoWidgetAudioOutType type;
+ BvwAudioOutType type;
bvw->priv->ao_driver = load_audio_out_driver (bvw,
FALSE, error);
@@ -3202,7 +3202,7 @@
void
bacon_video_widget_set_visuals_quality (BaconVideoWidget *bvw,
- VisualsQuality quality)
+ BvwVisualsQuality quality)
{
GdkScreen *screen;
int fps, h, w;
@@ -3535,7 +3535,7 @@
void
bacon_video_widget_set_aspect_ratio (BaconVideoWidget *bvw,
- BaconVideoWidgetAspectRatio ratio)
+ BvwAspectRatio ratio)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3544,7 +3544,7 @@
xine_set_param (bvw->priv->stream, XINE_PARAM_VO_ASPECT_RATIO, ratio);
}
-BaconVideoWidgetAspectRatio
+BvwAspectRatio
bacon_video_widget_get_aspect_ratio (BaconVideoWidget *bvw)
{
g_return_val_if_fail (bvw != NULL, 0);
@@ -3655,7 +3655,7 @@
int
bacon_video_widget_get_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty type)
+ BvwVideoProperty type)
{
g_return_val_if_fail (bvw != NULL, 65535 / 2);
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 65535 / 2);
@@ -3666,7 +3666,7 @@
void
bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty type, int value)
+ BvwVideoProperty type, int value)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3679,7 +3679,7 @@
gconf_client_set_int (bvw->priv->gc, video_props_str[type], value, NULL);
}
-BaconVideoWidgetAudioOutType
+BvwAudioOutType
bacon_video_widget_get_audio_out_type (BaconVideoWidget *bvw)
{
g_return_val_if_fail (bvw != NULL, BVW_AUDIO_SOUND_STEREO);
@@ -3693,7 +3693,7 @@
gboolean
bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
- BaconVideoWidgetAudioOutType type)
+ BvwAudioOutType type)
{
xine_cfg_entry_t entry;
int value;
@@ -3750,7 +3750,7 @@
}
static void
-bacon_video_widget_get_metadata_string (BaconVideoWidget *bvw, BaconVideoWidgetMetadataType type,
+bacon_video_widget_get_metadata_string (BaconVideoWidget *bvw, BvwMetadataType type,
GValue *value)
{
const char *string = NULL;
@@ -3838,7 +3838,7 @@
static void
bacon_video_widget_get_metadata_int (BaconVideoWidget *bvw,
- BaconVideoWidgetMetadataType type, GValue *value)
+ BvwMetadataType type, GValue *value)
{
int integer = 0;
@@ -3908,7 +3908,7 @@
static void
bacon_video_widget_get_metadata_bool (BaconVideoWidget *bvw,
- BaconVideoWidgetMetadataType type, GValue *value)
+ BvwMetadataType type, GValue *value)
{
gboolean boolean = FALSE;
@@ -3943,7 +3943,7 @@
void
bacon_video_widget_get_metadata (BaconVideoWidget *bvw,
- BaconVideoWidgetMetadataType type, GValue *value)
+ BvwMetadataType type, GValue *value)
{
g_return_if_fail (bvw != NULL);
g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
Modified: trunk/src/backend/bacon-video-widget.h
==============================================================================
--- trunk/src/backend/bacon-video-widget.h (original)
+++ trunk/src/backend/bacon-video-widget.h Wed Apr 15 06:44:11 2009
@@ -203,10 +203,10 @@
BVW_INFO_AUDIO_CODEC,
BVW_INFO_AUDIO_SAMPLE_RATE,
BVW_INFO_AUDIO_CHANNELS
-} BaconVideoWidgetMetadataType;
+} BvwMetadataType;
void bacon_video_widget_get_metadata (BaconVideoWidget *bvw,
- BaconVideoWidgetMetadataType
+ BvwMetadataType
type,
GValue *value);
@@ -217,7 +217,7 @@
VISUAL_LARGE,
VISUAL_EXTRA_LARGE,
NUM_VISUAL_QUALITIES
-} VisualsQuality;
+} BvwVisualsQuality;
void bacon_video_widget_set_show_visuals (BaconVideoWidget *bvw,
gboolean show_visuals);
@@ -225,7 +225,7 @@
gboolean bacon_video_widget_set_visuals (BaconVideoWidget *bvw,
const char *name);
void bacon_video_widget_set_visuals_quality (BaconVideoWidget *bvw,
- VisualsQuality quality);
+ BvwVisualsQuality quality);
/* Picture settings */
typedef enum {
@@ -233,7 +233,7 @@
BVW_VIDEO_CONTRAST,
BVW_VIDEO_SATURATION,
BVW_VIDEO_HUE
-} BaconVideoWidgetVideoProperty;
+} BvwVideoProperty;
typedef enum {
BVW_RATIO_AUTO = 0,
@@ -241,7 +241,7 @@
BVW_RATIO_FOURBYTHREE = 2,
BVW_RATIO_ANAMORPHIC = 3,
BVW_RATIO_DVB = 4
-} BaconVideoWidgetAspectRatio;
+} BvwAspectRatio;
gboolean bacon_video_widget_can_deinterlace (BaconVideoWidget *bvw);
void bacon_video_widget_set_deinterlacing (BaconVideoWidget *bvw,
@@ -249,9 +249,9 @@
gboolean bacon_video_widget_get_deinterlacing (BaconVideoWidget *bvw);
void bacon_video_widget_set_aspect_ratio (BaconVideoWidget *bvw,
- BaconVideoWidgetAspectRatio
+ BvwAspectRatio
ratio);
-BaconVideoWidgetAspectRatio bacon_video_widget_get_aspect_ratio
+BvwAspectRatio bacon_video_widget_get_aspect_ratio
(BaconVideoWidget *bvw);
void bacon_video_widget_set_scale_ratio (BaconVideoWidget *bvw,
@@ -262,10 +262,10 @@
int bacon_video_widget_get_zoom (BaconVideoWidget *bvw);
int bacon_video_widget_get_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty
+ BvwVideoProperty
type);
void bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
- BaconVideoWidgetVideoProperty
+ BvwVideoProperty
type,
int value);
@@ -288,10 +288,10 @@
BVW_DVD_ROOT_MENU_LEFT,
BVW_DVD_ROOT_MENU_RIGHT,
BVW_DVD_ROOT_MENU_SELECT
-} BaconVideoWidgetDVDEvent;
+} BvwDVDEvent;
void bacon_video_widget_dvd_event (BaconVideoWidget *bvw,
- BaconVideoWidgetDVDEvent
+ BvwDVDEvent
type);
GList *bacon_video_widget_get_languages (BaconVideoWidget *bvw);
int bacon_video_widget_get_language (BaconVideoWidget *bvw);
@@ -319,12 +319,12 @@
BVW_AUDIO_SOUND_5CHANNEL,
BVW_AUDIO_SOUND_51CHANNEL,
BVW_AUDIO_SOUND_AC3PASSTHRU
-} BaconVideoWidgetAudioOutType;
+} BvwAudioOutType;
-BaconVideoWidgetAudioOutType bacon_video_widget_get_audio_out_type
+BvwAudioOutType bacon_video_widget_get_audio_out_type
(BaconVideoWidget *bvw);
gboolean bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
- BaconVideoWidgetAudioOutType
+ BvwAudioOutType
type);
G_END_DECLS
Modified: trunk/src/totem-object.c
==============================================================================
--- trunk/src/totem-object.c (original)
+++ trunk/src/totem-object.c Wed Apr 15 06:44:11 2009
@@ -2016,7 +2016,7 @@
* @ratio: the aspect ratio to use
*
* Sets the aspect ratio selected in the menu to @ratio,
- * as defined in #BaconVideoWidgetAspectRatio.
+ * as defined in #BvwAspectRatio.
**/
void
totem_action_set_aspect_ratio (Totem *totem, int ratio)
@@ -2028,7 +2028,7 @@
* totem_action_get_aspect_ratio:
* @totem: a #TotemObject
*
- * Gets the current aspect ratio as defined in #BaconVideoWidgetAspectRatio.
+ * Gets the current aspect ratio as defined in #BvwAspectRatio.
*
* Return value: the current aspect ratio
**/
Modified: trunk/src/totem-preferences.c
==============================================================================
--- trunk/src/totem-preferences.c (original)
+++ trunk/src/totem-preferences.c Wed Apr 15 06:44:11 2009
@@ -398,7 +398,7 @@
void
audio_out_menu_changed (GtkComboBox *combobox, Totem *totem)
{
- BaconVideoWidgetAudioOutType audio_out;
+ BvwAudioOutType audio_out;
gboolean need_restart;
audio_out = gtk_combo_box_get_active (combobox);
@@ -469,13 +469,13 @@
guint i, hidden;
char *visual, *font, *encoding;
GList *list, *l;
- BaconVideoWidgetAudioOutType audio_out;
+ BvwAudioOutType audio_out;
GConfValue *value;
GObject *item;
static struct {
const char *name;
- BaconVideoWidgetVideoProperty prop;
+ BvwVideoProperty prop;
const char *label;
} props[4] = {
{ "tpw_contrast_scale", BVW_VIDEO_CONTRAST, "tpw_contrast_label" },
Modified: trunk/src/totem-video-indexer.c
==============================================================================
--- trunk/src/totem-video-indexer.c (original)
+++ trunk/src/totem-video-indexer.c Wed Apr 15 06:44:11 2009
@@ -63,7 +63,7 @@
}
static void
-totem_print_string (BaconVideoWidget *bvw, const char *key, BaconVideoWidgetMetadataType id)
+totem_print_string (BaconVideoWidget *bvw, const char *key, BvwMetadataType id)
{
GValue value = { 0, };
const char *str;
@@ -78,7 +78,7 @@
}
static void
-totem_print_int (BaconVideoWidget *bvw, const char *key, BaconVideoWidgetMetadataType id)
+totem_print_int (BaconVideoWidget *bvw, const char *key, BvwMetadataType id)
{
GValue value = { 0, };
int num;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
