[totem] Remove the unused "restart after change" dialogues
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Remove the unused "restart after change" dialogues
- Date: Thu, 2 Sep 2010 17:58:47 +0000 (UTC)
commit 63377577e22954c31f65da2b370366ac81a1180a
Author: Bastien Nocera <hadess hadess net>
Date: Thu Sep 2 18:57:35 2010 +0100
Remove the unused "restart after change" dialogues
https://bugzilla.gnome.org/show_bug.cgi?id=322226
src/backend/bacon-video-widget-gst-0.10.c | 24 ++++++++----------------
src/backend/bacon-video-widget.h | 4 ++--
src/totem-preferences.c | 12 ++----------
3 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index 498e13d..60ea4e1 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -3380,10 +3380,8 @@ bacon_video_widget_get_audio_out_type (BaconVideoWidget *bvw)
*
* Sets the audio output type (number of speaker channels) in the video widget,
* and stores it in GConf.
- *
- * Return value: %TRUE on success, %FALSE otherwise
**/
-gboolean
+void
bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
BvwAudioOutType type)
{
@@ -3391,17 +3389,15 @@ bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
if (type == bvw->priv->speakersetup)
- return FALSE;
+ return;
else if (type == BVW_AUDIO_SOUND_AC3PASSTHRU)
- return FALSE;
+ return;
bvw->priv->speakersetup = type;
gconf_client_set_int (bvw->priv->gc,
GCONF_PREFIX"/audio_output_type", type, NULL);
set_audio_filter (bvw);
-
- return FALSE;
}
/* =========================================== */
@@ -5025,32 +5021,28 @@ bacon_video_widget_get_visuals_list (BaconVideoWidget * bvw)
*
* If @name is %NULL, visualisations will be disabled. Otherwise, @name
* should be from the list returned by bacon_video_widget_get_visuals_list().
- *
- * Return value: %TRUE on success, %FALSE otherwise
**/
-gboolean
+void
bacon_video_widget_set_visuals (BaconVideoWidget * bvw, const char *name)
{
g_return_val_if_fail (bvw != NULL, FALSE);
g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
+
if (bvw->priv->vis_element_name) {
if (strcmp (bvw->priv->vis_element_name, name) == 0) {
- return FALSE;
+ return;
}
else {
g_free (bvw->priv->vis_element_name);
}
}
-
+
bvw->priv->vis_element_name = g_strdup (name);
GST_DEBUG ("new visualisation element name = '%s'", GST_STR_NULL (name));
-
+
setup_vis (bvw);
-
- return FALSE;
}
/**
diff --git a/src/backend/bacon-video-widget.h b/src/backend/bacon-video-widget.h
index 65e34b1..dcd29eb 100644
--- a/src/backend/bacon-video-widget.h
+++ b/src/backend/bacon-video-widget.h
@@ -316,7 +316,7 @@ typedef enum {
void bacon_video_widget_set_show_visuals (BaconVideoWidget *bvw,
gboolean show_visuals);
GList *bacon_video_widget_get_visuals_list (BaconVideoWidget *bvw);
-gboolean bacon_video_widget_set_visuals (BaconVideoWidget *bvw,
+void bacon_video_widget_set_visuals (BaconVideoWidget *bvw,
const char *name);
void bacon_video_widget_set_visuals_quality (BaconVideoWidget *bvw,
BvwVisualsQuality quality);
@@ -469,7 +469,7 @@ typedef enum {
BvwAudioOutType bacon_video_widget_get_audio_out_type
(BaconVideoWidget *bvw);
-gboolean bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
+void bacon_video_widget_set_audio_out_type (BaconVideoWidget *bvw,
BvwAudioOutType type);
G_END_DECLS
diff --git a/src/totem-preferences.c b/src/totem-preferences.c
index e0015cc..2646380 100644
--- a/src/totem-preferences.c
+++ b/src/totem-preferences.c
@@ -400,8 +400,7 @@ visual_menu_changed (GtkComboBox *combobox, Totem *totem)
gconf_client_set_string (totem->gc, GCONF_PREFIX"/visual",
name, NULL);
- if (bacon_video_widget_set_visuals (totem->bvw, name) != FALSE)
- totem_action_info (_("Changing the visuals effect type will require a restart to take effect."), totem);
+ bacon_video_widget_set_visuals (totem->bvw, name);
}
g_free (old_name);
@@ -480,16 +479,9 @@ void
audio_out_menu_changed (GtkComboBox *combobox, Totem *totem)
{
BvwAudioOutType audio_out;
- gboolean need_restart;
audio_out = gtk_combo_box_get_active (combobox);
- need_restart = bacon_video_widget_set_audio_out_type (totem->bvw, audio_out);
- if (need_restart != FALSE) {
- totem_action_info (_("The change of audio output type will "
- "only take effect when Totem is "
- "restarted."),
- totem);
- }
+ bacon_video_widget_set_audio_out_type (totem->bvw, audio_out);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]