[MPlayer-cvslog] r33660 - in trunk: Makefile gui/ui/gtk/about.c gui/ui/gtk/eq.c gui/ui/gtk/eq.h gui/ui/gtk/equalizer.c gui/ui/gtk/equalizer.h gui/ui/gtk/fileselect.c gui/ui/gtk/fileselect.h gui/ui/gtk/fs.c gui/ui/g...
ib
subversion at mplayerhq.hu
Sun Jun 19 17:34:08 CEST 2011
Author: ib
Date: Sun Jun 19 17:34:08 2011
New Revision: 33660
Log:
Rename some gtk files.
The new names better reflect what the files implement.
List of changes:
eq.* -> equalizer.*
fs.* -> fileselect.*
gtk_common.* -> tools.*
gtk_menu.* -> menu.*
gtk_url.* -> url.*
mb.* -> msgbox.*
opts.* -> preferences.*
pl.* -> playlist.*
sb.* -> skinbrowser.*
Added:
trunk/gui/ui/gtk/equalizer.c
- copied, changed from r33658, trunk/gui/ui/gtk/eq.c
trunk/gui/ui/gtk/equalizer.h
- copied, changed from r33658, trunk/gui/ui/gtk/eq.h
trunk/gui/ui/gtk/fileselect.c
- copied, changed from r33658, trunk/gui/ui/gtk/fs.c
trunk/gui/ui/gtk/fileselect.h
- copied, changed from r33658, trunk/gui/ui/gtk/fs.h
trunk/gui/ui/gtk/menu.c
- copied, changed from r33658, trunk/gui/ui/gtk/gtk_menu.c
trunk/gui/ui/gtk/menu.h
- copied unchanged from r33658, trunk/gui/ui/gtk/gtk_menu.h
trunk/gui/ui/gtk/msgbox.c
- copied, changed from r33658, trunk/gui/ui/gtk/mb.c
trunk/gui/ui/gtk/msgbox.h
- copied, changed from r33658, trunk/gui/ui/gtk/mb.h
trunk/gui/ui/gtk/playlist.c
- copied, changed from r33658, trunk/gui/ui/gtk/pl.c
trunk/gui/ui/gtk/playlist.h
- copied, changed from r33658, trunk/gui/ui/gtk/pl.h
trunk/gui/ui/gtk/preferences.c
- copied, changed from r33658, trunk/gui/ui/gtk/opts.c
trunk/gui/ui/gtk/preferences.h
- copied, changed from r33658, trunk/gui/ui/gtk/opts.h
trunk/gui/ui/gtk/skinbrowser.c
- copied, changed from r33658, trunk/gui/ui/gtk/sb.c
trunk/gui/ui/gtk/skinbrowser.h
- copied, changed from r33658, trunk/gui/ui/gtk/sb.h
trunk/gui/ui/gtk/tools.c
- copied, changed from r33658, trunk/gui/ui/gtk/gtk_common.c
trunk/gui/ui/gtk/tools.h
- copied, changed from r33658, trunk/gui/ui/gtk/gtk_common.h
trunk/gui/ui/gtk/url.c
- copied, changed from r33658, trunk/gui/ui/gtk/gtk_url.c
trunk/gui/ui/gtk/url.h
- copied, changed from r33658, trunk/gui/ui/gtk/gtk_url.h
Deleted:
trunk/gui/ui/gtk/eq.c
trunk/gui/ui/gtk/eq.h
trunk/gui/ui/gtk/fs.c
trunk/gui/ui/gtk/fs.h
trunk/gui/ui/gtk/gtk_common.c
trunk/gui/ui/gtk/gtk_common.h
trunk/gui/ui/gtk/gtk_menu.c
trunk/gui/ui/gtk/gtk_menu.h
trunk/gui/ui/gtk/gtk_url.c
trunk/gui/ui/gtk/gtk_url.h
trunk/gui/ui/gtk/mb.c
trunk/gui/ui/gtk/mb.h
trunk/gui/ui/gtk/opts.c
trunk/gui/ui/gtk/opts.h
trunk/gui/ui/gtk/pl.c
trunk/gui/ui/gtk/pl.h
trunk/gui/ui/gtk/sb.c
trunk/gui/ui/gtk/sb.h
Modified:
trunk/Makefile
trunk/gui/ui/gtk/about.c
trunk/gui/ui/widgets.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sun Jun 19 15:58:45 2011 (r33659)
+++ trunk/Makefile Sun Jun 19 17:34:08 2011 (r33660)
@@ -525,15 +525,15 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app.
gui/skin/skin.c \
gui/ui/actions.c \
gui/ui/gtk/about.c \
- gui/ui/gtk/eq.c \
- gui/ui/gtk/fs.c \
- gui/ui/gtk/gtk_common.c \
- gui/ui/gtk/gtk_menu.c \
- gui/ui/gtk/gtk_url.c \
- gui/ui/gtk/mb.c \
- gui/ui/gtk/opts.c \
- gui/ui/gtk/pl.c \
- gui/ui/gtk/sb.c \
+ gui/ui/gtk/equalizer.c \
+ gui/ui/gtk/fileselect.c \
+ gui/ui/gtk/menu.c \
+ gui/ui/gtk/msgbox.c \
+ gui/ui/gtk/playlist.c \
+ gui/ui/gtk/preferences.c \
+ gui/ui/gtk/skinbrowser.c \
+ gui/ui/gtk/tools.c \
+ gui/ui/gtk/url.c \
gui/ui/main.c \
gui/ui/menu.c \
gui/ui/playbar.c \
Modified: trunk/gui/ui/gtk/about.c
==============================================================================
--- trunk/gui/ui/gtk/about.c Sun Jun 19 15:58:45 2011 (r33659)
+++ trunk/gui/ui/gtk/about.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -23,7 +23,7 @@
#include "gui/ui/pixmaps/emblem.xpm"
#include "gui/ui/widgets.h"
#include "about.h"
-#include "gtk_common.h"
+#include "tools.h"
GtkWidget * About = NULL;
Copied and modified: trunk/gui/ui/gtk/equalizer.c (from r33658, trunk/gui/ui/gtk/eq.c)
==============================================================================
--- trunk/gui/ui/gtk/eq.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/equalizer.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -38,8 +38,8 @@
#include "libmpcodecs/dec_video.h"
#include "gui/ui/widgets.h"
-#include "eq.h"
-#include "gtk_common.h"
+#include "equalizer.h"
+#include "tools.h"
#define eqRange 15
Copied and modified: trunk/gui/ui/gtk/equalizer.h (from r33658, trunk/gui/ui/gtk/eq.h)
==============================================================================
--- trunk/gui/ui/gtk/eq.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/equalizer.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_EQ_H
-#define MPLAYER_GUI_EQ_H
+#ifndef MPLAYER_GUI_EQUALIZER_H
+#define MPLAYER_GUI_EQUALIZER_H
#include <gtk/gtk.h>
@@ -26,4 +26,4 @@ extern GtkWidget * Equalizer;
GtkWidget * create_Equalizer( void );
void ShowEqualizer( void );
-#endif /* MPLAYER_GUI_EQ_H */
+#endif /* MPLAYER_GUI_EQUALIZER_H */
Copied and modified: trunk/gui/ui/gtk/fileselect.c (from r33658, trunk/gui/ui/gtk/fs.c)
==============================================================================
--- trunk/gui/ui/gtk/fs.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/fileselect.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -37,9 +37,9 @@
#include "stream/stream.h"
#include "gui/ui/widgets.h"
-#include "fs.h"
-#include "opts.h"
-#include "gtk_common.h"
+#include "fileselect.h"
+#include "preferences.h"
+#include "tools.h"
#ifndef __linux__
#define get_current_dir_name() getcwd(NULL, PATH_MAX)
Copied and modified: trunk/gui/ui/gtk/fileselect.h (from r33658, trunk/gui/ui/gtk/fs.h)
==============================================================================
--- trunk/gui/ui/gtk/fs.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/fileselect.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_FS_H
-#define MPLAYER_GUI_FS_H
+#ifndef MPLAYER_GUI_FILESELECT_H
+#define MPLAYER_GUI_FILESELECT_H
#include <gtk/gtk.h>
@@ -36,4 +36,4 @@ void ShowFileSelect( int type, int modal
GtkWidget * create_FileSelect( void );
-#endif /* MPLAYER_GUI_FS_H */
+#endif /* MPLAYER_GUI_FILESELECT_H */
Copied and modified: trunk/gui/ui/gtk/menu.c (from r33658, trunk/gui/ui/gtk/gtk_menu.c)
==============================================================================
--- trunk/gui/ui/gtk/gtk_menu.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/menu.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -26,7 +26,7 @@
#include "mixer.h"
#include "mpcommon.h"
-#include "gtk_menu.h"
+#include "menu.h"
#include "gui/ui/widgets.h"
#include "gui/ui/gmplayer.h"
#include "gui/app.h"
Copied and modified: trunk/gui/ui/gtk/msgbox.c (from r33658, trunk/gui/ui/gtk/mb.c)
==============================================================================
--- trunk/gui/ui/gtk/mb.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/msgbox.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -24,8 +24,8 @@
#include "gui/ui/pixmaps/warning.xpm"
#include "gui/ui/widgets.h"
-#include "mb.h"
-#include "gtk_common.h"
+#include "msgbox.h"
+#include "tools.h"
GtkWidget * gtkMessageBoxText;
GtkWidget * MessageBox = NULL;
Copied and modified: trunk/gui/ui/gtk/msgbox.h (from r33658, trunk/gui/ui/gtk/mb.h)
==============================================================================
--- trunk/gui/ui/gtk/mb.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/msgbox.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_MB_H
-#define MPLAYER_GUI_MB_H
+#ifndef MPLAYER_GUI_MSGBOX_H
+#define MPLAYER_GUI_MSGBOX_H
#include <gtk/gtk.h>
@@ -26,4 +26,4 @@ extern GtkWidget * MessageBox;
GtkWidget * create_MessageBox( int type );
void ShowMessageBox( const char * msg );
-#endif /* MPLAYER_GUI_MB_H */
+#endif /* MPLAYER_GUI_MSGBOX_H */
Copied and modified: trunk/gui/ui/gtk/playlist.c (from r33658, trunk/gui/ui/gtk/pl.c)
==============================================================================
--- trunk/gui/ui/gtk/pl.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/playlist.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -33,8 +33,8 @@
#include "gui/interface.h"
#include "gui/ui/widgets.h"
-#include "pl.h"
-#include "gtk_common.h"
+#include "playlist.h"
+#include "tools.h"
static char * book_open_xpm[] = {
"16 16 4 1",
Copied and modified: trunk/gui/ui/gtk/playlist.h (from r33658, trunk/gui/ui/gtk/pl.h)
==============================================================================
--- trunk/gui/ui/gtk/pl.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/playlist.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_PL_H
-#define MPLAYER_GUI_PL_H
+#ifndef MPLAYER_GUI_PLAYLIST_H
+#define MPLAYER_GUI_PLAYLIST_H
#include <gtk/gtk.h>
@@ -26,4 +26,4 @@ void HidePlayList( void );
GtkWidget * create_PlayList (void);
-#endif /* MPLAYER_GUI_PL_H */
+#endif /* MPLAYER_GUI_PLAYLIST_H */
Copied and modified: trunk/gui/ui/gtk/preferences.c (from r33658, trunk/gui/ui/gtk/opts.c)
==============================================================================
--- trunk/gui/ui/gtk/opts.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/preferences.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -44,9 +44,9 @@
#include "gui/interface.h"
#include "gui/ui/gmplayer.h"
#include "gui/ui/widgets.h"
-#include "opts.h"
-#include "fs.h"
-#include "gtk_common.h"
+#include "preferences.h"
+#include "fileselect.h"
+#include "tools.h"
// for mpcodecs_[av]d_drivers:
#include "libmpcodecs/vd.h"
Copied and modified: trunk/gui/ui/gtk/preferences.h (from r33658, trunk/gui/ui/gtk/opts.h)
==============================================================================
--- trunk/gui/ui/gtk/opts.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/preferences.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_OPTS_H
-#define MPLAYER_GUI_OPTS_H
+#ifndef MPLAYER_GUI_PREFERENCES_H
+#define MPLAYER_GUI_PREFERENCES_H
#include <gtk/gtk.h>
@@ -30,4 +30,4 @@ GtkWidget * create_AudioConfig( void );
void ShowPreferences( void );
-#endif /* MPLAYER_GUI_OPTS_H */
+#endif /* MPLAYER_GUI_PREFERENCES_H */
Copied and modified: trunk/gui/ui/gtk/skinbrowser.c (from r33658, trunk/gui/ui/gtk/sb.c)
==============================================================================
--- trunk/gui/ui/gtk/sb.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/skinbrowser.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -24,8 +24,8 @@
#include <stdio.h>
#include "config.h"
-#include "sb.h"
-#include "gtk_common.h"
+#include "skinbrowser.h"
+#include "tools.h"
#include "gui/app.h"
#include "help_mp.h"
Copied and modified: trunk/gui/ui/gtk/skinbrowser.h (from r33658, trunk/gui/ui/gtk/sb.h)
==============================================================================
--- trunk/gui/ui/gtk/sb.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/skinbrowser.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_SB_H
-#define MPLAYER_GUI_SB_H
+#ifndef MPLAYER_GUI_SKINBROWSER_H
+#define MPLAYER_GUI_SKINBROWSER_H
#include <gtk/gtk.h>
@@ -27,4 +27,4 @@ extern GtkWidget * SkinBrowser;
void ShowSkinBrowser( void );
GtkWidget * create_SkinBrowser( void );
-#endif /* MPLAYER_GUI_SB_H */
+#endif /* MPLAYER_GUI_SKINBROWSER_H */
Copied and modified: trunk/gui/ui/gtk/tools.c (from r33658, trunk/gui/ui/gtk/gtk_common.c)
==============================================================================
--- trunk/gui/ui/gtk/gtk_common.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/tools.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -19,7 +19,7 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gtk_common.h"
+#include "tools.h"
void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer )
{
Copied and modified: trunk/gui/ui/gtk/tools.h (from r33658, trunk/gui/ui/gtk/gtk_common.h)
==============================================================================
--- trunk/gui/ui/gtk/gtk_common.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/tools.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_GTK_COMMON_H
-#define MPLAYER_GUI_GTK_COMMON_H
+#ifndef MPLAYER_GUI_TOOLS_H
+#define MPLAYER_GUI_TOOLS_H
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
@@ -38,4 +38,4 @@ GtkWidget * AddVScaler( GtkAdjustment *
GtkWidget * AddComboBox( GtkWidget * parent );
void WidgetDestroy( GtkWidget * widget, GtkWidget ** widget_pointer );
-#endif /* MPLAYER_GUI_GTK_COMMON_H */
+#endif /* MPLAYER_GUI_TOOLS_H */
Copied and modified: trunk/gui/ui/gtk/url.c (from r33658, trunk/gui/ui/gtk/gtk_url.c)
==============================================================================
--- trunk/gui/ui/gtk/gtk_url.c Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/url.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -26,8 +26,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gtk_url.h"
-#include "gtk_common.h"
+#include "url.h"
+#include "tools.h"
#include "gui/interface.h"
#include "gui/app.h"
#include "gui/ui/gmplayer.h"
Copied and modified: trunk/gui/ui/gtk/url.h (from r33658, trunk/gui/ui/gtk/gtk_url.h)
==============================================================================
--- trunk/gui/ui/gtk/gtk_url.h Sun Jun 19 15:01:20 2011 (r33658, copy source)
+++ trunk/gui/ui/gtk/url.h Sun Jun 19 17:34:08 2011 (r33660)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_GTK_URL_H
-#define MPLAYER_GUI_GTK_URL_H
+#ifndef MPLAYER_GUI_URL_H
+#define MPLAYER_GUI_URL_H
#include <gtk/gtk.h>
@@ -27,4 +27,4 @@ extern int gtkVURLDialogBox;
void ShowURLDialogBox( void );
GtkWidget * create_URL( void );
-#endif /* MPLAYER_GUI_GTK_URL_H */
+#endif /* MPLAYER_GUI_URL_H */
Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c Sun Jun 19 15:58:45 2011 (r33659)
+++ trunk/gui/ui/widgets.c Sun Jun 19 17:34:08 2011 (r33660)
@@ -44,7 +44,7 @@
#include "gui/wm/ws.h"
#include "actions.h"
-#include "gtk/fs.h"
+#include "gtk/fileselect.h"
GtkWidget *PopUpMenu = NULL;
@@ -55,15 +55,14 @@ int gtkPopupMenu = 0;
int gtkPopupMenuParam = 0;
int gtkInitialized = 0;
-#include "gtk/sb.h"
-#include "gtk/pl.h"
-#include "gtk/fs.h"
-#include "gtk/mb.h"
+#include "gtk/skinbrowser.h"
+#include "gtk/playlist.h"
+#include "gtk/msgbox.h"
#include "gtk/about.h"
-#include "gtk/opts.h"
-#include "gtk/gtk_menu.h"
-#include "gtk/gtk_url.h"
-#include "gtk/eq.h"
+#include "gtk/preferences.h"
+#include "gtk/menu.h"
+#include "gtk/url.h"
+#include "gtk/equalizer.h"
#include "pixmaps/mplayer.xpm"
More information about the MPlayer-cvslog
mailing list