changeset 36054:1562f350e8d2

Cosmetic: Rename GMPlayer definition gmplayer. Additionally, add doxygen comment.
author ib
date Thu, 04 Apr 2013 11:50:37 +0000
parents 7affacef2f88
children 4489eafbe0a9
files gui/dialog/dialog.c gui/interface.h mplayer.c
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/dialog.c	Thu Apr 04 11:47:39 2013 +0000
+++ b/gui/dialog/dialog.c	Thu Apr 04 11:50:37 2013 +0000
@@ -122,7 +122,7 @@
 
     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,
--- a/gui/interface.h	Thu Apr 04 11:47:39 2013 +0000
+++ b/gui/interface.h	Thu Apr 04 11:50:37 2013 +0000
@@ -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 {
--- a/mplayer.c	Thu Apr 04 11:47:39 2013 +0000
+++ b/mplayer.c	Thu Apr 04 11:50:37 2013 +0000
@@ -2789,7 +2789,7 @@
     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;
     }