[Xfce4-commits] <parole:master> Documentation and interface fixes

[Sean Davis]

Updating branch refs/heads/master
         to 87a5f7448a7219008f01e8a8b239607eeeca7957 (commit)
       from f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a (commit)

commit 87a5f7448a7219008f01e8a8b239607eeeca7957
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Dec 13 06:54:49 2013 -0500

    Documentation and interface fixes

 docs/plugin-api/tmpl/parole-provider-player.sgml |    8 ++++++++
 docs/plugin-api/tmpl/parole-stream.sgml          |   15 +++++++++++++++
 src/misc/parole-provider-player.c                |   13 +++++++++++--
 src/misc/parole-provider-player.h                |    5 ++++-
 src/parole-plugin-player.c                       |    6 ++++++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/docs/plugin-api/tmpl/parole-provider-player.sgml b/docs/plugin-api/tmpl/parole-provider-player.sgml
index c9706e5..49a31cc 100644
--- a/docs/plugin-api/tmpl/parole-provider-player.sgml
+++ b/docs/plugin-api/tmpl/parole-provider-player.sgml
@@ -28,6 +28,14 @@ playback status.
 </para>
 
 
+<!-- ##### SIGNAL ParoleProviderPlayerIface::seeked ##### -->
+<para>
+
+</para>
+
+ at paroleproviderplayeriface: the object which received the signal.
+ at arg1: 
+
 <!-- ##### SIGNAL ParoleProviderPlayerIface::state-changed ##### -->
 <para>
 
diff --git a/docs/plugin-api/tmpl/parole-stream.sgml b/docs/plugin-api/tmpl/parole-stream.sgml
index 55dfd9b..e8a862d 100644
--- a/docs/plugin-api/tmpl/parole-stream.sgml
+++ b/docs/plugin-api/tmpl/parole-stream.sgml
@@ -58,6 +58,11 @@ signal of the player, the plugin shouldn't take reference and all the properties
 
 </para>
 
+<!-- ##### ARG ParoleStream:bitrate ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG ParoleStream:comment ##### -->
 <para>
 
@@ -78,6 +83,11 @@ signal of the player, the plugin shouldn't take reference and all the properties
 
 </para>
 
+<!-- ##### ARG ParoleStream:genre ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG ParoleStream:has-audio ##### -->
 <para>
 
@@ -88,6 +98,11 @@ signal of the player, the plugin shouldn't take reference and all the properties
 
 </para>
 
+<!-- ##### ARG ParoleStream:image-uri ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG ParoleStream:live ##### -->
 <para>
 
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index 4496170..d3c7c03 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -469,7 +469,16 @@ void parole_provider_player_open_media_chooser (ParoleProviderPlayer *player)
  **/
 GtkAction *parole_provider_player_get_action(ParoleProviderPlayer *player, ParolePlayerAction action)
 {
-    return parole_player_get_action(action);
+    GtkAction *ret = NULL;;
+    
+    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+    
+    if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action )
+    {
+        ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action) (player, action);
+    }
+    
+    return ret;
 }
 
 /**
@@ -484,7 +493,7 @@ gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
 {
     g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
     
-    if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
+    if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen )
     {
         return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen) (player);
     }
diff --git a/src/misc/parole-provider-player.h b/src/misc/parole-provider-player.h
index 0c93d8e..7551276 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -88,7 +88,10 @@ struct _ParoleProviderPlayerIface
     gboolean     (*set_fullscreen)              (ParoleProviderPlayer *player,
                                                  gboolean fullscreen);
                              
-    void     (*open_media_chooser)              (ParoleProviderPlayer *player);
+    void         (*open_media_chooser)          (ParoleProviderPlayer *player);
+    
+    GtkAction*   (*get_action)                  (ParoleProviderPlayer *player,
+                                                 ParolePlayerAction action);
                              
     /*< signals >*/
     void     (*tag_message)                     (ParoleProviderPlayer *player,
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 191f190..91c5f82 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -223,6 +223,11 @@ static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer *provi
     g_object_unref (list);
 }
 
+static GtkAction* parole_plugin_player_get_action (ParoleProviderPlayer *provider, ParolePlayerAction action)
+{
+    return parole_player_get_action (action);
+}
+
 static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer *provider)
 {
     ParolePluginPlayer *player;
@@ -261,6 +266,7 @@ static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
     iface->seek = parole_plugin_player_seek;
     iface->get_stream_position = parole_plugin_player_get_stream_position;
     iface->open_media_chooser = parole_plugin_player_open_media_chooser;
+    iface->get_action = parole_plugin_player_get_action;
     iface->get_fullscreen = parole_plugin_player_get_fullscreen;
     iface->set_fullscreen = parole_plugin_player_set_fullscreen;
 }