From b19414f3bf0ae28461ef6d5048e9626e69d45319 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 29 Oct 2013 22:38:29 +0100 Subject: Split mplayer.c mplayer.c was a bit too big. Split it into multiple files. I hope the way it's split makes sense. Maybe some things don't make too much sense, or go against intuition. These will fixed as soon as I notice them. Some files are a bit questionable (misc.c, osd.c, configfiles.c), and suggestions how to organize this better are welcome. Regressions are possible due to reorganized include statements. Obviously I didn't just copy mplayer.c's orgy of include statements, but recreated them for each file. It's easily possible that there are oversights and mistakes, which will show up on other platforms. There is one actual change: the public avutil.h include is removed from encode.h, and I tried to replace most FFMIN/FFMAX/av_clip uses. I consider using libavutil too much as dangerous, because the set of include files they recursively pull in is rather arbitrary and is different between FFmpeg and Libav. --- mpvcore/player/mplayer.c | 5079 ---------------------------------------------- 1 file changed, 5079 deletions(-) delete mode 100644 mpvcore/player/mplayer.c (limited to 'mpvcore/player/mplayer.c') diff --git a/mpvcore/player/mplayer.c b/mpvcore/player/mplayer.c deleted file mode 100644 index b92b38e050..0000000000 --- a/mpvcore/player/mplayer.c +++ /dev/null @@ -1,5079 +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. - */ - -#include -#include -#include -#include -#include -#include - -#ifdef PTW32_STATIC_LIB -#include -#endif - -#include -#include -#include -#include - -#include - -#include "config.h" -#include "talloc.h" - -#include "osdep/io.h" - -#if defined(__MINGW32__) || defined(__CYGWIN__) -#include -#endif -#define WAKEUP_PERIOD 0.5 -#include -#include - -// #include -#include -#ifndef __MINGW32__ -#include -#include -#endif - -#include -#include - -#include -#include -#include -#include - -#include - -#include "mpvcore/mpv_global.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/av_log.h" - - -#include "mpvcore/m_option.h" -#include "mpvcore/m_config.h" -#include "mpvcore/resolve.h" -#include "mpvcore/m_property.h" - -#include "sub/find_subfiles.h" -#include "sub/dec_sub.h" -#include "sub/sd.h" - -#include "mp_osd.h" -#include "video/out/vo.h" -#include "screenshot.h" - -#include "sub/sub.h" -#include "mpvcore/cpudetect.h" - -#ifdef CONFIG_X11 -#include "video/out/x11_common.h" -#endif - -#ifdef CONFIG_COCOA -#include "osdep/macosx_application.h" -#endif - -#include "audio/out/ao.h" - -#include "mpvcore/codecs.h" - -#include "osdep/getch2.h" -#include "osdep/timer.h" - -#include "mpvcore/input/input.h" -#include "mpvcore/encode.h" - -#include "osdep/priority.h" - -#include "stream/tv.h" -#include "stream/stream_radio.h" -#ifdef CONFIG_DVBIN -#include "stream/dvbin.h" -#endif - -//**************************************************************************// -// Playtree -//**************************************************************************// -#include "mpvcore/playlist.h" -#include "mpvcore/playlist_parser.h" - -//**************************************************************************// -// Config -//**************************************************************************// -#include "mpvcore/parser-cfg.h" -#include "mpvcore/parser-mpcmd.h" - -//**************************************************************************// -// Config file -//**************************************************************************// - -#include "mpvcore/path.h" - -//**************************************************************************// -//**************************************************************************// -// Input media streaming & demultiplexer: -//**************************************************************************// - -#include "stream/stream.h" -#include "demux/demux.h" -#include "demux/stheader.h" - -#include "audio/filter/af.h" -#include "audio/decode/dec_audio.h" -#include "video/decode/dec_video.h" -#include "video/mp_image.h" -#include "video/filter/vf.h" -#include "video/decode/vd.h" - -#include "audio/mixer.h" - -#include "mp_core.h" -#include "mpvcore/options.h" - -#include "mp_lua.h" - -const char mp_help_text[] = _( -"Usage: mpv [options] [url|path/]filename\n" -"\n" -"Basic options:\n" -" --start=