Mercurial > mplayer.hg
changeset 33749:d8f49edf8f25
Remove skin related variables from interface.[ch].
Move them to skin.[ch] instead.
| author | ib |
|---|---|
| date | Thu, 07 Jul 2011 14:20:35 +0000 |
| parents | 5860cfaff0a4 |
| children | 8b5898908212 |
| files | gui/interface.c gui/interface.h gui/skin/skin.c gui/skin/skin.h gui/ui/gtk/skinbrowser.c |
| diffstat | 5 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Thu Jul 07 14:13:17 2011 +0000 +++ b/gui/interface.c Thu Jul 07 14:20:35 2011 +0000 @@ -60,9 +60,6 @@ .Balance = 50.0f }; -char *skinDirInHome; -char *skinMPlayerDir; - char *fsHistory[fsPersistant_MaxPos] = { NULL, NULL, NULL, NULL, NULL }; static int initialized;
--- a/gui/interface.h Thu Jul 07 14:13:17 2011 +0000 +++ b/gui/interface.h Thu Jul 07 14:20:35 2011 +0000 @@ -176,9 +176,6 @@ extern guiInterface_t guiInfo; -extern char *skinDirInHome; -extern char *skinMPlayerDir; - extern char *fsHistory[fsPersistant_MaxPos]; /* MPlayer -> GUI */
--- a/gui/skin/skin.c Thu Jul 07 14:13:17 2011 +0000 +++ b/gui/skin/skin.c Thu Jul 07 14:20:35 2011 +0000 @@ -38,6 +38,9 @@ int (*func)(char *in); } _item; +char *skinDirInHome; +char *skinMPlayerDir; + static guiItems *skin; static int linenumber;
--- a/gui/skin/skin.h Thu Jul 07 14:13:17 2011 +0000 +++ b/gui/skin/skin.h Thu Jul 07 14:20:35 2011 +0000 @@ -21,6 +21,9 @@ #include "gui/util/bitmap.h" +extern char *skinDirInHome; +extern char *skinMPlayerDir; + int skinBPRead(char *fname, guiImage *bf); int skinRead(char *dname);
--- a/gui/ui/gtk/skinbrowser.c Thu Jul 07 14:13:17 2011 +0000 +++ b/gui/ui/gtk/skinbrowser.c Thu Jul 07 14:20:35 2011 +0000 @@ -28,7 +28,8 @@ #include "tools.h" #include "gui/app.h" -#include "gui/interface.h" +#include "gui/cfg.h" +#include "gui/skin/skin.h" #include "help_mp.h" #include "gui/ui/widgets.h"