wmusic: Update documentation and help text

wmusic/README

@@ -1,41 +1,37 @@
 wmusic
 by Hadess <hadess@hadess.net>
-maintained by John <john+wmusic@jtan.com>
+previously maintained by John <john+wmusic@jtan.com>
+now maintained by the Window Maker Team <wmaker-dev@googlegroups.com>
+https://dockapps.net/wmusic
 
-wmusic is a dockapp that remote-controls xmms. Here is a list of the features:
+wmusic is a dockapp that remote-controls MPRIS-compatible media players. Here
+is a list of the features:
 
 - VCR style controls including fast rewind and fast forward
 - Time and Playlist position display
 - Super stylee rotating arrow
-- Hiding of the xmms windows (on startup and through middle-click)
 
 - AfterStep users, add this line to your ~/GNUstep/Library/AfterStep/wharf:
 	*Wharf wmusic - Swallow "wmusic" wmusic -w &
 - Sawfish users, grab Tiger-T's DockMill theme, and apply it to the running
   dockapp with the -w flag on. See the theme's README for more details.
+  (http://sawmill.sourceforge.net/themes.org/current/DockMill.tar.gz)
 - KDE users can use the "Dock Application Bar" to dock wmusic, don't forget
   the -w flag to launch wmusic. Right-Click on Kicker, then pick:
   Add->Extension->Dock Application Bar
 
-http://home.jtan.com/~john/index.shtml?software.shtml
-
 Building
 --------
 
 Requirements:
-	- xmms >= 1.0.0 and all the appropriate devel packages (glib,
+	- libdockapp (https://www.dockapps.net/libdockapp)
-gtk+, xmms, glibc...)
+	- playerctl (https://github.com/acrisci/playerctl)
-	- xmms > 1.2.4 if you have problems with the prefs window popping up
+	- an MPRIS-compatible media player (most of them)
 
 Simply type:
     ./configure
     make
-    make install
+    sudo make install
-
-URLs
-----
-XMMS: http://xmms.org
-DockMill: http://tigert.gimp.org/files/sawmill-themes/DockMill.tar.gz
 
 Copyright
 ---------

wmusic/src/wmusic.c

@@ -117,17 +117,19 @@ static DAActionRect volumeRects[] = {
 };
 
 static DAProgramOption options[] = {
-	{"-c", "--command", "Command to launch xmms", DOString, False,
+	{"-c", "--command", "Command to launch the media player", DOString,
-		{&xmms_cmd} },
+	 False,	{&xmms_cmd} },
 	{"-d", "--display", "Display to use", DOString, False, {&displayName} },
-	{"-r", "--run", "Run xmms on startup", DONone, False, {NULL} },
+	{"-r", "--run", "Run the media player on startup", DONone, False,
+	 {NULL} },
 	{"-V", "--volume", "Stepping of the wheel volume control (in percent)",
 		DONatural, False, {&volume_step} },
 	{"-a", "--rotate-arrow", "Do not rotate the arrow, when paused",
 		DONone, False, {NULL} },
 	{"-l", "--time-left", "Show time left instead of time remaining by default",
 	 DONone, False, {NULL} },
-	{"-R", "--run-excusive", "Run xmms on startup, exit when xmms exits", DONone, False, {NULL} }
+	{"-R", "--run-excusive", "Run media player on startup, "
+	 "exit when it exits", DONone, False, {NULL} }
 };
 
 typedef struct
@@ -739,7 +741,10 @@ int main(int argc, char **argv)
 	/* Initialization */
 	DAParseArguments(argc, argv, options,
 		sizeof(options)/sizeof(DAProgramOption),
-		"XMMS remote control by Bastien Nocera <hadess@hadess.net>",
+		"MPRIS-compatible media player remote control\n"
+			 "by Bastien Nocera <hadess@hadess.net>\n"
+			 "maintained by the Window Maker Team "
+			 "<wmaker-dev@googlegroups.com>",
 		PACKAGE_STRING);
 
 	setlocale(LC_ALL, "");