[MPlayer-cvslog] r36148 - in trunk: gui/dialog/dialog.c gui/interface.h mplayer.c

[ib]

Author: ib
Date: Thu Apr  4 13:50:37 2013
New Revision: 36148

Log:
Cosmetic: Rename GMPlayer definition gmplayer.

Additionally, add doxygen comment.

Modified:
   trunk/gui/dialog/dialog.c
   trunk/gui/interface.h
   trunk/mplayer.c

Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c	Thu Apr  4 13:47:39 2013	(r36147)
+++ trunk/gui/dialog/dialog.c	Thu Apr  4 13:50:37 2013	(r36148)
@@ -122,7 +122,7 @@ void gtkInit(char *display_name)
 
     mp_msg(MSGT_GPLAYER, MSGL_V, "GTK init.\n");
 
-    arg[argc++] = GMPlayer;
+    arg[argc++] = gmplayer;
 
     if (display_name) {             // MPlayer option '-display' was given
         arg[argc++] = "--display";  // Pass corresponding command line arguments to GTK,

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Apr  4 13:47:39 2013	(r36147)
+++ trunk/gui/interface.h	Thu Apr  4 13:50:37 2013	(r36148)
@@ -34,7 +34,8 @@
 extern int use_gui;             // this is defined in mplayer.c
 // ------------------------------------------------------------
 
-#define GMPlayer "gmplayer"
+/// Name of the GUI binary
+#define gmplayer "gmplayer"
 
 /// gui() instructions
 enum {

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Thu Apr  4 13:47:39 2013	(r36147)
+++ trunk/mplayer.c	Thu Apr  4 13:50:37 2013	(r36148)
@@ -2789,7 +2789,7 @@ int main(int argc, char *argv[])
     if (argc > 1 && argv[1] &&
         (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) {
         use_gui = !strcmp(argv[1], "-gui");
-    } else if (argv[0] && strstr(mp_basename(argv[0]), GMPlayer)) {
+    } else if (argv[0] && strstr(mp_basename(argv[0]), gmplayer)) {
         use_gui = 1;
     }