Author: ib Date: Mon Apr 1 01:09:34 2013 New Revision: 36126 Log: Cosmetic: Rearrange #includes. Modified: trunk/gui/app/cfg.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/url.c trunk/gui/interface.c trunk/gui/interface.h trunk/gui/skin/font.c trunk/gui/skin/skin.c trunk/gui/ui/actions.c trunk/gui/ui/render.c trunk/gui/util/bitmap.c trunk/gui/util/string.c trunk/gui/wm/ws.c Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/app/cfg.c Mon Apr 1 01:09:34 2013 (r36126) @@ -28,11 +28,6 @@ #include "config.h" #include "help_mp.h" -#include "libavutil/common.h" -#include "libmpcodecs/vd.h" -#include "libmpdemux/demuxer.h" -#include "libvo/video_out.h" -#include "libvo/x11_common.h" #include "mixer.h" #include "mp_core.h" #include "mp_msg.h" @@ -40,6 +35,11 @@ #include "mplayer.h" #include "parser-cfg.h" #include "path.h" +#include "libavutil/common.h" +#include "libmpcodecs/vd.h" +#include "libmpdemux/demuxer.h" +#include "libvo/video_out.h" +#include "libvo/x11_common.h" #include "stream/stream.h" #include "sub/ass_mp.h" #include "sub/font_load.h" Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/dialog/fileselect.c Mon Apr 1 01:09:34 2013 (r36126) @@ -20,8 +20,8 @@ #include <stdlib.h> #include <string.h> #include <strings.h> -#include <sys/stat.h> #include <unistd.h> +#include <sys/stat.h> #include "fileselect.h" #include "dialog.h" @@ -30,10 +30,10 @@ #include "pixmaps/dir.xpm" #include "pixmaps/file.xpm" #include "pixmaps/up.xpm" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/cfg.h" #include "gui/app/gui.h" -#include "gui/interface.h" #include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/mem.h" @@ -44,8 +44,8 @@ #include "config.h" #include "help_mp.h" -#include "libavutil/common.h" #include "mpcommon.h" +#include "libavutil/common.h" #include "stream/stream.h" #ifdef __linux__ Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/dialog/url.c Mon Apr 1 01:09:34 2013 (r36126) @@ -23,8 +23,8 @@ #include "url.h" #include "dialog.h" #include "tools.h" -#include "gui/app/app.h" #include "gui/interface.h" +#include "gui/app/app.h" #include "gui/ui/actions.h" #include "gui/util/list.h" #include "gui/util/string.h" Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/interface.c Mon Apr 1 01:09:34 2013 (r36126) @@ -38,6 +38,11 @@ #include "codec-cfg.h" #include "config.h" #include "help_mp.h" +#include "mixer.h" +#include "mp_msg.h" +#include "mpcommon.h" +#include "mplayer.h" +#include "path.h" #include "input/input.h" #include "libaf/equalizer.h" #include "libavutil/common.h" @@ -47,11 +52,6 @@ #include "libmpcodecs/vf.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "mixer.h" -#include "mp_msg.h" -#include "mpcommon.h" -#include "mplayer.h" -#include "path.h" #ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" #endif Modified: trunk/gui/interface.h ============================================================================== --- trunk/gui/interface.h Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/interface.h Mon Apr 1 01:09:34 2013 (r36126) @@ -19,11 +19,11 @@ #ifndef MPLAYER_GUI_INTERFACE_H #define MPLAYER_GUI_INTERFACE_H -#include "libaf/af.h" -#include "libmpdemux/stheader.h" #include "m_config.h" #include "mp_core.h" #include "playtree.h" +#include "libaf/af.h" +#include "libmpdemux/stheader.h" #include "stream/stream.h" // These are in support of the non-GUI files that interact with Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/skin/font.c Mon Apr 1 01:09:34 2013 (r36126) @@ -32,8 +32,8 @@ #include "gui/util/mem.h" #include "gui/util/string.h" -#include "libavutil/avstring.h" #include "mp_msg.h" +#include "libavutil/avstring.h" #define MAX_FONTS 25 Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/skin/skin.c Mon Apr 1 01:09:34 2013 (r36126) @@ -26,17 +26,17 @@ #include "skin.h" #include "font.h" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/gui.h" #include "gui/dialog/dialog.h" -#include "gui/interface.h" #include "gui/util/cut.h" #include "gui/util/string.h" #include "help_mp.h" +#include "mp_msg.h" #include "libavutil/avstring.h" #include "libavutil/common.h" -#include "mp_msg.h" typedef struct { const char *name; Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/ui/actions.c Mon Apr 1 01:09:34 2013 (r36126) @@ -26,11 +26,11 @@ #include "actions.h" #include "ui.h" +#include "gui/interface.h" #include "gui/app/app.h" #include "gui/app/cfg.h" #include "gui/app/gui.h" #include "gui/dialog/dialog.h" -#include "gui/interface.h" #include "gui/skin/skin.h" #include "gui/util/list.h" #include "gui/util/mem.h" @@ -41,18 +41,18 @@ #include "access_mpcontext.h" #include "config.h" #include "help_mp.h" -#include "input/input.h" -#include "libmpcodecs/vd.h" -#include "libmpdemux/demuxer.h" -#include "libvo/video_out.h" -#include "libvo/wskeys.h" -#include "libvo/x11_common.h" #include "m_property.h" #include "mixer.h" #include "mp_core.h" #include "mp_msg.h" #include "mpcommon.h" #include "mplayer.h" +#include "input/input.h" +#include "libmpcodecs/vd.h" +#include "libmpdemux/demuxer.h" +#include "libvo/video_out.h" +#include "libvo/wskeys.h" +#include "libvo/x11_common.h" #include "osdep/timer.h" #include "stream/stream.h" #include "sub/sub.h" Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/ui/render.c Mon Apr 1 01:09:34 2013 (r36126) @@ -27,8 +27,8 @@ #include "gui/util/string.h" #include "access_mpcontext.h" -#include "libavutil/avstring.h" #include "mixer.h" +#include "libavutil/avstring.h" #include "osdep/timer.h" #include "stream/stream.h" Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/util/bitmap.c Mon Apr 1 01:09:34 2013 (r36126) @@ -30,11 +30,11 @@ #include "gui/app/gui.h" #include "help_mp.h" +#include "mp_msg.h" #include "libavcodec/avcodec.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libvo/fastmemcpy.h" -#include "mp_msg.h" /** * @brief Check whether a (PNG) file exists. Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/util/string.c Mon Apr 1 01:09:34 2013 (r36126) @@ -25,8 +25,8 @@ #include <string.h> #include "string.h" -#include "gui/app/gui.h" #include "gui/interface.h" +#include "gui/app/gui.h" #include "config.h" #include "help_mp.h" Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Mon Apr 1 00:45:25 2013 (r36125) +++ trunk/gui/wm/ws.c Mon Apr 1 01:09:34 2013 (r36126) @@ -31,15 +31,15 @@ #include "config.h" #include "help_mp.h" +#include "mp_core.h" +#include "mp_msg.h" +#include "mpbswap.h" +#include "mplayer.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" #include "libswscale/swscale.h" #include "libvo/video_out.h" #include "libvo/x11_common.h" -#include "mpbswap.h" -#include "mplayer.h" -#include "mp_core.h" -#include "mp_msg.h" #include "osdep/timer.h" #ifdef HAVE_SHM