From 4873b32c5959c988af1769529ff72e3fd62fba82 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Nov 2012 01:06:43 +0100 Subject: Rename directories, move files (step 2 of 2) Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.) --- .gitignore | 14 +- DOCS/tech-overview.txt | 40 +-- Makefile | 602 ++++++++++++++++++++--------------------- audio/decode/ad.c | 4 +- audio/decode/ad.h | 4 +- audio/decode/ad_dvdpcm.c | 2 +- audio/decode/ad_internal.h | 8 +- audio/decode/ad_lavc.c | 8 +- audio/decode/ad_pcm.c | 4 +- audio/decode/ad_spdif.c | 2 +- audio/decode/dec_audio.c | 14 +- audio/decode/dec_audio.h | 2 +- audio/filter/af.h | 7 +- audio/filter/af_bs2b.c | 2 +- audio/filter/af_export.c | 2 +- audio/filter/af_format.c | 2 +- audio/filter/af_lavcac3enc.c | 2 +- audio/filter/af_scaletempo.c | 2 +- audio/format.c | 2 +- audio/format.h | 2 +- audio/mixer.c | 6 +- audio/mixer.h | 3 - audio/out/ao.c | 4 +- audio/out/ao.h | 2 +- audio/out/ao_alsa.c | 10 +- audio/out/ao_coreaudio.c | 8 +- audio/out/ao_dsound.c | 8 +- audio/out/ao_jack.c | 8 +- audio/out/ao_lavc.c | 15 +- audio/out/ao_null.c | 4 +- audio/out/ao_openal.c | 8 +- audio/out/ao_oss.c | 8 +- audio/out/ao_pcm.c | 10 +- audio/out/ao_portaudio.c | 8 +- audio/out/ao_pulse.c | 8 +- audio/out/ao_rsound.c | 6 +- audio/out/audio_out_internal.h | 2 +- audio/reorder_ch.c | 4 +- configure | 8 +- core/asxparser.c | 4 +- core/av_log.c | 2 +- core/bstr.c | 2 +- core/cfg-mplayer.h | 12 +- core/codec-cfg.c | 8 +- core/command.c | 31 ++- core/cpudetect.c | 6 +- core/cpudetect.h | 2 +- core/defaultopts.c | 4 +- core/encode_lavc.c | 8 +- core/encode_lavc.h | 2 +- core/input/appleir.c | 2 +- core/input/input.c | 16 +- core/input/input.h | 6 +- core/input/joystick.c | 2 +- core/input/lirc.c | 2 +- core/m_config.c | 4 +- core/m_config.h | 2 +- core/m_option.c | 10 +- core/m_option.h | 2 +- core/m_property.c | 6 +- core/m_struct.c | 6 +- core/m_struct.h | 2 +- core/mp_common.c | 2 +- core/mp_core.h | 6 +- core/mp_fifo.c | 2 +- core/mp_fifo.h | 2 +- core/mp_msg.c | 2 +- core/mp_msg.h | 2 +- core/mplayer.c | 74 ++--- core/mplayer.h | 2 +- core/parser-cfg.c | 4 +- core/parser-mpcmd.c | 4 +- core/path.c | 4 +- core/path.h | 2 +- core/playlist.c | 4 +- core/playlist.h | 2 +- core/playlist_parser.c | 6 +- core/quvi.c | 4 +- core/screenshot.c | 24 +- core/subopt-helper.c | 4 +- core/timeline/tl_cue.c | 12 +- core/timeline/tl_edl.c | 12 +- core/timeline/tl_matroska.c | 12 +- demux/asf.h | 2 +- demux/asfguid.h | 2 +- demux/asfheader.c | 4 +- demux/asfheader.h | 2 +- demux/aviheader.c | 4 +- demux/aviheader.h | 2 +- demux/aviprint.c | 2 +- demux/demux.c | 9 +- demux/demux.h | 4 +- demux/demux_asf.c | 6 +- demux/demux_avi.c | 4 +- demux/demux_cue.c | 4 +- demux/demux_edl.c | 2 +- demux/demux_gif.c | 7 +- demux/demux_lavf.c | 14 +- demux/demux_mf.c | 4 +- demux/demux_mkv.c | 8 +- demux/demux_mng.c | 6 +- demux/demux_mpg.c | 8 +- demux/demux_rawaudio.c | 6 +- demux/demux_rawvideo.c | 6 +- demux/demux_ts.c | 8 +- demux/ebml.c | 4 +- demux/ebml.h | 2 +- demux/extension.c | 4 +- demux/mf.c | 4 +- demux/mp3_hdr.c | 2 +- demux/mpeg_hdr.c | 2 +- demux/parse_es.c | 4 +- demux/parse_es.h | 2 +- demux/video.c | 4 +- osdep/cocoa_events.h | 2 +- osdep/cocoa_events.m | 2 +- osdep/getch2-win.c | 6 +- osdep/getch2.c | 6 +- osdep/macosx_finder_args.h | 2 +- osdep/macosx_finder_args.m | 2 +- osdep/priority.c | 2 +- osdep/shmem.c | 2 +- osdep/timer-darwin.c | 2 +- stream/ai_alsa1x.c | 2 +- stream/ai_oss.c | 2 +- stream/asf_mmst_streaming.c | 6 +- stream/asf_streaming.c | 10 +- stream/audio_in.c | 2 +- stream/cache2.c | 4 +- stream/cdinfo.c | 2 +- stream/cookies.c | 2 +- stream/dvb_tune.c | 2 +- stream/http.c | 4 +- stream/network.c | 9 +- stream/stream.c | 8 +- stream/stream.h | 4 +- stream/stream_bluray.c | 8 +- stream/stream_cdda.c | 10 +- stream/stream_cddb.c | 8 +- stream/stream_dvb.c | 8 +- stream/stream_dvd.c | 8 +- stream/stream_dvd.h | 2 +- stream/stream_dvd_common.c | 2 +- stream/stream_file.c | 6 +- stream/stream_ftp.c | 6 +- stream/stream_lavf.c | 8 +- stream/stream_mf.c | 2 +- stream/stream_netstream.c | 8 +- stream/stream_netstream.h | 4 +- stream/stream_pvr.c | 2 +- stream/stream_radio.c | 8 +- stream/stream_smb.c | 6 +- stream/stream_tv.c | 6 +- stream/stream_vcd.c | 8 +- stream/stream_vstream.c | 6 +- stream/tcp.c | 2 +- stream/tv.c | 10 +- stream/tv.h | 2 +- stream/tvi_bsdbt848.c | 6 +- stream/tvi_def.h | 2 +- stream/tvi_dummy.c | 2 +- stream/tvi_v4l2.c | 6 +- stream/udp.c | 2 +- stream/url.c | 2 +- stream/vcd_read.h | 2 +- stream/vcd_read_darwin.h | 4 +- stream/vcd_read_fbsd.h | 2 +- stream/vcd_read_win32.h | 2 +- sub/ass_mp.c | 6 +- sub/dec_sub.c | 4 +- sub/draw_bmp.c | 10 +- sub/find_sub.c | 7 +- sub/find_subfiles.c | 8 +- sub/img_convert.c | 7 +- sub/osd_libass.c | 4 +- sub/sd_ass.c | 8 +- sub/sd_lavc.c | 4 +- sub/spudec.c | 6 +- sub/sub.c | 9 +- sub/subassconvert.c | 4 +- sub/subreader.c | 6 +- sub/vobsub.c | 6 +- talloc.h | 2 +- video/decode/dec_video.c | 22 +- video/decode/dec_video.h | 2 +- video/decode/vd.c | 16 +- video/decode/vd.h | 6 +- video/decode/vd_lavc.c | 22 +- video/filter/pullup.c | 4 +- video/filter/vf.c | 12 +- video/filter/vf.h | 11 +- video/filter/vf_crop.c | 12 +- video/filter/vf_delogo.c | 14 +- video/filter/vf_divtc.c | 12 +- video/filter/vf_dlopen.c | 10 +- video/filter/vf_down3dright.c | 10 +- video/filter/vf_dsize.c | 6 +- video/filter/vf_eq2.c | 8 +- video/filter/vf_expand.c | 14 +- video/filter/vf_flip.c | 6 +- video/filter/vf_format.c | 10 +- video/filter/vf_gradfun.c | 14 +- video/filter/vf_hqdn3d.c | 6 +- video/filter/vf_ilpack.c | 8 +- video/filter/vf_mirror.c | 6 +- video/filter/vf_noformat.c | 10 +- video/filter/vf_noise.c | 10 +- video/filter/vf_phase.c | 8 +- video/filter/vf_pp.c | 8 +- video/filter/vf_pullup.c | 10 +- video/filter/vf_rotate.c | 6 +- video/filter/vf_scale.c | 22 +- video/filter/vf_screenshot.c | 12 +- video/filter/vf_softpulldown.c | 8 +- video/filter/vf_stereo3d.c | 14 +- video/filter/vf_sub.c | 16 +- video/filter/vf_swapuv.c | 6 +- video/filter/vf_unsharp.c | 10 +- video/filter/vf_vo.c | 8 +- video/filter/vf_yadif.c | 12 +- video/fmt-conversion.c | 4 +- video/image_writer.c | 15 +- video/img_format.c | 4 +- video/img_format.h | 2 +- video/mp_image.c | 8 +- video/mp_image.h | 4 +- video/out/aspect.c | 8 +- video/out/bitmap_packer.c | 6 +- video/out/cocoa_common.h | 2 +- video/out/cocoa_common.m | 12 +- video/out/geometry.c | 2 +- video/out/gl_common.c | 3 +- video/out/gl_common.h | 10 +- video/out/osx_common.c | 9 +- video/out/vo.c | 16 +- video/out/vo.h | 4 +- video/out/vo_caca.c | 14 +- video/out/vo_corevideo.m | 11 +- video/out/vo_direct3d.c | 18 +- video/out/vo_image.c | 21 +- video/out/vo_lavc.c | 16 +- video/out/vo_null.c | 8 +- video/out/vo_opengl.c | 18 +- video/out/vo_opengl_old.c | 12 +- video/out/vo_vdpau.c | 14 +- video/out/vo_x11.c | 12 +- video/out/vo_xv.c | 16 +- video/out/w32_common.c | 14 +- video/out/x11_common.c | 16 +- video/sws_utils.c | 10 +- 250 files changed, 1171 insertions(+), 1187 deletions(-) diff --git a/.gitignore b/.gitignore index 56bc6b1fa6..6fc7816d5c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,16 +10,16 @@ /mpv /mpv.app /version.h -/codecs.conf.h -/input/input_conf.h +/core/codecs.conf.h +/core/input/input_conf.h /tags /TAGS /locale /po -/libvo/vo_opengl_shaders.h -/libmpdemux/ebml_defs.c -/libmpdemux/ebml_types.h -/libvo/vdpau_template.c +/video/out/vo_opengl_shaders.h +/video/out/vdpau_template.c +/demux/ebml_defs.c +/demux/ebml_types.h /sub/osd_font.h -DOCS/man/*/mpv.1 +/DOCS/man/*/mpv.1 diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt index d407b92caa..0fb20e7e81 100644 --- a/DOCS/tech-overview.txt +++ b/DOCS/tech-overview.txt @@ -2,7 +2,7 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it is possibly or definitely outdated. This file intends to give a big picture of how mplayer/mpv is structured. -mplayer.c: +core/mplayer.c: This contains the main play loop, anything related to mplayer and playback related initializations. It also contains the main function. Generally, it accesses all other subsystems, initializes them, and pushes data between @@ -72,7 +72,7 @@ talloc.h & talloc.c: Documentation can be found here: http://git.samba.org/?p=samba.git;a=blob;f=lib/talloc/talloc.h;hb=HEAD -mp_core.h: +core/mp_core.h: Data structures for mplayer.c and command.c. They are usually not accessed by other parts of mplayer for the sake of modularization. @@ -83,7 +83,7 @@ mp_core.h: options.h contains the global option struct MPOpts, and its default values are in defaultopts.c for some reason. -input/input.c: +core/input/input.c: This translates keyboard input comming from libvo and other sources (such as remote control devices like Apple IR or slave mode commands) to the key bindings listed in the user's (or the builtin) input.conf and turns @@ -95,14 +95,14 @@ input/input.c: direction of slave mode communication, mplayer to application, consists of random mp_msg() calls all over the code in all parts of the player.) -command.c: +core/command.c: This contains the implementation for slave commands and properties. Properties are essentially dynamic variables changed by certain commands. This is basically responsible for all user commands, like initiating seeking, switching tracks, etc. It calls into mplayer.c, where most of the work is done, but also into other parts of mplayer. -mp_msg.h: +core/mp_msg.h: All terminal output should go though mp_msg(). stream/*: @@ -123,7 +123,7 @@ stream/*: cache2.c is a horrible little thing which provides a caching wrapper around stream implementations, needed for smooth network playback. -libmpdemux/: +demux/: Demuxers split data streams into audio/video/sub streams, which in turn yield packets. Packets (see demux_packet.h) are mostly byte chunks tagged with a playback time (PTS). These packets are passed to the decoders. @@ -133,29 +133,28 @@ libmpdemux/: There are some pseudo demuxers like demux_cue.c, which exist only to invoke other frontend code (tl_cue.c in this case). - The main interface is in demuxer.h. A demuxer provides a list of available + The main interface is in demux.h. A demuxer provides a list of available streams. Also, for each type of stream (video/audio/sub) there is a demux_stream. This contains the current packet stream coming from the demuxer as a linked list of demux_packets. -libmpcodecs/: +video/: This contains several things related to audio/video encoding, as well as video filters. mp_image.h and img_format.h define how mplayer stores video frames internally. +video/decode/: vd_*.c are video decoders. (There's only vd_ffmpeg.c left.) dec_video.c/vd.c handle most of connecting the frontend with the actual decoder. +video/filter/: vf_*.c and vf.c form the video filter chain. They are fed by the video decoder, and output the filtered images to the VOs though vf_vo.c. By default, no video filters (except vf_vo) are used. - ad_*.c and dec_audio.c/ad.c handle audio decoding. The audio filter chain is - separately in libaf. - -libvo/: +video/out/: Video output. They also create GUI windows and handle user input. In most cases, the windowing code is shared among VOs, like x11_common.c for X11 and w32_common.c for Windows. The VOs stand between frontend and windowing code. @@ -167,12 +166,17 @@ libvo/: vo_vdpau and vo_opengl should be taken as reference. -libaf/: - Audio filter chain. format.h/format.c define the audio formats. +audio/: + format.h/format.c define the audio formats. + +audio/decode/: + ad_*.c and dec_audio.c/ad.c handle audio decoding. + +audio/filter/: + Audio filter chain. -libao2/: - Audio outputs. (It was probably named libao2 because libao is already - another library unrelated to mplayer?) +audio/out/: + Audio outputs. Unlike VOs, AOs can't be reconfigured on a format change. Without --gapless-audio, even playing a new file will close and re-open the audio @@ -192,7 +196,7 @@ sub/: subtitle event from the demuxer and converting it to ass for display is different from loading a text subtitle and converting it to ass. -timeline/: +core/timeline/: A timeline is the abstraction used by mplayer.c to combine several files into one seemingly linear video. It's mainly used for ordered chapters playback. The high level code to find and load other files containing the diff --git a/Makefile b/Makefile index c8b82d8f95..4241bb4cbf 100644 --- a/Makefile +++ b/Makefile @@ -23,292 +23,294 @@ include config.mak ###### variable declarations ####### -SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa1x.c -SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c -SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) -SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ - stream/cdinfo.c -SRCS_COMMON-$(CDDB) += stream/stream_cddb.c -SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ - stream/stream_dvb.c -SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ - stream/stream_dvd_common.c - -SRCS_COMMON-$(FTP) += stream/stream_ftp.c -SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c -SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c -SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c -SRCS_COMMON-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c - -SRCS_COMMON-$(LIBBLURAY) += stream/stream_bluray.c -SRCS_COMMON-$(LIBBS2B) += libaf/af_bs2b.c - -SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c -SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c - -SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.m -SRCS_COMMON-$(COCOA) += libvo/osx_common.c \ - libvo/cocoa_common.m \ - osdep/cocoa_events.m -SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c -SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c - -SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c -SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c -SRCS_COMMON-$(NEED_SETENV) += osdep/setenv.c -SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c -SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c -SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c -SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \ - stream/asf_mmst_streaming.c \ - stream/asf_streaming.c \ - stream/cookies.c \ - stream/http.c \ - stream/network.c \ - stream/udp.c \ - stream/tcp.c \ - stream/stream_udp.c \ - -SRCS_COMMON-$(PRIORITY) += osdep/priority.c -SRCS_COMMON-$(PVR) += stream/stream_pvr.c -SRCS_COMMON-$(RADIO) += stream/stream_radio.c -SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c -SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c - -SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \ - stream/frequencies.c stream/tvi_dummy.c -SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c - -SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c -SRCS_COMMON-$(VCD) += stream/stream_vcd.c -SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c - -SRCS_COMMON-$(DUMMY_OSD) += sub/osd_dummy.c -SRCS_COMMON-$(LIBASS_OSD) += sub/osd_libass.c - -SRCS_COMMON = asxparser.c \ - av_log.c \ - av_opts.c \ - bstr.c \ - codec-cfg.c \ - cpudetect.c \ - defaultopts.c \ - fmt-conversion.c \ - m_config.c \ - m_option.c \ - m_struct.c \ - mp_msg.c \ - mpcommon.c \ - version.c \ - parser-cfg.c \ - path.c \ - playlist.c \ - playlist_parser.c \ - subopt-helper.c \ - talloc.c \ - libaf/af.c \ - libaf/af_center.c \ - libaf/af_channels.c \ - libaf/af_delay.c \ - libaf/af_dummy.c \ - libaf/af_equalizer.c \ - libaf/af_extrastereo.c \ - libaf/af_format.c \ - libaf/af_hrtf.c \ - libaf/af_karaoke.c \ - libaf/af_lavcac3enc.c \ - libaf/af_lavcresample.c \ - libaf/af_pan.c \ - libaf/af_resample.c \ - libaf/af_scaletempo.c \ - libaf/af_sinesuppress.c \ - libaf/af_sub.c \ - libaf/af_surround.c \ - libaf/af_sweep.c \ - libaf/af_tools.c \ - libaf/af_volnorm.c \ - libaf/af_volume.c \ - libaf/filter.c \ - libaf/format.c \ - libaf/reorder_ch.c \ - libaf/window.c \ - libmpcodecs/ad.c \ - libmpcodecs/ad_ffmpeg.c \ - libmpcodecs/ad_pcm.c \ - libmpcodecs/ad_dvdpcm.c \ - libmpcodecs/ad_spdif.c \ - libmpcodecs/dec_audio.c \ - libmpcodecs/dec_video.c \ - libmpcodecs/img_format.c \ - libmpcodecs/mp_image.c \ - libmpcodecs/pullup.c \ - libmpcodecs/sws_utils.c \ - libmpcodecs/vd.c \ - libmpcodecs/vd_ffmpeg.c \ - libmpcodecs/vf.c \ - libmpcodecs/vf_crop.c \ - libmpcodecs/vf_delogo.c \ - libmpcodecs/vf_divtc.c \ - libmpcodecs/vf_dlopen.c \ - libmpcodecs/vf_down3dright.c \ - libmpcodecs/vf_dsize.c \ - libmpcodecs/vf_eq2.c \ - libmpcodecs/vf_expand.c \ - libmpcodecs/vf_flip.c \ - libmpcodecs/vf_format.c \ - libmpcodecs/vf_gradfun.c \ - libmpcodecs/vf_hqdn3d.c \ - libmpcodecs/vf_ilpack.c \ - libmpcodecs/vf_mirror.c \ - libmpcodecs/vf_noformat.c \ - libmpcodecs/vf_noise.c \ - libmpcodecs/vf_phase.c \ - libmpcodecs/vf_pullup.c \ - libmpcodecs/vf_rotate.c \ - libmpcodecs/vf_scale.c \ - libmpcodecs/vf_screenshot.c \ - libmpcodecs/vf_softpulldown.c \ - libmpcodecs/vf_stereo3d.c \ - libmpcodecs/vf_sub.c \ - libmpcodecs/vf_swapuv.c \ - libmpcodecs/vf_unsharp.c \ - libmpcodecs/vf_vo.c \ - libmpcodecs/vf_yadif.c \ - libmpdemux/asfheader.c \ - libmpdemux/aviheader.c \ - libmpdemux/aviprint.c \ - libmpdemux/demuxer.c \ - libmpdemux/demux_asf.c \ - libmpdemux/demux_avi.c \ - libmpdemux/demux_edl.c \ - libmpdemux/demux_cue.c \ - libmpdemux/demux_lavf.c \ - libmpdemux/demux_mf.c \ - libmpdemux/demux_mkv.c \ - libmpdemux/demux_mpg.c \ - libmpdemux/demux_ts.c \ - libmpdemux/mp3_hdr.c \ - libmpdemux/parse_es.c \ - libmpdemux/mpeg_hdr.c \ - libmpdemux/demux_rawaudio.c \ - libmpdemux/demux_rawvideo.c \ - libmpdemux/ebml.c \ - libmpdemux/extension.c \ - libmpdemux/mf.c \ - libmpdemux/mp_taglists.c \ - libmpdemux/video.c \ - libvo/bitmap_packer.c \ - osdep/numcores.c \ - osdep/io.c \ - osdep/$(GETCH) \ - osdep/$(TIMER) \ - stream/stream.c \ - stream/stream_ffmpeg.c \ - stream/stream_file.c \ - stream/stream_mf.c \ - stream/stream_null.c \ - stream/url.c \ - sub/dec_sub.c \ - sub/find_sub.c \ - sub/find_subfiles.c \ - sub/sd_lavc.c \ - sub/spudec.c \ - sub/sub.c \ - sub/img_convert.c \ - sub/draw_bmp.c \ - sub/subassconvert.c \ - sub/subreader.c \ - sub/vobsub.c \ - timeline/tl_edl.c \ - timeline/tl_matroska.c \ - timeline/tl_cue.c \ - $(SRCS_COMMON-yes) - - -SRCS_MPLAYER-$(ALSA) += libao2/ao_alsa.c -SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c -SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c -SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c -SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c -SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m -SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c -SRCS_MPLAYER-$(DSOUND) += libao2/ao_dsound.c -SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_opengl.c \ - libvo/gl_osd.c libvo/vo_opengl_old.c pnm_loader.c -SRCS_MPLAYER-$(ENCODING) += libvo/vo_lavc.c libao2/ao_lavc.c encode_lavc.c -SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c -SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c - -SRCS_MPLAYER-$(JACK) += libao2/ao_jack.c -SRCS_MPLAYER-$(JOYSTICK) += input/joystick.c -SRCS_MPLAYER-$(LIBQUVI) += quvi.c -SRCS_MPLAYER-$(LIRC) += input/lirc.c -SRCS_MPLAYER-$(OPENAL) += libao2/ao_openal.c -SRCS_MPLAYER-$(OSS) += libao2/ao_oss.c -SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c -SRCS_MPLAYER-$(PORTAUDIO) += libao2/ao_portaudio.c -SRCS_MPLAYER-$(RSOUND) += libao2/ao_rsound.c -SRCS_MPLAYER-$(VDPAU) += libvo/vo_vdpau.c - -SRCS_MPLAYER-$(X11) += libvo/vo_x11.c libvo/x11_common.c -SRCS_MPLAYER-$(XV) += libvo/vo_xv.c - -SRCS_MPLAYER = command.c \ - m_property.c \ - mixer.c \ - mp_fifo.c \ - mplayer.c \ - parser-mpcmd.c \ - screenshot.c \ - image_writer.c \ - input/input.c \ - libao2/ao_null.c \ - libao2/ao_pcm.c \ - libao2/audio_out.c \ - libvo/aspect.c \ - libvo/csputils.c \ - libvo/filter_kernels.c \ - libvo/geometry.c \ - libvo/video_out.c \ - libvo/vo_null.c \ - libvo/vo_image.c \ - $(SRCS_MPLAYER-yes) - -COMMON_LIBS += $(COMMON_LIBS-yes) - -OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) -OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER))) -OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mpv-rc.o -OBJS_MPLAYER += $(OBJS_MPLAYER-yes) - -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) -DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON:.m=.d) $(SRCS_MPLAYER:.m=.d)))) - -ALL_PRG-$(MPLAYER) += mpv$(EXESUF) - -INSTALL_TARGETS-$(MPLAYER) += check_rst2man \ - install-mpv \ - install-mpv-man \ - install-mpv-msg - -INSTALL_NO_MAN_TARGETS-$(MPLAYER) += install-mpv \ - install-mpv-msg +SOURCES_AUDIO_INPUT-$(ALSA) += stream/ai_alsa1x.c +SOURCES_AUDIO_INPUT-$(OSS) += stream/ai_oss.c +SOURCES-$(AUDIO_INPUT) += $(SOURCES_AUDIO_INPUT-yes) +SOURCES-$(CDDA) += stream/stream_cdda.c \ + stream/cdinfo.c +SOURCES-$(CDDB) += stream/stream_cddb.c +SOURCES-$(DVBIN) += stream/dvb_tune.c \ + stream/stream_dvb.c +SOURCES-$(DVDREAD) += stream/stream_dvd.c \ + stream/stream_dvd_common.c + +SOURCES-$(FTP) += stream/stream_ftp.c +SOURCES-$(GIF) += demux/demux_gif.c +SOURCES-$(HAVE_SYS_MMAN_H) += audio/filter/af_export.c osdep/mmap_anon.c +SOURCES-$(LADSPA) += audio/filter/af_ladspa.c +SOURCES-$(LIBASS) += sub/ass_mp.c sub/sd_ass.c + +SOURCES-$(LIBBLURAY) += stream/stream_bluray.c +SOURCES-$(LIBBS2B) += audio/filter/af_bs2b.c + +SOURCES-$(LIBPOSTPROC) += video/filter/vf_pp.c +SOURCES-$(LIBSMBCLIENT) += stream/stream_smb.c + +SOURCES-$(MACOSX_FINDER) += osdep/macosx_finder_args.m +SOURCES-$(COCOA) += video/out/osx_common.c \ + video/out/cocoa_common.m \ + osdep/cocoa_events.m +SOURCES-$(MNG) += demux/demux_mng.c +SOURCES-$(MPG123) += audio/decode/ad_mpg123.c + +SOURCES-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c +SOURCES-$(NEED_GLOB) += osdep/glob-win.c +SOURCES-$(NEED_SETENV) += osdep/setenv.c +SOURCES-$(NEED_SHMEM) += osdep/shmem.c +SOURCES-$(NEED_STRSEP) += osdep/strsep.c +SOURCES-$(NEED_VSSCANF) += osdep/vsscanf.c +SOURCES-$(NETWORKING) += stream/stream_netstream.c \ + stream/asf_mmst_streaming.c \ + stream/asf_streaming.c \ + stream/cookies.c \ + stream/http.c \ + stream/network.c \ + stream/udp.c \ + stream/tcp.c \ + stream/stream_udp.c \ + +SOURCES-$(PRIORITY) += osdep/priority.c +SOURCES-$(PVR) += stream/stream_pvr.c +SOURCES-$(RADIO) += stream/stream_radio.c +SOURCES-$(RADIO_CAPTURE) += stream/audio_in.c +SOURCES-$(STREAM_CACHE) += stream/cache2.c + +SOURCES-$(TV) += stream/stream_tv.c stream/tv.c \ + stream/frequencies.c stream/tvi_dummy.c +SOURCES-$(TV_BSDBT848) += stream/tvi_bsdbt848.c + +SOURCES-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c +SOURCES-$(VCD) += stream/stream_vcd.c +SOURCES-$(VSTREAM) += stream/stream_vstream.c +SOURCES-$(DUMMY_OSD) += sub/osd_dummy.c +SOURCES-$(LIBASS_OSD) += sub/osd_libass.c + +SOURCES-$(ALSA) += audio/out/ao_alsa.c +SOURCES-$(APPLE_IR) += core/input/appleir.c +SOURCES-$(APPLE_REMOTE) += core/input/ar.c +SOURCES-$(CACA) += video/out/vo_caca.c +SOURCES-$(COREAUDIO) += audio/out/ao_coreaudio.c +SOURCES-$(COREVIDEO) += video/out/vo_corevideo.m +SOURCES-$(DIRECT3D) += video/out/vo_direct3d.c \ + video/out/w32_common.c +SOURCES-$(DSOUND) += audio/out/ao_dsound.c +SOURCES-$(GL) += video/out/gl_common.c video/out/gl_osd.c \ + video/out/vo_opengl.c \ + video/out/vo_opengl_old.c \ + video/out/pnm_loader.c + +SOURCES-$(ENCODING) += video/out/vo_lavc.c audio/out/ao_lavc.c \ + core/encode_lavc.c +SOURCES-$(GL_WIN32) += video/out/w32_common.c +SOURCES-$(GL_X11) += video/out/x11_common.c + +SOURCES-$(JACK) += audio/out/ao_jack.c +SOURCES-$(JOYSTICK) += core/input/joystick.c +SOURCES-$(LIBQUVI) += core/quvi.c +SOURCES-$(LIRC) += core/input/lirc.c +SOURCES-$(OPENAL) += audio/out/ao_openal.c +SOURCES-$(OSS) += audio/out/ao_oss.c +SOURCES-$(PULSE) += audio/out/ao_pulse.c +SOURCES-$(PORTAUDIO) += audio/out/ao_portaudio.c +SOURCES-$(RSOUND) += audio/out/ao_rsound.c +SOURCES-$(VDPAU) += video/out/vo_vdpau.c + +SOURCES-$(X11) += video/out/vo_x11.c video/out/x11_common.c +SOURCES-$(XV) += video/out/vo_xv.c + + +SOURCES = talloc.c \ + audio/format.c \ + audio/mixer.c \ + audio/reorder_ch.c \ + audio/decode/ad.c \ + audio/decode/ad_dvdpcm.c \ + audio/decode/ad_lavc.c \ + audio/decode/ad_pcm.c \ + audio/decode/ad_spdif.c \ + audio/decode/dec_audio.c \ + audio/filter/af.c \ + audio/filter/af_center.c \ + audio/filter/af_channels.c \ + audio/filter/af_delay.c \ + audio/filter/af_dummy.c \ + audio/filter/af_equalizer.c \ + audio/filter/af_extrastereo.c \ + audio/filter/af_format.c \ + audio/filter/af_hrtf.c \ + audio/filter/af_karaoke.c \ + audio/filter/af_lavcac3enc.c \ + audio/filter/af_lavcresample.c \ + audio/filter/af_pan.c \ + audio/filter/af_resample.c \ + audio/filter/af_scaletempo.c \ + audio/filter/af_sinesuppress.c \ + audio/filter/af_sub.c \ + audio/filter/af_surround.c \ + audio/filter/af_sweep.c \ + audio/filter/af_tools.c \ + audio/filter/af_volnorm.c \ + audio/filter/af_volume.c \ + audio/filter/filter.c \ + audio/filter/window.c \ + audio/out/ao.c \ + audio/out/ao_null.c \ + audio/out/ao_pcm.c \ + core/asxparser.c \ + core/av_log.c \ + core/av_opts.c \ + core/bstr.c \ + core/codec-cfg.c \ + core/command.c \ + core/cpudetect.c \ + core/defaultopts.c \ + core/m_config.c \ + core/m_option.c \ + core/m_property.c \ + core/m_struct.c \ + core/mp_common.c \ + core/mp_fifo.c \ + core/mp_msg.c \ + core/mplayer.c \ + core/parser-cfg.c \ + core/parser-mpcmd.c \ + core/path.c \ + core/playlist.c \ + core/playlist_parser.c \ + core/screenshot.c \ + core/subopt-helper.c \ + core/version.c \ + core/input/input.c \ + core/timeline/tl_edl.c \ + core/timeline/tl_matroska.c \ + core/timeline/tl_cue.c \ + demux/asfheader.c \ + demux/aviheader.c \ + demux/aviprint.c \ + demux/demux.c \ + demux/demux_asf.c \ + demux/demux_avi.c \ + demux/demux_edl.c \ + demux/demux_cue.c \ + demux/demux_lavf.c \ + demux/demux_mf.c \ + demux/demux_mkv.c \ + demux/demux_mpg.c \ + demux/demux_ts.c \ + demux/mp3_hdr.c \ + demux/parse_es.c \ + demux/mpeg_hdr.c \ + demux/demux_rawaudio.c \ + demux/demux_rawvideo.c \ + demux/ebml.c \ + demux/extension.c \ + demux/mf.c \ + demux/mp_taglists.c \ + demux/video.c \ + osdep/numcores.c \ + osdep/io.c \ + stream/stream.c \ + stream/stream_file.c \ + stream/stream_lavf.c \ + stream/stream_mf.c \ + stream/stream_null.c \ + stream/url.c \ + sub/dec_sub.c \ + sub/draw_bmp.c \ + sub/find_sub.c \ + sub/find_subfiles.c \ + sub/img_convert.c \ + sub/sd_lavc.c \ + sub/spudec.c \ + sub/sub.c \ + sub/subassconvert.c \ + sub/subreader.c \ + sub/vobsub.c \ + video/csputils.c \ + video/fmt-conversion.c \ + video/image_writer.c \ + video/img_format.c \ + video/mp_image.c \ + video/sws_utils.c \ + video/decode/dec_video.c \ + video/decode/vd.c \ + video/decode/vd_lavc.c \ + video/filter/vf.c \ + video/filter/pullup.c \ + video/filter/vf_crop.c \ + video/filter/vf_delogo.c \ + video/filter/vf_divtc.c \ + video/filter/vf_dlopen.c \ + video/filter/vf_down3dright.c \ + video/filter/vf_dsize.c \ + video/filter/vf_eq2.c \ + video/filter/vf_expand.c \ + video/filter/vf_flip.c \ + video/filter/vf_format.c \ + video/filter/vf_gradfun.c \ + video/filter/vf_hqdn3d.c \ + video/filter/vf_ilpack.c \ + video/filter/vf_mirror.c \ + video/filter/vf_noformat.c \ + video/filter/vf_noise.c \ + video/filter/vf_phase.c \ + video/filter/vf_pullup.c \ + video/filter/vf_rotate.c \ + video/filter/vf_scale.c \ + video/filter/vf_screenshot.c \ + video/filter/vf_softpulldown.c \ + video/filter/vf_stereo3d.c \ + video/filter/vf_sub.c \ + video/filter/vf_swapuv.c \ + video/filter/vf_unsharp.c \ + video/filter/vf_vo.c \ + video/filter/vf_yadif.c \ + video/out/bitmap_packer.c \ + video/out/aspect.c \ + video/out/filter_kernels.c \ + video/out/geometry.c \ + video/out/vo.c \ + video/out/vo_null.c \ + video/out/vo_image.c \ + osdep/$(GETCH) \ + osdep/$(TIMER) \ + $(SOURCES-yes) + +OBJECTS += $(addsuffix .o, $(basename $(SOURCES))) +OBJECTS-$(PE_EXECUTABLE) += osdep/mpv-rc.o +OBJECTS += $(OBJECTS-yes) + +DEP_FILES = $(patsubst %.S,%.d,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SOURCES:.m=.d) $(SOURCES:.m=.d)))) + +ALL_PRG += mpv$(EXESUF) + +INSTALL_TARGETS += check_rst2man \ + install-mpv \ + install-mpv-man \ + install-mpv-msg + +INSTALL_NO_MAN_TARGETS += install-mpv \ + install-mpv-msg DIRS = . \ - input \ - libaf \ - libao2 \ - libmpcodecs \ - libmpdemux \ - libvo \ + audio \ + audio/decode \ + audio/filter \ + audio/out \ + core \ + core/input \ + core/timeline \ + demux \ osdep \ stream \ sub \ - timeline \ + video \ + video/decode \ + video/filter \ + video/out MOFILES := $(MSG_LANGS:%=locale/%/LC_MESSAGES/mpv.mo) -ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h)) ADDSUFFIXES = $(foreach suf,$(1),$(addsuffix $(suf),$(2))) ADD_ALL_DIRS = $(call ADDSUFFIXES,$(1),$(DIRS)) @@ -323,7 +325,7 @@ endif ###### generic rules ####### -all: $(ALL_PRG-yes) locales +all: $(ALL_PRG) locales %.1: %.rst $(RST2MAN) $< $@ @@ -343,33 +345,32 @@ all: $(ALL_PRG-yes) locales %-rc.o: %.rc $(WINDRES) -I. $< $@ -mpv$(EXESUF): $(MPLAYER_DEPS) -mpv$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) +mpv$(EXESUF): $(OBJECTS) mpv$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) -codec-cfg.c: codecs.conf.h -codecs.conf.h: TOOLS/file2string.pl etc/codecs.conf +core/codec-cfg.c: core/codecs.conf.h +core/codecs.conf.h: TOOLS/file2string.pl etc/codecs.conf ./$^ >$@ -input/input.c: input/input_conf.h -input/input_conf.h: TOOLS/file2string.pl etc/input.conf +core/input/input.c: core/input/input_conf.h +core/input/input_conf.h: TOOLS/file2string.pl etc/input.conf ./$^ >$@ -libvo/vo_vdpau.c: libvo/vdpau_template.c -libvo/vdpau_template.c: TOOLS/vdpau_functions.pl +video/out/vo_vdpau.c: video/out/vdpau_template.c +video/out/vdpau_template.c: TOOLS/vdpau_functions.pl ./$< > $@ -libmpdemux/ebml.c libmpdemux/demux_mkv.c: libmpdemux/ebml_types.h -libmpdemux/ebml_types.h: TOOLS/matroska.pl +demux/ebml.c demux/demux_mkv.c: demux/ebml_types.h +demux/ebml_types.h: TOOLS/matroska.pl ./$< --generate-header > $@ -libmpdemux/ebml.c: libmpdemux/ebml_defs.c -libmpdemux/ebml_defs.c: TOOLS/matroska.pl +demux/ebml.c: demux/ebml_defs.c +demux/ebml_defs.c: TOOLS/matroska.pl ./$< --generate-definitions > $@ -libvo/vo_opengl.c: libvo/vo_opengl_shaders.h -libvo/vo_opengl_shaders.h: TOOLS/file2string.pl libvo/vo_opengl_shaders.glsl +video/out/vo_opengl.c: video/out/vo_opengl_shaders.h +video/out/vo_opengl_shaders.h: TOOLS/file2string.pl video/out/vo_opengl_shaders.glsl ./$^ >$@ sub/osd_libass.c: sub/osd_font.h @@ -400,13 +401,10 @@ locale/%/LC_MESSAGES/mpv.mo: po/%.po %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< -checkheaders: $(ALLHEADERS:.h=.ho) - - ###### dependency declarations / specific CFLAGS ###### -version.c osdep/mpv-rc.o: version.h +core/version.c osdep/mpv-rc.o: version.h osdep/mpv-rc.o: osdep/mpv.exe.manifest @@ -464,11 +462,11 @@ clean: -$(RM) $(call ADD_ALL_EXESUFS,mpv) -$(RM) $(MOFILES) -$(RM) version.h - -$(RM) codecs.conf.h - -$(RM) input/input_conf.h - -$(RM) libvo/vdpau_template.c - -$(RM) libmpdemux/ebml_types.h libmpdemux/ebml_defs.c - -$(RM) libvo/vo_opengl_shaders.h + -$(RM) core/codecs.conf.h + -$(RM) core/input/input_conf.h + -$(RM) video/out/vdpau_template.c + -$(RM) demux/ebml_types.h demux/ebml_defs.c + -$(RM) video/out/vo_opengl_shaders.h -$(RM) sub/osd_font.h distclean: clean diff --git a/audio/decode/ad.c b/audio/decode/ad.c index 93cebed86d..ac344636e6 100644 --- a/audio/decode/ad.c +++ b/audio/decode/ad.c @@ -25,8 +25,8 @@ #include "config.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "ad.h" /* Missed vorbis, mad, dshow */ diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 5396085d04..2de0e0641a 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -19,8 +19,8 @@ #ifndef MPLAYER_AD_H #define MPLAYER_AD_H -#include "mpc_info.h" -#include "libmpdemux/stheader.h" +#include "core/mpc_info.h" +#include "demux/stheader.h" typedef struct mp_codec_info ad_info_t; diff --git a/audio/decode/ad_dvdpcm.c b/audio/decode/ad_dvdpcm.c index 41f6a1426d..3b12c71c12 100644 --- a/audio/decode/ad_dvdpcm.c +++ b/audio/decode/ad_dvdpcm.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "ad_internal.h" static const ad_info_t info = diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h index 4cffc95126..1fed350b98 100644 --- a/audio/decode/ad_internal.h +++ b/audio/decode/ad_internal.h @@ -19,12 +19,12 @@ #ifndef MPLAYER_AD_INTERNAL_H #define MPLAYER_AD_INTERNAL_H -#include "codec-cfg.h" -#include "libaf/format.h" +#include "core/codec-cfg.h" +#include "audio/format.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "ad.h" diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 2eacfadb8f..2342a6985f 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -28,13 +28,13 @@ #include "talloc.h" #include "config.h" -#include "mp_msg.h" -#include "options.h" +#include "core/mp_msg.h" +#include "core/options.h" #include "ad_internal.h" -#include "libaf/reorder_ch.h" +#include "audio/reorder_ch.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" static const ad_info_t info = { diff --git a/audio/decode/ad_pcm.c b/audio/decode/ad_pcm.c index c265dfcd56..01500b1274 100644 --- a/audio/decode/ad_pcm.c +++ b/audio/decode/ad_pcm.c @@ -26,8 +26,8 @@ #include "talloc.h" #include "config.h" #include "ad_internal.h" -#include "libaf/format.h" -#include "libaf/reorder_ch.h" +#include "audio/format.h" +#include "audio/reorder_ch.h" static const ad_info_t info = { "Uncompressed PCM audio decoder", diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index 877bc99317..c22280cbf0 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -23,7 +23,7 @@ #include #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "ad_internal.h" static const ad_info_t info = { diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index 2602352e52..1444d39009 100644 --- a/audio/decode/dec_audio.c +++ b/audio/decode/dec_audio.c @@ -22,20 +22,20 @@ #include #include "config.h" -#include "mp_msg.h" -#include "bstr.h" +#include "core/mp_msg.h" +#include "core/bstr.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" +#include "demux/demux.h" -#include "codec-cfg.h" -#include "libmpdemux/stheader.h" +#include "core/codec-cfg.h" +#include "demux/stheader.h" #include "dec_audio.h" #include "ad.h" -#include "libaf/format.h" +#include "audio/format.h" -#include "libaf/af.h" +#include "audio/filter/af.h" int fakemono = 0; diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index 0d4baf0666..986b85f22a 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_DEC_AUDIO_H #define MPLAYER_DEC_AUDIO_H -#include "libmpdemux/stheader.h" +#include "demux/stheader.h" struct bstr; diff --git a/audio/filter/af.h b/audio/filter/af.h index edce49a978..31abe1edee 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -23,11 +23,10 @@ #include "config.h" -#include "options.h" -#include "libaf/format.h" +#include "core/options.h" +#include "audio/format.h" #include "control.h" -#include "cpudetect.h" -#include "mp_msg.h" +#include "core/mp_msg.h" struct af_instance; diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c index ccbf3794c5..aebcc3b201 100644 --- a/audio/filter/af_bs2b.c +++ b/audio/filter/af_bs2b.c @@ -27,7 +27,7 @@ #include #include "af.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" /// Internal specific data of the filter struct af_bs2b { diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c index 441ec31ac3..2e25d8a642 100644 --- a/audio/filter/af_export.c +++ b/audio/filter/af_export.c @@ -38,7 +38,7 @@ #include #include "af.h" -#include "path.h" +#include "core/path.h" #define DEF_SZ 512 // default buffer size (in samples) #define SHARED_FILE "mpv-af_export" /* default file name diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c index 4ac9caaa85..6192091f5a 100644 --- a/audio/filter/af_format.c +++ b/audio/filter/af_format.c @@ -30,7 +30,7 @@ #include "config.h" #include "af.h" -#include "mpbswap.h" +#include "compat/mpbswap.h" /* Functions used by play to convert the input audio to the correct format */ diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index ad78266ad3..b54f5bf61e 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -32,7 +32,7 @@ #include "config.h" #include "af.h" -#include "reorder_ch.h" +#include "audio/reorder_ch.h" #define AC3_MAX_CHANNELS 6 diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c index 0bbc220997..cf326fedfb 100644 --- a/audio/filter/af_scaletempo.c +++ b/audio/filter/af_scaletempo.c @@ -38,7 +38,7 @@ #include "af.h" #include "libavutil/common.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" // Data for specific instances of this filter typedef struct af_scaletempo_s diff --git a/audio/format.c b/audio/format.c index 88d66522a0..4ca7307ccf 100644 --- a/audio/format.c +++ b/audio/format.c @@ -24,7 +24,7 @@ #include #include -#include "af.h" +#include "audio/filter/af.h" int af_fmt2bits(int format) { diff --git a/audio/format.h b/audio/format.h index e60c0789b9..a3edcad20c 100644 --- a/audio/format.h +++ b/audio/format.h @@ -25,7 +25,7 @@ #include #include "config.h" -#include "bstr.h" +#include "core/bstr.h" // Endianness #define AF_FORMAT_BE (0<<0) // Big Endian diff --git a/audio/mixer.c b/audio/mixer.c index 2f9505a1ae..985ccb6516 100644 --- a/audio/mixer.c +++ b/audio/mixer.c @@ -21,9 +21,9 @@ #include #include "config.h" -#include "libao2/audio_out.h" -#include "libaf/af.h" -#include "mp_msg.h" +#include "audio/out/ao.h" +#include "audio/filter/af.h" +#include "core/mp_msg.h" #include "mixer.h" diff --git a/audio/mixer.h b/audio/mixer.h index ba90d0881c..3de92e1e03 100644 --- a/audio/mixer.h +++ b/audio/mixer.h @@ -21,9 +21,6 @@ #include -#include "libaf/af.h" -#include "libao2/audio_out.h" - enum { SOFTVOL_NO = 0, SOFTVOL_YES = 1, diff --git a/audio/out/ao.c b/audio/out/ao.c index ab8e60b753..915af93793 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -24,9 +24,9 @@ #include "talloc.h" #include "config.h" -#include "audio_out.h" +#include "ao.h" -#include "mp_msg.h" +#include "core/mp_msg.h" // there are some globals: struct ao *global_ao; diff --git a/audio/out/ao.h b/audio/out/ao.h index 9e172fd06c..2a7d15ae08 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -21,7 +21,7 @@ #include -#include "bstr.h" +#include "core/bstr.h" #define CONTROL_OK 1 #define CONTROL_TRUE 1 diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 27119112cb..cd50a1c1d5 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -36,18 +36,18 @@ #include #include "config.h" -#include "subopt-helper.h" -#include "mixer.h" -#include "mp_msg.h" +#include "core/subopt-helper.h" +#include "audio/mixer.h" +#include "core/mp_msg.h" #define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API #include -#include "audio_out.h" +#include "ao.h" #include "audio_out_internal.h" -#include "libaf/format.h" +#include "audio/format.h" static const ao_info_t info = { diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 146cfd2a22..850a6b2086 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -46,14 +46,14 @@ #include #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "audio_out.h" +#include "ao.h" #include "audio_out_internal.h" -#include "libaf/format.h" +#include "audio/format.h" #include "osdep/timer.h" #include "libavutil/fifo.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" static const ao_info_t info = { diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index f2f44dd401..8d3124122c 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -33,12 +33,12 @@ #include #include "config.h" -#include "libaf/format.h" -#include "audio_out.h" +#include "audio/format.h" +#include "ao.h" #include "audio_out_internal.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "osdep/timer.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" static const ao_info_t info = diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index b30f99a14e..2762954040 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -27,13 +27,13 @@ #include #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "audio_out.h" +#include "ao.h" #include "audio_out_internal.h" -#include "libaf/format.h" +#include "audio/format.h" #include "osdep/timer.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" #include "libavutil/fifo.h" diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index ef76db2717..08e1aa5555 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -27,16 +27,15 @@ #include #include "config.h" -#include "options.h" -#include "mpcommon.h" -#include "fmt-conversion.h" -#include "libaf/format.h" -#include "libaf/reorder_ch.h" +#include "core/options.h" +#include "core/mp_common.h" +#include "audio/format.h" +#include "audio/reorder_ch.h" #include "talloc.h" -#include "audio_out.h" -#include "mp_msg.h" +#include "ao.h" +#include "core/mp_msg.h" -#include "encode_lavc.h" +#include "core/encode_lavc.h" static const char *sample_padding_signed = "\x00\x00\x00\x00"; static const char *sample_padding_u8 = "\x80"; diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c index 87f11a51b6..102f0a7013 100644 --- a/audio/out/ao_null.c +++ b/audio/out/ao_null.c @@ -25,8 +25,8 @@ #include "config.h" #include "osdep/timer.h" -#include "libaf/format.h" -#include "audio_out.h" +#include "audio/format.h" +#include "ao.h" struct priv { unsigned last_time; diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index e5a40a769d..157cf93ac4 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -35,13 +35,13 @@ #include #endif -#include "mp_msg.h" +#include "core/mp_msg.h" -#include "audio_out.h" +#include "ao.h" #include "audio_out_internal.h" -#include "libaf/format.h" +#include "audio/format.h" #include "osdep/timer.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" static const ao_info_t info = { diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 9d4dde4837..ff8f8a1840 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -31,8 +31,8 @@ #include #include "config.h" -#include "mp_msg.h" -#include "mixer.h" +#include "core/mp_msg.h" +#include "audio/mixer.h" #ifdef HAVE_SYS_SOUNDCARD_H #include @@ -42,9 +42,9 @@ #endif #endif -#include "libaf/format.h" +#include "audio/format.h" -#include "audio_out.h" +#include "ao.h" #include "audio_out_internal.h" static const ao_info_t info = diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c index 0b1c527e89..f0fd390c8e 100644 --- a/audio/out/ao_pcm.c +++ b/audio/out/ao_pcm.c @@ -28,11 +28,11 @@ #include "talloc.h" -#include "subopt-helper.h" -#include "libaf/format.h" -#include "libaf/reorder_ch.h" -#include "audio_out.h" -#include "mp_msg.h" +#include "core/subopt-helper.h" +#include "audio/format.h" +#include "audio/reorder_ch.h" +#include "ao.h" +#include "core/mp_msg.h" #ifdef __MINGW32__ // for GetFileType to detect pipes diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c index 36b08f8288..b0744e8f8a 100644 --- a/audio/out/ao_portaudio.c +++ b/audio/out/ao_portaudio.c @@ -26,10 +26,10 @@ #include #include "config.h" -#include "subopt-helper.h" -#include "libaf/format.h" -#include "mp_msg.h" -#include "audio_out.h" +#include "core/subopt-helper.h" +#include "audio/format.h" +#include "core/mp_msg.h" +#include "ao.h" struct priv { PaStream *stream; diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 1d2ebc5281..539dbfa640 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -27,10 +27,10 @@ #include #include "config.h" -#include "libaf/format.h" -#include "mp_msg.h" -#include "audio_out.h" -#include "input/input.h" +#include "audio/format.h" +#include "core/mp_msg.h" +#include "ao.h" +#include "core/input/input.h" #define PULSE_CLIENT_NAME "mpv" diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c index 8232aad865..bf77b1e4c2 100644 --- a/audio/out/ao_rsound.c +++ b/audio/out/ao_rsound.c @@ -29,10 +29,10 @@ #include "talloc.h" -#include "subopt-helper.h" +#include "core/subopt-helper.h" #include "osdep/timer.h" -#include "libaf/format.h" -#include "audio_out.h" +#include "audio/format.h" +#include "ao.h" struct priv { rsound_t *rd; diff --git a/audio/out/audio_out_internal.h b/audio/out/audio_out_internal.h index 215428fb0e..f3e92dff66 100644 --- a/audio/out/audio_out_internal.h +++ b/audio/out/audio_out_internal.h @@ -19,7 +19,7 @@ #ifndef MPLAYER_AUDIO_OUT_INTERNAL_H #define MPLAYER_AUDIO_OUT_INTERNAL_H -#include "options.h" +#include "core/options.h" // prototypes: //static ao_info_t info; diff --git a/audio/reorder_ch.c b/audio/reorder_ch.c index 50379de2c5..4b51a79439 100644 --- a/audio/reorder_ch.c +++ b/audio/reorder_ch.c @@ -25,12 +25,12 @@ #include #include -#include "reorder_ch.h" +#include "audio/reorder_ch.h" #ifdef TEST #define mp_msg(mod,lev, fmt, args... ) printf( fmt, ## args ) #else -#include "mp_msg.h" +#include "core/mp_msg.h" #endif diff --git a/configure b/configure index f36fff9fc5..7ebadc28b6 100755 --- a/configure +++ b/configure @@ -436,7 +436,6 @@ _opt=-O2 _cross_compile=no _prefix="/usr/local" ffmpeg=auto -_mplayer=yes _encoding=yes _x11=auto _xshape=auto @@ -621,8 +620,6 @@ for ac_option do --disable-translation) _translation=no ;; --enable-cross-compile) _cross_compile=yes ;; --disable-cross-compile) _cross_compile=no ;; - --enable-mpv) _mplayer=yes ;; - --disable-mpv) _mplayer=no ;; --enable-encoding) _encoding=yes ;; --disable-encoding) _encoding=no ;; --enable-x11) _x11=yes ;; @@ -3332,8 +3329,7 @@ CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags DEPFLAGS = $DEPFLAGS -EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs -EXTRALIBS_MPLAYER = $libs_mplayer +EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs $libs_mplayer GETCH = $_getch TIMER = $_timer @@ -3346,8 +3342,6 @@ ARCH = $arch $(mak_enable "$arch_all" "$arch" ARCH) $(mak_enable "$subarch_all" "$subarch" ARCH) -MPLAYER = $_mplayer - NEED_GETTIMEOFDAY = $need_gettimeofday NEED_GLOB = $need_glob NEED_SHMEM = $need_shmem diff --git a/core/asxparser.c b/core/asxparser.c index 44236b8c18..17ce6b3e8c 100644 --- a/core/asxparser.c +++ b/core/asxparser.c @@ -27,9 +27,9 @@ #include "playlist.h" #include "playlist_parser.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" +#include "demux/demux.h" #include "asxparser.h" -#include "mp_msg.h" +#include "core/mp_msg.h" typedef struct ASX_Parser_t ASX_Parser_t; diff --git a/core/av_log.c b/core/av_log.c index 4e27e98d0f..4a80488a4b 100644 --- a/core/av_log.c +++ b/core/av_log.c @@ -25,7 +25,7 @@ #include "av_log.h" #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include #include diff --git a/core/bstr.c b/core/bstr.c index d3247ce1d6..5d8a47e9ac 100644 --- a/core/bstr.c +++ b/core/bstr.c @@ -25,7 +25,7 @@ #include "talloc.h" -#include "bstr.h" +#include "core/bstr.h" int bstrcmp(struct bstr str1, struct bstr str2) { diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index c0f4c91a9c..efb445cd68 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -26,13 +26,13 @@ #include #include -#include "options.h" +#include "core/options.h" #include "config.h" -#include "m_config.h" -#include "m_option.h" +#include "core/m_config.h" +#include "core/m_option.h" #include "stream/tv.h" #include "stream/stream_radio.h" -#include "libvo/csputils.h" +#include "video/csputils.h" extern char *lirc_configfile; @@ -67,7 +67,7 @@ extern int reuse_socket; extern int dvd_speed; /* stream/stream_dvd.c */ -/* defined in libmpdemux: */ +/* defined in demux: */ extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; extern const m_option_t cdda_opts[]; @@ -204,7 +204,7 @@ const m_option_t mfopts_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -#include "libaf/af.h" +#include "audio/filter/af.h" extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c const m_option_t audio_filter_conf[]={ {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, diff --git a/core/codec-cfg.c b/core/codec-cfg.c index da4c64c4c0..c8fc3c74bb 100644 --- a/core/codec-cfg.c +++ b/core/codec-cfg.c @@ -31,12 +31,12 @@ #include #include "config.h" -#include "mp_msg.h" -#include "libmpcodecs/img_format.h" +#include "core/mp_msg.h" +#include "video/img_format.h" #include "codec-cfg.h" -#include "bstr.h" +#include "core/bstr.h" #include "stream/stream.h" -#include "path.h" +#include "core/path.h" static const char embedded_file[] = #include "codecs.conf.h" diff --git a/core/command.c b/core/command.c index 14f24ac50e..f333f20f54 100644 --- a/core/command.c +++ b/core/command.c @@ -28,32 +28,33 @@ #include "command.h" #include "input/input.h" #include "stream/stream.h" -#include "libmpdemux/demuxer.h" -#include "libmpdemux/stheader.h" +#include "demux/demux.h" +#include "demux/stheader.h" #include "codec-cfg.h" #include "mplayer.h" #include "playlist.h" #include "playlist_parser.h" #include "sub/sub.h" #include "sub/dec_sub.h" -#include "m_option.h" +#include "core/m_option.h" #include "m_property.h" #include "m_config.h" -#include "libmpcodecs/vf.h" -#include "libmpcodecs/vd.h" +#include "video/filter/vf.h" +#include "video/decode/vd.h" #include "mp_osd.h" -#include "libvo/video_out.h" -#include "libvo/csputils.h" +#include "video/out/vo.h" +#include "video/csputils.h" #include "playlist.h" -#include "libao2/audio_out.h" -#include "mpcommon.h" -#include "mixer.h" -#include "libmpcodecs/dec_video.h" -#include "libmpcodecs/dec_audio.h" +#include "audio/mixer.h" +#include "audio/out/ao.h" +#include "core/mp_common.h" +#include "audio/filter/af.h" +#include "video/decode/dec_video.h" +#include "audio/decode/dec_audio.h" #include "osdep/strsep.h" #include "sub/vobsub.h" #include "sub/spudec.h" -#include "path.h" +#include "core/path.h" #include "sub/ass_mp.h" #include "stream/tv.h" #include "stream/stream_radio.h" @@ -64,10 +65,10 @@ #ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" #endif -#include "m_struct.h" +#include "core/m_struct.h" #include "screenshot.h" -#include "mp_core.h" +#include "core/mp_core.h" #include "mp_fifo.h" #include "libavutil/avstring.h" diff --git a/core/cpudetect.c b/core/cpudetect.c index 283600aff6..62cb03008d 100644 --- a/core/cpudetect.c +++ b/core/cpudetect.c @@ -21,11 +21,11 @@ #include #include -#include "libav_compat.h" +#include "compat/libav.h" #include "config.h" -#include "cpudetect.h" -#include "mp_msg.h" +#include "core/cpudetect.h" +#include "core/mp_msg.h" CpuCaps gCpuCaps; diff --git a/core/cpudetect.h b/core/cpudetect.h index 675dcbacde..d3d9206c65 100644 --- a/core/cpudetect.h +++ b/core/cpudetect.h @@ -22,7 +22,7 @@ #include #include "config.h" -#include "ffmpeg_files/x86_cpu.h" +#include "compat/x86_cpu.h" typedef struct cpucaps_s { bool hasMMX; diff --git a/core/defaultopts.c b/core/defaultopts.c index 1d3abf932c..a20656dd02 100644 --- a/core/defaultopts.c +++ b/core/defaultopts.c @@ -2,8 +2,8 @@ #include "config.h" #include "defaultopts.h" -#include "options.h" -#include "mixer.h" +#include "core/options.h" +#include "audio/mixer.h" void set_default_mplayer_options(struct MPOpts *opts) { diff --git a/core/encode_lavc.c b/core/encode_lavc.c index 5812fe0fed..d35db70b4f 100644 --- a/core/encode_lavc.c +++ b/core/encode_lavc.c @@ -22,11 +22,11 @@ #include "encode_lavc.h" -#include "mp_msg.h" -#include "libmpcodecs/vfcap.h" -#include "options.h" +#include "core/mp_msg.h" +#include "video/vfcap.h" +#include "core/options.h" #include "osdep/timer.h" -#include "libvo/video_out.h" +#include "video/out/vo.h" #include "talloc.h" #include "stream/stream.h" diff --git a/core/encode_lavc.h b/core/encode_lavc.h index 29b35c6335..747043b8b5 100644 --- a/core/encode_lavc.h +++ b/core/encode_lavc.h @@ -28,7 +28,7 @@ #include #include "encode.h" -#include "libvo/csputils.h" +#include "video/csputils.h" struct encode_lavc_context { struct encode_output_conf *options; diff --git a/core/input/appleir.c b/core/input/appleir.c index c64bc9648d..4615f1ef9d 100644 --- a/core/input/appleir.c +++ b/core/input/appleir.c @@ -37,7 +37,7 @@ #include #include -#include "mp_msg.h" +#include "core/mp_msg.h" // keycodes.h defines would conflict with linux/input.h ones #define AR_DEFINES_ONLY diff --git a/core/input/input.c b/core/input/input.c index 6643747e4d..115d181e69 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -34,18 +34,18 @@ #include "osdep/io.h" #include "input.h" -#include "mp_fifo.h" +#include "core/mp_fifo.h" #include "keycodes.h" #include "osdep/timer.h" #include "libavutil/avstring.h" #include "libavutil/common.h" -#include "mp_msg.h" -#include "m_config.h" -#include "m_option.h" -#include "path.h" +#include "core/mp_msg.h" +#include "core/m_config.h" +#include "core/m_option.h" +#include "core/path.h" #include "talloc.h" -#include "options.h" -#include "bstr.h" +#include "core/options.h" +#include "core/bstr.h" #include "stream/stream.h" #include "joystick