Mercurial > mplayer.hg

changeset 35528:ab07b17fddfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rebuild GUI directory structure. Rename ui/gmplayer.h ui/ui.h.
author ib
date Thu, 06 Dec 2012 14:59:06 +0000
parents b89f8ab15c5e
children 8ad4d2fb46e8
files gui/dialog/fileselect.c gui/dialog/menu.c gui/dialog/preferences.c gui/dialog/url.c gui/interface.c gui/ui/actions.c gui/ui/gmplayer.h gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/ui/ui.h gui/ui/video.c gui/win32/gui.c gui/win32/interface.c gui/win32/preferences.c gui/win32/wincfg.c
diffstat 16 files changed, 67 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/fileselect.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/dialog/fileselect.c	Thu Dec 06 14:59:06 2012 +0000
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 
 #include "pixmaps/up.xpm"
 #include "pixmaps/dir.xpm"
--- a/gui/dialog/menu.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/dialog/menu.c	Thu Dec 06 14:59:06 2012 +0000
@@ -28,7 +28,7 @@
 
 #include "menu.h"
 #include "gui/ui/widgets.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
--- a/gui/dialog/preferences.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/dialog/preferences.c	Thu Dec 06 14:59:06 2012 +0000
@@ -43,7 +43,7 @@
 #include "gui/app/cfg.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"
--- a/gui/dialog/url.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/dialog/url.c	Thu Dec 06 14:59:06 2012 +0000
@@ -30,7 +30,7 @@
 #include "tools.h"
 #include "gui/interface.h"
 #include "gui/app/app.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"
--- a/gui/interface.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/interface.c	Thu Dec 06 14:59:06 2012 +0000
@@ -25,7 +25,7 @@
 #include "app/app.h"
 #include "app/gui.h"
 #include "skin/skin.h"
-#include "ui/gmplayer.h"
+#include "ui/ui.h"
 #include "ui/widgets.h"
 #include "util/list.h"
 #include "util/mem.h"
--- a/gui/ui/actions.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/ui/actions.c	Thu Dec 06 14:59:06 2012 +0000
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "actions.h"
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
--- a/gui/ui/gmplayer.h	Thu Dec 06 14:32:33 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_GUI_GMPLAYER_H
-#define MPLAYER_GUI_GMPLAYER_H
-
-extern int             uiVideoRender;
-extern int             uiMainRender;
-
-extern unsigned char * mainDrawBuffer;
-extern unsigned char * menuDrawBuffer;
-extern int             mainVisible;
-
-extern int             uiMainAutoPlay;
-extern int             uiPlaybarFade;
-
-extern int             sx, sy;
-
-void uiInit( void * disp );
-
-void uiMainDraw( void );
-void uiEventHandling( int msg, float param );
-void uiMainMouseHandle( int Button, int X, int Y, int RX, int RY );
-void uiMainKeyHandle( int KeyCode, int Type, int Key );
-void uiDandDHandler(int num, char** files);
-
-void uiVideoDraw( void );
-void uiVideoMouseHandle( int Button, int X, int Y, int RX, int RY );
-
-void uiMenuInit( void );
-void uiHideMenu( int mx, int my, int w );
-void uiShowMenu( int mx, int my );
-void uiMenuMouseHandle( int RX, int RY );
-
-void uiPlaybarInit( void );
-void uiPlaybarShow( int y );
-
-#endif /* MPLAYER_GUI_GMPLAYER_H */
--- a/gui/ui/main.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/ui/main.c	Thu Dec 06 14:59:06 2012 +0000
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
--- a/gui/ui/menu.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/ui/menu.c	Thu Dec 06 14:59:06 2012 +0000
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
-#include "gmplayer.h"
+#include "ui.h"
 
 #include "widgets.h"
 
--- a/gui/ui/playbar.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/ui/playbar.c	Thu Dec 06 14:59:06 2012 +0000
@@ -45,7 +45,7 @@
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
 
-#include "gmplayer.h"
+#include "ui.h"
 #include "actions.h"
 #include "widgets.h"
 #include "render.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gui/ui/ui.h	Thu Dec 06 14:59:06 2012 +0000
@@ -0,0 +1,53 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_GUI_UI_H
+#define MPLAYER_GUI_UI_H
+
+extern int             uiVideoRender;
+extern int             uiMainRender;
+
+extern unsigned char * mainDrawBuffer;
+extern unsigned char * menuDrawBuffer;
+extern int             mainVisible;
+
+extern int             uiMainAutoPlay;
+extern int             uiPlaybarFade;
+
+extern int             sx, sy;
+
+void uiInit( void * disp );
+
+void uiMainDraw( void );
+void uiEventHandling( int msg, float param );
+void uiMainMouseHandle( int Button, int X, int Y, int RX, int RY );
+void uiMainKeyHandle( int KeyCode, int Type, int Key );
+void uiDandDHandler(int num, char** files);
+
+void uiVideoDraw( void );
+void uiVideoMouseHandle( int Button, int X, int Y, int RX, int RY );
+
+void uiMenuInit( void );
+void uiHideMenu( int mx, int my, int w );
+void uiShowMenu( int mx, int my );
+void uiMenuMouseHandle( int RX, int RY );
+
+void uiPlaybarInit( void );
+void uiPlaybarShow( int y );
+
+#endif /* MPLAYER_GUI_UI_H */
--- a/gui/ui/video.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/ui/video.c	Thu Dec 06 14:59:06 2012 +0000
@@ -24,7 +24,7 @@
 #include "help_mp.h"
 #include "mp_core.h"
 
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
--- a/gui/win32/gui.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/win32/gui.c	Thu Dec 06 14:59:06 2012 +0000
@@ -43,7 +43,7 @@
 #include "libmpcodecs/vd.h"
 #include "gui/interface.h"
 #include "gui/ui/actions.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/util/mem.h"
 #include "gui.h"
 #include "dialogs.h"
--- a/gui/win32/interface.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/win32/interface.c	Thu Dec 06 14:59:06 2012 +0000
@@ -62,7 +62,7 @@
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/dec_audio.h"
 #include "gui/ui/actions.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/util/mem.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"
--- a/gui/win32/preferences.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/win32/preferences.c	Thu Dec 06 14:59:06 2012 +0000
@@ -32,7 +32,7 @@
 #include "osdep/priority.h"
 #include "mixer.h"
 #include "gui/util/list.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/interface.h"
 #include "gui.h"
 #include "mp_msg.h"
--- a/gui/win32/wincfg.c	Thu Dec 06 14:32:33 2012 +0000
+++ b/gui/win32/wincfg.c	Thu Dec 06 14:59:06 2012 +0000
@@ -34,7 +34,7 @@
 #include "libvo/video_out.h"
 #include "osdep/priority.h"
 #include "mixer.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/interface.h"
 #include "gui.h"