[totem] main: Rename totem_action_pause()
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Rename totem_action_pause()
- Date: Tue, 19 Mar 2013 09:58:16 +0000 (UTC)
commit 6f26b3bcc2525b3a863841ee1848083834445b5b
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 19 09:49:57 2013 +0100
main: Rename totem_action_pause()
To totem_object_action_pause()
src/plugins/chapters/totem-chapters.c | 4 ++--
.../media-player-keys/totem-media-player-keys.c | 2 +-
src/totem-object.c | 16 ++++++++--------
src/totem.h | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/plugins/chapters/totem-chapters.c b/src/plugins/chapters/totem-chapters.c
index 482f54d..8ecba45 100644
--- a/src/plugins/chapters/totem-chapters.c
+++ b/src/plugins/chapters/totem-chapters.c
@@ -534,7 +534,7 @@ show_chapter_edit_dialog (TotemChaptersPlugin *plugin)
main_window = totem_object_get_main_window (plugin->priv->totem);
plugin->priv->was_played = totem_object_is_playing (plugin->priv->totem);
- totem_action_pause (plugin->priv->totem);
+ totem_object_action_pause (plugin->priv->totem);
/* adding a new one, check if it's time available */
g_object_get (G_OBJECT (plugin->priv->totem), "current-time", &_time, NULL);
@@ -953,7 +953,7 @@ load_button_clicked_cb (GtkButton *button,
g_return_if_fail (TOTEM_IS_CHAPTERS_PLUGIN (plugin));
plugin->priv->was_played = totem_object_is_playing (plugin->priv->totem);
- totem_action_pause (plugin->priv->totem);
+ totem_object_action_pause (plugin->priv->totem);
mrl = totem_object_get_current_mrl (plugin->priv->totem);
main_window = totem_object_get_main_window (plugin->priv->totem);
diff --git a/src/plugins/media-player-keys/totem-media-player-keys.c
b/src/plugins/media-player-keys/totem-media-player-keys.c
index 2d23dc6..4c7bf20 100644
--- a/src/plugins/media-player-keys/totem-media-player-keys.c
+++ b/src/plugins/media-player-keys/totem-media-player-keys.c
@@ -69,7 +69,7 @@ on_media_player_key_pressed (TotemObject *totem,
else if (strcmp ("Next", key) == 0)
totem_object_action_next (totem);
else if (strcmp ("Stop", key) == 0)
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
else if (strcmp ("FastForward", key) == 0)
totem_object_action_remote (totem, TOTEM_REMOTE_COMMAND_SEEK_FORWARD, NULL);
else if (strcmp ("Rewind", key) == 0)
diff --git a/src/totem-object.c b/src/totem-object.c
index 2c14de8..6d62522 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -1371,14 +1371,14 @@ totem_object_action_play_pause (TotemObject *totem)
}
/**
- * totem_action_pause:
+ * totem_object_action_pause:
* @totem: a #TotemObject
*
* Pauses the current stream. If Totem is already paused, it continues
* to be paused.
**/
void
-totem_action_pause (TotemObject *totem)
+totem_object_action_pause (TotemObject *totem)
{
if (bacon_video_widget_is_playing (totem->bvw) != FALSE) {
bacon_video_widget_pause (totem->bvw);
@@ -2416,7 +2416,7 @@ update_seekable (TotemObject *totem)
if (totem->seek_to_start != 0) {
bacon_video_widget_seek_time (totem->bvw,
totem->seek_to_start, FALSE, NULL);
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
}
}
totem->seek_to_start = 0;
@@ -2835,7 +2835,7 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
totem_object_action_play_pause (totem);
break;
case TOTEM_REMOTE_COMMAND_PAUSE:
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
icon_name = "media-playback-pause-symbolic";
break;
case TOTEM_REMOTE_COMMAND_STOP: {
@@ -3248,7 +3248,7 @@ on_eos_event (GtkWidget *widget, TotemObject *totem)
totem_object_action_seek_time (totem, 0, FALSE);
totem_object_action_play (totem);
} else {
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
totem_object_action_seek_time (totem, 0, FALSE);
}
} else {
@@ -3373,18 +3373,18 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
break;
case GDK_KEY_comma:
case GDK_KEY_FrameBack:
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
bacon_video_widget_step (totem->bvw, FALSE, NULL);
break;
case GDK_KEY_period:
case GDK_KEY_FrameForward:
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
bacon_video_widget_step (totem->bvw, TRUE, NULL);
break;
case GDK_KEY_AudioPause:
case GDK_KEY_Pause:
case GDK_KEY_AudioStop:
- totem_action_pause (totem);
+ totem_object_action_pause (totem);
icon_name = "media-playback-pause-symbolic";
break;
case GDK_KEY_q:
diff --git a/src/totem.h b/src/totem.h
index d392dfc..a4394dd 100644
--- a/src/totem.h
+++ b/src/totem.h
@@ -179,7 +179,7 @@ void totem_object_action_exit (TotemObject *totem) G_GNUC_NORETURN;
void totem_object_action_play (TotemObject *totem);
void totem_object_action_stop (TotemObject *totem);
void totem_object_action_play_pause (TotemObject *totem);
-void totem_action_pause (TotemObject *totem);
+void totem_object_action_pause (TotemObject *totem);
void totem_object_action_fullscreen_toggle (TotemObject *totem);
void totem_action_fullscreen (TotemObject *totem, gboolean state);
void totem_object_action_next (TotemObject *totem);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]