[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[306] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[306] mplayerxp
|
From: <nic...@us...> - 2012-11-09 07:18:55
|
Revision: 306
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=306&view=rev
Author: nickols_k
Date: 2012-11-09 07:18:45 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
rename main files
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/dump.c
mplayerxp/fifo.c
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpconf/cfgparser.c
mplayerxp/libmpdemux/asf_mmst_streaming.c
mplayerxp/libmpdemux/asf_streaming.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/cdda.c
mplayerxp/libmpdemux/cddb.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/demuxer_r.c
mplayerxp/libmpdemux/librtsp/rtsp.c
mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
mplayerxp/libmpdemux/librtsp/rtsp_session.c
mplayerxp/libmpdemux/network.c
mplayerxp/libmpdemux/realrtsp/asmrp.c
mplayerxp/libmpdemux/realrtsp/real.c
mplayerxp/libmpdemux/realrtsp/rmff.c
mplayerxp/libmpdemux/realrtsp/sdpplin.c
mplayerxp/libmpdemux/realrtsp/xbuffer.c
mplayerxp/libmpdemux/s_cdd.c
mplayerxp/libmpdemux/s_dvdnav.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_ffmpeg.c
mplayerxp/libmpdemux/s_file.c
mplayerxp/libmpdemux/s_oss.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libmpdemux/stream.c
mplayerxp/libmpdemux/sub_cc.c
mplayerxp/libmpdemux/sub_ty.c
mplayerxp/libmpdemux/url.c
mplayerxp/libmpdemux/video.c
mplayerxp/libmpsub/vobsub.c
mplayerxp/libplaytree/asxparser.c
mplayerxp/libvo/osd.c
mplayerxp/libvo/screenshot.c
mplayerxp/libvo/sub.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/vo_dga.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/libvo/x11_common.c
mplayerxp/mp_msg.h
mplayerxp/osdep/aclib.c
mplayerxp/osdep/cpudetect.h
mplayerxp/osdep/vbelib.c
mplayerxp/postproc/vf.c
mplayerxp/postproc/vf_menu.c
mplayerxp/xmpcore/mp_image.c
mplayerxp/xmpcore/sig_hand.c
mplayerxp/xmpcore/xmp_adecoder.c
mplayerxp/xmpcore/xmp_aplayer.c
mplayerxp/xmpcore/xmp_core.c
mplayerxp/xmpcore/xmp_vdecoder.c
mplayerxp/xmpcore/xmp_vplayer.c
Added Paths:
-----------
mplayerxp/cfg-mplayerxp.h
mplayerxp/mplayerxp.c
mplayerxp/mplayerxp.h
Removed Paths:
-------------
mplayerxp/cfg-mplayer.h
mplayerxp/mplayer.c
mplayerxp/mplayer.h
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/Makefile 2012-11-09 07:18:45 UTC (rev 306)
@@ -24,7 +24,7 @@
LDFLAGS += -Wl,-rpath,${CODECDIR}/codecs
SRCS_COMMON = mp_msg.c
-SRCS_MPLAYER = mplayer.c fifo.c $(SRCS_COMMON) mixer.c mp-opt-reg.c dump.c
+SRCS_MPLAYER = mplayerxp.c fifo.c $(SRCS_COMMON) mixer.c mp-opt-reg.c dump.c
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
Deleted: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/cfg-mplayer.h 2012-11-09 07:18:45 UTC (rev 306)
@@ -1,294 +0,0 @@
-/*
- * config for cfgparser
- */
-
-extern const char *oss_mixer_device;
-#ifdef HAVE_SDL
-//extern char *sdl_driver;
-extern int sdl_noxv;
-extern int sdl_forcexv;
-extern int sdl_forcegl;
-//extern char *sdl_adriver;
-#endif
-
-extern int network_prefer_ipv4;
-extern char *network_username;
-extern char *network_password;
-extern int network_bandwidth;
-extern char *network_useragent;
-extern int network_ipv4_only_proxy;
-extern int network_cookies_enabled;
-extern char *cookies_file;
-
-extern af_cfg_t af_cfg; // Configuration for audio filters
-extern vf_cfg_t vf_cfg; // Configuration for audio filters
-
-/*
- * CONF_TYPE_FUNC_FULL :
- * allows own implemtations for passing the params
- *
- * the function receives parameter name and argument (if it does not start with - )
- * useful with a conf.name like 'aa*' to parse several parameters to a function
- * return 0 =ok, but we didn't need the param (could be the filename)
- * return 1 =ok, we accepted the param
- * negative values: see cfgparser.h, ERR_XXX
- *
- * by Folke
- */
-
-static const config_t xpcore_config[]={
- {"xp", &mp_conf.xp, CONF_TYPE_INT, CONF_RANGE, 0, UINT_MAX, "specifies number cpus to use for playback"},
- {"dump", &mp_conf.stream_dump, CONF_TYPE_STRING, 0, 0, 0, "specifies dump type and name for the dump of stream"},
- {"gomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 0, 1, "enables usage of OpenMP extensions"},
- {"nogomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 1, 0, "disables usage of OpenMP extensions"},
- {"xp_buffs", &vo_conf.xp_buffs, CONF_TYPE_INT, CONF_RANGE, 4, 1024, "specifies number of buffers for decoding-ahead in XP mode"},
- {"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, "specifies amount of memory for precaching a file/URL"},
- {"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, "disables precaching a file/URL"},
- {"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, "dynamically changes the level of postprocessing depending on spare CPU time available"},
- {"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, "sets playback speed factor"},
- {"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, "performs benchmarking to estimate performance of MPlayerXP"},
- {"test-av", &mp_conf.test_av, CONF_TYPE_FLAG, 0, 0, 1, "test antiviral protection of MPlayerXP"},
- {"malloc-debug", &mp_conf.malloc_debug, CONF_TYPE_FLAG, 0, 1, 0, "debugs malloc() calls in MPlayerXP"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-#ifdef HAVE_STREAMING
-static const config_t net_config[]={
- {"ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, "forces mplayerxp to use IPv4 protocol over network"},
-#ifdef HAVE_AF_INET6
- {"ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, "forces mplayerxp to use IPv6 protocol over network"},
-#else
- {"ipv6", "MPlayerXP was compiled without IPv6 support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-#endif /* HAVE_AF_INET6 */
- {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, "skip the proxy for IPv6 addresses"},
- {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, "specifies username for HTTP authentication"},
- {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, "specifies password for HTTP authentication"},
- {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, "specifies the maximum bandwidth for network streaming"},
- {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, "specifies string as user agent for HTTP streaming"},
- {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, "send cookies when making HTTP requests"},
- {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, "Read HTTP cookies from file"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-#endif
-
-#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
-static const config_t cpu_config[]={
- {"simd", &x86.simd, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SIMD extensions of CPU"},
- {"nosimd", &x86.simd, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SIMD extensions of CPU"},
- {"mmx", &x86.mmx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX extensions of CPU"},
- {"nommx", &x86.mmx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX extensions of CPU"},
- {"mmx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX2 extensions of CPU"},
- {"nommx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX2 extensions of CPU"},
- {"3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow! extensions of CPU"},
- {"no3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow! extensions of CPU"},
- {"3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow-2! extensions of CPU"},
- {"no3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow-2! extensions of CPU"},
- {"sse", &x86.sse, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE extensions of CPU"},
- {"nosse", &x86.sse, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE extensions of CPU"},
- {"sse2", &x86.sse2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE2 extensions of CPU"},
- {"nosse2", &x86.sse2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE2 extensions of CPU"},
- {"sse3", &x86.sse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE3 extensions of CPU"},
- {"nosse3", &x86.sse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE3 extensions of CPU"},
- {"ssse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSSE3 extensions of CPU"},
- {"nossse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSSE3 extensions of CPU"},
- {"sse41", &x86.sse41, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE41 extensions of CPU"},
- {"nosse41", &x86.sse41, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE41 extensions of CPU"},
- {"sse42", &x86.sse42, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE42 extensions of CPU"},
- {"nosse42", &x86.sse42, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE42 extensions of CPU"},
- {"aes", &x86.aes, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AES extensions of CPU"},
- {"noaes", &x86.aes, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AES extensions of CPU"},
- {"avx", &x86.avx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AVX extensions of CPU"},
- {"noavx", &x86.avx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AVX extensions of CPU"},
- {"fma", &x86.fma, CONF_TYPE_FLAG, 0, 0, 1, "enables using of FMA extensions of CPU"},
- {"nofma", &x86.fma, CONF_TYPE_FLAG, 0, 1, 0, "disables using of FMA extensions of CPU"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-#endif
-
-static const config_t osd_config[]={
- {"level", &mp_conf.osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 , "specifies initial mode of the OSD"},
-#ifdef USE_OSD
- {"font", &mp_conf.font_name, CONF_TYPE_STRING, 0, 0, 0, "specifies an alternative directory of font.desc location"},
- {"ffactor", &mp_conf.font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, "specifies resampling of alphamap of the font"},
- {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, "specifies align position of SPU (DVD-VOBsub) subtitles"},
- {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies antialiasing/scaling mode for SPU"},
- {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, "specifies variance parameter of gaussian for -spuaa"},
-#endif
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-static const config_t veq_config[]={
- {"brightness",&vo_conf.gamma.brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies brightness-level for output image"},
- {"saturation",&vo_conf.gamma.saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies saturation-level for output image"},
- {"contrast",&vo_conf.gamma.contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies contrast-level for output image"},
- {"hue",&vo_conf.gamma.hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies hue of gamma-correction for output image"},
- {"red",&vo_conf.gamma.red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of red component for output image"},
- {"green",&vo_conf.gamma.green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of green component for output image"},
- {"blue",&vo_conf.gamma.blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of blue component for output image"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-
-static const config_t avsync_config[]={
- {"framedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, "enables frame-dropping on slow systems: decodes all video frames, but skips displaying some ones"},
-/*UD*/ {"hardframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, "enables hard frame-dropping on slow systems: skips displaying and decoding of some frames"},
- {"noframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, "disables frame dropping"},
- {"pts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 0, 1, "use PTS-based method of A/V synchronization"},
- {"nopts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 1, 0, "use BPS-based method of A/V synchronization"},
- {"force_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files"},
- {"noforce_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files"},
- {"force_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files without PTS changing"},
- {"noforce_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files without PTS changing"},
- {"frame_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 0, 1, "recalc PTS of frames as they were added to the buffer"},
- {"noframe_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 1, 0, "keep original PTS of each frame"},
- {"softsleep", &mp_conf.softsleep, CONF_TYPE_FLAG, 0, 0, 1, "enables high quality software timers for A/V synchronization"},
-#ifdef HAVE_RTC
- {"rtc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 1, 0, "enables using of /dev/rtc (real-time clock chip) to compute PTS"},
- {"nortc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 0, 1, "disables using of /dev/rtc (real-time clock chip) to compute PTS"},
-#endif
- {"fps", &mp_conf.force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, "forces frame rate (if value is wrong in the header)"},
- {"vsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 0, 1, "forces video hardware to wait VSYNC signal before frame switching"},
- {"novsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 1, 0, "disables video hardware to wait VSYNC signal before frame switching"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-
-static const config_t subtitle_config[]={
- {"on", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 0, 1, "enables subtitle-steam playback"},
- {"off", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 1, 0, "disables subtitle-stream playback"},
- {"vob", &mp_conf.vobsub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the VobSub files that are to be used for subtitle"},
- {"vobid", &mp_conf.vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies the VobSub subtitle id"},
-#ifdef USE_SUB
- {"file", &mp_conf.sub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the subtitle file"},
-#ifdef USE_ICONV
- {"cp", &sub_data.cp, CONF_TYPE_STRING, 0, 0, 0, "specifies codepage of subtitles"},
-#endif
- {"fps", &mp_conf.sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, "specifies frame/sec rate of subtitle file"},
- {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, "disable autodetection of vobsub for textsubs if vobsub found"},
- {"unicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UNICODE"},
- {"nounicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UNICODE"},
- {"utf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UTF8"},
- {"noutf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UTF8"},
- {"pos",&sub_data.pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, "specifies vertical shift of subtitles"},
-#endif
- {"cc", &mp_conf.subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, "enable DVD Closed Caption (CC) subtitles"},
- {"nocc", &mp_conf.subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, "disable DVD Closed Caption (CC) subtitles"},
- {"id", &mp_conf.dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "selects subtitle channel"},
- {"lang", &mp_conf.dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
- {"ifo", &mp_conf.spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, "specifies .ifo file for DVD subtitles"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-#ifdef HAVE_X11
-static const config_t x11_config[]={
- {"display", &vo_conf.mDisplayName, CONF_TYPE_STRING, 0, 0, 0, "specifies the hostname and display number of the X server"},
- {"wid", &vo_conf.WinID, CONF_TYPE_INT, 0, 0, 0, "tells MPlayerXP to use existing X11 window (for using MPlayerXP as plugin)"},
- {"rootwin", &vo_conf.WinID, CONF_TYPE_FLAG, 0, -1, 0, "render movie in the root window (desktop background)"},
-#ifdef HAVE_XINERAMA
- {"xinerama", &mp_conf.xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, "tells MPlayerXP the display for movie playback"},
-#endif
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-#endif
-
-static const config_t audio_config[]={
- {"on", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 0, 1, "enables audio-steam playback"},
- {"off", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 1, 0, "disables audio-stream playback"},
- {"mixer", &oss_mixer_device, CONF_TYPE_STRING, 0, 0, 0, "select audio-mixer device"},
- {"channels", &mp_conf.ao_channels, CONF_TYPE_INT, CONF_RANGE, 2, 8, "select number of audio output channels to be used"},
- {"rate", &mp_conf.force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, "specifies Hz for audio playback"},
- {"lang", &mp_conf.audio_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-audio stream as two-letter country code(s)"},
- {"id", &mp_conf.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects audio channel"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-static const config_t video_config[]={
- {"on", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 0, 1, "enables video-steam playback"},
- {"off", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 1, 0, "disables video-stream playback"},
- {"width", &vo_conf.opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to width (if driver supports)"},
- {"height", &vo_conf.opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to height (if driver supports)"},
- {"zoom", &vo_conf.screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0, 4096, "scale output image by given factor"},
- {"screenw", &vo_conf.screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the horizontal resolution of the screen (if supported)"},
- {"screenh", &vo_conf.screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the vertical resolution of the screen (if supported)"},
- {"aspect", &vo_conf.movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, "sets aspect-ratio of movies (autodetect)"},
- {"noaspect", &vo_conf.movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, "unsets aspect-ratio of movies"},
- {"aspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 0, 1, "keeps aspect-ratio of the movie during window resize"},
- {"noaspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 1, 0, "render movie to the user-defined window's geometry"},
- {"monitorpixelaspect", &mp_conf.monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, "sets the aspect-ratio of a single pixel of TV screen"},
- {"vm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 0, 1, "enables video-mode changing during playback"},
- {"novm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 1, 0, "disables video-mode changing during playback"},
- {"fs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 0, 1, "fullscreen playback"},
- {"nofs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 1, 0, "windowed playback"},
- {"fsmode", &vo_conf.fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, "enables workaround for some fullscreen related problems"},
- {"flip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 1, "flip output image upside-down"},
- {"noflip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 0, "render output image as is"},
- {"bpp", &vo_conf.dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, "use different color depth than autodetect"},
- {"bm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 1, "enables using of bus-mastering (if it available for given OS/videocard)"},
- {"bm2", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 2, "enables using of bus-mastering to store all decoded-ahead frames in video-memory"},
- {"nobm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 1, 0, "disables using of bus-mastering"},
- {"id", &mp_conf.video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects video channel"},
- {"pp", &mp_conf.npp_options, CONF_TYPE_STRING, 0, 0, 0, "specifies options of post-processing"},
-#ifdef HAVE_PNG
- {"z", &mp_conf.z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, "specifies compression level for PNG output"},
-#endif
-#ifdef HAVE_SDL
- {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, "disable XVideo hardware acceleration for SDL"},
- {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, "force XVideo hardware acceleration for SDL"},
- {"forcegl", &sdl_forcegl, CONF_TYPE_FLAG, 0, 0, 1, "force OpenGL hardware acceleration for SDL"},
-#endif
- {"eq",&veq_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video-equalizer specific options"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-static const config_t playback_config[]={
- {"sb", &mp_conf.seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, "seek to given byte position before playback"},
- {"ss", &mp_conf.seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, "seek to given time position before playback"},
- {"loop", &mp_conf.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, "loops movie playback given number of times. 0 means forever"},
- {"noloop", &mp_conf.loop_times, CONF_TYPE_FLAG, 0, 0, -1, "disable loop of playback"},
- {"shuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 0, 1, "play files in random order"},
- {"noshuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 1, 0, "play files in regular order"},
- {"list", NULL, CONF_TYPE_STRING, 0, 0, 0, "specifies playlist (1 file/row or Winamp or ASX format)"},
- {"frames", &mp_conf.play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, "play given number of frames and exit"},
- {NULL, NULL, 0, 0, 0, 0, NULL},
-};
-
-
-static const config_t mplayer_opts[]={
- /* name, pointer, type, flags, min, max, help */
- {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, ""}, /* this don't need anymore to be the first!!! */
-
-//---------------------- libao/libvo/mplayer options ------------------------
- {"vo", &mp_conf.video_driver, CONF_TYPE_STRING, 0, 0, 0, "select video output driver and optinaly device"},
- {"ao", &mp_conf.audio_driver, CONF_TYPE_STRING, 0, 0, 0, "select audio output driver and optinaly device"},
- {"af", &af_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects audio filter"},
- {"vf", &vf_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects video filter"},
- {"afm", &mp_conf.audio_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoders family"},
- {"vfm", &mp_conf.video_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoders family"},
- {"ac", &mp_conf.audio_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoder"},
- {"vc", &mp_conf.video_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoder"},
-/*UD*/ {"verbose", &mp_conf.verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, "verbose output"},
- {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, "verbose output (more -v means more verbosity)"},
- {"slave", &mp_conf.slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, "turns MPlayerXP into slave mode as a backend for other programs"},
- {"use-stdin", &mp_conf.use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "forces reading of keyboard codes from STDIN instead of terminal's console"},
- {"msgfilter", &mp_conf.msg_filter, CONF_TYPE_INT, CONF_RANGE, 0, 0xFFFFFFFF, "specifies filter for verbosed messages"},
-
- {"core", &xpcore_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "XP-core related options" },
- {"play", &playback_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Playback specific options" },
- {"audio", &audio_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Audio related options" },
- {"video", &video_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video related options" },
- {"sub", &subtitle_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Subtitle related options" },
-#ifdef HAVE_X11
- {"x", &x11_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "X11-specific options" },
-#endif
- {"osd", &osd_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "OSD-related options"},
- {"sync", &avsync_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "AV-synchronization related options" },
-#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
- {"cpu", &cpu_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "CPU specific options" },
-#endif
-// ------------------------- stream options --------------------
-#ifdef HAVE_STREAMING
- { "net", &net_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Network specific options" },
-#endif
-// ------------------------- codec/pp options --------------------
- {NULL, NULL, 0, 0, 0, 0, NULL}
-};
Copied: mplayerxp/cfg-mplayerxp.h (from rev 304, mplayerxp/cfg-mplayer.h)
===================================================================
--- mplayerxp/cfg-mplayerxp.h (rev 0)
+++ mplayerxp/cfg-mplayerxp.h 2012-11-09 07:18:45 UTC (rev 306)
@@ -0,0 +1,294 @@
+/*
+ * config for cfgparser
+ */
+
+extern const char *oss_mixer_device;
+#ifdef HAVE_SDL
+//extern char *sdl_driver;
+extern int sdl_noxv;
+extern int sdl_forcexv;
+extern int sdl_forcegl;
+//extern char *sdl_adriver;
+#endif
+
+extern int network_prefer_ipv4;
+extern char *network_username;
+extern char *network_password;
+extern int network_bandwidth;
+extern char *network_useragent;
+extern int network_ipv4_only_proxy;
+extern int network_cookies_enabled;
+extern char *cookies_file;
+
+extern af_cfg_t af_cfg; // Configuration for audio filters
+extern vf_cfg_t vf_cfg; // Configuration for audio filters
+
+/*
+ * CONF_TYPE_FUNC_FULL :
+ * allows own implemtations for passing the params
+ *
+ * the function receives parameter name and argument (if it does not start with - )
+ * useful with a conf.name like 'aa*' to parse several parameters to a function
+ * return 0 =ok, but we didn't need the param (could be the filename)
+ * return 1 =ok, we accepted the param
+ * negative values: see cfgparser.h, ERR_XXX
+ *
+ * by Folke
+ */
+
+static const config_t xpcore_config[]={
+ {"xp", &mp_conf.xp, CONF_TYPE_INT, CONF_RANGE, 0, UINT_MAX, "specifies number cpus to use for playback"},
+ {"dump", &mp_conf.stream_dump, CONF_TYPE_STRING, 0, 0, 0, "specifies dump type and name for the dump of stream"},
+ {"gomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 0, 1, "enables usage of OpenMP extensions"},
+ {"nogomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 1, 0, "disables usage of OpenMP extensions"},
+ {"xp_buffs", &vo_conf.xp_buffs, CONF_TYPE_INT, CONF_RANGE, 4, 1024, "specifies number of buffers for decoding-ahead in XP mode"},
+ {"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, "specifies amount of memory for precaching a file/URL"},
+ {"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, "disables precaching a file/URL"},
+ {"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, "dynamically changes the level of postprocessing depending on spare CPU time available"},
+ {"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, "sets playback speed factor"},
+ {"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, "performs benchmarking to estimate performance of MPlayerXP"},
+ {"test-av", &mp_conf.test_av, CONF_TYPE_FLAG, 0, 0, 1, "test antiviral protection of MPlayerXP"},
+ {"malloc-debug", &mp_conf.malloc_debug, CONF_TYPE_FLAG, 0, 1, 0, "debugs malloc() calls in MPlayerXP"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+#ifdef HAVE_STREAMING
+static const config_t net_config[]={
+ {"ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, "forces mplayerxp to use IPv4 protocol over network"},
+#ifdef HAVE_AF_INET6
+ {"ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, "forces mplayerxp to use IPv6 protocol over network"},
+#else
+ {"ipv6", "MPlayerXP was compiled without IPv6 support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+#endif /* HAVE_AF_INET6 */
+ {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, "skip the proxy for IPv6 addresses"},
+ {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, "specifies username for HTTP authentication"},
+ {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, "specifies password for HTTP authentication"},
+ {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, "specifies the maximum bandwidth for network streaming"},
+ {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, "specifies string as user agent for HTTP streaming"},
+ {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, "send cookies when making HTTP requests"},
+ {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, "Read HTTP cookies from file"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+#endif
+
+#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
+static const config_t cpu_config[]={
+ {"simd", &x86.simd, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SIMD extensions of CPU"},
+ {"nosimd", &x86.simd, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SIMD extensions of CPU"},
+ {"mmx", &x86.mmx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX extensions of CPU"},
+ {"nommx", &x86.mmx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX extensions of CPU"},
+ {"mmx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX2 extensions of CPU"},
+ {"nommx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX2 extensions of CPU"},
+ {"3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow! extensions of CPU"},
+ {"no3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow! extensions of CPU"},
+ {"3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow-2! extensions of CPU"},
+ {"no3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow-2! extensions of CPU"},
+ {"sse", &x86.sse, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE extensions of CPU"},
+ {"nosse", &x86.sse, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE extensions of CPU"},
+ {"sse2", &x86.sse2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE2 extensions of CPU"},
+ {"nosse2", &x86.sse2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE2 extensions of CPU"},
+ {"sse3", &x86.sse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE3 extensions of CPU"},
+ {"nosse3", &x86.sse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE3 extensions of CPU"},
+ {"ssse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSSE3 extensions of CPU"},
+ {"nossse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSSE3 extensions of CPU"},
+ {"sse41", &x86.sse41, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE41 extensions of CPU"},
+ {"nosse41", &x86.sse41, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE41 extensions of CPU"},
+ {"sse42", &x86.sse42, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE42 extensions of CPU"},
+ {"nosse42", &x86.sse42, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE42 extensions of CPU"},
+ {"aes", &x86.aes, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AES extensions of CPU"},
+ {"noaes", &x86.aes, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AES extensions of CPU"},
+ {"avx", &x86.avx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AVX extensions of CPU"},
+ {"noavx", &x86.avx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AVX extensions of CPU"},
+ {"fma", &x86.fma, CONF_TYPE_FLAG, 0, 0, 1, "enables using of FMA extensions of CPU"},
+ {"nofma", &x86.fma, CONF_TYPE_FLAG, 0, 1, 0, "disables using of FMA extensions of CPU"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+#endif
+
+static const config_t osd_config[]={
+ {"level", &mp_conf.osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 , "specifies initial mode of the OSD"},
+#ifdef USE_OSD
+ {"font", &mp_conf.font_name, CONF_TYPE_STRING, 0, 0, 0, "specifies an alternative directory of font.desc location"},
+ {"ffactor", &mp_conf.font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, "specifies resampling of alphamap of the font"},
+ {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, "specifies align position of SPU (DVD-VOBsub) subtitles"},
+ {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies antialiasing/scaling mode for SPU"},
+ {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, "specifies variance parameter of gaussian for -spuaa"},
+#endif
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+static const config_t veq_config[]={
+ {"brightness",&vo_conf.gamma.brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies brightness-level for output image"},
+ {"saturation",&vo_conf.gamma.saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies saturation-level for output image"},
+ {"contrast",&vo_conf.gamma.contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies contrast-level for output image"},
+ {"hue",&vo_conf.gamma.hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies hue of gamma-correction for output image"},
+ {"red",&vo_conf.gamma.red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of red component for output image"},
+ {"green",&vo_conf.gamma.green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of green component for output image"},
+ {"blue",&vo_conf.gamma.blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of blue component for output image"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+
+static const config_t avsync_config[]={
+ {"framedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, "enables frame-dropping on slow systems: decodes all video frames, but skips displaying some ones"},
+/*UD*/ {"hardframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, "enables hard frame-dropping on slow systems: skips displaying and decoding of some frames"},
+ {"noframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, "disables frame dropping"},
+ {"pts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 0, 1, "use PTS-based method of A/V synchronization"},
+ {"nopts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 1, 0, "use BPS-based method of A/V synchronization"},
+ {"force_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files"},
+ {"noforce_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files"},
+ {"force_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files without PTS changing"},
+ {"noforce_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files without PTS changing"},
+ {"frame_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 0, 1, "recalc PTS of frames as they were added to the buffer"},
+ {"noframe_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 1, 0, "keep original PTS of each frame"},
+ {"softsleep", &mp_conf.softsleep, CONF_TYPE_FLAG, 0, 0, 1, "enables high quality software timers for A/V synchronization"},
+#ifdef HAVE_RTC
+ {"rtc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 1, 0, "enables using of /dev/rtc (real-time clock chip) to compute PTS"},
+ {"nortc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 0, 1, "disables using of /dev/rtc (real-time clock chip) to compute PTS"},
+#endif
+ {"fps", &mp_conf.force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, "forces frame rate (if value is wrong in the header)"},
+ {"vsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 0, 1, "forces video hardware to wait VSYNC signal before frame switching"},
+ {"novsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 1, 0, "disables video hardware to wait VSYNC signal before frame switching"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+
+static const config_t subtitle_config[]={
+ {"on", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 0, 1, "enables subtitle-steam playback"},
+ {"off", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 1, 0, "disables subtitle-stream playback"},
+ {"vob", &mp_conf.vobsub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the VobSub files that are to be used for subtitle"},
+ {"vobid", &mp_conf.vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies the VobSub subtitle id"},
+#ifdef USE_SUB
+ {"file", &mp_conf.sub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the subtitle file"},
+#ifdef USE_ICONV
+ {"cp", &sub_data.cp, CONF_TYPE_STRING, 0, 0, 0, "specifies codepage of subtitles"},
+#endif
+ {"fps", &mp_conf.sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, "specifies frame/sec rate of subtitle file"},
+ {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, "disable autodetection of vobsub for textsubs if vobsub found"},
+ {"unicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UNICODE"},
+ {"nounicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UNICODE"},
+ {"utf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UTF8"},
+ {"noutf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UTF8"},
+ {"pos",&sub_data.pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, "specifies vertical shift of subtitles"},
+#endif
+ {"cc", &mp_conf.subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, "enable DVD Closed Caption (CC) subtitles"},
+ {"nocc", &mp_conf.subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, "disable DVD Closed Caption (CC) subtitles"},
+ {"id", &mp_conf.dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "selects subtitle channel"},
+ {"lang", &mp_conf.dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
+ {"ifo", &mp_conf.spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, "specifies .ifo file for DVD subtitles"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+#ifdef HAVE_X11
+static const config_t x11_config[]={
+ {"display", &vo_conf.mDisplayName, CONF_TYPE_STRING, 0, 0, 0, "specifies the hostname and display number of the X server"},
+ {"wid", &vo_conf.WinID, CONF_TYPE_INT, 0, 0, 0, "tells MPlayerXP to use existing X11 window (for using MPlayerXP as plugin)"},
+ {"rootwin", &vo_conf.WinID, CONF_TYPE_FLAG, 0, -1, 0, "render movie in the root window (desktop background)"},
+#ifdef HAVE_XINERAMA
+ {"xinerama", &mp_conf.xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, "tells MPlayerXP the display for movie playback"},
+#endif
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+#endif
+
+static const config_t audio_config[]={
+ {"on", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 0, 1, "enables audio-steam playback"},
+ {"off", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 1, 0, "disables audio-stream playback"},
+ {"mixer", &oss_mixer_device, CONF_TYPE_STRING, 0, 0, 0, "select audio-mixer device"},
+ {"channels", &mp_conf.ao_channels, CONF_TYPE_INT, CONF_RANGE, 2, 8, "select number of audio output channels to be used"},
+ {"rate", &mp_conf.force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, "specifies Hz for audio playback"},
+ {"lang", &mp_conf.audio_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-audio stream as two-letter country code(s)"},
+ {"id", &mp_conf.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects audio channel"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+static const config_t video_config[]={
+ {"on", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 0, 1, "enables video-steam playback"},
+ {"off", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 1, 0, "disables video-stream playback"},
+ {"width", &vo_conf.opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to width (if driver supports)"},
+ {"height", &vo_conf.opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to height (if driver supports)"},
+ {"zoom", &vo_conf.screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0, 4096, "scale output image by given factor"},
+ {"screenw", &vo_conf.screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the horizontal resolution of the screen (if supported)"},
+ {"screenh", &vo_conf.screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the vertical resolution of the screen (if supported)"},
+ {"aspect", &vo_conf.movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, "sets aspect-ratio of movies (autodetect)"},
+ {"noaspect", &vo_conf.movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, "unsets aspect-ratio of movies"},
+ {"aspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 0, 1, "keeps aspect-ratio of the movie during window resize"},
+ {"noaspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 1, 0, "render movie to the user-defined window's geometry"},
+ {"monitorpixelaspect", &mp_conf.monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, "sets the aspect-ratio of a single pixel of TV screen"},
+ {"vm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 0, 1, "enables video-mode changing during playback"},
+ {"novm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 1, 0, "disables video-mode changing during playback"},
+ {"fs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 0, 1, "fullscreen playback"},
+ {"nofs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 1, 0, "windowed playback"},
+ {"fsmode", &vo_conf.fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, "enables workaround for some fullscreen related problems"},
+ {"flip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 1, "flip output image upside-down"},
+ {"noflip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 0, "render output image as is"},
+ {"bpp", &vo_conf.dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, "use different color depth than autodetect"},
+ {"bm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 1, "enables using of bus-mastering (if it available for given OS/videocard)"},
+ {"bm2", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 2, "enables using of bus-mastering to store all decoded-ahead frames in video-memory"},
+ {"nobm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 1, 0, "disables using of bus-mastering"},
+ {"id", &mp_conf.video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects video channel"},
+ {"pp", &mp_conf.npp_options, CONF_TYPE_STRING, 0, 0, 0, "specifies options of post-processing"},
+#ifdef HAVE_PNG
+ {"z", &mp_conf.z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, "specifies compression level for PNG output"},
+#endif
+#ifdef HAVE_SDL
+ {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, "disable XVideo hardware acceleration for SDL"},
+ {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, "force XVideo hardware acceleration for SDL"},
+ {"forcegl", &sdl_forcegl, CONF_TYPE_FLAG, 0, 0, 1, "force OpenGL hardware acceleration for SDL"},
+#endif
+ {"eq",&veq_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video-equalizer specific options"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+static const config_t playback_config[]={
+ {"sb", &mp_conf.seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, "seek to given byte position before playback"},
+ {"ss", &mp_conf.seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, "seek to given time position before playback"},
+ {"loop", &mp_conf.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, "loops movie playback given number of times. 0 means forever"},
+ {"noloop", &mp_conf.loop_times, CONF_TYPE_FLAG, 0, 0, -1, "disable loop of playback"},
+ {"shuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 0, 1, "play files in random order"},
+ {"noshuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 1, 0, "play files in regular order"},
+ {"list", NULL, CONF_TYPE_STRING, 0, 0, 0, "specifies playlist (1 file/row or Winamp or ASX format)"},
+ {"frames", &mp_conf.play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, "play given number of frames and exit"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
+};
+
+
+static const config_t mplayer_opts[]={
+ /* name, pointer, type, flags, min, max, help */
+ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, ""}, /* this don't need anymore to be the first!!! */
+
+//---------------------- libao/libvo/mplayer options ------------------------
+ {"vo", &mp_conf.video_driver, CONF_TYPE_STRING, 0, 0, 0, "select video output driver and optinaly device"},
+ {"ao", &mp_conf.audio_driver, CONF_TYPE_STRING, 0, 0, 0, "select audio output driver and optinaly device"},
+ {"af", &af_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects audio filter"},
+ {"vf", &vf_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects video filter"},
+ {"afm", &mp_conf.audio_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoders family"},
+ {"vfm", &mp_conf.video_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoders family"},
+ {"ac", &mp_conf.audio_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoder"},
+ {"vc", &mp_conf.video_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoder"},
+/*UD*/ {"verbose", &mp_conf.verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, "verbose output"},
+ {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, "verbose output (more -v means more verbosity)"},
+ {"slave", &mp_conf.slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, "turns MPlayerXP into slave mode as a backend for other programs"},
+ {"use-stdin", &mp_conf.use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "forces reading of keyboard codes from STDIN instead of terminal's console"},
+ {"msgfilter", &mp_conf.msg_filter, CONF_TYPE_INT, CONF_RANGE, 0, 0xFFFFFFFF, "specifies filter for verbosed messages"},
+
+ {"core", &xpcore_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "XP-core related options" },
+ {"play", &playback_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Playback specific options" },
+ {"audio", &audio_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Audio related options" },
+ {"video", &video_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video related options" },
+ {"sub", &subtitle_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Subtitle related options" },
+#ifdef HAVE_X11
+ {"x", &x11_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "X11-specific options" },
+#endif
+ {"osd", &osd_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "OSD-related options"},
+ {"sync", &avsync_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "AV-synchronization related options" },
+#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
+ {"cpu", &cpu_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "CPU specific options" },
+#endif
+// ------------------------- stream options --------------------
+#ifdef HAVE_STREAMING
+ { "net", &net_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Network specific options" },
+#endif
+// ------------------------- codec/pp options --------------------
+ {NULL, NULL, 0, 0, 0, 0, NULL}
+};
Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/dump.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -13,7 +13,7 @@
#include "xmpcore/sig_hand.h"
#include "help_mp.h"
#include "input/input.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "libmpdemux/muxer.h"
#include "libmpdemux/mrl.h"
#include "osdep/mplib.h"
Modified: mplayerxp/fifo.c
===================================================================
--- mplayerxp/fifo.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/fifo.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -1,4 +1,4 @@
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "fifo.h"
#include "osdep/mplib.h"
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libao2/ao_alsa9.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -18,7 +18,7 @@
#include <sys/poll.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -8,12 +8,12 @@
#include "codecs_ld.h"
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "liba52/a52.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -8,13 +8,13 @@
#include "codecs_ld.h"
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/cpudetect.h"
#include "libdca/dca.h"
#include "osdep/mm_accel.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/bswap.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -6,7 +6,7 @@
#include "codecs_ld.h"
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/mplib.h"
#include "ad_internal.h"
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -15,7 +15,7 @@
#include "codecs_ld.h"
#include "mp_config.h"
#include "ad_internal.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
#include "osdep/mplib.h"
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -4,7 +4,7 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -8,7 +8,7 @@
#include "ad_internal.h"
#include "osdep/bswap.h"
#include "codecs_ld.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "libao2/afmt.h"
#ifdef WIN32_LOADER
#include "loader/ldt_keeper.h"
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/dec_audio.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -5,7 +5,7 @@
#include "mp_config.h"
#include "help_mp.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "xmpcore/xmp_core.h"
#include "libmpdemux/stream.h"
@@ -16,7 +16,7 @@
#include "dec_audio.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "libmpdemux/demuxer_r.h"
#include "postproc/af.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "help_mp.h"
#include "osdep/timer.h"
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -5,7 +5,7 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "xmpcore/xmp_core.h"
#ifdef HAVE_GOMP
#include <omp.h>
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -11,7 +11,7 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "vd_internal.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
Modified: mplayerxp/libmpconf/cfgparser.c
===================================================================
--- mplayerxp/libmpconf/cfgparser.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpconf/cfgparser.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -598,7 +598,7 @@
MSG_INFO("%s", (char *) conf[i].p);
exit(1);
default:
- MSG_ERR( "Unknown config type specified in conf-mplayer.h!\n");
+ MSG_ERR( "Unknown config type specified in conf-mplayerxp.h!\n");
break;
}
out:
Modified: mplayerxp/libmpdemux/asf_mmst_streaming.c
===================================================================
--- mplayerxp/libmpdemux/asf_mmst_streaming.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/asf_mmst_streaming.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -15,7 +15,7 @@
#include <inttypes.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "tcp.h"
#include "url.h"
Modified: mplayerxp/libmpdemux/asf_streaming.c
===================================================================
--- mplayerxp/libmpdemux/asf_streaming.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/asf_streaming.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -6,7 +6,7 @@
#include <errno.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#ifndef HAVE_WINSOCK2
#define closesocket close
#else
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/cache2.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -22,7 +22,7 @@
#include "osdep/mplib.h"
#include "help_mp.h"
#include "mpdemux.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "demux_msg.h"
#ifndef min
Modified: mplayerxp/libmpdemux/cdda.c
===================================================================
--- mplayerxp/libmpdemux/cdda.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/cdda.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -1,5 +1,5 @@
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#ifdef HAVE_LIBCDIO
Modified: mplayerxp/libmpdemux/cddb.c
===================================================================
--- mplayerxp/libmpdemux/cddb.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/cddb.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -13,7 +13,7 @@
*/
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#if defined(HAVE_LIBCDIO) && defined(HAVE_STREAMING)
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -7,7 +7,7 @@
*/
#define USE_QTX_CODECS 1
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include <stdlib.h>
#include <stdio.h>
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -12,7 +12,7 @@
#include <theora/theora.h>
#endif
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/bswap.h"
#include "help_mp.h"
#include "stream.h"
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -28,7 +28,7 @@
#include <string.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demux_ty.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -36,7 +36,7 @@
#include <stdarg.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/bswap.h"
#include "help_mp.h"
Modified: mplayerxp/libmpdemux/demuxer.c
===================================================================
--- mplayerxp/libmpdemux/demuxer.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demuxer.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -12,7 +12,7 @@
#include "stream.h"
#include "mp_config.h"
#include "help_mp.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "libmpsub/subreader.h"
#include "libmpconf/cfgparser.h"
#include "nls/nls.h"
Modified: mplayerxp/libmpdemux/demuxer_r.c
===================================================================
--- mplayerxp/libmpdemux/demuxer_r.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/demuxer_r.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -10,7 +10,7 @@
#include "libmpsub/vobsub.h"
#include "osdep/timer.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "xmpcore/xmp_core.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/librtsp/rtsp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/librtsp/rtsp.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <assert.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#ifndef HAVE_WINSOCK2
#define closesocket close
#include <sys/socket.h>
Modified: mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -27,7 +27,7 @@
#include <inttypes.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/mplib.h"
#ifndef HAVE_WINSOCK2
Modified: mplayerxp/libmpdemux/librtsp/rtsp_session.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_session.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/librtsp/rtsp_session.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -30,7 +30,7 @@
#include <sys/types.h>
#include "mp_config.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#ifndef HAVE_WINSOCK2
#include <sys/socket.h>
#include <netinet/in.h>
Modified: mplayerxp/libmpdemux/network.c
===================================================================
--- mplayerxp/libmpdemux/network.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/network.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -16,7 +16,7 @@
#include <ctype.h>
#include "../mp_config.h"
-#include "../mplayer.h"
+#include "../mplayerxp.h"
#ifndef HAVE_WINSOCK2
#define closesocket close
#else
Modified: mplayerxp/libmpdemux/realrtsp/asmrp.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/asmrp.c 2012-11-09 06:59:22 UTC (rev 305)
+++ mplayerxp/libmpdemux/realrtsp/asmrp.c 2012-11-09 07:18:45 UTC (rev 306)
@@ -42,7 +42,7 @@
#include <string.h>
#include "asmrp.h"
#include "demux_msg.h"
-#include "mplayer.h"
+#include "mplayerxp.h"
#include "osdep/mplib.h"
/*
Modified: mplayerxp/libmpdemux/realrtsp/real.c
==========================================================...
[truncated message content] |
