[totem/plugin-api-cleanup: 3/3] Remove compatibility defines and unify names of methods of TotemObject
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/plugin-api-cleanup: 3/3] Remove compatibility defines and unify names of methods of TotemObject
- Date: Sun, 8 Aug 2010 23:08:58 +0000 (UTC)
commit 192f32a69e3ca08100f5a077185941cc45c4781a
Author: Philip Withnall <philip withnall collabora co uk>
Date: Sun Aug 8 14:43:32 2010 +0100
Remove compatibility defines and unify names of methods of TotemObject
docs/reference/totem-sections.txt | 96 ++---
.../brasero-disc-recorder/totem-disc-recorder.c | 22 +-
src/plugins/coherence_upnp/coherence_upnp.py | 8 +-
src/plugins/dbus-service/dbus-service.py | 30 +-
src/plugins/gromit/totem-gromit.c | 4 +-
src/plugins/iplayer/iplayer.py | 4 +-
src/plugins/jamendo/jamendo.py | 6 +-
.../media-player-keys/totem-media-player-keys.c | 12 +-
src/plugins/ontop/totem-ontop.c | 6 +-
src/plugins/properties/totem-movie-properties.c | 8 +-
src/plugins/sample-python/sample-python.py | 2 +-
src/plugins/screensaver/totem-screensaver.c | 8 +-
src/plugins/screenshot/totem-gallery.c | 4 +-
src/plugins/screenshot/totem-screenshot-plugin.c | 14 +-
src/plugins/screenshot/totem-screenshot.c | 2 +-
src/plugins/sidebar-test/totem-sidebar-test.c | 4 +-
src/plugins/skipto/totem-skipto-plugin.c | 16 +-
src/plugins/skipto/totem-skipto.c | 2 +-
src/plugins/thumbnail/totem-thumbnail.c | 6 +-
src/plugins/youtube/totem-youtube.c | 14 +-
src/totem-menu.c | 54 +-
src/totem-menu.h | 2 +-
src/totem-object.c | 540 ++++++++++----------
src/totem-options.c | 2 +-
src/totem-private.h | 18 +-
src/totem-session.c | 6 +-
src/totem-video-list.c | 2 +-
src/totem.c | 24 +-
src/totem.h | 96 ++---
29 files changed, 478 insertions(+), 534 deletions(-)
---
diff --git a/docs/reference/totem-sections.txt b/docs/reference/totem-sections.txt
index fb26f15..93c2832 100644
--- a/docs/reference/totem-sections.txt
+++ b/docs/reference/totem-sections.txt
@@ -9,48 +9,48 @@ TotemRemoteSetting
TOTEM_GCONF_PREFIX
totem_object_plugins_init
totem_object_plugins_shutdown
-totem_object_action_error
-totem_object_action_exit
+totem_object_error
+totem_object_exit
totem_object_add_to_playlist_and_play
-totem_object_action_play
-totem_action_play_media
-totem_action_play_media_device
-totem_object_action_play_pause
-totem_action_pause
-totem_object_action_stop
-totem_action_fullscreen
-totem_object_action_fullscreen_toggle
-totem_object_action_next
-totem_object_action_previous
-totem_action_next_angle
-totem_object_action_remote_get_setting
-totem_object_action_remote_set_setting
-totem_object_action_seek_time
-totem_action_seek_relative
-totem_object_action_volume
-totem_action_volume_relative
-totem_action_volume_toggle_mute
-totem_action_toggle_aspect_ratio
-totem_action_get_aspect_ratio
-totem_action_set_aspect_ratio
-totem_action_toggle_controls
-totem_action_set_scale_ratio
-totem_action_set_playlist_index
-totem_object_action_remote
-totem_is_fullscreen
+totem_object_play
+totem_object_play_media
+totem_object_play_media_device
+totem_object_play_pause
+totem_object_pause
+totem_object_stop
+totem_object_fullscreen
+totem_object_fullscreen_toggle
+totem_object_next
+totem_object_previous
+totem_object_next_angle
+totem_object_remote_get_setting
+totem_object_remote_set_setting
+totem_object_seek_time
+totem_object_seek_relative
+totem_object_volume
+totem_object_volume_relative
+totem_object_volume_toggle_mute
+totem_object_toggle_aspect_ratio
+totem_object_get_aspect_ratio
+totem_object_set_aspect_ratio
+totem_object_toggle_controls
+totem_object_set_scale_ratio
+totem_object_set_playlist_index
+totem_object_remote
+totem_object_is_fullscreen
totem_object_is_playing
totem_object_is_paused
totem_object_is_seekable
totem_object_get_main_window
totem_object_get_ui_manager
-totem_get_video_widget
+totem_object_get_video_widget
totem_object_get_current_mrl
-totem_get_current_time
+totem_object_get_current_time
totem_object_set_current_subtitle
totem_object_get_playlist_length
totem_object_get_playlist_pos
totem_object_get_title_at_playlist_pos
-totem_get_short_title
+totem_object_get_short_title
totem_object_get_volume
totem_object_get_version
totem_object_add_sidebar_page
@@ -71,37 +71,9 @@ TOTEM_TYPE_REMOTE_SETTING
totem_remote_setting_get_type
totem_remote_setting_quark
<SUBSECTION Private>
-totem_action_set_mrl
-totem_action_set_mrl_and_play
-totem_action_set_mrl_with_warning
-totem_action_error
-totem_action_exit
-totem_action_fullscreen_toggle
-totem_action_next
-totem_action_play
-totem_action_play_pause
-totem_action_previous
-totem_action_remote
-totem_action_remote_get_setting
-totem_action_remote_set_setting
-totem_action_seek_time
-totem_action_stop
-totem_action_volume
-totem_add_sidebar_page
-totem_add_to_playlist_and_play
-totem_get_current_mrl
-totem_get_main_window
-totem_get_playlist_length
-totem_get_playlist_pos
-totem_get_title_at_playlist_pos
-totem_get_ui_manager
-totem_get_version
-totem_get_volume
-totem_is_paused
-totem_is_playing
-totem_is_seekable
-totem_remove_sidebar_page
-totem_set_current_subtitle
+totem_object_set_mrl
+totem_object_set_mrl_and_play
+totem_object_set_mrl_with_warning
</SECTION>
<SECTION>
diff --git a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
index a5afea2..d1512db 100644
--- a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+++ b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
@@ -108,7 +108,7 @@ totem_disc_recorder_plugin_start_burning (TotemDiscRecorderPlugin *pi,
g_ptr_array_add (array, (gpointer) "-r");
g_ptr_array_add (array, (gpointer) path);
- main_window = totem_get_main_window (pi->totem);
+ main_window = totem_object_get_main_window (pi->totem);
screen = gtk_widget_get_screen (GTK_WIDGET (main_window));
xid = gdk_x11_drawable_get_xid (GDK_DRAWABLE (gtk_widget_get_window (GTK_WIDGET (main_window))));
xid_str = g_strdup_printf ("%d", xid);
@@ -125,11 +125,11 @@ totem_disc_recorder_plugin_start_burning (TotemDiscRecorderPlugin *pi,
if (copy != FALSE) {
totem_interface_error (_("The video disc could not be duplicated."),
error->message,
- totem_get_main_window (pi->totem));
+ totem_object_get_main_window (pi->totem));
} else {
totem_interface_error (_("The movie could not be recorded."),
error->message,
- totem_get_main_window (pi->totem));
+ totem_object_get_main_window (pi->totem));
}
ret = FALSE;
g_error_free (error);
@@ -194,7 +194,7 @@ totem_disc_recorder_plugin_write_video_project (TotemDiscRecorderPlugin *pi,
if (success < 0)
goto error;
- title = totem_get_short_title (pi->totem);
+ title = totem_object_get_short_title (pi->totem);
if (title) {
success = xmlTextWriterWriteElement (project,
(xmlChar *) "label",
@@ -213,7 +213,7 @@ totem_disc_recorder_plugin_write_video_project (TotemDiscRecorderPlugin *pi,
if (success < 0)
goto error;
- uri = totem_get_current_mrl (pi->totem);
+ uri = totem_object_get_current_mrl (pi->totem);
escaped = (unsigned char *) g_uri_escape_string (uri, NULL, FALSE);
g_free (uri);
@@ -280,7 +280,7 @@ totem_disc_recorder_plugin_burn (GtkAction *action,
if (!path) {
totem_interface_error (_("The movie could not be recorded."),
error,
- totem_get_main_window (pi->totem));
+ totem_object_get_main_window (pi->totem));
g_free (error);
return;
}
@@ -297,7 +297,7 @@ totem_disc_recorder_plugin_copy (GtkAction *action,
{
char *mrl;
- mrl = totem_get_current_mrl (pi->totem);
+ mrl = totem_object_get_current_mrl (pi->totem);
if (!g_str_has_prefix (mrl, "dvd:") && !g_str_has_prefix (mrl, "vcd:")) {
g_free (mrl);
g_assert_not_reached ();
@@ -406,7 +406,7 @@ impl_activate (PeasActivatable *plugin)
G_N_ELEMENTS (totem_disc_recorder_plugin_actions),
pi);
- uimanager = totem_get_ui_manager (pi->totem);
+ uimanager = totem_object_get_ui_manager (pi->totem);
gtk_ui_manager_insert_action_group (uimanager, pi->action_group, -1);
g_object_unref (pi->action_group);
@@ -457,7 +457,7 @@ impl_activate (PeasActivatable *plugin)
GTK_UI_MANAGER_MENUITEM,
TRUE);
- if (!totem_is_paused (pi->totem) && !totem_is_playing (pi->totem)) {
+ if (!totem_object_is_paused (pi->totem) && !totem_object_is_playing (pi->totem)) {
action = gtk_action_group_get_action (pi->action_group, "VideoBurnToDisc");
gtk_action_set_visible (action, FALSE);
action = gtk_action_group_get_action (pi->action_group, "VideoDVDCopy");
@@ -467,7 +467,7 @@ impl_activate (PeasActivatable *plugin)
else {
char *mrl;
- mrl = totem_get_current_mrl (pi->totem);
+ mrl = totem_object_get_current_mrl (pi->totem);
totem_disc_recorder_file_opened (pi->totem, mrl, pi);
g_free (mrl);
}
@@ -484,7 +484,7 @@ impl_deactivate (PeasActivatable *plugin)
g_signal_handlers_disconnect_by_func (pi->totem, totem_disc_recorder_file_opened, plugin);
g_signal_handlers_disconnect_by_func (pi->totem, totem_disc_recorder_file_closed, plugin);
- uimanager = totem_get_ui_manager (pi->totem);
+ uimanager = totem_object_get_ui_manager (pi->totem);
gtk_ui_manager_remove_ui (uimanager, pi->ui_merge_id);
gtk_ui_manager_remove_action_group (uimanager, pi->action_group);
diff --git a/src/plugins/coherence_upnp/coherence_upnp.py b/src/plugins/coherence_upnp/coherence_upnp.py
index 15f8cb8..3975e0a 100644
--- a/src/plugins/coherence_upnp/coherence_upnp.py
+++ b/src/plugins/coherence_upnp/coherence_upnp.py
@@ -68,13 +68,13 @@ class UPnPClient(gobject.GObject, Peas.Activatable):
row_path = selected_rows.pop(0)
iter = self.ui.store.get_iter(row_path)
url, = self.ui.store.get(iter,SERVICE_COLUMN)
- self.totem_object.action_remote(totem.REMOTE_COMMAND_REPLACE,url)
- self.totem_object.action_remote(totem.REMOTE_COMMAND_PLAY,url)
+ self.totem_object.remote(totem.REMOTE_COMMAND_REPLACE,url)
+ self.totem_object.remote(totem.REMOTE_COMMAND_PLAY,url)
for row_path in selected_rows:
iter = self.ui.store.get_iter(row_path)
url, = self.ui.store.get(iter,SERVICE_COLUMN)
- self.totem_object.action_remote(totem.REMOTE_COMMAND_ENQUEUE,url)
- self.totem_object.action_remote(totem.REMOTE_COMMAND_PLAY,url)
+ self.totem_object.remote(totem.REMOTE_COMMAND_ENQUEUE,url)
+ self.totem_object.remote(totem.REMOTE_COMMAND_PLAY,url)
if not hasattr(self, 'context_no_delete'):
self.context_no_delete = gtk.Menu()
diff --git a/src/plugins/dbus-service/dbus-service.py b/src/plugins/dbus-service/dbus-service.py
index 7d96ffa..fc61ec7 100644
--- a/src/plugins/dbus-service/dbus-service.py
+++ b/src/plugins/dbus-service/dbus-service.py
@@ -59,7 +59,7 @@ class Root (dbus.service.Object):
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Quit(self):
- self.totem.action_exit()
+ self.totem.exit()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='(qq)')
def MprisVersion(self):
@@ -118,21 +118,21 @@ class Player(dbus.service.Object):
else:
playing_status = 2
- if self.totem.action_remote_get_setting(Totem.RemoteSetting.SHUFFLE):
+ if self.totem.remote_get_setting(Totem.RemoteSetting.SHUFFLE):
shuffle_status = 1
else:
shuffle_status = 0
- if self.totem.action_remote_get_setting(Totem.RemoteSetting.REPEAT):
+ if self.totem.remote_get_setting(Totem.RemoteSetting.REPEAT):
repeat_status = 1
else:
repeat_status = 0
return (
dbus.Int32(playing_status), # 0 = Playing, 1 = Paused, 2 = Stopped
- dbus.Int32(self.totem.action_remote_get_setting(Totem.RemoteSetting.SHUFFLE)), # 0 = Playing linearly , 1 = Playing randomly
+ dbus.Int32(self.totem.remote_get_setting(Totem.RemoteSetting.SHUFFLE)), # 0 = Playing linearly , 1 = Playing randomly
dbus.Int32(0), # 0 = Go to the next element once the current has finished playing , 1 = Repeat the current element
- dbus.Int32(self.totem.action_remote_get_setting(Totem.RemoteSetting.REPEAT)) # 0 = Stop playing once the last element has been played, 1 = Never give up playing
+ dbus.Int32(self.totem.remote_get_setting(Totem.RemoteSetting.REPEAT)) # 0 = Stop playing once the last element has been played, 1 = Never give up playing
)
def calculate_caps(self):
@@ -187,27 +187,27 @@ class Player(dbus.service.Object):
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Next(self):
- self.totem.action_next()
+ self.totem.next()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Prev(self):
- self.totem.action_previous()
+ self.totem.previous()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Pause(self):
- self.totem.action_play_pause()
+ self.totem.play_pause()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Stop(self):
- self.totem.action_stop()
+ self.totem.stop()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='')
def Play(self):
# If playing : rewind to the beginning of current track, else : start playing.
if self.totem.is_playing():
- self.totem.action_seek_time(0, False)
+ self.totem.seek_time(0, False)
else:
- self.totem.action_play()
+ self.totem.play()
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='b', out_signature='')
def Repeat(self, value):
@@ -231,7 +231,7 @@ class Player(dbus.service.Object):
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='i', out_signature='')
def VolumeSet(self, volume):
- self.totem.action_volume(volume / 100.0)
+ self.totem.volume(volume / 100.0)
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='i')
def VolumeGet(self):
@@ -239,7 +239,7 @@ class Player(dbus.service.Object):
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='i', out_signature='')
def PositionSet(self, position):
- self.totem.action_seek_time(position, False)
+ self.totem.seek_time(position, False)
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='', out_signature='i')
def PositionGet(self):
@@ -284,8 +284,8 @@ class TrackList(dbus.service.Object):
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='b', out_signature='')
def SetLoop(self, loop):
- self.totem.action_remote_set_setting(Totem.RemoteSetting.REPEAT, loop)
+ self.totem.remote_set_setting(Totem.RemoteSetting.REPEAT, loop)
@dbus.service.method(dbus_interface='org.freedesktop.MediaPlayer', in_signature='b', out_signature='')
def SetRandom(self, random):
- self.totem.action_remote_set_setting(Totem.RemoteSetting.SHUFFLE, random)
+ self.totem.remote_set_setting(Totem.RemoteSetting.SHUFFLE, random)
diff --git a/src/plugins/gromit/totem-gromit.c b/src/plugins/gromit/totem-gromit.c
index d7afa6e..0c19400 100644
--- a/src/plugins/gromit/totem-gromit.c
+++ b/src/plugins/gromit/totem-gromit.c
@@ -273,7 +273,7 @@ impl_activate (PeasActivatable *plugin)
#endif
}
- window = totem_get_main_window (g_object_get_data (G_OBJECT (plugin), "object"));
+ window = totem_object_get_main_window (g_object_get_data (G_OBJECT (plugin), "object"));
pi->handler_id = g_signal_connect (G_OBJECT(window), "key-press-event",
G_CALLBACK (on_window_key_press_event), plugin);
g_object_unref (window);
@@ -286,7 +286,7 @@ impl_deactivate (PeasActivatable *plugin)
GtkWindow *window;
if (pi->handler_id != 0) {
- window = totem_get_main_window (g_object_get_data (G_OBJECT (plugin), "object"));
+ window = totem_object_get_main_window (g_object_get_data (G_OBJECT (plugin), "object"));
g_signal_handler_disconnect (G_OBJECT(window), pi->handler_id);
pi->handler_id = 0;
g_object_unref (window);
diff --git a/src/plugins/iplayer/iplayer.py b/src/plugins/iplayer/iplayer.py
index 525485a..78df206 100644
--- a/src/plugins/iplayer/iplayer.py
+++ b/src/plugins/iplayer/iplayer.py
@@ -63,7 +63,7 @@ class IplayerPlugin (gobject.GObject, Peas.Activatable):
def _populate_channel_list_cb (self, tree_store, parent_path, values):
# Callback from PopulateChannelsThread to add stuff to the tree store
if values == None:
- self.totem.action_error (_('Error listing channel categories'), _('There was an unknown error getting the list of television channels available on BBC iPlayer.'))
+ self.totem.error (_('Error listing channel categories'), _('There was an unknown error getting the list of television channels available on BBC iPlayer.'))
return False
parent_iter = tree_store.get_iter (parent_path)
@@ -112,7 +112,7 @@ class IplayerPlugin (gobject.GObject, Peas.Activatable):
def _populate_programme_list_cb (self, tree_store, category_path, values, remove_placeholder):
# Callback from PopulateProgrammesThread to add stuff to the tree store
if values == None:
- self.totem.action_error (_('Error getting programme feed'), _('There was an error getting the list of programmes for this channel and category combination.'))
+ self.totem.error (_('Error getting programme feed'), _('There was an error getting the list of programmes for this channel and category combination.'))
return False
category_iter = tree_store.get_iter (category_path)
diff --git a/src/plugins/jamendo/jamendo.py b/src/plugins/jamendo/jamendo.py
index e0db439..87081a9 100644
--- a/src/plugins/jamendo/jamendo.py
+++ b/src/plugins/jamendo/jamendo.py
@@ -346,9 +346,9 @@ class JamendoPlugin(gobject.GObject, Peas.Activatable, PeasUI.Configurable):
enqueue_and_play.
"""
if mode == 'replace':
- self.totem.action_remote(Totem.RemoteCommand.REPLACE, t['stream'])
+ self.totem.remote(Totem.RemoteCommand.REPLACE, t['stream'])
elif mode == 'enqueue':
- self.totem.action_remote(Totem.RemoteCommand.ENQUEUE, t['stream'])
+ self.totem.remote(Totem.RemoteCommand.ENQUEUE, t['stream'])
def fetch_albums(self, pn=1):
"""
@@ -434,7 +434,7 @@ class JamendoPlugin(gobject.GObject, Peas.Activatable, PeasUI.Configurable):
else:
msg = str(exc)
- self.totem.action_error(_('An error occurred while fetching albums.'), msg)
+ self.totem.error(_('An error occurred while fetching albums.'), msg)
def on_search_entry_activate(self, *args):
"""
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 a38aa61..f126d4b 100644
--- a/src/plugins/media-player-keys/totem-media-player-keys.c
+++ b/src/plugins/media-player-keys/totem-media-player-keys.c
@@ -89,13 +89,13 @@ on_media_player_key_pressed (DBusGProxy *proxy, const gchar *application, const
{
if (strcmp ("Totem", application) == 0) {
if (strcmp ("Play", key) == 0)
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
else if (strcmp ("Previous", key) == 0)
- totem_action_previous (totem);
+ totem_object_previous (totem);
else if (strcmp ("Next", key) == 0)
- totem_action_next (totem);
+ totem_object_next (totem);
else if (strcmp ("Stop", key) == 0)
- totem_action_pause (totem);
+ totem_object_pause (totem);
}
}
@@ -183,7 +183,7 @@ impl_activate (PeasActivatable *plugin)
dbus_g_proxy_connect_signal (pi->media_player_keys_proxy, "MediaPlayerKeyPressed",
G_CALLBACK (on_media_player_key_pressed), totem, NULL);
- window = totem_get_main_window (totem);
+ window = totem_object_get_main_window (totem);
pi->handler_id = g_signal_connect (G_OBJECT (window), "focus-in-event",
G_CALLBACK (on_window_focus_in_event), pi);
@@ -208,7 +208,7 @@ impl_deactivate (PeasActivatable *plugin)
TotemObject *totem;
totem = g_object_get_data (G_OBJECT (plugin), "object");
- window = totem_get_main_window (totem);
+ window = totem_object_get_main_window (totem);
if (window == NULL)
return;
diff --git a/src/plugins/ontop/totem-ontop.c b/src/plugins/ontop/totem-ontop.c
index 2d4929d..c364ee0 100644
--- a/src/plugins/ontop/totem-ontop.c
+++ b/src/plugins/ontop/totem-ontop.c
@@ -96,7 +96,7 @@ update_from_state (TotemOntopPluginPrivate *priv)
bacon_video_widget_get_metadata (priv->bvw, BVW_INFO_HAS_VIDEO, &has_video);
gtk_window_set_keep_above (priv->window,
- (totem_is_playing (priv->totem) != FALSE &&
+ (totem_object_is_playing (priv->totem) != FALSE &&
g_value_get_boolean (&has_video) != FALSE));
g_value_unset (&has_video);
}
@@ -121,8 +121,8 @@ impl_activate (PeasActivatable *plugin)
TotemOntopPlugin *pi = TOTEM_ONTOP_PLUGIN (plugin);
pi->priv->totem = g_object_get_data (G_OBJECT (plugin), "object");
- pi->priv->window = totem_get_main_window (pi->priv->totem);
- pi->priv->bvw = BACON_VIDEO_WIDGET (totem_get_video_widget (pi->priv->totem));
+ pi->priv->window = totem_object_get_main_window (pi->priv->totem);
+ pi->priv->bvw = BACON_VIDEO_WIDGET (totem_object_get_video_widget (pi->priv->totem));
pi->priv->handler_id = g_signal_connect (G_OBJECT (pi->priv->totem),
"notify::playing",
diff --git a/src/plugins/properties/totem-movie-properties.c b/src/plugins/properties/totem-movie-properties.c
index 334b390..5cd23d7 100644
--- a/src/plugins/properties/totem-movie-properties.c
+++ b/src/plugins/properties/totem-movie-properties.c
@@ -105,7 +105,7 @@ totem_movie_properties_plugin_file_opened (TotemObject *totem,
{
GtkWidget *bvw;
- bvw = totem_get_video_widget (totem);
+ bvw = totem_object_get_video_widget (totem);
bacon_video_widget_properties_update
(BACON_VIDEO_WIDGET_PROPERTIES (plugin->props), bvw);
g_object_unref (bvw);
@@ -132,7 +132,7 @@ totem_movie_properties_plugin_metadata_updated (TotemObject *totem,
{
GtkWidget *bvw;
- bvw = totem_get_video_widget (totem);
+ bvw = totem_object_get_video_widget (totem);
bacon_video_widget_properties_update
(BACON_VIDEO_WIDGET_PROPERTIES (plugin->props), bvw);
g_object_unref (bvw);
@@ -149,7 +149,7 @@ impl_activate (PeasActivatable *plugin)
pi->props = bacon_video_widget_properties_new ();
gtk_widget_show (pi->props);
- totem_add_sidebar_page (totem,
+ totem_object_add_sidebar_page (totem,
"properties",
_("Properties"),
pi->props);
@@ -193,6 +193,6 @@ impl_deactivate (PeasActivatable *plugin)
totem_movie_properties_plugin_file_closed,
plugin);
pi->handler_id_stream_length = 0;
- totem_remove_sidebar_page (totem, "properties");
+ totem_object_remove_sidebar_page (totem, "properties");
}
diff --git a/src/plugins/sample-python/sample-python.py b/src/plugins/sample-python/sample-python.py
index 3956cf8..5e098af 100644
--- a/src/plugins/sample-python/sample-python.py
+++ b/src/plugins/sample-python/sample-python.py
@@ -11,7 +11,7 @@ class SamplePython(gobject.GObject, Peas.Activatable):
def do_activate(self):
print "Activating sample Python plugin"
- self.object.action_fullscreen_toggle()
+ self.object.fullscreen_toggle()
def do_deactivate(self):
print "Deactivating sample Python plugin"
diff --git a/src/plugins/screensaver/totem-screensaver.c b/src/plugins/screensaver/totem-screensaver.c
index df20851..1f136e0 100644
--- a/src/plugins/screensaver/totem-screensaver.c
+++ b/src/plugins/screensaver/totem-screensaver.c
@@ -113,7 +113,7 @@ totem_screensaver_update_from_state (TotemObject *totem,
BaconVideoWidget *bvw;
GConfClient *gc;
- bvw = BACON_VIDEO_WIDGET (totem_get_video_widget ((Totem *)(totem)));
+ bvw = BACON_VIDEO_WIDGET (totem_object_get_video_widget ((Totem *)(totem)));
gc = gconf_client_get_default ();
lock_screensaver_on_audio = gconf_client_get_bool (gc,
@@ -121,9 +121,9 @@ totem_screensaver_update_from_state (TotemObject *totem,
NULL);
can_get_frames = bacon_video_widget_can_get_frames (bvw, NULL);
- if (totem_is_playing (totem) != FALSE && can_get_frames)
+ if (totem_object_is_playing (totem) != FALSE && can_get_frames)
totem_scrsaver_disable (pi->scr);
- else if (totem_is_playing (totem) != FALSE && !lock_screensaver_on_audio)
+ else if (totem_object_is_playing (totem) != FALSE && !lock_screensaver_on_audio)
totem_scrsaver_disable (pi->scr);
else
totem_scrsaver_enable (pi->scr);
@@ -160,7 +160,7 @@ impl_activate (PeasActivatable *plugin)
GConfClient *gc;
totem = g_object_get_data (G_OBJECT (plugin), "object");
- pi->bvw = BACON_VIDEO_WIDGET (totem_get_video_widget (totem));
+ pi->bvw = BACON_VIDEO_WIDGET (totem_object_get_video_widget (totem));
gc = gconf_client_get_default ();
gconf_client_add_dir (gc, GCONF_PREFIX,
diff --git a/src/plugins/screenshot/totem-gallery.c b/src/plugins/screenshot/totem-gallery.c
index c05b7c2..0a8fb5c 100644
--- a/src/plugins/screenshot/totem-gallery.c
+++ b/src/plugins/screenshot/totem-gallery.c
@@ -106,7 +106,7 @@ totem_gallery_new (Totem *totem, TotemScreenshotPlugin *plugin)
"gallery_dialog_content"));
gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (gallery), container);
- movie_title = totem_get_short_title (totem);
+ movie_title = totem_object_get_short_title (totem);
/* Translators: The first argument is the movie title. The second
* argument is a number which is used to prevent overwriting files.
@@ -165,7 +165,7 @@ dialog_response_callback (GtkDialog *dialog, gint response_id, TotemGallery *sel
screenshot_count = gtk_spin_button_get_value_as_int (self->priv->screenshot_count);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (self));
- video_mrl = totem_get_current_mrl (self->priv->totem);
+ video_mrl = totem_object_get_current_mrl (self->priv->totem);
totem_screenshot_plugin_update_file_chooser (filename);
/* Build the command and arguments to pass it */
diff --git a/src/plugins/screenshot/totem-screenshot-plugin.c b/src/plugins/screenshot/totem-screenshot-plugin.c
index fa596b6..5dc9eda 100644
--- a/src/plugins/screenshot/totem-screenshot-plugin.c
+++ b/src/plugins/screenshot/totem-screenshot-plugin.c
@@ -99,14 +99,14 @@ take_screenshot_action_cb (GtkAction *action, TotemScreenshotPlugin *self)
if (err == NULL)
return;
- totem_action_error (priv->totem, _("Totem could not get a screenshot of the video."), err->message);
+ totem_object_error (priv->totem, _("Totem could not get a screenshot of the video."), err->message);
g_error_free (err);
return;
}
pixbuf = bacon_video_widget_get_current_frame (priv->bvw);
if (pixbuf == NULL) {
- totem_action_error (priv->totem, _("Totem could not get a screenshot of the video."), _("This is not supposed to happen; please file a bug report."));
+ totem_object_error (priv->totem, _("Totem could not get a screenshot of the video."), _("This is not supposed to happen; please file a bug report."));
return;
}
@@ -214,7 +214,7 @@ impl_activate (PeasActivatable *plugin)
};
priv->totem = g_object_get_data (G_OBJECT (plugin), "object");
- priv->bvw = BACON_VIDEO_WIDGET (totem_get_video_widget (priv->totem));
+ priv->bvw = BACON_VIDEO_WIDGET (totem_object_get_video_widget (priv->totem));
priv->got_metadata_signal = g_signal_connect (G_OBJECT (priv->bvw),
"got-metadata",
G_CALLBACK (got_metadata_cb),
@@ -225,7 +225,7 @@ impl_activate (PeasActivatable *plugin)
self);
/* Key press handler */
- window = totem_get_main_window (priv->totem);
+ window = totem_object_get_main_window (priv->totem);
priv->key_press_event_signal = g_signal_connect (G_OBJECT (window),
"key-press-event",
G_CALLBACK (window_key_press_event_cb),
@@ -238,7 +238,7 @@ impl_activate (PeasActivatable *plugin)
gtk_action_group_add_actions (priv->action_group, menu_entries,
G_N_ELEMENTS (menu_entries), self);
- manager = totem_get_ui_manager (priv->totem);
+ manager = totem_object_get_ui_manager (priv->totem);
gtk_ui_manager_insert_action_group (manager, priv->action_group, -1);
g_object_unref (priv->action_group);
@@ -278,7 +278,7 @@ impl_deactivate (PeasActivatable *plugin)
g_signal_handler_disconnect (G_OBJECT (priv->bvw), priv->got_metadata_signal);
g_signal_handler_disconnect (G_OBJECT (priv->bvw), priv->notify_logo_mode_signal);
- window = totem_get_main_window (priv->totem);
+ window = totem_object_get_main_window (priv->totem);
g_signal_handler_disconnect (G_OBJECT (window), priv->key_press_event_signal);
g_object_unref (window);
@@ -288,7 +288,7 @@ impl_deactivate (PeasActivatable *plugin)
g_object_unref (client);
/* Remove the menu */
- manager = totem_get_ui_manager (priv->totem);
+ manager = totem_object_get_ui_manager (priv->totem);
gtk_ui_manager_remove_ui (manager, priv->ui_merge_id);
gtk_ui_manager_remove_action_group (manager, priv->action_group);
diff --git a/src/plugins/screenshot/totem-screenshot.c b/src/plugins/screenshot/totem-screenshot.c
index 4cdf0f2..8a4d597 100644
--- a/src/plugins/screenshot/totem-screenshot.c
+++ b/src/plugins/screenshot/totem-screenshot.c
@@ -154,7 +154,7 @@ totem_screenshot_new (Totem *totem, TotemScreenshotPlugin *screenshot_plugin, Gd
screenshot = TOTEM_SCREENSHOT (g_object_new (TOTEM_TYPE_SCREENSHOT, NULL));
- movie_title = totem_get_short_title (totem);
+ movie_title = totem_object_get_short_title (totem);
/* Create the screenshot widget */
/* Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique */
diff --git a/src/plugins/sidebar-test/totem-sidebar-test.c b/src/plugins/sidebar-test/totem-sidebar-test.c
index 90bc9a9..f5d4c41 100644
--- a/src/plugins/sidebar-test/totem-sidebar-test.c
+++ b/src/plugins/sidebar-test/totem-sidebar-test.c
@@ -81,7 +81,7 @@ impl_activate (PeasActivatable *plugin)
label = gtk_label_new ("This is a test sidebar main widget");
gtk_widget_show (label);
- totem_add_sidebar_page (g_object_get_data (G_OBJECT (plugin), "object"),
+ totem_object_add_sidebar_page (g_object_get_data (G_OBJECT (plugin), "object"),
"sidebar-test",
"Sidebar Test",
label);
@@ -94,7 +94,7 @@ impl_deactivate (PeasActivatable *plugin)
TotemObject *totem;
totem = g_object_get_data (G_OBJECT (plugin), "object");
- totem_remove_sidebar_page (totem, "sidebar-test");
+ totem_object_remove_sidebar_page (totem, "sidebar-test");
g_message ("Just removed a test sidebar");
}
diff --git a/src/plugins/skipto/totem-skipto-plugin.c b/src/plugins/skipto/totem-skipto-plugin.c
index 80252d7..b5129d7 100644
--- a/src/plugins/skipto/totem-skipto-plugin.c
+++ b/src/plugins/skipto/totem-skipto-plugin.c
@@ -139,7 +139,7 @@ skip_to_response_callback (GtkDialog *dialog, gint response, TotemSkiptoPlugin *
gtk_widget_hide (GTK_WIDGET (dialog));
- totem_action_seek_time (plugin->totem,
+ totem_object_seek_time (plugin->totem,
totem_skipto_get_range (plugin->priv->st),
TRUE);
destroy_dialog (plugin);
@@ -150,12 +150,12 @@ run_skip_to_dialog (TotemSkiptoPlugin *plugin)
{
TotemSkiptoPluginPrivate *priv = plugin->priv;
- if (totem_is_seekable (plugin->totem) == FALSE)
+ if (totem_object_is_seekable (plugin->totem) == FALSE)
return;
if (priv->st != NULL) {
gtk_window_present (GTK_WINDOW (priv->st));
- totem_skipto_set_current (priv->st, totem_get_current_time
+ totem_skipto_set_current (priv->st, totem_object_get_current_time
(plugin->totem));
return;
}
@@ -169,7 +169,7 @@ run_skip_to_dialog (TotemSkiptoPlugin *plugin)
(gpointer *)&(priv->st));
totem_skipto_update_from_state (plugin->totem, plugin);
totem_skipto_set_current (priv->st,
- totem_get_current_time (plugin->totem));
+ totem_object_get_current_time (plugin->totem));
}
static void
@@ -220,7 +220,7 @@ impl_activate (PeasActivatable *plugin)
pi);
/* Key press handler */
- window = totem_get_main_window (pi->totem);
+ window = totem_object_get_main_window (pi->totem);
priv->handler_id_key_press = g_signal_connect (G_OBJECT(window),
"key-press-event",
G_CALLBACK (on_window_key_press_event),
@@ -233,7 +233,7 @@ impl_activate (PeasActivatable *plugin)
gtk_action_group_add_actions (priv->action_group, menu_entries,
G_N_ELEMENTS (menu_entries), pi);
- manager = totem_get_ui_manager (pi->totem);
+ manager = totem_object_get_ui_manager (pi->totem);
gtk_ui_manager_insert_action_group (manager, priv->action_group, -1);
g_object_unref (priv->action_group);
@@ -262,7 +262,7 @@ impl_deactivate (PeasActivatable *plugin)
priv->handler_id_seekable);
if (priv->handler_id_key_press != 0) {
- window = totem_get_main_window (totem);
+ window = totem_object_get_main_window (totem);
g_signal_handler_disconnect (G_OBJECT(window),
priv->handler_id_key_press);
priv->handler_id_key_press = 0;
@@ -270,7 +270,7 @@ impl_deactivate (PeasActivatable *plugin)
}
/* Remove the menu */
- manager = totem_get_ui_manager (totem);
+ manager = totem_object_get_ui_manager (totem);
gtk_ui_manager_remove_ui (manager, priv->ui_merge_id);
gtk_ui_manager_remove_action_group (manager, priv->action_group);
}
diff --git a/src/plugins/skipto/totem-skipto.c b/src/plugins/skipto/totem-skipto.c
index 0758b84..e072dac 100644
--- a/src/plugins/skipto/totem-skipto.c
+++ b/src/plugins/skipto/totem-skipto.c
@@ -190,7 +190,7 @@ totem_skipto_new (TotemSkiptoPlugin *plugin)
0); /* padding */
gtk_window_set_transient_for (GTK_WINDOW (skipto),
- totem_get_main_window (plugin->totem));
+ totem_object_get_main_window (plugin->totem));
gtk_widget_show_all (GTK_WIDGET (skipto));
diff --git a/src/plugins/thumbnail/totem-thumbnail.c b/src/plugins/thumbnail/totem-thumbnail.c
index afbe58a..57d3cad 100644
--- a/src/plugins/thumbnail/totem-thumbnail.c
+++ b/src/plugins/thumbnail/totem-thumbnail.c
@@ -96,7 +96,7 @@ set_icon_to_default (TotemObject *totem)
GtkWindow *window = NULL;
g_return_if_fail (TOTEM_IS_OBJECT (totem));
- window = totem_get_main_window (totem);
+ window = totem_object_get_main_window (totem);
gtk_window_set_icon (window, NULL);
gtk_window_set_icon_name (window, "totem");
}
@@ -112,7 +112,7 @@ update_from_state (TotemThumbnailPluginPrivate *priv,
GError *err = NULL;
g_return_if_fail (TOTEM_IS_OBJECT (totem));
- window = totem_get_main_window (totem);
+ window = totem_object_get_main_window (totem);
if (mrl == NULL) {
set_icon_to_default (totem);
@@ -182,7 +182,7 @@ impl_activate (PeasActivatable *plugin)
char *mrl;
pi->priv->totem = g_object_get_data (G_OBJECT (plugin), "object");
- pi->priv->window = totem_get_main_window (pi->priv->totem);
+ pi->priv->window = totem_object_get_main_window (pi->priv->totem);
pi->priv->file_opened_handler_id = g_signal_connect (G_OBJECT (pi->priv->totem),
"file-opened",
diff --git a/src/plugins/youtube/totem-youtube.c b/src/plugins/youtube/totem-youtube.c
index bb653dd..b3b06f7 100644
--- a/src/plugins/youtube/totem-youtube.c
+++ b/src/plugins/youtube/totem-youtube.c
@@ -342,10 +342,10 @@ impl_activate (PeasActivatable *plugin)
guint i;
self->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
- self->bvw = BACON_VIDEO_WIDGET (totem_get_video_widget (self->totem));
+ self->bvw = BACON_VIDEO_WIDGET (totem_object_get_video_widget (self->totem));
/* Set up the interface */
- main_window = totem_get_main_window (self->totem);
+ main_window = totem_object_get_main_window (self->totem);
builder = totem_plugin_load_interface ("youtube", "youtube.ui", TRUE, main_window, self);
g_object_unref (main_window);
@@ -362,7 +362,7 @@ impl_activate (PeasActivatable *plugin)
gtk_widget_show_all (self->vbox);
/* Add the sidebar page */
- totem_add_sidebar_page (self->totem, "youtube", _("YouTube"), self->vbox);
+ totem_object_add_sidebar_page (self->totem, "youtube", _("YouTube"), self->vbox);
g_object_unref (builder);
}
@@ -372,7 +372,7 @@ impl_deactivate (PeasActivatable *plugin)
guint i;
TotemYouTubePlugin *self = TOTEM_YOUTUBE_PLUGIN (plugin);
- totem_remove_sidebar_page (self->totem, "youtube");
+ totem_object_remove_sidebar_page (self->totem, "youtube");
for (i = 0; i < NUM_TREE_VIEWS; i++) {
/* Cancel any queries which are still underway */
@@ -501,7 +501,7 @@ resolve_t_param_cb (GObject *source_object, GAsyncResult *result, TParamData *da
}
/* Couldn't load the page contents; error */
- window = totem_get_main_window (data->plugin->totem);
+ window = totem_object_get_main_window (data->plugin->totem);
totem_interface_error (_("Error Looking Up Video URI"), error->message, window);
g_object_unref (window);
g_error_free (error);
@@ -771,7 +771,7 @@ query_finished_cb (GObject *source_object, GAsyncResult *result, QueryData *data
}
/* Error! */
- window = totem_get_main_window (data->plugin->totem);
+ window = totem_object_get_main_window (data->plugin->totem);
if (g_error_matches (error, GDATA_SERVICE_ERROR, GDATA_SERVICE_ERROR_PROTOCOL_ERROR) == TRUE) {
/* Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
* if we're receiving a protocol error). */
@@ -1063,7 +1063,7 @@ open_in_web_browser_activate_cb (GtkAction *action, TotemYouTubePlugin *self)
/* Display the page */
if (gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (self->bvw)), gdata_link_get_uri (page_link),
GDK_CURRENT_TIME, &error) == FALSE) {
- GtkWindow *window = totem_get_main_window (self->totem);
+ GtkWindow *window = totem_object_get_main_window (self->totem);
totem_interface_error (_("Error Opening Video in Web Browser"), error->message, window);
g_object_unref (window);
g_error_free (error);
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 7e3b56a..8213358 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -385,7 +385,7 @@ on_recent_file_item_activated (GtkAction *action,
recent_info = g_object_get_data (G_OBJECT (action), "recent-info");
uri = gtk_recent_info_get_uri (recent_info);
- totem_add_to_playlist_and_play (totem, uri, NULL, FALSE);
+ totem_object_add_to_playlist_and_play (totem, uri, NULL, FALSE);
}
static gint
@@ -577,7 +577,7 @@ recent_info_cb (GFile *file,
}
void
-totem_action_add_recent (Totem *totem, const char *uri, const char *display_name)
+totem_add_recent (Totem *totem, const char *uri, const char *display_name)
{
GFile *file;
@@ -600,7 +600,7 @@ on_play_disc_activate (GtkAction *action, Totem *totem)
char *device_path;
device_path = g_object_get_data (G_OBJECT (action), "device_path");
- totem_action_play_media_device (totem, device_path);
+ totem_object_play_media_device (totem, device_path);
}
static const char *
@@ -980,37 +980,37 @@ totem_setup_play_disc (Totem *totem)
void
open_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_open (totem);
+ totem_object_open (totem);
}
void
open_location_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_open_location (totem);
+ totem_object_open_location (totem);
}
void
eject_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_eject (totem);
+ totem_object_eject (totem);
}
void
properties_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_show_properties (totem);
+ totem_object_show_properties (totem);
}
void
play_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
}
G_GNUC_NORETURN void
quit_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_exit (totem);
+ totem_object_exit (totem);
}
void
@@ -1022,43 +1022,43 @@ preferences_action_callback (GtkAction *action, Totem *totem)
void
fullscreen_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_fullscreen_toggle (totem);
+ totem_object_fullscreen_toggle (totem);
}
void
zoom_1_2_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_set_scale_ratio (totem, 0.5);
+ totem_object_set_scale_ratio (totem, 0.5);
}
void
zoom_1_1_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_set_scale_ratio (totem, 1);
+ totem_object_set_scale_ratio (totem, 1);
}
void
zoom_2_1_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_set_scale_ratio (totem, 2);
+ totem_object_set_scale_ratio (totem, 2);
}
void
zoom_in_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_IN_OFFSET);
}
void
zoom_reset_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_zoom_reset (totem);
+ totem_object_zoom_reset (totem);
}
void
zoom_out_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_OUT_OFFSET);
}
void
@@ -1071,7 +1071,7 @@ select_subtitle_action_callback (GtkAction *action, Totem *totem)
void
next_angle_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_next_angle (totem);
+ totem_object_next_angle (totem);
}
void
@@ -1107,43 +1107,43 @@ dvd_chapter_menu_action_callback (GtkAction *action, Totem *totem)
void
next_chapter_action_callback (GtkAction *action, Totem *totem)
{
- TOTEM_PROFILE (totem_action_next (totem));
+ TOTEM_PROFILE (totem_object_next (totem));
}
void
previous_chapter_action_callback (GtkAction *action, Totem *totem)
{
- TOTEM_PROFILE (totem_action_previous (totem));
+ TOTEM_PROFILE (totem_object_previous (totem));
}
void
skip_forward_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
}
void
skip_backwards_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
}
void
volume_up_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_volume_relative (totem, VOLUME_UP_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_UP_OFFSET);
}
void
volume_down_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_volume_relative (totem, VOLUME_DOWN_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_DOWN_OFFSET);
}
void
contents_action_callback (GtkAction *action, Totem *totem)
{
- totem_action_show_help (totem);
+ totem_object_show_help (totem);
}
void
@@ -1276,7 +1276,7 @@ show_controls_action_callback (GtkToggleAction *action, Totem *totem)
void
show_sidebar_action_callback (GtkToggleAction *action, Totem *totem)
{
- if (totem_is_fullscreen (totem))
+ if (totem_object_is_fullscreen (totem))
return;
totem_sidebar_toggle (totem, gtk_toggle_action_get_active (action));
@@ -1285,14 +1285,14 @@ show_sidebar_action_callback (GtkToggleAction *action, Totem *totem)
void
aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem)
{
- totem_action_set_aspect_ratio (totem, gtk_radio_action_get_current_value (current));
+ totem_object_set_aspect_ratio (totem, gtk_radio_action_get_current_value (current));
}
void
clear_playlist_action_callback (GtkAction *action, Totem *totem)
{
totem_playlist_clear (totem->playlist);
- totem_action_set_mrl (totem, NULL, NULL);
+ totem_object_set_mrl (totem, NULL, NULL);
}
/* Show help in status bar when selecting (hovering over) a menu item. */
diff --git a/src/totem-menu.h b/src/totem-menu.h
index ba93fa8..e6055e1 100644
--- a/src/totem-menu.h
+++ b/src/totem-menu.h
@@ -35,7 +35,7 @@ void totem_sublang_exit (Totem *totem);
void totem_setup_play_disc (Totem *totem);
void totem_setup_recent (Totem *totem);
-void totem_action_add_recent (Totem *totem,
+void totem_add_recent (Totem *totem,
const char *uri,
const char *display_name);
diff --git a/src/totem-object.c b/src/totem-object.c
index 63c8eb4..b79ee05 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -96,8 +96,8 @@ static const GtkTargetEntry target_table[] = {
{ (gchar*) "_NETSCAPE_URL", 0, 1 }
};
-static gboolean totem_action_open_files_list (TotemObject *totem, GSList *list);
-static gboolean totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device);
+static gboolean totem_object_open_files_list (TotemObject *totem, GSList *list);
+static gboolean totem_object_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device);
static void update_buttons (TotemObject *totem);
static void update_fill (TotemObject *totem, gdouble level);
static void update_media_menu_items (TotemObject *totem);
@@ -301,10 +301,10 @@ totem_object_get_property (GObject *object,
switch (property_id)
{
case PROP_FULLSCREEN:
- g_value_set_boolean (value, totem_is_fullscreen (totem));
+ g_value_set_boolean (value, totem_object_is_fullscreen (totem));
break;
case PROP_PLAYING:
- g_value_set_boolean (value, totem_is_playing (totem));
+ g_value_set_boolean (value, totem_object_is_playing (totem));
break;
case PROP_STREAM_LENGTH:
g_value_set_int64 (value, bacon_video_widget_get_stream_length (totem->bvw));
@@ -313,7 +313,7 @@ totem_object_get_property (GObject *object,
g_value_set_int64 (value, bacon_video_widget_get_current_time (totem->bvw));
break;
case PROP_SEEKABLE:
- g_value_set_boolean (value, totem_is_seekable (totem));
+ g_value_set_boolean (value, totem_object_is_seekable (totem));
break;
case PROP_CURRENT_MRL:
g_value_set_string (value, totem->mrl);
@@ -388,7 +388,7 @@ totem_object_get_ui_manager (TotemObject *totem)
}
/**
- * totem_get_video_widget:
+ * totem_object_get_video_widget:
* @totem: a #TotemObject
*
* Gets Totem's video widget and increments its reference count.
@@ -396,7 +396,7 @@ totem_object_get_ui_manager (TotemObject *totem)
* Return value: Totem's video widget
**/
GtkWidget *
-totem_get_video_widget (TotemObject *totem)
+totem_object_get_video_widget (TotemObject *totem)
{
g_return_val_if_fail (TOTEM_IS_OBJECT (totem), NULL);
@@ -420,7 +420,7 @@ totem_object_get_version (void)
}
/**
- * totem_get_current_time:
+ * totem_object_get_current_time:
* @totem: a #TotemObject
*
* Gets the current position's time in the stream as a gint64.
@@ -428,7 +428,7 @@ totem_object_get_version (void)
* Return value: the current position in the stream
**/
gint64
-totem_get_current_time (TotemObject *totem)
+totem_object_get_current_time (TotemObject *totem)
{
g_return_val_if_fail (TOTEM_IS_OBJECT (totem), 0);
@@ -462,7 +462,7 @@ add_to_playlist_and_play_cb (TotemPlaylist *playlist, GAsyncResult *async_result
subtitle = NULL;
totem_playlist_set_current (playlist, end);
mrl = totem_playlist_get_current_mrl (playlist, &subtitle);
- totem_action_set_mrl_and_play (data->totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (data->totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
}
@@ -571,7 +571,7 @@ totem_object_get_title_at_playlist_pos (TotemObject *totem, guint playlist_index
}
/**
- * totem_get_short_title:
+ * totem_object_get_short_title:
* @totem: a #TotemObject
*
* Gets the title of the current entry in the playlist.
@@ -579,7 +579,7 @@ totem_object_get_title_at_playlist_pos (TotemObject *totem, guint playlist_index
* Return value: the current entry's title, or %NULL; free with g_free()
**/
char *
-totem_get_short_title (TotemObject *totem)
+totem_object_get_short_title (TotemObject *totem)
{
gboolean custom;
return totem_playlist_get_current_title (totem->playlist, &custom);
@@ -794,12 +794,12 @@ reset_seek_status (TotemObject *totem)
totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label), FALSE);
totem->seek_lock = FALSE;
bacon_video_widget_seek (totem->bvw, 0, NULL);
- totem_action_stop (totem);
+ totem_object_stop (totem);
}
}
/**
- * totem_object_action_error:
+ * totem_object_error:
* @totem: a #TotemObject
* @title: the error dialog title
* @reason: the error dialog text
@@ -808,7 +808,7 @@ reset_seek_status (TotemObject *totem)
* given @title and @reason.
**/
void
-totem_object_action_error (TotemObject *totem, const char *title, const char *reason)
+totem_object_error (TotemObject *totem, const char *title, const char *reason)
{
reset_seek_status (totem);
totem_interface_error (title, reason,
@@ -816,24 +816,24 @@ totem_object_action_error (TotemObject *totem, const char *title, const char *re
}
G_GNUC_NORETURN void
-totem_action_error_and_exit (const char *title,
+totem_object_error_and_exit (const char *title,
const char *reason, TotemObject *totem)
{
reset_seek_status (totem);
totem_interface_error_blocking (title, reason,
GTK_WINDOW (totem->win));
- totem_action_exit (totem);
+ totem_object_exit (totem);
}
static void
-totem_action_save_size (TotemObject *totem)
+totem_object_save_size (TotemObject *totem)
{
GtkPaned *item;
if (totem->bvw == NULL)
return;
- if (totem_is_fullscreen (totem) != FALSE)
+ if (totem_object_is_fullscreen (totem) != FALSE)
return;
/* Save the size of the video widget */
@@ -845,7 +845,7 @@ totem_action_save_size (TotemObject *totem)
}
static void
-totem_action_save_state (TotemObject *totem, const char *page_id)
+totem_object_save_state (TotemObject *totem, const char *page_id)
{
GKeyFile *keyfile;
char *contents, *filename;
@@ -881,26 +881,26 @@ totem_action_save_state (TotemObject *totem, const char *page_id)
}
G_GNUC_NORETURN static void
-totem_action_wait_force_exit (gpointer user_data)
+totem_object_wait_force_exit (gpointer user_data)
{
g_usleep (10 * G_USEC_PER_SEC);
exit (1);
}
/**
- * totem_object_action_exit:
+ * totem_object_exit:
* @totem: a #TotemObject
*
* Closes Totem.
**/
void
-totem_object_action_exit (TotemObject *totem)
+totem_object_exit (TotemObject *totem)
{
GdkDisplay *display = NULL;
char *page_id;
/* Exit forcefully if we can't do the shutdown in 10 seconds */
- g_thread_create ((GThreadFunc) totem_action_wait_force_exit,
+ g_thread_create ((GThreadFunc) totem_object_wait_force_exit,
NULL, FALSE, NULL);
if (gtk_main_level () > 0)
@@ -926,14 +926,14 @@ totem_object_action_exit (TotemObject *totem)
gdk_display_sync (display);
if (totem->bvw) {
- totem_action_save_size (totem);
+ totem_object_save_size (totem);
totem_save_position (totem);
bacon_video_widget_close (totem->bvw);
}
if (totem->app != NULL)
g_object_unref (totem->app);
- totem_action_save_state (totem, page_id);
+ totem_object_save_state (totem, page_id);
g_free (page_id);
totem_sublang_exit (totem);
@@ -954,7 +954,7 @@ totem_object_action_exit (TotemObject *totem)
}
static void
-totem_action_menu_popup (TotemObject *totem, guint button)
+totem_object_menu_popup (TotemObject *totem, guint button)
{
GtkWidget *menu;
@@ -968,7 +968,7 @@ totem_action_menu_popup (TotemObject *totem, guint button)
G_GNUC_NORETURN gboolean
main_window_destroy_cb (GtkWidget *widget, GdkEvent *event, TotemObject *totem)
{
- totem_action_exit (totem);
+ totem_object_exit (totem);
}
static void
@@ -1028,7 +1028,7 @@ play_pause_set_label (TotemObject *totem, TotemStates state)
}
void
-totem_action_eject (TotemObject *totem)
+totem_object_eject (TotemObject *totem)
{
GMount *mount;
@@ -1047,21 +1047,21 @@ totem_action_eject (TotemObject *totem)
}
void
-totem_action_show_properties (TotemObject *totem)
+totem_object_show_properties (TotemObject *totem)
{
- if (totem_is_fullscreen (totem) == FALSE)
+ if (totem_object_is_fullscreen (totem) == FALSE)
totem_sidebar_set_current_page (totem, "properties", TRUE);
}
/**
- * totem_object_action_play:
+ * totem_object_play:
* @totem: a #TotemObject
*
* Plays the current stream. If Totem is already playing, it continues
* to play. If the stream cannot be played, and error dialog is displayed.
**/
void
-totem_object_action_play (TotemObject *totem)
+totem_object_play (TotemObject *totem)
{
GError *err = NULL;
int retval;
@@ -1083,14 +1083,14 @@ totem_object_action_play (TotemObject *totem)
msg = g_strdup_printf(_("Totem could not play '%s'."), disp);
g_free (disp);
- totem_action_error (totem, msg, err->message);
- totem_action_stop (totem);
+ totem_object_error (totem, msg, err->message);
+ totem_object_stop (totem);
g_free (msg);
g_error_free (err);
}
static void
-totem_action_seek (TotemObject *totem, double pos)
+totem_object_seek (TotemObject *totem, double pos)
{
GError *err = NULL;
int retval;
@@ -1112,31 +1112,31 @@ totem_action_seek (TotemObject *totem, double pos)
reset_seek_status (totem);
- totem_action_error (totem, msg, err->message);
+ totem_object_error (totem, msg, err->message);
g_free (msg);
g_error_free (err);
}
}
/**
- * totem_action_set_mrl_and_play:
+ * totem_object_set_mrl_and_play:
* @totem: a #TotemObject
* @mrl: the MRL to play
* @subtitle: a subtitle file to load, or %NULL
*
* Loads the specified @mrl and plays it, if possible.
- * Calls totem_action_set_mrl() then totem_action_play().
- * For more information, see the documentation for totem_action_set_mrl_with_warning().
+ * Calls totem_object_set_mrl() then totem_object_play().
+ * For more information, see the documentation for totem_object_set_mrl_with_warning().
**/
void
-totem_action_set_mrl_and_play (TotemObject *totem, const char *mrl, const char *subtitle)
+totem_object_set_mrl_and_play (TotemObject *totem, const char *mrl, const char *subtitle)
{
- if (totem_action_set_mrl (totem, mrl, subtitle) != FALSE)
- totem_action_play (totem);
+ if (totem_object_set_mrl (totem, mrl, subtitle) != FALSE)
+ totem_object_play (totem);
}
static gboolean
-totem_action_open_dialog (TotemObject *totem, const char *path, gboolean play)
+totem_object_open_dialog (TotemObject *totem, const char *path, gboolean play)
{
GSList *filenames;
gboolean playlist_modified;
@@ -1146,7 +1146,7 @@ totem_action_open_dialog (TotemObject *totem, const char *path, gboolean play)
if (filenames == NULL)
return FALSE;
- playlist_modified = totem_action_open_files_list (totem,
+ playlist_modified = totem_object_open_files_list (totem,
filenames);
if (playlist_modified == FALSE) {
@@ -1162,7 +1162,7 @@ totem_action_open_dialog (TotemObject *totem, const char *path, gboolean play)
char *mrl, *subtitle;
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
}
@@ -1171,7 +1171,7 @@ totem_action_open_dialog (TotemObject *totem, const char *path, gboolean play)
}
static gboolean
-totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
+totem_object_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
{
char **mrls;
GError *error = NULL;
@@ -1185,7 +1185,7 @@ totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char
/* No errors? Weird */
if (error == NULL) {
msg = g_strdup_printf (_("Totem could not play this media (%s) although a plugin is present to handle it."), _(totem_cd_get_human_readable_name (type)));
- totem_action_error (totem, msg, _("You might want to check that a disc is present in the drive and that it is correctly configured."));
+ totem_object_error (totem, msg, _("You might want to check that a disc is present in the drive and that it is correctly configured."));
g_free (msg);
return FALSE;
}
@@ -1202,7 +1202,7 @@ totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char
/* Unsupported type (ie. CDDA) */
} else if (g_error_matches (error, BVW_ERROR, BVW_ERROR_INVALID_LOCATION) != FALSE) {
msg = g_strdup_printf(_("Totem cannot play this type of media (%s) because it is not supported."), _(totem_cd_get_human_readable_name (type)));
- totem_action_error (totem, msg, _("Please insert another disc to play back."));
+ totem_object_error (totem, msg, _("Please insert another disc to play back."));
g_free (msg);
return FALSE;
} else {
@@ -1214,14 +1214,14 @@ totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char
return FALSE;
}
- retval = totem_action_open_files (totem, mrls);
+ retval = totem_object_open_files (totem, mrls);
g_strfreev (mrls);
return retval;
}
static gboolean
-totem_action_load_media_device (TotemObject *totem, const char *device)
+totem_object_load_media_device (TotemObject *totem, const char *device)
{
TotemDiscMediaType type;
GError *error = NULL;
@@ -1237,7 +1237,7 @@ totem_action_load_media_device (TotemObject *totem, const char *device)
switch (type) {
case MEDIA_TYPE_ERROR:
- totem_action_error (totem,
+ totem_object_error (totem,
_("Totem was not able to play this disc."),
error ? error->message : _("No reason."));
retval = FALSE;
@@ -1245,14 +1245,14 @@ totem_action_load_media_device (TotemObject *totem, const char *device)
case MEDIA_TYPE_DATA:
/* Set default location to the mountpoint of
* this device */
- retval = totem_action_open_dialog (totem, url, FALSE);
+ retval = totem_object_open_dialog (totem, url, FALSE);
break;
case MEDIA_TYPE_DVD:
case MEDIA_TYPE_VCD:
- retval = totem_action_load_media (totem, type, device_path);
+ retval = totem_object_load_media (totem, type, device_path);
break;
case MEDIA_TYPE_CDDA:
- totem_action_error (totem,
+ totem_object_error (totem,
_("Totem does not support playback of Audio CDs"),
_("Please consider using a music player or a CD extractor to play this CD"));
retval = FALSE;
@@ -1269,7 +1269,7 @@ totem_action_load_media_device (TotemObject *totem, const char *device)
}
/**
- * totem_action_play_media_device:
+ * totem_object_play_media_device:
* @totem: a #TotemObject
* @device: the media device's path
*
@@ -1281,19 +1281,19 @@ totem_action_load_media_device (TotemObject *totem, const char *device)
* the media device.
**/
void
-totem_action_play_media_device (TotemObject *totem, const char *device)
+totem_object_play_media_device (TotemObject *totem, const char *device)
{
char *mrl;
- if (totem_action_load_media_device (totem, device) != FALSE) {
+ if (totem_object_load_media_device (totem, device) != FALSE) {
mrl = totem_playlist_get_current_mrl (totem->playlist, NULL);
- totem_action_set_mrl_and_play (totem, mrl, NULL);
+ totem_object_set_mrl_and_play (totem, mrl, NULL);
g_free (mrl);
}
}
/**
- * totem_action_play_media:
+ * totem_object_play_media:
* @totem: a #TotemObject
* @type: the type of disc media
* @device: the media's device path
@@ -1304,39 +1304,39 @@ totem_action_play_media_device (TotemObject *totem, const char *device)
* An error dialog will be displayed if Totem cannot support media of @type.
**/
void
-totem_action_play_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
+totem_object_play_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
{
char *mrl;
- if (totem_action_load_media (totem, type, device) != FALSE) {
+ if (totem_object_load_media (totem, type, device) != FALSE) {
mrl = totem_playlist_get_current_mrl (totem->playlist, NULL);
- totem_action_set_mrl_and_play (totem, mrl, NULL);
+ totem_object_set_mrl_and_play (totem, mrl, NULL);
g_free (mrl);
}
}
/**
- * totem_object_action_stop:
+ * totem_object_stop:
* @totem: a #TotemObject
*
* Stops the current stream.
**/
void
-totem_object_action_stop (TotemObject *totem)
+totem_object_stop (TotemObject *totem)
{
bacon_video_widget_stop (totem->bvw);
play_pause_set_label (totem, STATE_STOPPED);
}
/**
- * totem_object_action_play_pause:
+ * totem_object_play_pause:
* @totem: a #TotemObject
*
* Gets the current MRL from the playlist and attempts to play it.
* If the stream is already playing, playback is paused.
**/
void
-totem_object_action_play_pause (TotemObject *totem)
+totem_object_play_pause (TotemObject *totem)
{
if (totem->mrl == NULL) {
char *mrl, *subtitle;
@@ -1347,7 +1347,7 @@ totem_object_action_play_pause (TotemObject *totem)
play_pause_set_label (totem, STATE_STOPPED);
return;
} else {
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
return;
@@ -1367,14 +1367,14 @@ totem_object_action_play_pause (TotemObject *totem)
}
/**
- * totem_action_pause:
+ * totem_object_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_pause (TotemObject *totem)
{
if (bacon_video_widget_is_playing (totem->bvw) != FALSE) {
bacon_video_widget_pause (totem->bvw);
@@ -1404,7 +1404,7 @@ window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
if (totem->controls_visibility != TOTEM_CONTROLS_UNDEFINED)
- totem_action_save_size (totem);
+ totem_object_save_size (totem);
totem_fullscreen_set_fullscreen (totem->fs, TRUE);
totem->controls_visibility = TOTEM_CONTROLS_FULLSCREEN;
@@ -1433,47 +1433,47 @@ window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
}
/**
- * totem_object_action_fullscreen_toggle:
+ * totem_object_fullscreen_toggle:
* @totem: a #TotemObject
*
* Toggles Totem's fullscreen state; if Totem is fullscreened, calling
* this makes it unfullscreened and vice-versa.
**/
void
-totem_object_action_fullscreen_toggle (TotemObject *totem)
+totem_object_fullscreen_toggle (TotemObject *totem)
{
- if (totem_is_fullscreen (totem) != FALSE)
+ if (totem_object_is_fullscreen (totem) != FALSE)
gtk_window_unfullscreen (GTK_WINDOW (totem->win));
else
gtk_window_fullscreen (GTK_WINDOW (totem->win));
}
/**
- * totem_action_fullscreen:
+ * totem_object_fullscreen:
* @totem: a #TotemObject
* @state: %TRUE if Totem should be fullscreened
*
* Sets Totem's fullscreen state according to @state.
**/
void
-totem_action_fullscreen (TotemObject *totem, gboolean state)
+totem_object_fullscreen (TotemObject *totem, gboolean state)
{
- if (totem_is_fullscreen (totem) == state)
+ if (totem_object_is_fullscreen (totem) == state)
return;
- totem_action_fullscreen_toggle (totem);
+ totem_object_fullscreen_toggle (totem);
}
void
fs_exit1_activate_cb (GtkButton *button, TotemObject *totem)
{
- totem_action_fullscreen (totem, FALSE);
+ totem_object_fullscreen (totem, FALSE);
}
void
-totem_action_open (TotemObject *totem)
+totem_object_open (TotemObject *totem)
{
- totem_action_open_dialog (totem, NULL, TRUE);
+ totem_object_open_dialog (totem, NULL, TRUE);
}
static void
@@ -1498,10 +1498,10 @@ totem_open_location_response_cb (GtkDialog *dialog, gint response, TotemObject *
filenames[0] = uri;
filenames[1] = NULL;
- totem_action_open_files (totem, (char **) filenames);
+ totem_object_open_files (totem, (char **) filenames);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
}
@@ -1511,7 +1511,7 @@ totem_open_location_response_cb (GtkDialog *dialog, gint response, TotemObject *
}
void
-totem_action_open_location (TotemObject *totem)
+totem_object_open_location (TotemObject *totem)
{
if (totem->open_location != NULL) {
gtk_window_present (GTK_WINDOW (totem->open_location));
@@ -1612,7 +1612,7 @@ update_mrl_label (TotemObject *totem, const char *name)
}
/**
- * totem_action_set_mrl_with_warning:
+ * totem_object_set_mrl_with_warning:
* @totem: a #TotemObject
* @mrl: the MRL to play
* @subtitle: a subtitle file to load, or %NULL
@@ -1630,7 +1630,7 @@ update_mrl_label (TotemObject *totem, const char *name)
* Return value: %TRUE on success
**/
gboolean
-totem_action_set_mrl_with_warning (TotemObject *totem,
+totem_object_set_mrl_with_warning (TotemObject *totem,
const char *mrl,
const char *subtitle,
gboolean warn)
@@ -1732,10 +1732,10 @@ totem_action_set_mrl_with_warning (TotemObject *totem,
msg = g_strdup_printf(_("Totem could not play '%s'."), disp);
g_free (disp);
if (err && err->message) {
- totem_action_error (totem, msg, err->message);
+ totem_object_error (totem, msg, err->message);
}
else {
- totem_action_error (totem, msg, _("No error message"));
+ totem_object_error (totem, msg, _("No error message"));
}
g_free (msg);
}
@@ -1762,7 +1762,7 @@ totem_action_set_mrl_with_warning (TotemObject *totem,
GDK_ACTION_COPY);
display_name = totem_playlist_get_current_title (totem->playlist, NULL);
- totem_action_add_recent (totem, totem->mrl, display_name);
+ totem_add_recent (totem, totem->mrl, display_name);
g_free (display_name);
}
}
@@ -1773,20 +1773,20 @@ totem_action_set_mrl_with_warning (TotemObject *totem,
}
/**
- * totem_action_set_mrl:
+ * totem_object_set_mrl:
* @totem: a #TotemObject
* @mrl: the MRL to load
* @subtitle: a subtitle file to load, or %NULL
*
- * Calls totem_action_set_mrl_with_warning() with warnings enabled.
- * For more information, see the documentation for totem_action_set_mrl_with_warning().
+ * Calls totem_object_set_mrl_with_warning() with warnings enabled.
+ * For more information, see the documentation for totem_object_set_mrl_with_warning().
*
* Return value: %TRUE on success
**/
gboolean
-totem_action_set_mrl (TotemObject *totem, const char *mrl, const char *subtitle)
+totem_object_set_mrl (TotemObject *totem, const char *mrl, const char *subtitle)
{
- return totem_action_set_mrl_with_warning (totem, mrl, subtitle, TRUE);
+ return totem_object_set_mrl_with_warning (totem, mrl, subtitle, TRUE);
}
static gboolean
@@ -1800,7 +1800,7 @@ totem_time_within_seconds (TotemObject *totem)
}
static void
-totem_action_direction (TotemObject *totem, TotemPlaylistDirection dir)
+totem_object_direction (TotemObject *totem, TotemPlaylistDirection dir)
{
if (totem_playing_dvd (totem->mrl) == FALSE &&
totem_playlist_has_direction (totem->playlist, dir) == FALSE
@@ -1824,17 +1824,17 @@ totem_action_direction (TotemObject *totem, TotemPlaylistDirection dir)
totem_playlist_set_direction (totem->playlist, dir);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (subtitle);
g_free (mrl);
} else {
- totem_action_seek (totem, 0);
+ totem_object_seek (totem, 0);
}
}
/**
- * totem_object_action_previous:
+ * totem_object_previous:
* @totem: a #TotemObject
*
* If a DVD is being played, goes to the previous chapter. If a normal stream
@@ -1842,22 +1842,22 @@ totem_action_direction (TotemObject *totem, TotemPlaylistDirection dir)
* not possible, plays the previous entry in the playlist.
**/
void
-totem_object_action_previous (TotemObject *totem)
+totem_object_previous (TotemObject *totem)
{
- totem_action_direction (totem, TOTEM_PLAYLIST_DIRECTION_PREVIOUS);
+ totem_object_direction (totem, TOTEM_PLAYLIST_DIRECTION_PREVIOUS);
}
/**
- * totem_object_action_next:
+ * totem_object_next:
* @totem: a #TotemObject
*
* If a DVD is being played, goes to the next chapter. If a normal stream
* is being played, plays the next entry in the playlist.
**/
void
-totem_object_action_next (TotemObject *totem)
+totem_object_next (TotemObject *totem)
{
- totem_action_direction (totem, TOTEM_PLAYLIST_DIRECTION_NEXT);
+ totem_object_direction (totem, TOTEM_PLAYLIST_DIRECTION_NEXT);
}
static void
@@ -1895,15 +1895,15 @@ totem_seek_time_rel (TotemObject *totem, gint64 _time, gboolean relative, gboole
msg = g_strdup_printf(_("Totem could not play '%s'."), disp);
g_free (disp);
- totem_action_stop (totem);
- totem_action_error (totem, msg, err->message);
+ totem_object_stop (totem);
+ totem_object_error (totem, msg, err->message);
g_free (msg);
g_error_free (err);
}
}
/**
- * totem_action_seek_relative:
+ * totem_object_seek_relative:
* @totem: a #TotemObject
* @offset: the time offset to seek to
* @accurate: whether to use accurate seek, an accurate seek might be slower for some formats (see GStreamer docs)
@@ -1912,13 +1912,13 @@ totem_seek_time_rel (TotemObject *totem, gint64 _time, gboolean relative, gboole
* or displays an error dialog if that's not possible.
**/
void
-totem_action_seek_relative (TotemObject *totem, gint64 offset, gboolean accurate)
+totem_object_seek_relative (TotemObject *totem, gint64 offset, gboolean accurate)
{
totem_seek_time_rel (totem, offset, TRUE, accurate);
}
/**
- * totem_object_action_seek_time:
+ * totem_object_seek_time:
* @totem: a #TotemObject
* @msec: the time to seek to
* @accurate: whether to use accurate seek, an accurate seek might be slower for some formats (see GStreamer docs)
@@ -1927,13 +1927,13 @@ totem_action_seek_relative (TotemObject *totem, gint64 offset, gboolean accurate
* error dialog if that's not possible.
**/
void
-totem_object_action_seek_time (TotemObject *totem, gint64 msec, gboolean accurate)
+totem_object_seek_time (TotemObject *totem, gint64 msec, gboolean accurate)
{
totem_seek_time_rel (totem, msec, FALSE, accurate);
}
static void
-totem_action_zoom (TotemObject *totem, double zoom)
+totem_object_zoom (TotemObject *totem, double zoom)
{
GtkAction *action;
gboolean zoom_reset, zoom_in, zoom_out;
@@ -1966,18 +1966,18 @@ totem_action_zoom (TotemObject *totem, double zoom)
}
void
-totem_action_zoom_relative (TotemObject *totem, double off_pct)
+totem_object_zoom_relative (TotemObject *totem, double off_pct)
{
double zoom;
zoom = bacon_video_widget_get_zoom (totem->bvw);
- totem_action_zoom (totem, zoom + off_pct);
+ totem_object_zoom (totem, zoom + off_pct);
}
void
-totem_action_zoom_reset (TotemObject *totem)
+totem_object_zoom_reset (TotemObject *totem)
{
- totem_action_zoom (totem, ZOOM_RESET);
+ totem_object_zoom (totem, ZOOM_RESET);
}
/**
@@ -1995,14 +1995,14 @@ totem_object_get_volume (TotemObject *totem)
}
/**
- * totem_object_action_volume:
+ * totem_object_volume:
* @totem: a #TotemObject
* @volume: the new absolute volume value
*
* Sets the volume, with %1.0 being the maximum, and %0.0 being the minimum level.
**/
void
-totem_object_action_volume (TotemObject *totem, double volume)
+totem_object_volume (TotemObject *totem, double volume)
{
if (bacon_video_widget_can_set_volume (totem->bvw) == FALSE)
return;
@@ -2011,7 +2011,7 @@ totem_object_action_volume (TotemObject *totem, double volume)
}
/**
- * totem_action_volume_relative:
+ * totem_object_volume_relative:
* @totem: a #TotemObject
* @off_pct: the value by which to increase or decrease the volume
*
@@ -2019,27 +2019,27 @@ totem_object_action_volume (TotemObject *totem, double volume)
* maximum, and %0.0 being the minimum level.
**/
void
-totem_action_volume_relative (TotemObject *totem, double off_pct)
+totem_object_volume_relative (TotemObject *totem, double off_pct)
{
double vol;
if (bacon_video_widget_can_set_volume (totem->bvw) == FALSE)
return;
if (totem->muted != FALSE)
- totem_action_volume_toggle_mute (totem);
+ totem_object_volume_toggle_mute (totem);
vol = bacon_video_widget_get_volume (totem->bvw);
bacon_video_widget_set_volume (totem->bvw, vol + off_pct);
}
/**
- * totem_action_volume_toggle_mute:
+ * totem_object_volume_toggle_mute:
* @totem: a #TotemObject
*
* Toggles the mute status.
**/
void
-totem_action_volume_toggle_mute (TotemObject *totem)
+totem_object_volume_toggle_mute (TotemObject *totem)
{
if (totem->muted == FALSE) {
totem->muted = TRUE;
@@ -2052,19 +2052,19 @@ totem_action_volume_toggle_mute (TotemObject *totem)
}
/**
- * totem_action_toggle_aspect_ratio:
+ * totem_object_toggle_aspect_ratio:
* @totem: a #TotemObject
*
* Toggles the aspect ratio selected in the menu to the
* next one in the list.
**/
void
-totem_action_toggle_aspect_ratio (TotemObject *totem)
+totem_object_toggle_aspect_ratio (TotemObject *totem)
{
GtkAction *action;
int tmp;
- tmp = totem_action_get_aspect_ratio (totem);
+ tmp = totem_object_get_aspect_ratio (totem);
tmp++;
if (tmp > BVW_RATIO_DVB)
tmp = BVW_RATIO_AUTO;
@@ -2074,7 +2074,7 @@ totem_action_toggle_aspect_ratio (TotemObject *totem)
}
/**
- * totem_action_set_aspect_ratio:
+ * totem_object_set_aspect_ratio:
* @totem: a #TotemObject
* @ratio: the aspect ratio to use
*
@@ -2082,13 +2082,13 @@ totem_action_toggle_aspect_ratio (TotemObject *totem)
* as defined in #BvwAspectRatio.
**/
void
-totem_action_set_aspect_ratio (TotemObject *totem, int ratio)
+totem_object_set_aspect_ratio (TotemObject *totem, int ratio)
{
bacon_video_widget_set_aspect_ratio (totem->bvw, ratio);
}
/**
- * totem_action_get_aspect_ratio:
+ * totem_object_get_aspect_ratio:
* @totem: a #TotemObject
*
* Gets the current aspect ratio as defined in #BvwAspectRatio.
@@ -2096,13 +2096,13 @@ totem_action_set_aspect_ratio (TotemObject *totem, int ratio)
* Return value: the current aspect ratio
**/
int
-totem_action_get_aspect_ratio (TotemObject *totem)
+totem_object_get_aspect_ratio (TotemObject *totem)
{
return (bacon_video_widget_get_aspect_ratio (totem->bvw));
}
/**
- * totem_action_set_scale_ratio:
+ * totem_object_set_scale_ratio:
* @totem: a #TotemObject
* @ratio: the scale ratio to use
*
@@ -2110,18 +2110,18 @@ totem_action_get_aspect_ratio (TotemObject *totem)
* 1.0 is 1:1 and 2.0 is 2:1.
**/
void
-totem_action_set_scale_ratio (TotemObject *totem, gfloat ratio)
+totem_object_set_scale_ratio (TotemObject *totem, gfloat ratio)
{
bacon_video_widget_set_scale_ratio (totem->bvw, ratio);
}
void
-totem_action_show_help (TotemObject *totem)
+totem_object_show_help (TotemObject *totem)
{
GError *error = NULL;
if (gtk_show_uri (gtk_widget_get_screen (totem->win), "ghelp:totem", gtk_get_current_event_time (), &error) == FALSE) {
- totem_action_error (totem, _("Totem could not display the help contents."), error->message);
+ totem_object_error (totem, _("Totem could not display the help contents."), error->message);
g_error_free (error);
}
}
@@ -2133,17 +2133,17 @@ typedef struct {
/* This is called in the main thread */
static void
-totem_action_drop_files_finished (TotemPlaylist *playlist, GAsyncResult *result, DropFilesData *data)
+totem_object_drop_files_finished (TotemPlaylist *playlist, GAsyncResult *result, DropFilesData *data)
{
/* When add_mrl_complete reaches 0, this is the last callback to occur and we can safely reconnect the playlist's changed signal (which was
- * disconnected below in totem_action_drop_files(). We can also free the data struct and generally clean up. */
+ * disconnected below in totem_object_drop_files(). We can also free the data struct and generally clean up. */
if (g_atomic_int_dec_and_test (&(data->add_mrl_complete)) == TRUE) {
char *mrl, *subtitle;
/* Reconnect the signal */
g_signal_connect (G_OBJECT (playlist), "changed", G_CALLBACK (playlist_changed_cb), data->totem);
mrl = totem_playlist_get_current_mrl (playlist, &subtitle);
- totem_action_set_mrl_and_play (data->totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (data->totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
@@ -2154,7 +2154,7 @@ totem_action_drop_files_finished (TotemPlaylist *playlist, GAsyncResult *result,
}
static gboolean
-totem_action_drop_files (TotemObject *totem, GtkSelectionData *data,
+totem_object_drop_files (TotemObject *totem, GtkSelectionData *data,
int drop_type, gboolean empty_pl)
{
char **list;
@@ -2202,7 +2202,7 @@ totem_action_drop_files (TotemObject *totem, GtkSelectionData *data,
cleared = TRUE;
/* Allocate some shared memory to count how many add_mrl operations have completed (see the comment below).
- * It's freed in totem_action_drop_files_cb() once all add_mrl operations have finished. */
+ * It's freed in totem_object_drop_files_cb() once all add_mrl operations have finished. */
drop_files_data = g_slice_new (DropFilesData);
drop_files_data->add_mrl_complete = len;
drop_files_data->totem = g_object_ref (totem);
@@ -2232,7 +2232,7 @@ totem_action_drop_files (TotemObject *totem, GtkSelectionData *data,
* If we haven't cleared the playlist, there's no need to do this. */
if (cleared == TRUE) {
totem_playlist_add_mrl (totem->playlist, filename, title, TRUE, NULL,
- (GAsyncReadyCallback) totem_action_drop_files_finished, drop_files_data);
+ (GAsyncReadyCallback) totem_object_drop_files_finished, drop_files_data);
} else {
totem_playlist_add_mrl (totem->playlist, filename, title, TRUE, NULL, NULL, NULL);
}
@@ -2268,7 +2268,7 @@ drop_video_cb (GtkWidget *widget,
}
if (action == GDK_ACTION_ASK) {
- action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
+ action = totem_drag_ask (totem_object_get_playlist_length (totem) > 0);
gdk_drag_status (context, action, GDK_CURRENT_TIME);
}
@@ -2279,7 +2279,7 @@ drop_video_cb (GtkWidget *widget,
}
empty_pl = (action == GDK_ACTION_MOVE);
- totem_action_drop_files (totem, data, info, empty_pl);
+ totem_object_drop_files (totem, data, info, empty_pl);
gtk_drag_finish (context, TRUE, FALSE, _time);
return;
}
@@ -2318,7 +2318,7 @@ drop_playlist_cb (GtkWidget *widget,
GdkDragAction action = gdk_drag_context_get_selected_action (context);
if (action == GDK_ACTION_ASK) {
- action = totem_drag_ask (totem_get_playlist_length (totem) > 0);
+ action = totem_drag_ask (totem_object_get_playlist_length (totem) > 0);
gdk_drag_status (context, action, GDK_CURRENT_TIME);
}
@@ -2329,7 +2329,7 @@ drop_playlist_cb (GtkWidget *widget,
empty_pl = (action == GDK_ACTION_MOVE);
- totem_action_drop_files (totem, data, info, empty_pl);
+ totem_object_drop_files (totem, data, info, empty_pl);
gtk_drag_finish (context, TRUE, FALSE, _time);
}
@@ -2476,9 +2476,9 @@ on_error_event (BaconVideoWidget *bvw, char *message,
play_pause_set_label (totem, STATE_STOPPED);
if (fatal == FALSE) {
- totem_action_error (totem, _("An error occurred"), message);
+ totem_object_error (totem, _("An error occurred"), message);
} else {
- totem_action_error_and_exit (_("An error occurred"),
+ totem_object_error_and_exit (_("An error occurred"),
message, totem);
}
}
@@ -2547,7 +2547,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_pause (totem);
} else if (totem->seek_to != 0) {
bacon_video_widget_seek_time (totem->bvw,
totem->seek_to, FALSE, NULL);
@@ -2631,7 +2631,7 @@ property_notify_cb_logo_mode (BaconVideoWidget *bvw, GParamSpec *spec, TotemObje
{
gboolean enabled;
enabled = bacon_video_widget_get_logo_mode (totem->bvw);
- totem_action_zoom (totem, enabled ? ZOOM_DISABLE : ZOOM_ENABLE);
+ totem_object_zoom (totem, enabled ? ZOOM_DISABLE : ZOOM_ENABLE);
}
static void
@@ -2677,7 +2677,7 @@ seek_slider_changed_cb (GtkAdjustment *adj, TotemObject *totem)
(int) (pos * _time), _time);
if (bacon_video_widget_can_direct_seek (totem->bvw) != FALSE)
- totem_action_seek (totem, pos);
+ totem_object_seek (totem, pos);
}
gboolean
@@ -2698,7 +2698,7 @@ seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *
val = gtk_adjustment_get_value (adj);
if (bacon_video_widget_can_direct_seek (totem->bvw) == FALSE)
- totem_action_seek (totem, val / 65535.0);
+ totem_object_seek (totem, val / 65535.0);
totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), FALSE);
totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label),
@@ -2707,7 +2707,7 @@ seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *
}
gboolean
-totem_action_open_files (TotemObject *totem, char **list)
+totem_object_open_files (TotemObject *totem, char **list)
{
GSList *slist = NULL;
int i, retval;
@@ -2716,14 +2716,14 @@ totem_action_open_files (TotemObject *totem, char **list)
slist = g_slist_prepend (slist, list[i]);
slist = g_slist_reverse (slist);
- retval = totem_action_open_files_list (totem, slist);
+ retval = totem_object_open_files_list (totem, slist);
g_slist_free (slist);
return retval;
}
static gboolean
-totem_action_open_files_list (TotemObject *totem, GSList *list)
+totem_object_open_files_list (TotemObject *totem, GSList *list)
{
GSList *l;
gboolean changed;
@@ -2776,7 +2776,7 @@ totem_action_open_files_list (TotemObject *totem, GSList *list)
}
if (totem_is_block_device (filename) != FALSE) {
- totem_action_load_media_device (totem, data);
+ totem_object_load_media_device (totem, data);
changed = TRUE;
} else if (g_str_has_prefix (filename, "dvb:/") != FALSE) {
totem_playlist_add_mrl (totem->playlist, data, NULL, FALSE, NULL, NULL, NULL);
@@ -2821,7 +2821,7 @@ show_controls (TotemObject *totem, gboolean was_fullscreen)
widget = GTK_WIDGET (totem->bvw);
action = gtk_action_group_get_action (totem->main_action_group, "show-controls");
- gtk_action_set_sensitive (action, !totem_is_fullscreen (totem));
+ gtk_action_set_sensitive (action, !totem_object_is_fullscreen (totem));
gtk_widget_get_allocation (widget, &allocation);
if (totem->controls_visibility == TOTEM_CONTROLS_VISIBLE) {
@@ -2898,19 +2898,19 @@ show_controls (TotemObject *totem, gboolean was_fullscreen)
}
/**
- * totem_action_toggle_controls:
+ * totem_object_toggle_controls:
* @totem: a #TotemObject
*
* If Totem's not fullscreened, this toggles the state of the "Show Controls"
* menu entry, and consequently shows or hides the controls in the UI.
**/
void
-totem_action_toggle_controls (TotemObject *totem)
+totem_object_toggle_controls (TotemObject *totem)
{
GtkAction *action;
gboolean state;
- if (totem_is_fullscreen (totem) != FALSE)
+ if (totem_object_is_fullscreen (totem) != FALSE)
return;
action = gtk_action_group_get_action (totem->main_action_group,
@@ -2920,21 +2920,21 @@ totem_action_toggle_controls (TotemObject *totem)
}
/**
- * totem_action_next_angle:
+ * totem_object_next_angle:
* @totem: a #TotemObject
*
* Switches to the next angle, if watching a DVD. If not watching a DVD, this is a
* no-op.
**/
void
-totem_action_next_angle (TotemObject *totem)
+totem_object_next_angle (TotemObject *totem)
{
if (totem_playing_dvd (totem->mrl) != FALSE)
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_NEXT_ANGLE);
}
/**
- * totem_action_set_playlist_index:
+ * totem_object_set_playlist_index:
* @totem: a #TotemObject
* @index: the new playlist index
*
@@ -2945,19 +2945,19 @@ totem_action_next_angle (TotemObject *totem)
* has the effect of restarting the current playlist entry.
**/
void
-totem_action_set_playlist_index (TotemObject *totem, guint playlist_index)
+totem_object_set_playlist_index (TotemObject *totem, guint playlist_index)
{
char *mrl, *subtitle;
totem_playlist_set_current (totem->playlist, playlist_index);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
}
/**
- * totem_object_action_remote:
+ * totem_object_remote:
* @totem: a #TotemObject
* @cmd: a #TotemRemoteCommand
* @url: an MRL to play, or %NULL
@@ -2970,7 +2970,7 @@ totem_action_set_playlist_index (TotemObject *totem, guint playlist_index)
* the controls will appear as if the user had moved the mouse.
**/
void
-totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const char *url)
+totem_object_remote (TotemObject *totem, TotemRemoteCommand cmd, const char *url)
{
const char *icon_name;
gboolean handled;
@@ -2980,7 +2980,7 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
switch (cmd) {
case TOTEM_REMOTE_COMMAND_PLAY:
- totem_action_play (totem);
+ totem_object_play (totem);
icon_name = "media-playback-start-symbolic";
break;
case TOTEM_REMOTE_COMMAND_PLAYPAUSE:
@@ -2988,10 +2988,10 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
icon_name = "media-playback-start-symbolic";
else
icon_name = "media-playback-pause-symbolic";
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
break;
case TOTEM_REMOTE_COMMAND_PAUSE:
- totem_action_pause (totem);
+ totem_object_pause (totem);
icon_name = "media-playback-pause-symbolic";
break;
case TOTEM_REMOTE_COMMAND_STOP: {
@@ -2999,10 +2999,10 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
totem_playlist_set_at_start (totem->playlist);
update_buttons (totem);
- totem_action_stop (totem);
+ totem_object_stop (totem);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
if (mrl != NULL) {
- totem_action_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
+ totem_object_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
bacon_video_widget_pause (totem->bvw);
g_free (mrl);
g_free (subtitle);
@@ -3016,9 +3016,9 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
if (url != NULL)
offset = g_ascii_strtod (url, NULL);
if (offset == 0) {
- totem_action_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
} else {
- totem_action_seek_relative (totem, offset * 1000, FALSE);
+ totem_object_seek_relative (totem, offset * 1000, FALSE);
}
icon_name = "media-seek-forward-symbolic";
break;
@@ -3029,31 +3029,31 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
if (url != NULL)
offset = g_ascii_strtod (url, NULL);
if (offset == 0)
- totem_action_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
else
- totem_action_seek_relative (totem, - (offset * 1000), FALSE);
+ totem_object_seek_relative (totem, - (offset * 1000), FALSE);
icon_name = "media-seek-backward-symbolic";
break;
}
case TOTEM_REMOTE_COMMAND_VOLUME_UP:
- totem_action_volume_relative (totem, VOLUME_UP_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_UP_OFFSET);
break;
case TOTEM_REMOTE_COMMAND_VOLUME_DOWN:
- totem_action_volume_relative (totem, VOLUME_DOWN_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_DOWN_OFFSET);
break;
case TOTEM_REMOTE_COMMAND_NEXT:
- totem_action_next (totem);
+ totem_object_next (totem);
icon_name = "media-skip-forward-symbolic";
break;
case TOTEM_REMOTE_COMMAND_PREVIOUS:
- totem_action_previous (totem);
+ totem_object_previous (totem);
icon_name = "media-skip-backward-symbolic";
break;
case TOTEM_REMOTE_COMMAND_FULLSCREEN:
- totem_action_fullscreen_toggle (totem);
+ totem_object_fullscreen_toggle (totem);
break;
case TOTEM_REMOTE_COMMAND_QUIT:
- totem_action_exit (totem);
+ totem_object_exit (totem);
break;
case TOTEM_REMOTE_COMMAND_ENQUEUE:
g_assert (url != NULL);
@@ -3064,15 +3064,15 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
if (url == NULL) {
bacon_video_widget_close (totem->bvw);
emit_file_closed (totem);
- totem_action_set_mrl (totem, NULL, NULL);
+ totem_object_set_mrl (totem, NULL, NULL);
break;
}
if (strcmp (url, "dvd:") == 0) {
/* FIXME b0rked */
- totem_action_play_media (totem, MEDIA_TYPE_DVD, NULL);
+ totem_object_play_media (totem, MEDIA_TYPE_DVD, NULL);
} else if (strcmp (url, "vcd:") == 0) {
/* FIXME b0rked */
- totem_action_play_media (totem, MEDIA_TYPE_VCD, NULL);
+ totem_object_play_media (totem, MEDIA_TYPE_VCD, NULL);
} else {
totem_playlist_add_mrl (totem->playlist, url, NULL, TRUE, NULL, NULL, NULL);
}
@@ -3118,23 +3118,23 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
BVW_DVD_ROOT_MENU);
break;
case TOTEM_REMOTE_COMMAND_ZOOM_UP:
- totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_IN_OFFSET);
break;
case TOTEM_REMOTE_COMMAND_ZOOM_DOWN:
- totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_OUT_OFFSET);
break;
case TOTEM_REMOTE_COMMAND_EJECT:
- totem_action_eject (totem);
+ totem_object_eject (totem);
icon_name = "media-eject";
break;
case TOTEM_REMOTE_COMMAND_PLAY_DVD:
/* TODO - how to see if can, and play the DVD (like the menu item) */
break;
case TOTEM_REMOTE_COMMAND_MUTE:
- totem_action_volume_toggle_mute (totem);
+ totem_object_volume_toggle_mute (totem);
break;
case TOTEM_REMOTE_COMMAND_TOGGLE_ASPECT:
- totem_action_toggle_aspect_ratio (totem);
+ totem_object_toggle_aspect_ratio (totem);
break;
case TOTEM_REMOTE_COMMAND_UNKNOWN:
default:
@@ -3150,14 +3150,14 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
}
/**
- * totem_object_action_remote_set_setting:
+ * totem_object_remote_set_setting:
* @totem: a #TotemObject
* @setting: a #TotemRemoteSetting
* @value: the new value for the setting
*
* Sets @setting to @value on this instance of Totem.
**/
-void totem_object_action_remote_set_setting (TotemObject *totem,
+void totem_object_remote_set_setting (TotemObject *totem,
TotemRemoteSetting setting,
gboolean value)
{
@@ -3180,7 +3180,7 @@ void totem_object_action_remote_set_setting (TotemObject *totem,
}
/**
- * totem_object_action_remote_get_setting:
+ * totem_object_remote_get_setting:
* @totem: a #TotemObject
* @setting: a #TotemRemoteSetting
*
@@ -3188,7 +3188,7 @@ void totem_object_action_remote_set_setting (TotemObject *totem,
*
* Return value: %TRUE if the setting is enabled, %FALSE otherwise
**/
-gboolean totem_object_action_remote_get_setting (TotemObject *totem,
+gboolean totem_object_remote_get_setting (TotemObject *totem,
TotemRemoteSetting setting)
{
GtkAction *action;
@@ -3221,7 +3221,7 @@ playlist_changed_cb (GtkWidget *playlist, TotemObject *totem)
return;
if (totem_playlist_get_playing (totem->playlist) == TOTEM_PLAYLIST_STATUS_NONE)
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
@@ -3230,7 +3230,7 @@ playlist_changed_cb (GtkWidget *playlist, TotemObject *totem)
static void
item_activated_cb (GtkWidget *playlist, TotemObject *totem)
{
- totem_action_seek (totem, 0);
+ totem_object_seek (totem, 0);
}
static void
@@ -3252,7 +3252,7 @@ current_removed_cb (GtkWidget *playlist, TotemObject *totem)
update_buttons (totem);
}
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
}
@@ -3262,9 +3262,9 @@ subtitle_changed_cb (GtkWidget *playlist, TotemObject *totem)
{
char *mrl, *subtitle;
- totem_action_stop (totem);
+ totem_object_stop (totem);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_and_play (totem, mrl, subtitle);
+ totem_object_set_mrl_and_play (totem, mrl, subtitle);
g_free (mrl);
g_free (subtitle);
@@ -3303,7 +3303,7 @@ playlist_shuffle_toggle_cb (TotemPlaylist *playlist, gboolean shuffle, TotemObje
}
/**
- * totem_is_fullscreen:
+ * totem_object_is_fullscreen:
* @totem: a #TotemObject
*
* Returns %TRUE if Totem is fullscreened.
@@ -3311,7 +3311,7 @@ playlist_shuffle_toggle_cb (TotemPlaylist *playlist, gboolean shuffle, TotemObje
* Return value: %TRUE if Totem is fullscreened
**/
gboolean
-totem_is_fullscreen (TotemObject *totem)
+totem_object_is_fullscreen (TotemObject *totem)
{
g_return_val_if_fail (TOTEM_IS_OBJECT (totem), FALSE);
@@ -3387,10 +3387,10 @@ on_video_button_press_event (BaconVideoWidget *bvw, GdkEventButton *event,
gtk_widget_grab_focus (GTK_WIDGET (bvw));
return TRUE;
} else if (event->type == GDK_2BUTTON_PRESS && event->button == 1) {
- totem_action_fullscreen_toggle(totem);
+ totem_object_fullscreen_toggle(totem);
return TRUE;
} else if (event->type == GDK_BUTTON_PRESS && event->button == 2) {
- if (totem_is_fullscreen (totem) != FALSE) {
+ if (totem_object_is_fullscreen (totem) != FALSE) {
const char *icon_name;
if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
icon_name = "media-playback-start-symbolic";
@@ -3398,10 +3398,10 @@ on_video_button_press_event (BaconVideoWidget *bvw, GdkEventButton *event,
icon_name = "media-playback-pause-symbolic";
totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
}
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
return TRUE;
} else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
- totem_action_menu_popup (totem, event->button);
+ totem_object_menu_popup (totem, event->button);
return TRUE;
}
@@ -3419,30 +3419,30 @@ on_eos_event (GtkWidget *widget, TotemObject *totem)
if (totem_playlist_has_next_mrl (totem->playlist) == FALSE &&
totem_playlist_get_repeat (totem->playlist) == FALSE &&
(totem_playlist_get_last (totem->playlist) != 0 ||
- totem_is_seekable (totem) == FALSE)) {
+ totem_object_is_seekable (totem) == FALSE)) {
char *mrl, *subtitle;
/* Set play button status */
totem_playlist_set_at_start (totem->playlist);
update_buttons (totem);
- totem_action_stop (totem);
+ totem_object_stop (totem);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
+ totem_object_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
bacon_video_widget_pause (totem->bvw);
g_free (mrl);
g_free (subtitle);
} else {
if (totem_playlist_get_last (totem->playlist) == 0 &&
- totem_is_seekable (totem)) {
+ totem_object_is_seekable (totem)) {
if (totem_playlist_get_repeat (totem->playlist) != FALSE) {
- totem_action_seek_time (totem, 0, FALSE);
- totem_action_play (totem);
+ totem_object_seek_time (totem, 0, FALSE);
+ totem_object_play (totem);
} else {
- totem_action_pause (totem);
- totem_action_seek_time (totem, 0, FALSE);
+ totem_object_pause (totem);
+ totem_object_seek_time (totem, 0, FALSE);
}
} else {
- totem_action_next (totem);
+ totem_object_next (totem);
}
}
@@ -3450,7 +3450,7 @@ on_eos_event (GtkWidget *widget, TotemObject *totem)
}
static gboolean
-totem_action_handle_key_release (TotemObject *totem, GdkEventKey *event)
+totem_object_handle_key_release (TotemObject *totem, GdkEventKey *event)
{
gboolean retval = TRUE;
@@ -3468,27 +3468,27 @@ totem_action_handle_key_release (TotemObject *totem, GdkEventKey *event)
}
static void
-totem_action_handle_seek (TotemObject *totem, GdkEventKey *event, gboolean is_forward)
+totem_object_handle_seek (TotemObject *totem, GdkEventKey *event, gboolean is_forward)
{
if (is_forward != FALSE) {
if (event->state & GDK_SHIFT_MASK)
- totem_action_seek_relative (totem, SEEK_FORWARD_SHORT_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_SHORT_OFFSET * 1000, FALSE);
else if (event->state & GDK_CONTROL_MASK)
- totem_action_seek_relative (totem, SEEK_FORWARD_LONG_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_LONG_OFFSET * 1000, FALSE);
else
- totem_action_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_OFFSET * 1000, FALSE);
} else {
if (event->state & GDK_SHIFT_MASK)
- totem_action_seek_relative (totem, SEEK_BACKWARD_SHORT_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_SHORT_OFFSET * 1000, FALSE);
else if (event->state & GDK_CONTROL_MASK)
- totem_action_seek_relative (totem, SEEK_BACKWARD_LONG_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_LONG_OFFSET * 1000, FALSE);
else
- totem_action_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_OFFSET * 1000, FALSE);
}
}
static gboolean
-totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
+totem_object_handle_key_press (TotemObject *totem, GdkEventKey *event)
{
gboolean retval;
const char *icon_name;
@@ -3499,13 +3499,13 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
switch (event->keyval) {
case GDK_A:
case GDK_a:
- totem_action_toggle_aspect_ratio (totem);
+ totem_object_toggle_aspect_ratio (totem);
break;
case GDK_AudioPrev:
case GDK_Back:
case GDK_B:
case GDK_b:
- totem_action_previous (totem);
+ totem_object_previous (totem);
icon_name = "media-skip-backward-symbolic";
break;
case GDK_C:
@@ -3516,15 +3516,15 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
case GDK_F11:
case GDK_f:
case GDK_F:
- totem_action_fullscreen_toggle (totem);
+ totem_object_fullscreen_toggle (totem);
break;
case GDK_g:
case GDK_G:
- totem_action_next_angle (totem);
+ totem_object_next_angle (totem);
break;
case GDK_h:
case GDK_H:
- totem_action_toggle_controls (totem);
+ totem_object_toggle_controls (totem);
break;
case GDK_M:
case GDK_m:
@@ -3535,81 +3535,81 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
case GDK_N:
case GDK_n:
case GDK_End:
- totem_action_next (totem);
+ totem_object_next (totem);
icon_name = "media-skip-forward-symbolic";
break;
case GDK_OpenURL:
- totem_action_fullscreen (totem, FALSE);
- totem_action_open_location (totem);
+ totem_object_fullscreen (totem, FALSE);
+ totem_object_open_location (totem);
break;
case GDK_O:
case GDK_o:
case GDK_Open:
- totem_action_fullscreen (totem, FALSE);
- totem_action_open (totem);
+ totem_object_fullscreen (totem, FALSE);
+ totem_object_open (totem);
break;
case GDK_AudioPlay:
case GDK_p:
case GDK_P:
if (event->state & GDK_CONTROL_MASK) {
- totem_action_show_properties (totem);
+ totem_object_show_properties (totem);
} else {
if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
icon_name = "media-playback-start-symbolic";
else
icon_name = "media-playback-pause-symbolic";
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
}
break;
case GDK_comma:
- totem_action_pause (totem);
+ totem_object_pause (totem);
bacon_video_widget_step (totem->bvw, FALSE, NULL);
break;
case GDK_period:
- totem_action_pause (totem);
+ totem_object_pause (totem);
bacon_video_widget_step (totem->bvw, TRUE, NULL);
break;
case GDK_AudioPause:
case GDK_AudioStop:
- totem_action_pause (totem);
+ totem_object_pause (totem);
icon_name = "media-playback-pause-symbolic";
break;
case GDK_q:
case GDK_Q:
- totem_action_exit (totem);
+ totem_object_exit (totem);
break;
case GDK_r:
case GDK_R:
case GDK_ZoomIn:
- totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_IN_OFFSET);
break;
case GDK_t:
case GDK_T:
case GDK_ZoomOut:
- totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_OUT_OFFSET);
break;
case GDK_Eject:
- totem_action_eject (totem);
+ totem_object_eject (totem);
icon_name = "media-eject";
break;
case GDK_Escape:
if (event->state & GDK_SUPER_MASK)
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU);
else
- totem_action_fullscreen (totem, FALSE);
+ totem_object_fullscreen (totem, FALSE);
break;
case GDK_space:
case GDK_Return:
{
GtkWidget *focus = gtk_window_get_focus (GTK_WINDOW (totem->win));
- if (totem_is_fullscreen (totem) != FALSE || focus == NULL ||
+ if (totem_object_is_fullscreen (totem) != FALSE || focus == NULL ||
focus == GTK_WIDGET (totem->bvw) || focus == totem->seek) {
if (event->keyval == GDK_space) {
if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
icon_name = "media-playback-start-symbolic";
else
icon_name = "media-playback-pause-symbolic";
- totem_action_play_pause (totem);
+ totem_object_play_pause (totem);
} else if (bacon_video_widget_has_menus (totem->bvw) != FALSE) {
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_SELECT);
}
@@ -3628,7 +3628,7 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
is_forward = !is_forward;
icon_name = is_forward ? "media-seek-forward-symbolic" : "media-seek-backward-symbolic";
- totem_action_handle_seek (totem, event, is_forward);
+ totem_object_handle_seek (totem, event, is_forward);
} else {
if (event->keyval == GDK_Left)
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_LEFT);
@@ -3637,59 +3637,59 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
}
break;
case GDK_Home:
- totem_action_seek (totem, 0);
+ totem_object_seek (totem, 0);
icon_name = "media-seek-backward-symbolic";
break;
case GDK_Up:
if (bacon_video_widget_has_menus (totem->bvw) != FALSE)
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_UP);
else
- totem_action_volume_relative (totem, VOLUME_UP_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_UP_OFFSET);
break;
case GDK_Down:
if (bacon_video_widget_has_menus (totem->bvw) != FALSE)
bacon_video_widget_dvd_event (totem->bvw, BVW_DVD_ROOT_MENU_DOWN);
else
- totem_action_volume_relative (totem, VOLUME_DOWN_OFFSET);
+ totem_object_volume_relative (totem, VOLUME_DOWN_OFFSET);
break;
case GDK_0:
if (event->state & GDK_CONTROL_MASK)
- totem_action_zoom_reset (totem);
+ totem_object_zoom_reset (totem);
else
- totem_action_set_scale_ratio (totem, 0.5);
+ totem_object_set_scale_ratio (totem, 0.5);
break;
case GDK_onehalf:
- totem_action_set_scale_ratio (totem, 0.5);
+ totem_object_set_scale_ratio (totem, 0.5);
break;
case GDK_1:
- totem_action_set_scale_ratio (totem, 1);
+ totem_object_set_scale_ratio (totem, 1);
break;
case GDK_2:
- totem_action_set_scale_ratio (totem, 2);
+ totem_object_set_scale_ratio (totem, 2);
break;
case GDK_Menu:
- totem_action_menu_popup (totem, 0);
+ totem_object_menu_popup (totem, 0);
break;
case GDK_F10:
if (!(event->state & GDK_SHIFT_MASK))
return FALSE;
- totem_action_menu_popup (totem, 0);
+ totem_object_menu_popup (totem, 0);
break;
case GDK_plus:
case GDK_KP_Add:
if (!(event->state & GDK_CONTROL_MASK)) {
- totem_action_next (totem);
+ totem_object_next (totem);
} else {
- totem_action_zoom_relative (totem, ZOOM_IN_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_IN_OFFSET);
}
break;
case GDK_minus:
case GDK_KP_Subtract:
if (!(event->state & GDK_CONTROL_MASK)) {
- totem_action_previous (totem);
+ totem_object_previous (totem);
} else {
- totem_action_zoom_relative (totem, ZOOM_OUT_OFFSET);
+ totem_object_zoom_relative (totem, ZOOM_OUT_OFFSET);
}
break;
case GDK_KP_Up:
@@ -3720,7 +3720,7 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
retval = FALSE;
}
- if (totem_is_fullscreen (totem) != FALSE && icon_name != NULL)
+ if (totem_object_is_fullscreen (totem) != FALSE && icon_name != NULL)
totem_fullscreen_show_popups_or_osd (totem->fs,
icon_name,
FALSE);
@@ -3729,7 +3729,7 @@ totem_action_handle_key_press (TotemObject *totem, GdkEventKey *event)
}
static gboolean
-totem_action_handle_scroll (TotemObject *totem, GdkScrollDirection direction)
+totem_object_handle_scroll (TotemObject *totem, GdkScrollDirection direction)
{
gboolean retval = TRUE;
@@ -3738,10 +3738,10 @@ totem_action_handle_scroll (TotemObject *totem, GdkScrollDirection direction)
switch (direction) {
case GDK_SCROLL_UP:
- totem_action_seek_relative (totem, SEEK_FORWARD_SHORT_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_FORWARD_SHORT_OFFSET * 1000, FALSE);
break;
case GDK_SCROLL_DOWN:
- totem_action_seek_relative (totem, SEEK_BACKWARD_SHORT_OFFSET * 1000, FALSE);
+ totem_object_seek_relative (totem, SEEK_BACKWARD_SHORT_OFFSET * 1000, FALSE);
break;
case GDK_SCROLL_LEFT:
case GDK_SCROLL_RIGHT:
@@ -3799,9 +3799,9 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote
case GDK_KP_Subtract:
case GDK_0:
if (event->type == GDK_KEY_PRESS)
- return totem_action_handle_key_press (totem, event);
+ return totem_object_handle_key_press (totem, event);
else
- return totem_action_handle_key_release (totem, event);
+ return totem_object_handle_key_release (totem, event);
default:
break;
}
@@ -3811,9 +3811,9 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote
switch (event->keyval) {
case GDK_Escape:
if (event->type == GDK_KEY_PRESS)
- return totem_action_handle_key_press (totem, event);
+ return totem_object_handle_key_press (totem, event);
else
- return totem_action_handle_key_release (totem, event);
+ return totem_object_handle_key_release (totem, event);
default:
break;
}
@@ -3832,16 +3832,16 @@ window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *tote
return FALSE;
if (event->type == GDK_KEY_PRESS) {
- return totem_action_handle_key_press (totem, event);
+ return totem_object_handle_key_press (totem, event);
} else {
- return totem_action_handle_key_release (totem, event);
+ return totem_object_handle_key_release (totem, event);
}
}
gboolean
window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, TotemObject *totem)
{
- return totem_action_handle_scroll (totem, event->direction);
+ return totem_object_handle_scroll (totem, event->direction);
}
static void
@@ -4136,7 +4136,7 @@ playlist_widget_setup (TotemObject *totem)
totem->playlist = TOTEM_PLAYLIST (totem_playlist_new ());
if (totem->playlist == NULL)
- totem_action_exit (totem);
+ totem_object_exit (totem);
gtk_widget_show_all (GTK_WIDGET (totem->playlist));
@@ -4175,12 +4175,12 @@ video_widget_create (TotemObject *totem)
(bacon_video_widget_new (-1, -1, BVW_USE_TYPE_VIDEO, &err));
if (totem->bvw == NULL) {
- totem_action_error_and_exit (_("Totem could not startup."), err != NULL ? err->message : _("No reason."), totem);
+ totem_object_error_and_exit (_("Totem could not startup."), err != NULL ? err->message : _("No reason."), totem);
if (err != NULL)
g_error_free (err);
}
- totem_action_zoom (totem, ZOOM_RESET);
+ totem_object_zoom (totem, ZOOM_RESET);
g_signal_connect_after (G_OBJECT (totem->bvw),
"button-press-event",
diff --git a/src/totem-options.c b/src/totem-options.c
index 86df80b..71e1446 100644
--- a/src/totem-options.c
+++ b/src/totem-options.c
@@ -74,7 +74,7 @@ void
totem_options_process_late (Totem *totem, const TotemCmdLineOptions *options)
{
if (options->togglecontrols)
- totem_action_toggle_controls (totem);
+ totem_object_toggle_controls (totem);
/* Handle --playlist-idx */
totem->index = options->playlistidx;
diff --git a/src/totem-private.h b/src/totem-private.h
index 8caef97..aee4961 100644
--- a/src/totem-private.h
+++ b/src/totem-private.h
@@ -177,15 +177,15 @@ GtkWidget *totem_volume_create (void);
#define ZOOM_IN_OFFSET 0.01
#define ZOOM_OUT_OFFSET -0.01
-void totem_action_open (Totem *totem);
-void totem_action_open_location (Totem *totem);
-void totem_action_eject (Totem *totem);
-void totem_action_zoom_relative (Totem *totem, double off_pct);
-void totem_action_zoom_reset (Totem *totem);
-void totem_action_show_help (Totem *totem);
-void totem_action_show_properties (Totem *totem);
-gboolean totem_action_open_files (Totem *totem, char **list);
-G_GNUC_NORETURN void totem_action_error_and_exit (const char *title, const char *reason, Totem *totem);
+void totem_object_open (Totem *totem);
+void totem_object_open_location (Totem *totem);
+void totem_object_eject (Totem *totem);
+void totem_object_zoom_relative (Totem *totem, double off_pct);
+void totem_object_zoom_reset (Totem *totem);
+void totem_object_show_help (Totem *totem);
+void totem_object_show_properties (Totem *totem);
+gboolean totem_object_open_files (Totem *totem, char **list);
+G_GNUC_NORETURN void totem_object_error_and_exit (const char *title, const char *reason, Totem *totem);
void show_controls (Totem *totem, gboolean was_fullscreen);
diff --git a/src/totem-session.c b/src/totem-session.c
index ad272f0..9f2833f 100644
--- a/src/totem-session.c
+++ b/src/totem-session.c
@@ -105,7 +105,7 @@ G_GNUC_NORETURN static void
totem_quit_cb (EggSMClient *client,
Totem *totem)
{
- totem_action_exit (totem);
+ totem_object_exit (totem);
}
void
@@ -151,7 +151,7 @@ totem_session_restore (Totem *totem, char **filenames)
* the GTK+ main loop, and thus can't freeze the application. */
if (totem_playlist_add_mrl_sync (totem->playlist, uri, NULL) == FALSE) {
totem_signal_unblock_by_data (totem->playlist, totem);
- totem_action_set_mrl (totem, NULL, NULL);
+ totem_object_set_mrl (totem, NULL, NULL);
g_free (uri);
return;
}
@@ -162,7 +162,7 @@ totem_session_restore (Totem *totem, char **filenames)
totem_playlist_set_current (totem->playlist, totem->index);
mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
- totem_action_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
+ totem_object_set_mrl_with_warning (totem, mrl, subtitle, FALSE);
/* We do the seeking after being told that the stream is seekable,
* not straight away */
diff --git a/src/totem-video-list.c b/src/totem-video-list.c
index f7f42cd..a03126e 100644
--- a/src/totem-video-list.c
+++ b/src/totem-video-list.c
@@ -355,7 +355,7 @@ row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *
goto finish;
if (mrl != NULL)
- totem_add_to_playlist_and_play (self->priv->totem, mrl, display_name, FALSE);
+ totem_object_add_to_playlist_and_play (self->priv->totem, mrl, display_name, FALSE);
finish:
g_free (mrl);
diff --git a/src/totem.c b/src/totem.c
index af267de..30860be 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -59,7 +59,7 @@ long_action (void)
}
static void
-totem_action_handler (GApplication *app,
+totem_object_handler (GApplication *app,
gchar *name,
GVariant *platform_data,
gpointer user_data)
@@ -95,7 +95,7 @@ totem_action_handler (GApplication *app,
g_type_class_unref (klass);
- totem_action_remote (TOTEM_OBJECT (user_data), command, url);
+ totem_object_remote (TOTEM_OBJECT (user_data), command, url);
g_free (url);
}
@@ -171,7 +171,7 @@ main (int argc, char **argv)
{
gtk_init (&argc, &argv);
g_set_application_name (_("Totem Movie Player"));
- totem_action_error_and_exit (_("Could not initialize the thread-safe libraries."), _("Verify your system installation. Totem will now exit."), NULL);
+ totem_object_error_and_exit (_("Could not initialize the thread-safe libraries."), _("Verify your system installation. Totem will now exit."), NULL);
}
#endif
@@ -192,7 +192,7 @@ main (int argc, char **argv)
error->message, argv[0]);
g_error_free (error);
g_option_context_free (context);
- totem_action_exit (NULL);
+ totem_object_exit (NULL);
}
g_option_context_free (context);
@@ -207,7 +207,7 @@ main (int argc, char **argv)
gc = gconf_client_get_default ();
if (gc == NULL) {
- totem_action_error_and_exit (_("Totem could not initialize the configuration engine."),
+ totem_object_error_and_exit (_("Totem could not initialize the configuration engine."),
_("Make sure that GNOME is properly installed."), NULL);
}
@@ -232,7 +232,7 @@ main (int argc, char **argv)
if (g_application_is_remote (G_APPLICATION (totem->app))) {
totem_options_process_for_server (G_APPLICATION (totem->app), &optionstate);
gdk_notify_startup_complete ();
- totem_action_exit (totem);
+ totem_object_exit (totem);
} else {
totem_options_register_remote_commands (totem);
totem_options_process_early (totem, &optionstate);
@@ -244,7 +244,7 @@ main (int argc, char **argv)
/* Main window */
totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem);
if (totem->xml == NULL)
- totem_action_exit (NULL);
+ totem_object_exit (NULL);
totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window"));
/* FIXME should be enabled
@@ -295,7 +295,7 @@ main (int argc, char **argv)
if (optionstate.fullscreen != FALSE) {
gtk_widget_show (totem->win);
gdk_flush ();
- totem_action_fullscreen (totem, TRUE);
+ totem_object_fullscreen (totem, TRUE);
}
/* The prefs after the video widget is connected */
@@ -314,10 +314,10 @@ main (int argc, char **argv)
if (totem->session_restored != FALSE) {
totem_session_restore (totem, optionstate.filenames);
- } else if (optionstate.filenames != NULL && totem_action_open_files (totem, optionstate.filenames)) {
- totem_action_play_pause (totem);
+ } else if (optionstate.filenames != NULL && totem_object_open_files (totem, optionstate.filenames)) {
+ totem_object_play_pause (totem);
} else {
- totem_action_set_mrl (totem, NULL, NULL);
+ totem_object_set_mrl (totem, NULL, NULL);
}
/* Set the logo at the last minute so we won't try to show it before a video */
@@ -328,7 +328,7 @@ main (int argc, char **argv)
if (totem->app != NULL) {
g_signal_connect (G_APPLICATION (totem->app), "action-with-data",
- G_CALLBACK (totem_action_handler), totem);
+ G_CALLBACK (totem_object_handler), totem);
}
gtk_main ();
diff --git a/src/totem.h b/src/totem.h
index 151b6cb..ad5fa60 100644
--- a/src/totem.h
+++ b/src/totem.h
@@ -178,121 +178,93 @@ GType totem_object_get_type (void);
void totem_object_plugins_init (TotemObject *totem);
void totem_object_plugins_shutdown (TotemObject *totem);
-#define totem_action_exit totem_object_action_exit
-void totem_object_action_exit (TotemObject *totem) G_GNUC_NORETURN;
-#define totem_action_play totem_object_action_play
-void totem_object_action_play (TotemObject *totem);
-#define totem_action_stop totem_object_action_stop
-void totem_object_action_stop (TotemObject *totem);
-#define totem_action_play_pause totem_object_action_play_pause
-void totem_object_action_play_pause (TotemObject *totem);
-void totem_action_pause (TotemObject *totem);
-#define totem_action_fullscreen_toggle totem_object_action_fullscreen_toggle
-void totem_object_action_fullscreen_toggle (TotemObject *totem);
-void totem_action_fullscreen (TotemObject *totem, gboolean state);
-#define totem_action_next totem_object_action_next
-void totem_object_action_next (TotemObject *totem);
-#define totem_action_previous totem_object_action_previous
-void totem_object_action_previous (TotemObject *totem);
-#define totem_action_seek_time totem_object_action_seek_time
-void totem_object_action_seek_time (TotemObject *totem, gint64 msec, gboolean accurate);
-void totem_action_seek_relative (TotemObject *totem, gint64 offset, gboolean accurate);
-#define totem_get_volume totem_object_get_volume
+void totem_object_exit (TotemObject *totem) G_GNUC_NORETURN;
+void totem_object_play (TotemObject *totem);
+void totem_object_stop (TotemObject *totem);
+void totem_object_play_pause (TotemObject *totem);
+void totem_object_pause (TotemObject *totem);
+void totem_object_fullscreen_toggle (TotemObject *totem);
+void totem_object_fullscreen (TotemObject *totem, gboolean state);
+void totem_object_next (TotemObject *totem);
+void totem_object_previous (TotemObject *totem);
+void totem_object_seek_time (TotemObject *totem, gint64 msec, gboolean accurate);
+void totem_object_seek_relative (TotemObject *totem, gint64 offset, gboolean accurate);
double totem_object_get_volume (TotemObject *totem);
-#define totem_action_volume totem_object_action_volume
-void totem_object_action_volume (TotemObject *totem, double volume);
-void totem_action_volume_relative (TotemObject *totem, double off_pct);
-void totem_action_volume_toggle_mute (TotemObject *totem);
-gboolean totem_action_set_mrl (TotemObject *totem,
+void totem_object_volume (TotemObject *totem, double volume);
+void totem_object_volume_relative (TotemObject *totem, double off_pct);
+void totem_object_volume_toggle_mute (TotemObject *totem);
+gboolean totem_object_set_mrl (TotemObject *totem,
const char *mrl,
const char *subtitle);
-void totem_action_set_mrl_and_play (TotemObject *totem,
+void totem_object_set_mrl_and_play (TotemObject *totem,
const char *mrl,
const char *subtitle);
-gboolean totem_action_set_mrl_with_warning (TotemObject *totem,
+gboolean totem_object_set_mrl_with_warning (TotemObject *totem,
const char *mrl,
const char *subtitle,
gboolean warn);
-void totem_action_play_media (TotemObject *totem,
+void totem_object_play_media (TotemObject *totem,
TotemDiscMediaType type,
const char *device);
-void totem_action_toggle_aspect_ratio (TotemObject *totem);
-void totem_action_set_aspect_ratio (TotemObject *totem, int ratio);
-int totem_action_get_aspect_ratio (TotemObject *totem);
-void totem_action_toggle_controls (TotemObject *totem);
-void totem_action_next_angle (TotemObject *totem);
+void totem_object_toggle_aspect_ratio (TotemObject *totem);
+void totem_object_set_aspect_ratio (TotemObject *totem, int ratio);
+int totem_object_get_aspect_ratio (TotemObject *totem);
+void totem_object_toggle_controls (TotemObject *totem);
+void totem_object_next_angle (TotemObject *totem);
-void totem_action_set_scale_ratio (TotemObject *totem, gfloat ratio);
-#define totem_action_error totem_object_action_error
-void totem_object_action_error (TotemObject *totem,
+void totem_object_set_scale_ratio (TotemObject *totem, gfloat ratio);
+void totem_object_error (TotemObject *totem,
const char *title,
const char *reason);
-void totem_action_play_media_device (TotemObject *totem,
+void totem_object_play_media_device (TotemObject *totem,
const char *device);
-gboolean totem_is_fullscreen (TotemObject *totem);
-#define totem_is_playing totem_object_is_playing
+gboolean totem_object_is_fullscreen (TotemObject *totem);
gboolean totem_object_is_playing (TotemObject *totem);
-#define totem_is_paused totem_object_is_paused
gboolean totem_object_is_paused (TotemObject *totem);
-#define totem_is_seekable totem_object_is_seekable
gboolean totem_object_is_seekable (TotemObject *totem);
-#define totem_get_main_window totem_object_get_main_window
GtkWindow *totem_object_get_main_window (TotemObject *totem);
-#define totem_get_ui_manager totem_object_get_ui_manager
GtkUIManager *totem_object_get_ui_manager (TotemObject *totem);
-GtkWidget *totem_get_video_widget (TotemObject *totem);
-#define totem_get_version totem_object_get_version
+GtkWidget *totem_object_get_video_widget (TotemObject *totem);
char *totem_object_get_version (void);
/* Current media information */
-char * totem_get_short_title (TotemObject *totem);
-gint64 totem_get_current_time (TotemObject *totem);
+char * totem_object_get_short_title (TotemObject *totem);
+gint64 totem_object_get_current_time (TotemObject *totem);
/* Playlist handling */
-#define totem_get_playlist_length totem_object_get_playlist_length
guint totem_object_get_playlist_length (TotemObject *totem);
-void totem_action_set_playlist_index (TotemObject *totem,
+void totem_object_set_playlist_index (TotemObject *totem,
guint index);
-#define totem_get_playlist_pos totem_object_get_playlist_pos
int totem_object_get_playlist_pos (TotemObject *totem);
-#define totem_get_title_at_playlist_pos totem_object_get_title_at_playlist_pos
char * totem_object_get_title_at_playlist_pos (TotemObject *totem,
guint playlist_index);
-#define totem_add_to_playlist_and_play totem_object_add_to_playlist_and_play
void totem_object_add_to_playlist_and_play (TotemObject *totem,
const char *uri,
const char *display_name,
gboolean add_to_recent);
-#define totem_get_current_mrl totem_object_get_current_mrl
char * totem_object_get_current_mrl (TotemObject *totem);
-#define totem_set_current_subtitle totem_object_set_current_subtitle
void totem_object_set_current_subtitle (TotemObject *totem,
const char *subtitle_uri);
/* Sidebar handling */
-#define totem_add_sidebar_page totem_object_add_sidebar_page
void totem_object_add_sidebar_page (TotemObject *totem,
const char *page_id,
const char *title,
GtkWidget *main_widget);
-#define totem_remove_sidebar_page totem_object_remove_sidebar_page
void totem_object_remove_sidebar_page (TotemObject *totem,
const char *page_id);
/* Remote actions */
-#define totem_action_remote totem_object_action_remote
-void totem_object_action_remote (TotemObject *totem,
+void totem_object_remote (TotemObject *totem,
TotemRemoteCommand cmd,
const char *url);
-#define totem_action_remote_set_setting totem_object_action_remote_set_setting
-void totem_object_action_remote_set_setting (TotemObject *totem,
+void totem_object_remote_set_setting (TotemObject *totem,
TotemRemoteSetting setting,
gboolean value);
-#define totem_action_remote_get_setting totem_object_action_remote_get_setting
-gboolean totem_object_action_remote_get_setting (TotemObject *totem,
+gboolean totem_object_remote_get_setting (TotemObject *totem,
TotemRemoteSetting setting);
#endif /* __TOTEM_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
