[Xfce4-commits] <parole:bluesabre/gtk3> Make cli more friendly, remove deprecated stop item

Sean Davis noreply at xfce.org
Sun Sep 22 14:44:01 CEST 2013


Updating branch refs/heads/bluesabre/gtk3
         to ab8c02b34a0064dd36308ef8e282c717a12e35ec (commit)
       from 4f8e3ca6f9b55823e3fcca8f8241b87de4694c21 (commit)

commit ab8c02b34a0064dd36308ef8e282c717a12e35ec
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun Sep 22 08:42:27 2013 -0400

    Make cli more friendly, remove deprecated stop item

 data/desktop/desktop.sh           |    6 +++---
 data/desktop/parole.desktop.in.in |    4 ++--
 src/main.c                        |   27 +++++++++++----------------
 src/org.parole.media.player.xml   |    3 ---
 src/parole-player.c               |   10 ----------
 5 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/data/desktop/desktop.sh b/data/desktop/desktop.sh
index 8ccc56a..eea5f53 100755
--- a/data/desktop/desktop.sh
+++ b/data/desktop/desktop.sh
@@ -21,14 +21,14 @@ echo "Icon=media-playback-start-symbolic"
 echo "OnlyShowIn=Unity;"
 echo ""
 echo "[Desktop Action Previous]"
-echo "Exec=parole --previous-track"
+echo "Exec=parole --previous"
 echo "_Name=Previous Track"
 echo "Icon=media-skip-backward-symbolic"
 echo "OnlyShowIn=Unity;"
 echo ""
 echo "[Desktop Action Next]"
-echo "Exec=parole --next-track"
+echo "Exec=parole --next"
 echo "_Name=Next Track"
 echo "Icon=media-skip-forward-symbolic"
 echo "OnlyShowIn=Unity;"
-echo ""
\ No newline at end of file
+echo ""
diff --git a/data/desktop/parole.desktop.in.in b/data/desktop/parole.desktop.in.in
index d0bd629..9fba268 100644
--- a/data/desktop/parole.desktop.in.in
+++ b/data/desktop/parole.desktop.in.in
@@ -17,13 +17,13 @@ Icon=media-playback-start-symbolic
 OnlyShowIn=Unity;
 
 [Desktop Action Previous]
-Exec=parole --previous-track
+Exec=parole --previous
 _Name=Previous Track
 Icon=media-skip-backward-symbolic
 OnlyShowIn=Unity;
 
 [Desktop Action Next]
-Exec=parole --next-track
+Exec=parole --next
 _Name=Next Track
 Icon=media-skip-forward-symbolic
 OnlyShowIn=Unity;
diff --git a/src/main.c b/src/main.c
index b2abf32..5af6ffb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -257,7 +257,6 @@ int main (int argc, char **argv)
     gboolean new_instance = FALSE;
     gboolean version = FALSE;
     gboolean play = FALSE;
-    gboolean stop = FALSE;
     gboolean next_track = FALSE;
     gboolean prev_track = FALSE;
     gboolean raise_volume = FALSE;
@@ -275,20 +274,19 @@ int main (int argc, char **argv)
     {
     { "new-instance", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &new_instance, N_("Open a new instance"), NULL },
     { "no-plugins", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_plugins, N_("Do not load plugins"), NULL },
-    { "device", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &device, N_("Set Audio-CD/VCD/DVD device path"), NULL },
+    { "device", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &device, N_("Set Audio-CD/VCD/DVD device path"), NULL },
+    { "xv", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xv_option_given, N_("Enable/Disable XV support (true or false, default=true)"), NULL},
+    { "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded, N_("Start in embedded mode"), NULL },
+    { "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL },
     { "play", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &play, N_("Play or pause if already playing"), NULL },
-    { "stop", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &stop, N_("Stop playing"), NULL },
-    { "next-track", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &next_track, N_("Next track"), NULL },
-    { "previous-track", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &prev_track, N_("Previous track"), NULL },
-    { "raise-volume", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &raise_volume, N_("Raise volume"), NULL },
-    { "lower-volume", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &lower_volume, N_("Lower volume"), NULL },
+    { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &next_track, N_("Next track"), NULL },
+    { "previous", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &prev_track, N_("Previous track"), NULL },
+    { "volume-up", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &raise_volume, N_("Raise volume"), NULL },
+    { "volume-down", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &lower_volume, N_("Lower volume"), NULL },
     { "mute", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &mute, N_("Mute volume"), NULL },
     { "unmute", 'u', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &unmute, N_("Unmute (restore) volume"), NULL },
-    { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
-    { "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded, N_("Start in embedded mode"), NULL },
-    { "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL },
-    { "xv", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xv_option_given, N_("Enable/Disable XV support (true or false)"), NULL},
     { "add", 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &enqueue, N_("Add files to playlist"), NULL},
+    { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
     { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
     {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, N_("Media to play"), NULL},
         { NULL, },
@@ -313,7 +311,7 @@ int main (int argc, char **argv)
     
     gtk_init (&argc, &argv);
     
-    ctx = g_option_context_new (NULL);
+    ctx = g_option_context_new (_("[FILES...] - Play movies and songs"));
     
     gst_option_group = gst_init_get_option_group ();
     g_option_context_add_main_entries (ctx, option_entries, GETTEXT_PACKAGE);
@@ -338,7 +336,7 @@ int main (int argc, char **argv)
     /* Check for cli options if there is an instance of Parole already */
     if ( !new_instance && parole_dbus_name_has_owner (PAROLE_DBUS_NAME) )
     {
-        if (!enqueue && !play && !stop && !next_track && !prev_track && 
+        if (!enqueue && !play && !next_track && !prev_track && 
             !raise_volume && !lower_volume && !mute && !unmute)
             g_print (_("Parole is already running, use -i to open a new instance\n"));
         
@@ -350,9 +348,6 @@ int main (int argc, char **argv)
         if ( play )
             parole_send_message ("Play");
             
-        if ( stop )
-            parole_send_message ("Stop");
-            
         if ( next_track )
             parole_send_message ("NextTrack");
         
diff --git a/src/org.parole.media.player.xml b/src/org.parole.media.player.xml
index d53987f..b8342e9 100644
--- a/src/org.parole.media.player.xml
+++ b/src/org.parole.media.player.xml
@@ -10,9 +10,6 @@
     <method name="Play">
     </method>
 
-    <method name="Stop">
-    </method>
-
     <method name="NextTrack">
     </method>
 
diff --git a/src/parole-player.c b/src/parole-player.c
index cabf6f9..e588c7d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3532,9 +3532,6 @@ void parole_player_terminate (ParolePlayer *player)
 static gboolean     parole_player_dbus_play             (ParolePlayer *player, 
                                                          GError *error);
 
-static gboolean     parole_player_dbus_stop             (ParolePlayer *player, 
-                                                         GError *error);
-
 static gboolean     parole_player_dbus_next_track       (ParolePlayer *player,
                                                          GError *error);
 
@@ -3585,13 +3582,6 @@ static gboolean parole_player_dbus_play (ParolePlayer *player,
     return TRUE;
 }
 
-static gboolean parole_player_dbus_stop (ParolePlayer *player,
-                                         GError *error)
-{
-    parole_gst_stop (PAROLE_GST (player->priv->gst));
-    return TRUE;
-}
-
 static gboolean parole_player_dbus_next_track (ParolePlayer *player,
                                                GError *error)
 {


More information about the Xfce4-commits mailing list