[MPlayer-cvslog] r33133 - in trunk: Makefile gui/app.h gui/bitmap.c gui/bitmap.h gui/skin/cut.c gui/skin/cut.h gui/skin/font.c gui/skin/font.h gui/skin/skin.c gui/skin/skin.h gui/util gui/util/bitmap.c gui/util/bit...

[ib]

Author: ib
Date: Mon Mar 28 14:37:48 2011
New Revision: 33133

Log:
Move files with auxiliary functions to own directory.

Added:
   trunk/gui/util/
   trunk/gui/util/bitmap.c
      - copied unchanged from r33113, trunk/gui/bitmap.c
   trunk/gui/util/bitmap.h
      - copied unchanged from r33113, trunk/gui/bitmap.h
   trunk/gui/util/cut.c
      - copied unchanged from r33113, trunk/gui/skin/cut.c
   trunk/gui/util/cut.h
      - copied unchanged from r33113, trunk/gui/skin/cut.h
Deleted:
   trunk/gui/bitmap.c
   trunk/gui/bitmap.h
   trunk/gui/skin/cut.c
   trunk/gui/skin/cut.h
Modified:
   trunk/Makefile
   trunk/gui/app.h
   trunk/gui/skin/font.c
   trunk/gui/skin/font.h
   trunk/gui/skin/skin.c
   trunk/gui/skin/skin.h
   trunk/gui/win32/skinload.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/Makefile	Mon Mar 28 14:37:48 2011	(r33133)
@@ -517,7 +517,7 @@ SRCS_MPLAYER-$(GL_SDL)       += libvo/sd
 SRCS_MPLAYER-$(GL_WIN32)     += libvo/w32_common.c
 SRCS_MPLAYER-$(GL_X11)       += libvo/x11_common.c
 SRCS_MPLAYER-$(MATRIXVIEW)   += libvo/vo_matrixview.c libvo/matrixview.c
-SRCS_MPLAYER-$(GUI)          += gui/bitmap.c
+SRCS_MPLAYER-$(GUI)          += gui/util/bitmap.c
 SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
                                 gui/cfg.c \
                                 gui/interface.c \
@@ -538,9 +538,9 @@ SRCS_MPLAYER-$(GUI_GTK)      += gui/app.
                                 gui/mplayer/gtk/opts.c \
                                 gui/mplayer/gtk/pl.c \
                                 gui/mplayer/gtk/sb.c \
-                                gui/skin/cut.c \
                                 gui/skin/font.c \
                                 gui/skin/skin.c \
+                                gui/util/cut.c \
                                 gui/wm/ws.c \
                                 gui/wm/wsxdnd.c \
 

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/app.h	Mon Mar 28 14:37:48 2011	(r33133)
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_GUI_APP_H
 #define MPLAYER_GUI_APP_H
 
-#include "bitmap.h"
+#include "util/bitmap.h"
 #include "wm/ws.h"
 
 // User events

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/skin/font.c	Mon Mar 28 14:37:48 2011	(r33133)
@@ -22,8 +22,8 @@
 #include <string.h>
 
 #include "font.h"
-#include "cut.h"
 #include "gui/interface.h"
+#include "gui/util/cut.h"
 #include "skin.h"
 
 #include "libavutil/avstring.h"

Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/skin/font.h	Mon Mar 28 14:37:48 2011	(r33133)
@@ -20,7 +20,7 @@
 #define MPLAYER_GUI_FONT_H
 
 #include "gui/app.h"
-#include "gui/bitmap.h"
+#include "gui/util/bitmap.h"
 
 #define ASCII_CHRS 128   // number of ASCII characters
 #define EXTRA_CHRS 128   // (arbitrary) number of non-ASCII characters

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/skin/skin.c	Mon Mar 28 14:37:48 2011	(r33133)
@@ -20,11 +20,11 @@
 #include <string.h>
 
 #include "skin.h"
-#include "cut.h"
 #include "font.h"
 #include "gui/app.h"
 #include "gui/interface.h"
 #include "gui/mplayer/widgets.h"
+#include "gui/util/cut.h"
 
 #include "config.h"
 #include "help_mp.h"

Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/skin/skin.h	Mon Mar 28 14:37:48 2011	(r33133)
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_GUI_SKIN_H
 #define MPLAYER_GUI_SKIN_H
 
-#include "gui/bitmap.h"
+#include "gui/util/bitmap.h"
 
 int skinBPRead(char *fname, txSample *bf);
 int skinRead(char *dname);

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Sun Mar 27 23:25:58 2011	(r33132)
+++ trunk/gui/win32/skinload.c	Mon Mar 28 14:37:48 2011	(r33133)
@@ -31,7 +31,7 @@
 #include "libswscale/swscale.h"
 #include "libavutil/imgutils.h"
 #include "gui.h"
-#include "gui/bitmap.h"
+#include "gui/util/bitmap.h"
 
 #define MAX_LINESIZE 256