[Xfce4-commits] <parole:master> Added get_stream to the plugin API.

[Ali Abdallah]

Updating branch refs/heads/master
         to 9b54ae7170289292f7b733ea62e271a53099d273 (commit)
       from c4c528824ecd48ba1cc908ff15f478616a3667b3 (commit)

commit 9b54ae7170289292f7b733ea62e271a53099d273
Author: Ali Abdallah <aliov at xfce.org>
Date:   Fri Dec 11 11:00:38 2009 +0100

    Added get_stream to the plugin API.

 docs/plugin-api/Parole-Plugins-sections.txt      |    1 +
 docs/plugin-api/tmpl/parole-provider-player.sgml |    9 ++++++++
 parole/parole-provider-player.c                  |   24 ++++++++++++++++++++++
 parole/parole-provider-player.h                  |    4 +++
 src/parole-plugin-player.c                       |   11 ++++++++++
 5 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/docs/plugin-api/Parole-Plugins-sections.txt b/docs/plugin-api/Parole-Plugins-sections.txt
index f72b9a5..1d83097 100644
--- a/docs/plugin-api/Parole-Plugins-sections.txt
+++ b/docs/plugin-api/Parole-Plugins-sections.txt
@@ -7,6 +7,7 @@ ParoleState
 parole_provider_player_get_main_window
 parole_provider_player_pack
 parole_provider_player_get_state
+parole_provider_player_get_stream
 parole_provider_player_play_uri
 parole_provider_player_pause
 parole_provider_player_resume
diff --git a/docs/plugin-api/tmpl/parole-provider-player.sgml b/docs/plugin-api/tmpl/parole-provider-player.sgml
index 7cccc04..c90cb6b 100644
--- a/docs/plugin-api/tmpl/parole-provider-player.sgml
+++ b/docs/plugin-api/tmpl/parole-provider-player.sgml
@@ -95,6 +95,15 @@ playback status.
 @Returns: 
 
 
+<!-- ##### FUNCTION parole_provider_player_get_stream ##### -->
+<para>
+
+</para>
+
+ at player: 
+ at Returns: 
+
+
 <!-- ##### FUNCTION parole_provider_player_play_uri ##### -->
 <para>
 
diff --git a/parole/parole-provider-player.c b/parole/parole-provider-player.c
index 7a85914..e5ee1e2 100644
--- a/parole/parole-provider-player.c
+++ b/parole/parole-provider-player.c
@@ -144,6 +144,8 @@ GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player)
  * This function can be called once, the Player is responsible on removing the widget in
  * case the plugin was unloaded.
  * 
+ * 
+ * Since: 0.2
  **/ 
 void parole_provider_player_pack (ParoleProviderPlayer *player, GtkWidget *widget, 
 				  const gchar *title, ParolePluginContainer container)
@@ -182,6 +184,28 @@ ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player)
 }
 
 /**
+ * parole_provider_player_get_stream:
+ * @player: a #ParoleProviderPlayer
+ * 
+ * Get the #ParoleStream object.
+ * 
+ * Returns: the #ParoleStream object.
+ * 
+ * Since: 0.2
+ **/
+const ParoleStream *parole_provider_player_get_stream   (ParoleProviderPlayer *player)
+{
+    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+    
+    if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
+    {
+	return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream) (player);
+    }
+    
+    return NULL;
+}
+
+/**
  * parole_provider_player_play_uri:
  * @player: a #ParoleProviderPlayer
  * @uri: uri
diff --git a/parole/parole-provider-player.h b/parole/parole-provider-player.h
index 69bd7e5..6373121 100644
--- a/parole/parole-provider-player.h
+++ b/parole/parole-provider-player.h
@@ -67,6 +67,8 @@ struct _ParoleProviderPlayerIface
 							 
     ParoleState  (*get_state)				(ParoleProviderPlayer *player);
     
+    const ParoleStream *(*get_stream)			(ParoleProviderPlayer *player);
+    
     gboolean	 (*play_uri)				(ParoleProviderPlayer *player,
 							 const gchar *uri);
 							 
@@ -102,6 +104,8 @@ void		 parole_provider_player_pack		(ParoleProviderPlayer *player,
 							 
 ParoleState	parole_provider_player_get_state	(ParoleProviderPlayer *player);
 
+const ParoleStream *parole_provider_player_get_stream   (ParoleProviderPlayer *player);
+
 gboolean	parole_provider_player_play_uri		(ParoleProviderPlayer *player,
 							 const gchar *uri);
 
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 4dc5990..889b35b 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -92,6 +92,16 @@ parole_plugin_player_get_state (ParoleProviderPlayer *provider)
     return parole_gst_get_state (PAROLE_GST (player->priv->gst));
 }
 
+static const ParoleStream *
+parole_plugin_player_get_stream (ParoleProviderPlayer *provider)
+{
+    ParolePluginPlayer *player;
+    
+    player = PAROLE_PLUGIN_PLAYER (provider);
+    
+    return parole_gst_get_stream (PAROLE_GST (player->priv->gst));
+}
+
 static gboolean	
 parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar *uri)
 {
@@ -167,6 +177,7 @@ static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
     iface->get_main_window = parole_plugin_player_get_main_window;
     iface->pack = parole_plugin_player_pack_widget;
     iface->get_state = parole_plugin_player_get_state;
+    iface->get_stream = parole_plugin_player_get_stream;
     iface->play_uri = parole_plugin_player_play_uri;
     iface->pause = parole_plugin_player_pause;
     iface->resume = parole_plugin_player_resume;