[totem] main: Remove transitions between player/browser
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Remove transitions between player/browser
- Date: Wed, 29 Jan 2014 18:20:58 +0000 (UTC)
commit fd6873de492568c052e86316e859a684df465868
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jan 29 17:14:44 2014 +0100
main: Remove transitions between player/browser
src/totem-object.c | 20 ++++----------------
src/totem-private.h | 3 +--
src/totem-session.c | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 1105fae..78b1f98 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -853,21 +853,9 @@ totem_object_remove_sidebar_page (TotemObject *totem,
void
totem_object_set_main_page (TotemObject *totem,
- const char *page_id,
- gboolean animate)
+ const char *page_id)
{
- GtkStackTransitionType type;
-
- if (!animate)
- type = GTK_STACK_TRANSITION_TYPE_NONE;
- else if (g_str_equal (page_id, "player"))
- type = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT;
- else
- type = GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT;
-
- /* FIXME should we increase the minimum duration like that? */
- gtk_stack_set_transition_duration (GTK_STACK (totem->stack), 500);
- gtk_stack_set_visible_child_full (GTK_STACK (totem->stack), page_id, type);
+ gtk_stack_set_visible_child_full (GTK_STACK (totem->stack), page_id, GTK_STACK_TRANSITION_TYPE_NONE);
}
/**
@@ -1313,7 +1301,7 @@ totem_object_play (TotemObject *totem)
if (bacon_video_widget_is_playing (totem->bvw) != FALSE)
return;
- totem_object_set_main_page (totem, "player", TRUE);
+ totem_object_set_main_page (totem, "player");
retval = bacon_video_widget_play (totem->bvw, &err);
play_pause_set_label (totem, retval ? STATE_PLAYING : STATE_STOPPED);
@@ -2227,7 +2215,7 @@ back_button_clicked_cb (GtkButton *button,
TotemObject *totem)
{
totem_playlist_clear (totem->playlist);
- totem_object_set_main_page (totem, "grilo", TRUE);
+ totem_object_set_main_page (totem, "grilo");
}
static void
diff --git a/src/totem-private.h b/src/totem-private.h
index cc1ffe4..24af562 100644
--- a/src/totem-private.h
+++ b/src/totem-private.h
@@ -190,8 +190,7 @@ void totem_object_add_main_page (TotemObject *totem,
const char *page_id,
GtkWidget *widget);
void totem_object_set_main_page (TotemObject *totem,
- const char *page_id,
- gboolean animate);
+ const char *page_id);
const char * totem_object_get_main_page (Totem *totem);
/* Signal emission */
diff --git a/src/totem-session.c b/src/totem-session.c
index 4cfd080..ed4caa5 100644
--- a/src/totem-session.c
+++ b/src/totem-session.c
@@ -75,7 +75,7 @@ totem_session_try_restore (Totem *totem)
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
if (mrl != NULL)
- totem_object_set_main_page (totem, "player", FALSE);
+ totem_object_set_main_page (totem, "player");
totem_object_set_mrl (totem, mrl, subtitle);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]