[MPlayer-cvslog] r30573 - in trunk: Makefile gui/mplayer/gtk/gtk_menu.c gui/mplayer/gtk/gtk_menu.h gui/mplayer/gtk/menu.c gui/mplayer/gtk/menu.h gui/mplayer/menu.c gui/mplayer/widgets.c

[diego]

Author: diego
Date: Sun Feb 14 13:55:02 2010
New Revision: 30573

Log:
Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].
This avoids confusion with headers of the same name in other places.

Added:
   trunk/gui/mplayer/gtk/gtk_menu.c
      - copied, changed from r30571, trunk/gui/mplayer/gtk/menu.c
   trunk/gui/mplayer/gtk/gtk_menu.h
      - copied unchanged from r30571, trunk/gui/mplayer/gtk/menu.h
Deleted:
   trunk/gui/mplayer/gtk/menu.c
   trunk/gui/mplayer/gtk/menu.h
Modified:
   trunk/Makefile
   trunk/gui/mplayer/menu.c
   trunk/gui/mplayer/widgets.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Feb 14 13:39:58 2010	(r30572)
+++ trunk/Makefile	Sun Feb 14 13:55:02 2010	(r30573)
@@ -572,9 +572,9 @@ SRCS_MPLAYER-$(GUI_GTK)      += gui/app.
                                 gui/mplayer/gtk/eq.c \
                                 gui/mplayer/gtk/fs.c \
                                 gui/mplayer/gtk/gtk_common.c \
+                                gui/mplayer/gtk/gtk_menu.c \
                                 gui/mplayer/gtk/gtk_url.c \
                                 gui/mplayer/gtk/mb.c \
-                                gui/mplayer/gtk/menu.c \
                                 gui/mplayer/gtk/opts.c \
                                 gui/mplayer/gtk/pl.c \
                                 gui/mplayer/gtk/sb.c \

Copied and modified: trunk/gui/mplayer/gtk/gtk_menu.c (from r30571, trunk/gui/mplayer/gtk/menu.c)
==============================================================================
--- trunk/gui/mplayer/gtk/menu.c	Sun Feb 14 13:31:24 2010	(r30571, copy source)
+++ trunk/gui/mplayer/gtk/gtk_menu.c	Sun Feb 14 13:55:02 2010	(r30573)
@@ -25,7 +25,7 @@
 #include "access_mpcontext.h"
 #include "mixer.h"
 
-#include "menu.h"
+#include "gtk_menu.h"
 #include "gui/mplayer/widgets.h"
 #include "gui/mplayer/gmplayer.h"
 #include "gui/app.h"

Modified: trunk/gui/mplayer/menu.c
==============================================================================
--- trunk/gui/mplayer/menu.c	Sun Feb 14 13:39:58 2010	(r30572)
+++ trunk/gui/mplayer/menu.c	Sun Feb 14 13:55:02 2010	(r30573)
@@ -151,7 +151,7 @@ void mplMenuInit( void )
  if ( ( mplMenuDrawBuffer = calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL )
   {
 #ifdef DEBUG
-    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu.h] %s",MSGTR_NEMFMR );
+    mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR );
 #endif
    gtkMessageBox( GTK_MB_FATAL,MSGTR_NEMFMR );
    return;
@@ -164,7 +164,7 @@ void mplMenuInit( void )
  wsSetShape( &appMPlayer.menuWindow,appMPlayer.menuBase.Mask.Image );
 
 #ifdef DEBUG
-  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu.h] menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID );
+  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"menu: 0x%x\n",(int)appMPlayer.menuWindow.WindowID );
 #endif
 
  mplMenuIsInitialized=1;

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	Sun Feb 14 13:39:58 2010	(r30572)
+++ trunk/gui/mplayer/widgets.c	Sun Feb 14 13:55:02 2010	(r30573)
@@ -41,7 +41,6 @@
 #include "gui/wm/ws.h"
 
 
-#include "gtk/menu.h"
 #include "play.h"
 #include "gtk/fs.h"
 
@@ -60,7 +59,7 @@ int gtkInitialized = 0;
 #include "gtk/mb.h"
 #include "gtk/about.h"
 #include "gtk/opts.h"
-#include "gtk/menu.h"
+#include "gtk/gtk_menu.h"
 #include "gtk/gtk_url.h"
 #include "gtk/eq.h"