[totem/plugin-api-cleanup: 1/3] Make TotemObject signal emission functions static to totem-object.c



commit a7568182b6707b770feae35dcb3273d7e77645c5
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Sun Aug 8 11:07:03 2010 +0100

    Make TotemObject signal emission functions static to totem-object.c

 docs/reference/totem-sections.txt |    3 --
 src/totem-object.c                |   49 ++++++++++++++++++-------------------
 src/totem.h                       |    8 ------
 3 files changed, 24 insertions(+), 36 deletions(-)
---
diff --git a/docs/reference/totem-sections.txt b/docs/reference/totem-sections.txt
index 98ac6a2..35d8d09 100644
--- a/docs/reference/totem-sections.txt
+++ b/docs/reference/totem-sections.txt
@@ -9,9 +9,6 @@ TotemRemoteSetting
 TOTEM_GCONF_PREFIX
 totem_object_plugins_init
 totem_object_plugins_shutdown
-totem_file_opened
-totem_file_closed
-totem_metadata_updated
 totem_object_action_error
 totem_object_action_exit
 totem_object_add_to_playlist_and_play
diff --git a/src/totem-object.c b/src/totem-object.c
index ba8e31e..285be5e 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -654,16 +654,16 @@ totem_object_remove_sidebar_page (TotemObject *totem,
 				page_id);
 }
 
-/**
- * totem_file_opened:
+/*
+ * emit_file_opened:
  * @totem: a #TotemObject
  * @mrl: the MRL opened
  *
  * Emits the #TotemObject::file-opened signal on @totem, with the
  * specified @mrl.
  **/
-void
-totem_file_opened (TotemObject *totem,
+static void
+emit_file_opened (TotemObject *totem,
 		   const char *mrl)
 {
 	g_signal_emit (G_OBJECT (totem),
@@ -671,23 +671,22 @@ totem_file_opened (TotemObject *totem,
 		       0, mrl);
 }
 
-/**
- * totem_file_closed:
+/*
+ * emit_file_closed:
  * @totem: a #TotemObject
  *
  * Emits the #TotemObject::file-closed signal on @totem.
  **/
-void
-totem_file_closed (TotemObject *totem)
+static void
+emit_file_closed (TotemObject *totem)
 {
 	g_signal_emit (G_OBJECT (totem),
 		       totem_table_signals[FILE_CLOSED],
 		       0);
-
 }
 
-/**
- * totem_metadata_updated:
+/*
+ * emit_metadata_updated:
  * @totem: a #TotemObject
  * @artist: the stream's artist, or %NULL
  * @title: the stream's title, or %NULL
@@ -697,8 +696,8 @@ totem_file_closed (TotemObject *totem)
  * Emits the #TotemObject::metadata-updated signal on @totem,
  * with the specified stream data.
  **/
-void
-totem_metadata_updated (TotemObject *totem,
+static void
+emit_metadata_updated (TotemObject *totem,
 			const char *artist,
 			const char *title,
 			const char *album,
@@ -1055,7 +1054,7 @@ totem_action_eject (TotemObject *totem)
 	g_free (totem->mrl);
 	totem->mrl = NULL;
 	bacon_video_widget_close (totem->bvw);
-	totem_file_closed (totem);
+	emit_file_closed (totem);
 
 	/* The volume monitoring will take care of removing the items */
 	g_mount_eject_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, NULL, NULL);
@@ -1567,11 +1566,11 @@ totem_get_nice_name_for_stream (TotemObject *totem)
 	tracknum = g_value_get_int (&value);
 	g_value_unset (&value);
 
-	totem_metadata_updated (totem,
-				g_value_get_string (&artist_value),
-				g_value_get_string (&title_value),
-				g_value_get_string (&album_value),
-				tracknum);
+	emit_metadata_updated (totem,
+	                       g_value_get_string (&artist_value),
+	                       g_value_get_string (&title_value),
+	                       g_value_get_string (&album_value),
+	                       tracknum);
 
 	if (g_value_get_string (&title_value) == NULL) {
 		retval = NULL;
@@ -1658,7 +1657,7 @@ totem_action_set_mrl_with_warning (TotemObject *totem,
 		g_free (totem->mrl);
 		totem->mrl = NULL;
 		bacon_video_widget_close (totem->bvw);
-		totem_file_closed (totem);
+		emit_file_closed (totem);
 		play_pause_set_label (totem, STATE_STOPPED);
 		update_fill (totem, -1.0);
 	}
@@ -1769,7 +1768,7 @@ totem_action_set_mrl_with_warning (TotemObject *totem,
 				{ (gchar*) "text/uri-list", 0, 0 }
 			};
 
-			totem_file_opened (totem, totem->mrl);
+			emit_file_opened (totem, totem->mrl);
 
 			/* Set the drag source */
 			gtk_drag_source_set (GTK_WIDGET (totem->bvw),
@@ -2424,10 +2423,10 @@ on_got_redirect (BaconVideoWidget *bvw, const char *mrl, TotemObject *totem)
 	}
 
 	bacon_video_widget_close (totem->bvw);
-	totem_file_closed (totem);
+	emit_file_closed (totem);
 	totem_gdk_window_set_waiting_cursor (gtk_widget_get_window (totem->win));
 	bacon_video_widget_open (totem->bvw, new_mrl ? new_mrl : mrl, NULL, NULL);
-	totem_file_opened (totem, new_mrl ? new_mrl : mrl);
+	emit_file_opened (totem, new_mrl ? new_mrl : mrl);
 	gdk_window_set_cursor (gtk_widget_get_window (totem->win), NULL);
 	bacon_video_widget_play (bvw, NULL);
 	g_free (new_mrl);
@@ -2787,7 +2786,7 @@ totem_action_open_files_list (TotemObject *totem, GSList *list)
 					 playlist_changed_cb, totem);
 				changed = totem_playlist_clear (totem->playlist);
 				bacon_video_widget_close (totem->bvw);
-				totem_file_closed (totem);
+				emit_file_closed (totem);
 				cleared = TRUE;
 			}
 
@@ -3079,7 +3078,7 @@ totem_object_action_remote (TotemObject *totem, TotemRemoteCommand cmd, const ch
 		totem_playlist_clear (totem->playlist);
 		if (url == NULL) {
 			bacon_video_widget_close (totem->bvw);
-			totem_file_closed (totem);
+			emit_file_closed (totem);
 			totem_action_set_mrl (totem, NULL, NULL);
 			break;
 		}
diff --git a/src/totem.h b/src/totem.h
index 4674e68..2e7ba54 100644
--- a/src/totem.h
+++ b/src/totem.h
@@ -177,14 +177,6 @@ typedef struct {
 GType	totem_object_get_type			(void);
 void    totem_object_plugins_init		(TotemObject *totem);
 void    totem_object_plugins_shutdown		(TotemObject *totem);
-void	totem_file_opened			(TotemObject *totem,
-						 const char *mrl);
-void	totem_file_closed			(TotemObject *totem);
-void	totem_metadata_updated			(TotemObject *totem,
-						 const char *artist,
-						 const char *title,
-						 const char *album,
-						 guint track_num);
 
 #define totem_action_exit totem_object_action_exit
 void	totem_object_action_exit		(TotemObject *totem) G_GNUC_NORETURN;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]