RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 12:22:25 +00:00
Code Issues Releases Wiki Activity

Merge svn changes up to r27441

Browse Source 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
This commit is contained in:
Uoti Urpala 2008-08-08 02:04:43 +03:00
commit 17d3e4b36d
131 changed files with 1651 additions and 1160 deletions

1
Changelog
View File

@ -54,6 +54,7 @@ MPlayer (1.0)
Drivers:
* replace PolypAudio by PulseAudio (-ao pulse)
* add force-pbo suboption for faster output in vo_gl
* add Nintendo Wii/GameCube video driver (-vo wii)
MEncoder:
* Ogg muxing using -of lavf -o done.ogg

4
DOCS/man/en/mplayer.1
View File

@ -3928,6 +3928,10 @@ Explicitly choose the fbdev device name to use (default: /dev/\:fb0).
.PD 1
.
.TP
.B wii (Linux only)
Nintendo Wii/GameCube specific video output driver.
.
.TP
.B 3dfx (Linux only)
3dfx-specific video output driver that directly uses
the hardware on top of X11.

6
DOCS/man/fr/mplayer.1
View File

@ -1,4 +1,4 @@
.\" synced with r27236
.\" synced with r27407
.\" Encoding: iso-8859-1
.\" MPlayer (C) 2000-2008 MPlayer Team
.\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@ -4149,6 +4149,10 @@ Choisit explicitement le p
.PD 1
.
.TP
.B wii (Linux uniquement)
Pilote de sortie vidéo spécifique aux consoles Nintendo Wii et GameCube.
.
.TP
.B 3dfx (Linux uniquement)
Pilote de sortie vidéo spécifique aux cartes 3dfx, qui exploite directement
les circuits matériels 3dfx sous X11.

26
DOCS/man/hu/mplayer.1
View File

@ -1,4 +1,4 @@
.\" Synced with r27236
.\" Synced with r27407
.\" MPlayer (C) 2000-2008 MPlayer Team
.\" Ezt a man oldalt Gabucino, Diego Biurrun és Jonas Jermann készíti/készítette
.\" Karbantartó: Gabrov
@ -33,7 +33,7 @@
.\" Név
.\" --------------------------------------------------------------------------
.
.TH MPlayer 1 "2008. 07. 18." "MPlayer Project" "A film lejátszó"
.TH MPlayer 1 "2008. 08. 06." "MPlayer Project" "A film lejátszó"
.
.SH NÉV
mplayer \- film lejátszó
@ -2903,7 +2903,6 @@ Csak az fbdev, dga, svga, vesa vide
Ablakkerettel és dekorációkkal játsza le a filmet.
Mivel alapértelmezésként ez be van kapcsolva, használd a \-noborder opciót
a szabványos ablak dekorációk kikapcsolásához.
A directx videó kimeneti vezérlő támogatja.
.
.TP
.B \-brightness <\-100\-100>
@ -3251,7 +3250,7 @@ hasznos ha b
kiterjesztéssel).
.
.TP
.B \-xineramascreen <\-2\-...> (csak X11)
.B \-xineramascreen <\-2\-...>
Xinerama konfigurációkban (tehát amikor egy desktop több kijelzőn látható),
ezzel az opcióval adható meg hogy melyik kijelzőn történjen a lejátszás.
A \-2 érték teljes képernyőt jelent az egész virtuális képernyőn (ebben az
@ -3261,6 +3260,9 @@ A kezdeti poz
relatívan.
Általában a "\-fstype \-fullscreen" vagy "\-fstype none" opciókkal együtt
működik.
Ez az opció nem alkalmas csak a kezdő képernyő beállítására (sem a teljes
képernyőére), jelenleg a \-geometry a legalkalmasabb erre a célra.
A gl, gl2, x11 és az xv videó kimeneti vezérlő támogatja.
.
.TP
.B \-zrbw (csak \-vo zr)
@ -3954,6 +3956,10 @@ Explicit kiv
.PD 1
.
.TP
.B wii (csak Linux)
Nintendo Wii/GameCube specifikus videó kimeneti vezérlő.
.
.TP
.B 3dfx (csak Linux)
3dfx specifikus kimeneti videó vezérlő, ami közvetlenül.
használja a hardvert az X11 felett.
@ -8215,24 +8221,14 @@ id
.TP
.B vqcomp=<0.0\-1.0>
Kvantálási tömörítés, a vrc_eq függ ettől (alapértelmezett: 0.5).
Például feltéve, hogy az alapértelmezett rate control egyenletet használjuk,
ha a vqcomp=1.0, a ratecontrol minden kockához annyi számú bitet foglal le,
amennyi szükséges az azonos QP melletti kódolásukhoz.
Ha a vqcomp=0.0, a ratecontrol minden kockához ugyanannyi számú bitet foglal le,
pl. szigorú CBR.
.I MEGJEGYZÉS:
Ezek extrém beállítások és nem ajánlott őket használni.
A látható minőség valahol ezen két szélsőséges eset között lesz optimális.
A látható minőség valahol a két szélsőérték között lesz optimális.
.
.TP
.B vrc_eq=<egyenlet>
fő ratecontrol egyenlet
.RE
.RSs
.IPs "1\ \ \ \ "
konstans bitráta
.IPs "tex\ \ "
konstans minőség
.IPs 1+(tex/\:avgTex-1)*qComp
körülbelül a régi ratecontrol kódjának megfelelő egyenlet
.IPs tex^qComp

1
DOCS/tech/MAINTAINERS
View File

@ -187,6 +187,7 @@ libvo drivers:
* vo_tdfxfb.c - Alban Bedel
* vo_tga.c - Daniele Forghieri
* vo_vesa.c - Aurelien Jacobs
* vo_wii.c - Benjamin Zores
* vo_winvidix.c - Sascha Sommer
* vo_x11.c - Alexander Strasser
* vo_xmga.c - Attila Kinali

197
Makefile
View File

@ -249,12 +249,50 @@ SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \
dvdread/nav_read.c \
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
libfaad2/cfft.c \
libfaad2/common.c \
libfaad2/decoder.c \
libfaad2/drc.c \
libfaad2/drm_dec.c \
libfaad2/error.c \
libfaad2/filtbank.c \
libfaad2/hcr.c \
libfaad2/huffman.c \
libfaad2/ic_predict.c \
libfaad2/is.c \
libfaad2/lt_predict.c \
libfaad2/mdct.c \
libfaad2/mp4.c \
libfaad2/ms.c \
libfaad2/output.c \
libfaad2/pns.c \
libfaad2/ps_dec.c \
libfaad2/ps_syntax.c \
libfaad2/pulse.c \
libfaad2/rvlc.c \
libfaad2/sbr_dct.c \
libfaad2/sbr_dec.c \
libfaad2/sbr_e_nf.c \
libfaad2/sbr_fbt.c \
libfaad2/sbr_hfadj.c \
libfaad2/sbr_hfgen.c \
libfaad2/sbr_huff.c \
libfaad2/sbr_qmf.c \
libfaad2/sbr_syntax.c \
libfaad2/sbr_tf_grid.c \
libfaad2/specrec.c \
libfaad2/ssr.c \
libfaad2/ssr_fb.c \
libfaad2/ssr_ipqf.c \
libfaad2/syntax.c \
libfaad2/tns.c \
SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
SRCS_COMMON-$(FTP) += stream/stream_ftp.c
SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c
SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_hwac3.c \
@ -306,45 +344,6 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
libdvdcss/ioctl.c \
libdvdcss/libdvdcss.c \
SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
libfaad2/cfft.c \
libfaad2/common.c \
libfaad2/decoder.c \
libfaad2/drc.c \
libfaad2/drm_dec.c \
libfaad2/error.c \
libfaad2/filtbank.c \
libfaad2/hcr.c \
libfaad2/huffman.c \
libfaad2/ic_predict.c \
libfaad2/is.c \
libfaad2/lt_predict.c \
libfaad2/mdct.c \
libfaad2/mp4.c \
libfaad2/ms.c \
libfaad2/output.c \
libfaad2/pns.c \
libfaad2/ps_dec.c \
libfaad2/ps_syntax.c \
libfaad2/pulse.c \
libfaad2/rvlc.c \
libfaad2/sbr_dct.c \
libfaad2/sbr_dec.c \
libfaad2/sbr_e_nf.c \
libfaad2/sbr_fbt.c \
libfaad2/sbr_hfadj.c \
libfaad2/sbr_hfgen.c \
libfaad2/sbr_huff.c \
libfaad2/sbr_qmf.c \
libfaad2/sbr_syntax.c \
libfaad2/sbr_tf_grid.c \
libfaad2/specrec.c \
libfaad2/ssr.c \
libfaad2/ssr_fb.c \
libfaad2/ssr_ipqf.c \
libfaad2/syntax.c \
libfaad2/tns.c \
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
libmpeg2/alloc.c \
@ -373,7 +372,10 @@ SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \
libmpdemux/demux_ogg.c
SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
libmpdemux/demux_rtp_codec.cpp \
stream/stream_live555.c
SRCS_COMMON-$(MACOSX_FINDER) += osdep/macosx_finder_args.c
SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c
SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \
@ -384,25 +386,6 @@ SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c
SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c
SRCS_COMMON-$(MP3LIB)-$(HAVE_SSE) += mp3lib/dct64_sse.c
SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \
stream/asf_mmst_streaming.c \
stream/asf_streaming.c \
stream/cookies.c \
stream/http.c \
stream/network.c \
stream/pnm.c \
stream/rtp.c \
stream/udp.c \
stream/tcp.c \
stream/stream_rtp.c \
stream/stream_udp.c \
stream/librtsp/rtsp.c \
stream/realrtsp/asmrp.c \
stream/realrtsp/real.c \
stream/realrtsp/rmff.c \
stream/realrtsp/sdpplin.c \
stream/realrtsp/xbuffer.c \
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
libmpdemux/demux_mpc.c
SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
@ -421,6 +404,25 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c
SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c
SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c
SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c
SRCS_COMMON-$(NETWORK) += stream/stream_netstream.c \
stream/asf_mmst_streaming.c \
stream/asf_streaming.c \
stream/cookies.c \
stream/http.c \
stream/network.c \
stream/pnm.c \
stream/rtp.c \
stream/udp.c \
stream/tcp.c \
stream/stream_rtp.c \
stream/stream_udp.c \
stream/librtsp/rtsp.c \
stream/realrtsp/asmrp.c \
stream/realrtsp/real.c \
stream/realrtsp/rmff.c \
stream/realrtsp/sdpplin.c \
stream/realrtsp/xbuffer.c \
SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c
SRCS_COMMON-$(PVR) += stream/stream_pvr.c
SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \
@ -432,9 +434,6 @@ SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \
libmpcodecs/vd_realvid.c
SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \
libmpdemux/demux_rtp_codec.cpp \
stream/stream_live555.c \
SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
tremor/block.c \
@ -646,16 +645,16 @@ OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)))
OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
INSTALL_TARGETS-$(GUI) += install-gui
INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mencoder-man
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
DIRS = . \
dvdread \
@ -730,12 +729,12 @@ all: $(ALL_PRG-yes)
%.d: %.m
$(MPDEPEND_CMD) > $@
%.o: %.m
$(CC) $(CFLAGS) -c -o $@ $<
%.ho: %.h
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
%.o: %.m
$(CC) $(CFLAGS) -c -o $@ $<
%-rc.o: %.rc
$(WINDRES) -I. $< $@
@ -748,12 +747,12 @@ $(FFMPEGLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
$(MAKE) -C $(@D)
touch $@
mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
mencoder$(EXESUF): $(MENCODER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
mplayer$(EXESUF): $(MPLAYER_DEPS)
$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
$(HOST_CC) -O -I. -Iffmpeg -DCODECS2HTML -o $@ $<
@ -783,20 +782,22 @@ version.h:
###### dependency declarations / specific CFLAGS ######
codec-cfg.d: codecs.conf.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d osdep/mplayer-rc.o: version.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(LIBDVDCSS_DVDREAD_FLAGS)
libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H
dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER)
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN)
loader/win32.o loader/win32.d: CFLAGS += $(CFLAGS_STACKREALIGN)
mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer
vidix/%: CFLAGS += $(CFLAG_DHAHELPER) $(CFLAG_SVGALIB_HELPER)
tremor/%.o tremor/%.d: CFLAGS += $(CFLAGS_TREMOR_LOW)
vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER)
VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \
vidix/pci_names.h vidix/pci_vendors.h
@ -821,15 +822,26 @@ install-dirs:
install-%: %$(EXESUF) install-dirs
$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
install-gui: install-mplayer
-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
install-mencoder-man-en: install-mplayer-man-en
cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/
install-mencoder-man-en: install-mplayer-man-en
cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
endef
define MPLAYER_MAN_RULE
install-mplayer-man-$(lang):
@ -837,19 +849,8 @@ install-mplayer-man-$(lang):
$(INSTALL) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/
endef
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
endef
$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE)))
install-gui: install-mplayer
-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE)))
uninstall:
rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
@ -886,12 +887,12 @@ tags:
TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h codec-cfg.h $(TEST_OBJS)
$(CC) -I. -DTESTING -o $@ $^
codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^
liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm
libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)

36
cfg-common-opts.h
View File

@ -6,7 +6,7 @@
{"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
{"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
{"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#endif
#ifdef WIN32
@ -45,7 +45,7 @@
{"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"csslib", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#ifdef MPLAYER_NETWORK
#ifdef CONFIG_NETWORK
{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
@ -68,25 +68,25 @@
{"passwd", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"bandwidth", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* MPLAYER_NETWORK */
#endif /* CONFIG_NETWORK */
#ifdef STREAMING_LIVE555
#ifdef CONFIG_LIVE555
{"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
{"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#elif defined (LIBNEMESI)
#elif defined (CONFIG_LIBNEMESI)
{"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#else
{"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* STREAMING_LIVE555 */
#ifdef MPLAYER_NETWORK
#endif /* CONFIG_LIVE555 */
#ifdef CONFIG_NETWORK
{"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
{"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},
#else
{"rtsp-port", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"rtsp-destination", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* MPLAYER_NETWORK */
#endif /* CONFIG_NETWORK */
// ------------------------- demuxer options --------------------
@ -125,7 +125,7 @@
{ "rawaudio", &demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
{ "rawvideo", &demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#ifdef HAVE_CDDA
#ifdef CONFIG_CDDA
{ "cdda", &cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
@ -150,13 +150,13 @@
#else
{"tv", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif /* CONFIG_TV */
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
{"pvr", (void *) pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#else
{"pvr", "MPlayer was compiled without V4L2/PVR interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
{"vivo", (void *) vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
{"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
@ -258,7 +258,7 @@
// ------------------------- subtitles options --------------------
{"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
#ifdef HAVE_FRIBIDI
#ifdef CONFIG_FRIBIDI
{"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
@ -270,8 +270,8 @@
{"noflip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"flip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"noflip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* HAVE_FRIBIDI */
#ifdef HAVE_ICONV
#endif /* CONFIG_FRIBIDI */
#ifdef CONFIG_ICONV
{"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
{"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL},
@ -303,7 +303,7 @@
{"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL},
{"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
{"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, NULL},
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
{"subfont-encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"subfont-text-scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
{"subfont-osd-scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
@ -328,10 +328,10 @@
{"ass-styles", &ass_styles_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"ass-hinting", &ass_hinting, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
#endif
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
{"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, -1, 1, NULL},
{"nofontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 1, -1, NULL},
#else
{"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif /* HAVE_FONTCONFIG */
#endif /* CONFIG_FONTCONFIG */

24
cfg-common.h
View File

@ -84,7 +84,7 @@ const m_option_t tvopts_conf[]={
{"chanlist", &stream_tv_defaults.chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"norm", &stream_tv_defaults.norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"automute", &stream_tv_defaults.automute, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
{"normid", &stream_tv_defaults.normid, CONF_TYPE_INT, 0, 0, 0, NULL},
#endif
{"width", &stream_tv_defaults.width, CONF_TYPE_INT, 0, 0, 4096, NULL},
@ -98,12 +98,12 @@ const m_option_t tvopts_conf[]={
{"hue", &stream_tv_defaults.hue, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
{"saturation", &stream_tv_defaults.saturation, CONF_TYPE_INT, CONF_RANGE, -100, 100, NULL},
{"gain", &stream_tv_defaults.gain, CONF_TYPE_INT, CONF_RANGE, -1, 100, NULL},
#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW)
#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW)
{"buffersize", &stream_tv_defaults.buffer_size, CONF_TYPE_INT, CONF_RANGE, 16, 1024, NULL},
{"amode", &stream_tv_defaults.amode, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
{"volume", &stream_tv_defaults.volume, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
#endif
#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
#if defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2)
{"bass", &stream_tv_defaults.bass, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
{"treble", &stream_tv_defaults.treble, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
{"balance", &stream_tv_defaults.balance, CONF_TYPE_INT, CONF_RANGE, 0, 65535, NULL},
@ -113,19 +113,19 @@ const m_option_t tvopts_conf[]={
{"mjpeg", &stream_tv_defaults.mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"decimation", &stream_tv_defaults.decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
{"quality", &stream_tv_defaults.quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
#ifdef CONFIG_ALSA
{"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#endif /* defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) */
#endif /* defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2) */
#endif /* CONFIG_ALSA */
#endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */
{"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
{"tdevice", &stream_tv_defaults.tdevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"tpage", &stream_tv_defaults.tpage, CONF_TYPE_INT, CONF_RANGE, 100, 899, NULL},
{"tformat", &stream_tv_defaults.tformat, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL},
{"tlang", &stream_tv_defaults.tlang, CONF_TYPE_INT, CONF_RANGE, -1, 0x7f, NULL},
#endif /* HAVE_TV_TELETEXT */
#endif /* CONFIG_TV_TELETEXT */
{"audioid", &stream_tv_defaults.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
#ifdef HAVE_TV_DSHOW
#ifdef CONFIG_TV_DSHOW
{"hidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nohidden_video_renderer", &stream_tv_defaults.hidden_video_renderer, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"hidden_vp_renderer", &stream_tv_defaults.hidden_vp_renderer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@ -139,7 +139,7 @@ const m_option_t tvopts_conf[]={
};
#endif /* CONFIG_TV */
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
extern int pvr_param_aspect_ratio;
extern int pvr_param_sample_rate;
extern int pvr_param_audio_layer;
@ -162,9 +162,9 @@ const m_option_t pvropts_conf[]={
{"fmt", &pvr_param_stream_type, CONF_TYPE_STRING, 0, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL}
};
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
#include "stream/dvbin.h"
extern const m_config_t dvbin_opts_conf[];
#endif

20
cfg-mplayer.h
View File

@ -113,16 +113,16 @@ const m_option_t mplayer_opts[]={
CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
#ifdef HAVE_X11
#ifdef CONFIG_X11
{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif
// -vo png only:
#ifdef HAVE_PNG
#ifdef CONFIG_PNG
{"z", "-z has been removed. Use -vo png:z=<0-9> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
// -vo jpeg only:
#ifdef HAVE_JPEG
#ifdef CONFIG_JPEG
{"jpeg", "-jpeg has been removed. Use -vo jpeg:<options> instead.\n",
CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
@ -189,7 +189,7 @@ const m_option_t mplayer_opts[]={
{"adapter", &vo_adapter_num, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
{"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL},
{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
#ifdef HAVE_X11
#ifdef CONFIG_X11
// x11,xv,xmga,xvidix
{"icelayer", "-icelayer has been removed. Use -fstype layer:<number> instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL},
@ -221,12 +221,12 @@ const m_option_t mplayer_opts[]={
{"aa*", "-aa* has been removed. Use -vo aa:suboption instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
#ifdef HAVE_ZR
#ifdef CONFIG_ZR
// -vo zr
{"zr*", vo_zr_parseoption, CONF_TYPE_FUNC_FULL, 0, 0, 0, &vo_zr_revertoption },
#endif
#ifdef HAVE_DXR2
#ifdef CONFIG_DXR2
{"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
@ -235,7 +235,7 @@ const m_option_t mplayer_opts[]={
{"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"nouse-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
#ifdef CRASH_DEBUG
#ifdef CONFIG_CRASH_DEBUG
{"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
#endif
@ -249,13 +249,13 @@ const m_option_t mplayer_opts[]={
{"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL},
#ifdef HAVE_FRIBIDI
#ifdef CONFIG_FRIBIDI
{"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"menu-noflip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"menu-flip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"menu-noflip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#endif /* HAVE_FRIBIDI */
#endif /* CONFIG_FRIBIDI */
#else
{"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL},
#endif /* CONFIG_MENU */
@ -290,7 +290,7 @@ const m_option_t mplayer_opts[]={
{"dumpjacosub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 8, NULL},
{"dumpsami", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 9, NULL},
#ifdef HAVE_LIRC
#ifdef CONFIG_LIRC
{"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#endif

64
command.c
View File

@ -35,10 +35,10 @@
#ifdef CONFIG_RADIO
#include "stream/stream_radio.h"
#endif
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
#include "stream/pvr.h"
#endif
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
#include "stream/dvbin.h"
#endif
#ifdef CONFIG_DVDREAD
@ -384,13 +384,14 @@ static int mp_property_time_pos(m_option_t *prop, int action,
static int mp_property_chapter(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
int chapter;
int chapter = -1;
float next_pts = 0;
int chapter_num;
int step_all;
char *chapter_name = NULL;
chapter = demuxer_get_current_chapter(mpctx->demuxer);
if (mpctx->demuxer)
chapter = demuxer_get_current_chapter(mpctx->demuxer);
if (chapter < 0)
return M_PROPERTY_UNAVAILABLE;
@ -455,11 +456,12 @@ static int mp_property_chapter(m_option_t *prop, int action, void *arg,
static int mp_property_angle(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
int angle;
int angle = -1;
int angles;
char *angle_name = NULL;
angle = demuxer_get_current_angle(mpctx->demuxer);
if (mpctx->demuxer)
angle = demuxer_get_current_angle(mpctx->demuxer);
if (angle < 0)
return M_PROPERTY_UNAVAILABLE;
angles = demuxer_angles_count(mpctx->demuxer);
@ -841,6 +843,8 @@ static int mp_property_audio(m_option_t *prop, int action, void *arg,
case M_PROPERTY_STEP_UP:
case M_PROPERTY_SET:
if (!mpctx->demuxer)
return M_PROPERTY_UNAVAILABLE;
if (action == M_PROPERTY_SET && arg)
tmp = *((int *) arg);
else
@ -1781,7 +1785,7 @@ static int mp_property_sub_forced_only(m_option_t *prop, int action,
}
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
/// Subtitle scale (RW)
static int mp_property_sub_scale(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
@ -1869,7 +1873,7 @@ static int mp_property_tv_color(m_option_t *prop, int action, void *arg,
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
static int mp_property_teletext_common(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
@ -1950,7 +1954,7 @@ static int mp_property_teletext_page(m_option_t *prop, int action, void *arg,
}
#endif /* HAVE_TV_TELETEXT */
#endif /* CONFIG_TV_TELETEXT */
///@}
@ -2081,7 +2085,7 @@ static const m_option_t mp_properties[] = {
M_OPT_RANGE, 0, 1, NULL },
{ "sub_forced_only", mp_property_sub_forced_only, CONF_TYPE_FLAG,
M_OPT_RANGE, 0, 1, NULL },
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
{ "sub_scale", mp_property_sub_scale, CONF_TYPE_FLOAT,
M_OPT_RANGE, 0, 100, NULL },
#endif
@ -2101,7 +2105,7 @@ static const m_option_t mp_properties[] = {
M_OPT_RANGE, -100, 100, (void *) TV_COLOR_HUE },
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
{ "teletext_page", mp_property_teletext_page, CONF_TYPE_INT,
M_OPT_RANGE, 100, 899, (void*)TV_VBI_CONTROL_GET_PAGE },
{ "teletext_subpage", mp_property_teletext_common, CONF_TYPE_INT,
@ -2214,7 +2218,7 @@ static struct {
{ "sub_delay", MP_CMD_SUB_DELAY, 0, 0, OSD_MSG_SUB_DELAY, MSGTR_SubDelayStatus },
{ "sub_visibility", MP_CMD_SUB_VISIBILITY, 1, 0, -1, MSGTR_SubVisibleStatus },
{ "sub_forced_only", MP_CMD_SUB_FORCED_ONLY, 1, 0, -1, MSGTR_SubForcedOnlyStatus },
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
{ "sub_scale", MP_CMD_SUB_SCALE, 0, 0, -1, MSGTR_SubScale},
#endif
#ifdef CONFIG_ASS
@ -2659,6 +2663,10 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
break;
case MP_CMD_STOP:
// Go back to the starting point.
while (play_tree_iter_up_step
(mpctx->playtree_iter, 0, 1) != PLAY_TREE_ITER_END)
/* NOP */ ;
mpctx->eof = PT_STOP;
brk_cmd = 1;
break;
@ -2712,28 +2720,28 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (mpctx->file_format == DEMUXER_TYPE_TV)
tv_set_freq((tvi_handle_t *) (mpctx->demuxer->priv),
cmd->args[0].v.f * 16.0);
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
pvr_set_freq (mpctx->stream, ROUND (cmd->args[0].v.f));
set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
pvr_get_current_channelname (mpctx->stream),
pvr_get_current_stationname (mpctx->stream));
}
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
break;
case MP_CMD_TV_STEP_FREQ:
if (mpctx->file_format == DEMUXER_TYPE_TV)
tv_step_freq((tvi_handle_t *) (mpctx->demuxer->priv),
cmd->args[0].v.f * 16.0);
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
pvr_force_freq_step (mpctx->stream, ROUND (cmd->args[0].v.f));
set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: f %d",
pvr_get_current_channelname (mpctx->stream),
pvr_get_current_frequency (mpctx->stream));
}
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
break;
case MP_CMD_TV_SET_NORM:
@ -2760,7 +2768,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
//vo_osd_changed(OSDTYPE_SUBTITLE);
}
}
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
else if (mpctx->stream &&
mpctx->stream->type == STREAMTYPE_PVR) {
pvr_set_channel_step (mpctx->stream, cmd->args[0].v.i);
@ -2768,9 +2776,9 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
pvr_get_current_channelname (mpctx->stream),
pvr_get_current_stationname (mpctx->stream));
}
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
}
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
if (mpctx->stream->type == STREAMTYPE_DVB) {
int dir;
int v = cmd->args[0].v.i;
@ -2785,7 +2793,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (dvb_step_channel(mpctx->stream, dir))
mpctx->eof = mpctx->dvbin_reopen = 1;
}
#endif /* HAS_DVBIN_SUPPORT */
#endif /* CONFIG_DVBIN */
break;
case MP_CMD_TV_SET_CHANNEL:
@ -2798,17 +2806,17 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
//vo_osd_changed(OSDTYPE_SUBTITLE);
}
}
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
pvr_set_channel (mpctx->stream, cmd->args[0].v.s);
set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
pvr_get_current_channelname (mpctx->stream),
pvr_get_current_stationname (mpctx->stream));
}
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
break;
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
case MP_CMD_DVB_SET_CHANNEL:
if (mpctx->stream->type == STREAMTYPE_DVB) {
mpctx->last_dvb_step = 1;
@ -2818,7 +2826,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
mpctx->eof = mpctx->dvbin_reopen = 1;
}
break;
#endif /* HAS_DVBIN_SUPPORT */
#endif /* CONFIG_DVBIN */
case MP_CMD_TV_LAST_CHANNEL:
if (mpctx->file_format == DEMUXER_TYPE_TV) {
@ -2829,14 +2837,14 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
//vo_osd_changed(OSDTYPE_SUBTITLE);
}
}
#ifdef HAVE_PVR
#ifdef CONFIG_PVR
else if (mpctx->stream && mpctx->stream->type == STREAMTYPE_PVR) {
pvr_set_lastchannel (mpctx->stream);
set_osd_msg (OSD_MSG_TV_CHANNEL, 1, osd_duration, "%s: %s",
pvr_get_current_channelname (mpctx->stream),
pvr_get_current_stationname (mpctx->stream));
}
#endif /* HAVE_PVR */
#endif /* CONFIG_PVR */
break;
case MP_CMD_TV_STEP_NORM:
@ -2848,7 +2856,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
if (mpctx->file_format == DEMUXER_TYPE_TV)
tv_step_chanlist((tvi_handle_t *) (mpctx->demuxer->priv));
break;
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
case MP_CMD_TV_TELETEXT_ADD_DEC:
{
tvi_handle_t* tvh=(tvi_handle_t *)(mpctx->demuxer->priv);
@ -2863,7 +2871,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
tvh->functions->control(tvh->priv,TV_VBI_CONTROL_GO_LINK,&(cmd->args[0].v.i));
break;
}
#endif /* HAVE_TV_TELETEXT */
#endif /* CONFIG_TV_TELETEXT */
#endif /* CONFIG_TV */
case MP_CMD_SUB_LOAD:

474
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
get_path.c
View File

@ -13,7 +13,7 @@
#include "mp_msg.h"
#include "get_path.h"
#ifdef MACOSX_BUNDLE
#ifdef CONFIG_MACOSX_BUNDLE
#include <CoreFoundation/CoreFoundation.h>
#include <sys/types.h>
#include <sys/stat.h>
@ -38,7 +38,7 @@ char *get_path(const char *filename){
static char *config_dir = "/.mplayer";
#endif
int len;
#ifdef MACOSX_BUNDLE
#ifdef CONFIG_MACOSX_BUNDLE
struct stat dummy;
CFIndex maxlen=256;
CFURLRef res_url_ref=NULL;
@ -96,7 +96,7 @@ char *get_path(const char *filename){
sprintf(buff, "%s%s/%s", homedir, config_dir, filename);
}
#ifdef MACOSX_BUNDLE
#ifdef CONFIG_MACOSX_BUNDLE
if (stat(buff, &dummy)) {
res_url_ref=CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());

16
gui/cfg.c
View File

@ -58,12 +58,12 @@ char * gtkAOOSSMixer;
char * gtkAOOSSMixerChannel;
char * gtkAOOSSDevice;
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
char * gtkAOALSAMixer;
char * gtkAOALSAMixerChannel;
char * gtkAOALSADevice;
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
char * gtkAOSDLDriver;
#endif
#ifdef CONFIG_ESD
@ -76,7 +76,7 @@ int gtkCacheSize = 2048;
int gtkAutoSyncOn = 0;
int gtkAutoSync = 0;
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
char * gtkDXR3Device;
#endif
@ -111,7 +111,7 @@ static const m_option_t gui_opts[] =
{ "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
{ "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
{ "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL },
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
{ "vo_dxr3_device",&gtkDXR3Device,CONF_TYPE_STRING,0,0,0,NULL },
#endif
@ -139,12 +139,12 @@ static const m_option_t gui_opts[] =
{ "ao_oss_mixer_channel",&gtkAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
{ "ao_oss_device",&gtkAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL },
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
{ "ao_alsa_mixer",&gtkAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL },
{ "ao_alsa_mixer_channel",&gtkAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
{ "ao_alsa_device",&gtkAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL },
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
{ "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
#endif
#ifdef CONFIG_ESD
@ -165,12 +165,12 @@ static const m_option_t gui_opts[] =
#endif
{ "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL },
{ "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL },
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
{ "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL },
#endif
{ "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL },
{ "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL },
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
{ "font_encoding",&subtitle_font_encoding,CONF_TYPE_STRING,0,0,0,NULL },
{ "font_text_scale",&text_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },
{ "font_osd_scale",&osd_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL },

24
gui/interface.c
View File

@ -51,7 +51,7 @@
extern af_cfg_t af_cfg;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
#include <iconv.h>
#endif
@ -185,7 +185,7 @@ void guiInit( void )
guiIntfStruct.StreamType=-1;
memset( &gtkEquChannels,0,sizeof( gtkEquChannels ) );
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" );
#endif
if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
@ -400,7 +400,7 @@ extern m_obj_settings_t * vf_settings;
void guiLoadFont( void )
{
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor);
#else
if ( vo_font )
@ -616,7 +616,7 @@ int guiGetEvent( int type,char * arg )
guiGetEvent( guiSetDVD,(char *)stream->priv );
break;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
{
int i;
@ -706,7 +706,7 @@ int guiGetEvent( int type,char * arg )
}
}
// -- subtitle
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
#ifdef CONFIG_LIBAVCODEC
&& !gtkVfLAVC
@ -743,7 +743,7 @@ int guiGetEvent( int type,char * arg )
{
case STREAMTYPE_PLAYLIST:
break;
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
{
char tmp[512];
@ -795,7 +795,7 @@ int guiGetEvent( int type,char * arg )
}
}
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
#ifdef CONFIG_LIBAVCODEC
remove_vf( "lavc" );
#endif
@ -842,7 +842,7 @@ int guiGetEvent( int type,char * arg )
free(tmp);
}
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) )
{
char *tmp;
@ -857,7 +857,7 @@ int guiGetEvent( int type,char * arg )
free(tmp);
}
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) )
{
char *tmp;
@ -1075,7 +1075,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
} else { url_item->next=NULL; URLList=url_item; }
return NULL;
// --- subtitle
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
case gtkSetFontFactor:
font_factor=fparam;
guiLoadFont();
@ -1107,7 +1107,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
guiLoadFont();
return NULL;
#endif
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
case gtkSetSubEncoding:
gfree( (void **)&sub_cp );
sub_cp=gstrdup( (char *)vparam );
@ -1125,7 +1125,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
#ifdef CONFIG_DVDREAD
if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0;
#endif
return NULL;

2
gui/interface.h
View File

@ -90,7 +90,7 @@ typedef struct
int Chapter;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
int VCDTracks;
#endif

2
gui/mplayer/gtk/fs.c
View File

@ -116,7 +116,7 @@ int fsLastAudioFilterSelected = -1;
char * fsFontFileNames[][2] =
{
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
{ "True Type fonts (*.ttf)", "*.ttf" },
{ "Type1 fonts (*.pfb)", "*.pfb" },
{ "All fonts", "*.ttf,*.pfb" },

6
gui/mplayer/gtk/menu.c
View File

@ -72,7 +72,7 @@
#include "../pixmaps/tonguebla.xpm"
#include "../pixmaps/empty1px.xpm"
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
#include "../pixmaps/vcd.xpm"
#include "../pixmaps/playvcd.xpm"
#endif
@ -421,7 +421,7 @@ GtkWidget * create_PopUpMenu( void )
AddSeparator( Menu );
SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile" ", evLoadPlay );
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
#endif
#ifdef CONFIG_DVDREAD
@ -446,7 +446,7 @@ GtkWidget * create_PopUpMenu( void )
// AddMenuItem( SubMenu,MSGTR_MENU_NormalSize" ", evNormalSize );
// AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
// AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen );
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD );
AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
AddSeparator( VCDSubMenu );

70
gui/mplayer/gtk/opts.c
View File

@ -122,7 +122,7 @@ static GtkWidget * HSFPS;
static GtkAdjustment * HSExtraStereoMuladj, * HSAudioDelayadj, * HSPanscanadj, * HSSubDelayadj;
static GtkAdjustment * HSSubPositionadj, * HSSubFPSadj, * HSPPQualityadj, * HSFPSadj;
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
static GtkWidget * HSFontFactor;
static GtkAdjustment * HSFontFactoradj;
#else
@ -133,11 +133,11 @@ static GtkWidget * RBFontNoAutoScale, * RBFontAutoScaleWidth, * RBFontAutoSc
//static GtkWidget * AutoScale;
#endif
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
static GtkWidget * CBSubEncoding, * ESubEncoding;
#endif
#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV)
#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
static struct
{
char * name;
@ -178,7 +178,7 @@ static char * ao_driver[3];
static char * vo_driver[3];
static int old_video_driver = 0;
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
void ShowDXR3Config( void );
void HideDXR3Config( void );
#endif
@ -188,7 +188,7 @@ static int old_video_driver = 0;
static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer user_data );
static void prToggled( GtkToggleButton * togglebutton,gpointer user_data );
static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data );
#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV)
#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
static void prEntry( GtkContainer * container,gpointer user_data );
#endif
@ -271,7 +271,7 @@ void ShowPreferences( void )
gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 );
gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver );
gtk_widget_set_sensitive( VConfig,FALSE );
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
#endif
}
@ -312,7 +312,7 @@ void ShowPreferences( void )
if ( guiIntfStruct.Subtitlename ) gtk_entry_set_text( GTK_ENTRY( ESubtitleName ),guiIntfStruct.Subtitlename );
#endif
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
if ( sub_cp )
{
int i;
@ -326,7 +326,7 @@ void ShowPreferences( void )
// --- 4. page
// font ...
if ( font_name ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
gtk_adjustment_set_value( HSFontFactoradj,font_factor );
#else
gtk_adjustment_set_value( HSFontBluradj,( subtitle_font_radius / 8.0f ) * 100.0f );
@ -434,7 +434,7 @@ void ShowPreferences( void )
gtk_signal_connect( GTK_OBJECT( CBSoftwareMixer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );
gtk_signal_connect( GTK_OBJECT( CBAudioEqualizer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)2 );
gtk_signal_connect( GTK_OBJECT( CBShowVideoWindow ),"toggled",GTK_SIGNAL_FUNC( prToggled ), (void*)3 );
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
gtk_signal_connect( GTK_OBJECT( RBFontNoAutoScale ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)4 );
gtk_signal_connect( GTK_OBJECT( RBFontAutoScaleHeight ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)5 );
gtk_signal_connect( GTK_OBJECT( RBFontAutoScaleWidth ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)6 );
@ -451,7 +451,7 @@ void ShowPreferences( void )
gtk_signal_connect( GTK_OBJECT( HSPanscan ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)2 );
gtk_signal_connect( GTK_OBJECT( HSSubDelay ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)3 );
gtk_signal_connect( GTK_OBJECT( HSSubPosition ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)4 );
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
gtk_signal_connect( GTK_OBJECT( HSFontFactor ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)5 );
#else
gtk_signal_connect( GTK_OBJECT( HSFontBlur ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)6 );
@ -460,7 +460,7 @@ void ShowPreferences( void )
gtk_signal_connect( GTK_OBJECT( HSFontOSDScale ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)9 );
gtk_signal_connect( GTK_OBJECT( EFontEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),(void *)0 );
#endif
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
gtk_signal_connect( GTK_OBJECT( ESubEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),(void *)1 );
#endif
gtk_signal_connect( GTK_OBJECT( HSPPQuality ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)10 );
@ -487,12 +487,12 @@ void HidePreferences( void )
gtk_widget_destroy( Preferences );
Preferences=NULL;
HideAudioConfig();
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
HideDXR3Config();
#endif
}
#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV)
#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
static void prEntry( GtkContainer * container,gpointer user_data )
{
const char * comment;
@ -500,7 +500,7 @@ static void prEntry( GtkContainer * container,gpointer user_data )
switch( (int)user_data )
{
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
case 0: // font encoding
comment=gtk_entry_get_text( GTK_ENTRY( EFontEncoding ) );
for ( i=0;lEncoding[i].name;i++ )
@ -508,7 +508,7 @@ static void prEntry( GtkContainer * container,gpointer user_data )
if ( lEncoding[i].comment ) gtkSet( gtkSetFontEncoding,0,lEncoding[i].name );
break;
#endif
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
case 1: // sub encoding
comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) );
for ( i=0;lEncoding[i].name;i++ )
@ -580,7 +580,7 @@ void prButton( GtkButton * button,gpointer user_data )
// --- 4. page
guiSetFilename( font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
gtkSet( gtkSetFontFactor,HSFontFactoradj->value,NULL );
#else
gtkSet( gtkSetFontBlur,HSFontBluradj->value,NULL );
@ -649,7 +649,7 @@ void prButton( GtkButton * button,gpointer user_data )
case bVconfig:
if ( !vo_driver[0] ) break;
gtk_widget_set_sensitive( VConfig,FALSE );
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); }
#endif
break;
@ -684,7 +684,7 @@ static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer u
case 4: // sub position
sub_pos=(int)HSSubPositionadj->value;
break;
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
case 5: // font factor
gtkSet( gtkSetFontFactor,HSFontFactoradj->value,NULL );
break;
@ -790,7 +790,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g
case 1: // video driver
gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver );
gtk_widget_set_sensitive( VConfig,FALSE );
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
#endif
break;
@ -827,7 +827,7 @@ GtkWidget * create_Preferences( void )
GtkWidget * vbox603;
GtkWidget * hbox6;
GtkWidget * hbuttonbox5;
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
GtkWidget * hbox7;
#endif
GtkWidget * vbox601;
@ -1030,7 +1030,7 @@ GtkWidget * create_Preferences( void )
label=AddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
label=AddLabel( MSGTR_PREFERENCES_FontEncoding,NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
#endif
@ -1051,7 +1051,7 @@ GtkWidget * create_Preferences( void )
gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSSubFPS ),TRUE );
gtk_table_attach( GTK_TABLE( table1 ),HSSubFPS,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
CBSubEncoding=gtk_combo_new();
gtk_widget_set_name( CBSubEncoding,"CBSubEncoding" );
gtk_widget_show( CBSubEncoding );
@ -1117,7 +1117,7 @@ GtkWidget * create_Preferences( void )
gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox5 ),3 );
BLoadFont=AddButton( MSGTR_Browse,hbuttonbox5 );
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
hbox7=AddHBox( vbox603,1 );
AddLabel( MSGTR_PREFERENCES_FontFactor,hbox7 );
HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) );
@ -1388,7 +1388,7 @@ GList *appendOSSDevices(GList *l) {
l = g_list_append(l, (gpointer)"/dev/dsp2");
l = g_list_append(l, (gpointer)"/dev/dsp3");
}
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
l = g_list_append(l, (gpointer)"/dev/em8300_ma");
l = g_list_append(l, (gpointer)"/dev/em8300_ma-0");
l = g_list_append(l, (gpointer)"/dev/em8300_ma-1");
@ -1423,7 +1423,7 @@ GList *appendOSSMixerChannels(GList *l) {
}
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
GList *appendALSADevices(GList *l) {
l = g_list_append(l, (gpointer)"default");
l = g_list_append(l, (gpointer)"hw=0.0");
@ -1450,7 +1450,7 @@ GList *appendALSAMixerChannels(GList *l) {
}
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
GList *appendSDLDevices(GList *l) {
l = g_list_append(l, (gpointer)"alsa");
l = g_list_append(l, (gpointer)"arts");
@ -1510,14 +1510,14 @@ void ShowAudioConfig() {
setGtkEntryText(CEAudioMixerChannel, gtkAOOSSMixerChannel);
}
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0) {
setGtkEntryText(CEAudioDevice, gtkAOALSADevice);
setGtkEntryText(CEAudioMixer, gtkAOALSAMixer);
setGtkEntryText(CEAudioMixerChannel, gtkAOALSAMixerChannel);
}
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
if (strncmp(ao_driver[0], "sdl", 3) == 0) {
setGtkEntryText(CEAudioDevice, gtkAOSDLDriver);
}
@ -1552,7 +1552,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
}
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0) {
gfree(&gtkAOALSADevice);
gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice));
@ -1562,7 +1562,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
}
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
if (strncmp(ao_driver[0], "sdl", 3) == 0) {
gfree(&gtkAOSDLDriver);
gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
@ -1616,11 +1616,11 @@ GtkWidget *create_AudioConfig() {
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSDevices(items);
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0)
items = appendALSADevices(items);
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
if (strncmp(ao_driver[0], "sdl", 3) == 0)
items = appendSDLDevices(items);
#endif
@ -1646,7 +1646,7 @@ GtkWidget *create_AudioConfig() {
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixers(items);
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0)
items = appendALSAMixers(items);
#endif
@ -1668,7 +1668,7 @@ GtkWidget *create_AudioConfig() {
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixerChannels(items);
#endif
#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
#ifdef CONFIG_ALSA
if (strncmp(ao_driver[0], "alsa", 4) == 0)
items = appendALSAMixerChannels(items);
#endif
@ -1700,7 +1700,7 @@ GtkWidget *create_AudioConfig() {
return AudioConfig;
}
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
// --- dxr3 config box
static GtkWidget * DXR3Config;

4
gui/mplayer/gui_common.c
View File

@ -77,7 +77,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
else av_strlcat( tmp,MSGTR_NoChapter,tmplen );
break;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
break;
@ -174,7 +174,7 @@ calclengthmmmmss:
switch ( guiIntfStruct.StreamType )
{
case STREAMTYPE_FILE: av_strlcat( trbuf,"f",sizeof( trbuf ) ); break;
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD: av_strlcat( trbuf,"v",sizeof( trbuf ) ); break;
#endif
case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break;

4
gui/mplayer/mw.c
View File

@ -128,7 +128,7 @@ void mplEventHandling( int msg,float param )
mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext);
break;
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case evSetVCDTrack:
guiIntfStruct.Track=iparam;
case evPlayVCD:
@ -165,7 +165,7 @@ play:
case STREAMTYPE_FILE:
gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) );
break;
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) );
if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );

6
gui/mplayer/play.c
View File

@ -296,7 +296,7 @@ void mplCurr( void )
case STREAMTYPE_DVD:
break;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
break;
#endif
@ -332,7 +332,7 @@ void mplPrev( void )
guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
break;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; }
break;
@ -368,7 +368,7 @@ void mplNext( void )
guiIntfStruct.Track=guiIntfStruct.DVD.current_title;
break;
#endif
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
case STREAMTYPE_VCD:
if ( ++guiIntfStruct.Track > guiIntfStruct.VCDTracks ) { guiIntfStruct.Track=guiIntfStruct.VCDTracks; stop=1; }
break;

6
gui/skin/skin.c
View File

@ -169,7 +169,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
defList->main.width=defList->main.Bitmap.Width;
defList->main.height=defList->main.Bitmap.Height;
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
#else
@ -201,7 +201,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
defList->menuBase.width=defList->menuBase.Bitmap.Width;
defList->menuBase.height=defList->menuBase.Bitmap.Height;
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height );
#else
@ -219,7 +219,7 @@ int cmd_base( char * in )
if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
defList->bar.width=defList->bar.Bitmap.Width;
defList->bar.height=defList->bar.Bitmap.Height;
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height );
#else

8
gui/win32/gui.c
View File

@ -804,7 +804,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
char device[MAX_PATH];
char searchpath[MAX_PATH];
char searchpath2[MAX_PATH];
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
char searchpath3[MAX_PATH];
#endif
int len, pos = 0, cdromdrive = 0;
@ -826,14 +826,14 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos);
sprintf(searchpath, "%sVIDEO_TS", device + pos);
sprintf(searchpath2, "%sMpegav", device + pos);
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
sprintf(searchpath3, "%sTrack01.cda", device + pos);
#endif
if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
flags |= MF_ENABLED;
else if(GetFileAttributes(searchpath2) != INVALID_FILE_ATTRIBUTES)
flags |= MF_ENABLED;
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
else if(GetFileAttributes(searchpath3) != INVALID_FILE_ATTRIBUTES)
flags |= MF_ENABLED;
#endif
@ -1015,7 +1015,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
sprintf(searchpath, "%sTrack01.cda", device + pos);
if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
{
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
if (cdrom_device) free(cdrom_device);
cdrom_device = strdup(device + pos);
/* mplayer doesn't seem to like the trailing \ after the device name */

4
gui/win32/interface.c
View File

@ -41,7 +41,7 @@
#include "access_mpcontext.h"
#include "gui.h"
#include "dialogs.h"
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
#include <cdio/cdio.h>
#endif
@ -173,7 +173,7 @@ static void guiSetEvent(int event)
break;
}
#endif
#ifdef HAVE_LIBCDIO
#ifdef CONFIG_LIBCDIO
case evPlayCD:
{
int i;

20
gui/wm/ws.c
View File

@ -48,15 +48,15 @@
#include "wsxdnd.h"
#include <X11/extensions/XShm.h>
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
#include <X11/extensions/shape.h>
#endif
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
@ -235,7 +235,7 @@ wsXDNDInitialize();
mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm );
wsUseXShm=0;
}
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) )
{
mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape );
@ -249,7 +249,7 @@ wsXDNDInitialize();
wsScreen=DefaultScreen( wsDisplay );
wsRootWin=RootWindow( wsDisplay,wsScreen );
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
{
int clock;
XF86VidModeModeLine modeline;
@ -278,7 +278,7 @@ wsXDNDInitialize();
int minor,major,shp;
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Screen depth: %d\n",wsDepthOnScreen );
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] size: %dx%d\n",wsMaxX,wsMaxY );
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] origin: +%d+%d\n",wsOrgX,wsOrgY );
#endif
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] red mask: 0x%x\n",wsRedMask );
@ -289,7 +289,7 @@ wsXDNDInitialize();
XShmQueryVersion( wsDisplay,&major,&minor,&shp );
mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] XShm version is %d.%d\n",major,minor );
}
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
if ( wsUseXShape )
{
XShapeQueryVersion( wsDisplay,&major,&minor );
@ -1220,7 +1220,7 @@ static int timeout_save=0;
void wsScreenSaverOn( Display *mDisplay )
{
int nothing;
#ifdef HAVE_XDPMS
#ifdef CONFIG_XDPMS
if ( dpms_disabled )
{
if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
@ -1250,7 +1250,7 @@ void wsScreenSaverOn( Display *mDisplay )
void wsScreenSaverOff( Display * mDisplay )
{
int interval,prefer_blank,allow_exp,nothing;
#ifdef HAVE_XDPMS
#ifdef CONFIG_XDPMS
if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
{
BOOL onoff;
@ -1273,7 +1273,7 @@ void wsScreenSaverOff( Display * mDisplay )
void wsSetShape( wsTWindow * win,char * data )
{
#ifdef HAVE_XSHAPE
#ifdef CONFIG_XSHAPE
if ( !wsUseXShape ) return;
if ( data )
{

2
gui/wm/ws.h
View File

@ -27,7 +27,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/extensions/XShm.h>
#ifdef HAVE_XDPMS
#ifdef CONFIG_XDPMS
#include <X11/extensions/dpms.h>
#endif

2
help/help_mp-bg.h
View File

@ -12,7 +12,7 @@ static char help_text[]=
"Основни опции: (пълният списък е в ръководството - 'man mplayer')\n"
" -vo <дрв[:устр]> избор на видео драйвер & устройство ('-vo help' дава списък)\n"
" -ao <дрв[:устр]> избор на звуков драйвер & устройство ('-ao help' дава списък)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<пътечка> пуска (S)VCD (Super Video CD) пътечка (без монтиране!)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-cs.h
View File

@ -11,7 +11,7 @@ static char help_text[]=
"Základní volby: (úplný seznam najdete v manuálové stránce)\n"
" -vo <rozhraní> vybere výstupní video rozhraní (seznam: -vo help)\n"
" -ao <rozhraní> vybere výstupní audio rozhraní (seznam: -ao help)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<č_stopy> přehraje (S)VCD (Super Video CD) stopu (z nepřipojeného\n"
" zařízení)\n"
#endif

2
help/help_mp-de.h
View File

@ -18,7 +18,7 @@ static char help_text[]=
"Basisoptionen: (siehe Manpage für eine vollständige Liste aller Optionen!)\n"
" -vo <drv> Wähle Videoausgabetreiber ('-vo help' für eine Liste)\n"
" -ao <drv> Wähle Audioausgabetreiber ('-ao help' für eine Liste)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<tracknr> Spiele einen (S)VCD-Titel (Super Video CD) ab\n"
" ( direkter Gerätezugriff, kein mount! )\n"
#endif

2
help/help_mp-dk.h
View File

@ -13,7 +13,7 @@ static char help_text[]=
"Basale indstillinger (se manualen for en komplet liste):\n"
" -vo <drv[:enhed]> vælg videodriver og enhed (detaljer, se '-vo help')\n"
" -ao <drv[:enhed]> vælg lyddriver og enhed (detaljer, se '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<spor> afspil et VCD (Video CD) spor fra et drev i stedet for en fil\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-el.h
View File

@ -11,7 +11,7 @@ static char help_text[]=
"Βασικές επιλογές: (Ανατρέξτε στη σελίδα εγχειριδίου για ολοκληρωμένη λίστα με επιλογές)\n"
" -vo <drv[:dev]> επιλέξτε τον οδηγό εξόδου βίντεο και τη συσκευή (βλέπε '-vo help' για τη λίστα)\n"
" -ao <drv[:dev]> επιλέξτε τον οδηγό εξόδου ήχου και τη συσκευή (βλέπε '-ao help' για τη λίστα)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<αριθμός track> αναπαραγωγή track VCD (video cd) από συσκευή αντί για αρχείο\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-en.h
View File

@ -19,7 +19,7 @@ static char help_text[]=
"Basic options: (complete list in the man page)\n"
" -vo <drv> select video output driver ('-vo help' for a list)\n"
" -ao <drv> select audio output driver ('-ao help' for a list)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> play (S)VCD (Super Video CD) track (raw device, no mount)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-es.h
View File

@ -22,7 +22,7 @@ static char help_text[]=
"Opciones básicas: ('man mplayer' para una lista completa)\n"
" -vo <driver[:disp]> Seleccionar driver de salida de video y dispositivo ('-vo help' para obtener una lista).\n"
" -ao <driver[:disp]> Seleccionar driver de salida de audio y dispositivo ('-ao help' para obtener una lista).\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<numpista> Reproducir pista de (S)VCD (Super Video CD) (acceso directo al dispositivo, no montado)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-fr.h
View File

@ -14,7 +14,7 @@ static char help_text[]=
"Options de base : (liste complète dans la page de man)\n"
" -vo <pil[:pér]> pilote et périph. vidéo de sortie ('-vo help' pour liste)\n"
" -ao <pil[:pér]> pilote et périph. audio de sortie ('-ao help' pour liste)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<n°piste> lit piste (S)VCD (Super Video CD) (périf. brut, non-monté)\n"
#endif
#ifdef CONFIG_DVDREAD

4
help/help_mp-hu.h
View File

@ -3,7 +3,7 @@
//... Okay enough of the hw, now send the other two!
//
// Updated by: Gabrov <gabrov@freemail.hu>
// Sync'ed with help_mp-en.h r27123 (2008. 07. 18.)
// Sync'ed with help_mp-en.h r27402 (2008. 08. 06.)
// ========================= MPlayer help ===========================
@ -15,7 +15,7 @@ static char help_text[]=
"Alapvető opciók: (az összes opció listájához lásd a man lapot)\n"
" -vo <drv> kimeneti videó meghajtó kiválasztása (lista: '-vo help')\n"
" -ao <drv> kimeneti audió meghajtó kiválasztása (lista: '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<sávszám> (S)VCD (Super Video CD) sáv lejátszás (nyers, nincs mount)\n"
#endif
#ifdef CONFIG_DVDREAD

468
help/help_mp-it.h
View File

File diff suppressed because it is too large Load Diff

2
help/help_mp-ja.h
View File

@ -12,7 +12,7 @@ static char help_text[]=
"基本的なオプション: (man page に全て網羅されています)\n"
" -vo <drv[:dev]> 映像出力ドライバ及びデバイスを選択します ('-vo help'で一覧表示されます)\n"
" -ao <drv[:dev]> 音声出力ドライバ及びデバイスを選択します ('-ao help'で一覧表示されます)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> play VCD (Video CD) track from device instead of plain file\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-ko.h
View File

@ -10,7 +10,7 @@ static char help_text[]=
"기본 선택사항: (전체 목록은 man 페이지 참조)\n"
" -vo <drv[:dev]> 비디오 출력 드라이버 및 장치 선택 (목록보기는 '-vo help')\n"
" -ao <drv[:dev]> 오디오 출력 드라이버 및 장치 선택 (목록보기는 '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> (S)VCD (Super Video CD) 트랙 재생 (장치로부터, 마운트 없이)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-mk.h
View File

@ -11,7 +11,7 @@ static char help_text[]=
"Основни Опции: (комплетна листа на man страницата)\n"
" -vo <drv[:dev]> избира излезен видео драјвер и уред ('-vo help' за листа)\n"
" -ao <drv[:dev]> избира излезен аудио драјвер и уред ('-ao help' за листа)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> пушта VCD (Video CD) од уред наместо од датотека\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-nl.h
View File

@ -9,7 +9,7 @@ static char help_text[]=
"Basis-opties: (volledige lijst in de man-pagina's)\n"
" -vo <drv[:dev]> selecteer video uitvoer driver & device (zie '-vo help' voor lijst)\n"
" -ao <drv[:dev]> selecteer audio uitvoer driver & device (zie '-ao help' voor lijst)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> speel VCD (Video CD) track van cdrom in plaats van standaard bestand\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-pl.h
View File

@ -12,7 +12,7 @@ static char help_text[]=
"Podstawowe opcje: (pełna lista dostępna na stronie man)\n"
" -vo <drv> podaj wyjściowy sterownik video (lista: '-vo help')\n"
" -ao <drv> podaj wyjściowy sterownik audio (lista: '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<numer_ścieżki> odtwórz ścieżkę (S)VCD (Super Video CD) (bezpośrednio, bez montowania)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-pt_BR.h
View File

@ -14,7 +14,7 @@ static char help_text[]=
" ('-vo help' para listar)\n"
" -ao <drv[:dev]> seleciona o driver de saída de audio & dispositivo\n"
" ('-vo help' para listar)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<numtrilha> reproduz trilha de VCD (Video CD) do dispositivo em vez de um\n"
" arquivo\n"
#endif

2
help/help_mp-ro.h
View File

@ -18,7 +18,7 @@ static char help_text[]=
" -ao <drv[:dev]> alege driver-ul ºi device-ul de ieºire audio\n"
" ('-ao help' pentru listã)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<nrpistã> ruleazã pista VCD (Video CD) de pe device în loc de fiºier\n"
#endif

2
help/help_mp-ru.h
View File

@ -13,7 +13,7 @@ static char help_text[]=
"Базовые опции: (полный список см. на man-странице)\n"
" -vo <drv[:dev]> выбор драйвера и устройства видеовывода (список см. с '-vo help')\n"
" -ao <drv[:dev]> выбор драйвера и устройства аудиовывода (список см. с '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<номер трека> играть дорожку (S)VCD (Super Video CD) (указывайте устройство,\n не монтируйте его)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-sk.h
View File

@ -13,7 +13,7 @@ static char help_text[]=
"Základné prepínače: (Kompletný zoznam nájdete v man stránke)\n"
" -vo <drv[:dev]> výber výstup. video ovládača&zariadenia (-vo help pre zoznam)\n"
" -ao <drv[:dev]> výber výstup. audio ovládača&zariadenia (-ao help pre zoznam)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> prehrať VCD (video cd) stopu zo zariadenia namiesto zo súboru\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-sv.h
View File

@ -10,7 +10,7 @@ static char help_text[]=
"Grundläggande argument: (komplett lista återfinns i `man mplayer`)\n"
" -vo <drv[:enhet]> välj video-ut drivrutin & enhet ('-vo help' för lista)\n"
" -ao <drv[:enhet]> välj audio-ut drivrutin & enhet ('-ao help' för lista)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<spårnr> spela (S)VCD (Super Video CD) spår (rå enhet, ingen montering)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-tr.h
View File

@ -13,7 +13,7 @@ static char help_text[]=
"Genel seçenekler: (Tüm seçenekler için man sayfalarına bakınız)\n"
" -vo <sürücü> video çıkış sürücüsünü seçer ('-vo help' ile listeyi görebilirsiniz)\n"
" -ao <sürücü> ses çıkış sürücüsü seçer ('-ao help' ile listeyi görebilirsiniz)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<parçano> (S)VCD (Süper Video CD) parça numarasını oynatır (sade aygıtı kullan, sisteme takma)\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-uk.h
View File

@ -10,7 +10,7 @@ static char help_text[]=
"Опції:\n"
" -vo <drv[:dev]> вибір драйвера і пристрою відео виводу (список див. з '-vo help')\n"
" -ao <drv[:dev]> вибір драйвера і пристрою аудіо виводу (список див. з '-ao help')\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<номер треку> грати VCD (video cd) трек з пристрою замість файлу\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-zh_CN.h
View File

@ -23,7 +23,7 @@ static char help_text[]=
"基本选项： （完整列表参见手册页）\n"
" -vo <drv> 选择视频输出驱动程序（查看驱动程序列表用“-vo help”）\n"
" -ao <drv> 选择音频输出驱动程序（查看驱动程序列表用“-ao help”）\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<曲目号> 播放 (S)VCD（超级VCD）曲目（无格式设备，无需装载）\n"
#endif
#ifdef CONFIG_DVDREAD

2
help/help_mp-zh_TW.h
View File

@ -15,7 +15,7 @@ static char help_text[]=
"基本選項: (完整列表參見手册頁)\n"
" -vo <drv> 選擇視頻輸出驅動 (查看驅動列表用“-vo help”)\n"
" -ao <drv> 選擇音頻輸出驅動 (查看驅動列表用“-ao help”)\n"
#ifdef HAVE_VCD
#ifdef CONFIG_VCD
" vcd://<trackno> 播放 (S)VCD 軌迹號 (原始設備, 無需安挂)\n"
#endif
#ifdef CONFIG_DVDREAD

24
input/input.c
View File

@ -30,11 +30,11 @@
#include "joystick.h"
#ifdef HAVE_LIRC
#ifdef CONFIG_LIRC
#include "lirc.h"
#endif
#ifdef HAVE_LIRCC
#ifdef CONFIG_LIRCC
#include <lirc/lircc.h>
#endif
@ -149,7 +149,7 @@ static const mp_cmd_t mp_cmds[] = {
{ MP_CMD_TV_SET_SATURATION, "tv_set_saturation", 1, { { MP_CMD_ARG_INT ,{0}}, { MP_CMD_ARG_INT,{1} }, {-1,{0}} }},
#endif
{ MP_CMD_SUB_FORCED_ONLY, "forced_subs_only", 0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } },
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
{ MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
#endif
{ MP_CMD_SWITCH_RATIO, "switch_ratio", 0, { {MP_CMD_ARG_FLOAT,{0}}, {-1,{0}} } },
@ -165,7 +165,7 @@ static const mp_cmd_t mp_cmds[] = {
{ MP_CMD_LOADLIST, "loadlist", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
{ MP_CMD_RUN, "run", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
{ MP_CMD_VF_CHANGE_RECTANGLE, "change_rectangle", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
{ MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
{ MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
#endif
@ -432,12 +432,12 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
{ { 'n', 0 }, "tv_step_norm" },
{ { 'u', 0 }, "tv_step_chanlist" },
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
{ { 'X', 0 }, "step_property teletext_mode 1" },
{ { 'W', 0 }, "step_property teletext_page 1" },
{ { 'Q', 0 }, "step_property teletext_page -1" },
#endif
#ifdef HAVE_JOYSTICK
#ifdef CONFIG_JOYSTICK
{ { JOY_AXIS0_PLUS, 0 }, "seek 10" },
{ { JOY_AXIS0_MINUS, 0 }, "seek -10" },
{ { JOY_AXIS1_MINUS, 0 }, "seek 60" },
@ -447,7 +447,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = {
{ { JOY_BTN2, 0 }, "volume 1"},
{ { JOY_BTN3, 0 }, "volume -1"},
#endif
#ifdef HAVE_APPLE_REMOTE
#ifdef CONFIG_APPLE_REMOTE
{ { AR_PLAY, 0}, "pause" },
{ { AR_PLAY_HOLD, 0}, "quit" },
{ { AR_NEXT, 0 }, "seek 30" },
@ -1706,7 +1706,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui)
free(file);
}
#ifdef HAVE_JOYSTICK
#ifdef CONFIG_JOYSTICK
if (input_conf->use_joystick) {
int fd = mp_input_joystick_init(input_conf->js_dev);
if(fd < 0)
@ -1717,7 +1717,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui)
}
#endif
#ifdef HAVE_LIRC
#ifdef CONFIG_LIRC
if (input_conf->use_lirc) {
int fd = mp_input_lirc_init();
if(fd > 0)
@ -1726,7 +1726,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui)
}
#endif
#ifdef HAVE_LIRCC
#ifdef CONFIG_LIRCC
if (input_conf->use_lircc) {
int fd = lircc_init("mplayer", NULL);
if(fd >= 0)
@ -1734,7 +1734,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui)
}
#endif
#ifdef HAVE_APPLE_REMOTE
#ifdef CONFIG_APPLE_REMOTE
if (input_conf->use_ar) {
if(mp_input_ar_init() < 0)
mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitAppleRemote);
@ -1744,7 +1744,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui)
}
#endif
#ifdef HAVE_APPLE_IR
#ifdef CONFIG_APPLE_IR
if (input_conf->use_ar) {
int fd = mp_input_appleir_init(input_conf->ar_dev);
if(fd < 0)

2
libaf/af.c
View File

@ -60,7 +60,7 @@ static af_info_t* filter_list[]={
#endif
&af_info_sweep,
&af_info_hrtf,
#ifdef HAVE_LADSPA
#ifdef CONFIG_LADSPA
&af_info_ladspa,
#endif
&af_info_center,

2
libao2/ao_esd.c
View File

@ -216,7 +216,7 @@ static int init(int rate_hz, int channels, int format, int flags)
* latency is number of samples @ 44.1khz stereo 16 bit
* adjust according to rate_hz & bytes_per_sample
*/
#ifdef HAVE_ESD_LATENCY
#ifdef CONFIG_ESD_LATENCY
esd_latency = esd_get_latency(esd_fd);
#else
esd_latency = ((channels == 1 ? 2 : 1) * ESD_DEFAULT_RATE *

6
libao2/ao_mpegpes.c
View File

@ -10,10 +10,6 @@
#include "config.h"
#ifdef HAVE_DVB_HEAD
#define HAVE_DVB 1
#endif
#ifdef HAVE_DVB
#include <sys/poll.h>
#include <sys/ioctl.h>
@ -52,7 +48,7 @@ static ao_info_t info =
#ifdef HAVE_DVB
"DVB audio output",
#else
"Mpeg-PES audio output",
"MPEG-PES audio output",
#endif
"mpegpes",
"A'rpi",

20
libao2/audio_out.c
View File

@ -39,22 +39,22 @@ extern ao_functions_t audio_out_pss;
const ao_functions_t* const audio_out_drivers[] =
{
// native:
#ifdef HAVE_DIRECTX
#ifdef CONFIG_DIRECTX
&audio_out_dsound,
#endif
#ifdef HAVE_WIN32WAVEOUT
#ifdef CONFIG_WIN32WAVEOUT
&audio_out_win32,
#endif
#ifdef HAVE_COREAUDIO
#ifdef CONFIG_COREAUDIO
&audio_out_macosx,
#endif
#ifdef CONFIG_OSS_AUDIO
&audio_out_oss,
#endif
#if defined (HAVE_ALSA1X) || defined (HAVE_ALSA9)
#ifdef CONFIG_ALSA
&audio_out_alsa,
#endif
#ifdef HAVE_ALSA5
#ifdef CONFIG_ALSA5
&audio_out_alsa5,
#endif
#ifdef CONFIG_SGI_AUDIO
@ -76,23 +76,23 @@ const ao_functions_t* const audio_out_drivers[] =
#ifdef CONFIG_JACK
&audio_out_jack,
#endif
#ifdef HAVE_NAS
#ifdef CONFIG_NAS
&audio_out_nas,
#endif
#ifdef HAVE_SDL
#ifdef CONFIG_SDL
&audio_out_sdl,
#endif
#ifdef CONFIG_OPENAL
&audio_out_openal,
#endif
&audio_out_mpegpes,
#ifdef HAVE_DXR2
#ifdef CONFIG_DXR2
&audio_out_dxr2,
#endif
#ifdef HAVE_IVTV
#ifdef CONFIG_IVTV
&audio_out_ivtv,
#endif
#ifdef HAVE_V4L2_DECODER
#ifdef CONFIG_V4L2_DECODER
&audio_out_v4l2,
#endif
&audio_out_null,

12
libass/ass.c
View File

@ -32,7 +32,7 @@
#include <unistd.h>
#include <inttypes.h>
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
#include <iconv.h>
#endif
@ -810,7 +810,7 @@ void ass_process_chunk(ass_track_t* track, char *data, int size, long long timec
free(str);
}
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
/** \brief recode buffer to utf-8
* constraint: codepage != 0
* \param data pointer to text buffer
@ -826,7 +826,7 @@ static char* sub_recode(char* data, size_t size, char* codepage)
{
const char* cp_tmp = codepage;
#ifdef HAVE_ENCA
#ifdef CONFIG_ENCA
char enca_lang[3], enca_fallback[100];
if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2
|| sscanf(codepage, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) {
@ -991,7 +991,7 @@ ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize,
if (!buf)
return 0;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
if (codepage)
buf = sub_recode(buf, bufsize, codepage);
if (!buf)
@ -1017,7 +1017,7 @@ char* read_file_recode(char* fname, char* codepage, int* size)
buf = read_file(fname, &bufsize);
if (!buf)
return 0;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
if (codepage) {
char* tmpbuf = sub_recode(buf, bufsize, codepage);
free(buf);
@ -1071,7 +1071,7 @@ int ass_read_styles(ass_track_t* track, char* fname, char* codepage)
buf = read_file(fname, &sz);
if (!buf)
return 1;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
if (codepage) {
char* tmpbuf;
tmpbuf = sub_recode(buf, sz, codepage);

3
libass/ass_bitmap.c
View File

@ -274,9 +274,10 @@ int glyph_to_bitmap(ass_synth_priv_t* priv, FT_Glyph glyph, FT_Glyph outline_gly
resize_tmp(priv, (*bm_g)->w, (*bm_g)->h);
if (be) {
blur((*bm_g)->buffer, priv->tmp, (*bm_g)->w, (*bm_g)->h, (*bm_g)->w, (int*)priv->gt2, priv->g_r, priv->g_w);
if (*bm_o)
blur((*bm_o)->buffer, priv->tmp, (*bm_o)->w, (*bm_o)->h, (*bm_o)->w, (int*)priv->gt2, priv->g_r, priv->g_w);
else
blur((*bm_g)->buffer, priv->tmp, (*bm_g)->w, (*bm_g)->h, (*bm_g)->w, (int*)priv->gt2, priv->g_r, priv->g_w);
}
if (*bm_o)

2
libass/ass_font.c
View File

@ -284,7 +284,7 @@ FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch
break;
}
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
if (index == 0) {
int face_idx;
mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_GlyphNotFoundReselectingFont,

8
libass/ass_fontconfig.c
View File

@ -37,13 +37,13 @@
#include "ass_library.h"
#include "ass_fontconfig.h"
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
#endif
struct fc_instance_s {
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
FcConfig* config;
#endif
char* family_default;
@ -51,7 +51,7 @@ struct fc_instance_s {
int index_default;
};
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
// 4yo fontconfig does not have these.
// They are only needed for debug output, anyway.
@ -474,7 +474,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
return priv;
}
#else // HAVE_FONTCONFIG
#else /* CONFIG_FONTCONFIG */
char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index,
uint32_t code)

2
libass/ass_fontconfig.h
View File

@ -28,7 +28,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif

6
libass/ass_mp.c
View File

@ -32,7 +32,7 @@
#include "ass_mp.h"
#include "ass_library.h"
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
@ -55,7 +55,7 @@ char* ass_border_color = NULL;
char* ass_styles_file = NULL;
int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
extern int font_fontconfig;
#else
static int font_fontconfig = -1;
@ -65,7 +65,7 @@ extern char* sub_font_name;
extern float text_font_scale_factor;
extern int subtitle_autoscale;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
extern char* sub_cp;
#else
static char* sub_cp = 0;

19
libass/ass_render.c
View File

@ -149,8 +149,8 @@ typedef struct render_context_s {
EVENT_HSCROLL, // "Banner" transition effect, text_width is unlimited
EVENT_VSCROLL // "Scroll up", "Scroll down" transition effects
} evt_type;
int pos_x, pos_y; // position
int org_x, org_y; // origin
double pos_x, pos_y; // position
double org_x, org_y; // origin
char have_origin; // origin is explicitly defined; if 0, get_base_point() is used
double scale_x, scale_y;
double hspacing; // distance between letters, in pixels
@ -456,19 +456,19 @@ static ass_image_t* render_text(text_info_t* text_info, int dst_x, int dst_y)
/**
* \brief Mapping between script and screen coordinates
*/
static int x2scr(int x) {
static int x2scr(double x) {
return x*frame_context.orig_width_nocrop / frame_context.track->PlayResX +
FFMAX(global_settings->left_margin, 0);
}
/**
* \brief Mapping between script and screen coordinates
*/
static int y2scr(int y) {
static int y2scr(double y) {
return y * frame_context.orig_height_nocrop / frame_context.track->PlayResY +
FFMAX(global_settings->top_margin, 0);
}
// the same for toptitles
static int y2scr_top(int y) {
static int y2scr_top(double y) {
if (global_settings->use_margins)
return y * frame_context.orig_height_nocrop / frame_context.track->PlayResY;
else
@ -476,7 +476,7 @@ static int y2scr_top(int y) {
FFMAX(global_settings->top_margin, 0);
}
// the same for subtitles
static int y2scr_sub(int y) {
static int y2scr_sub(double y) {
if (global_settings->use_margins)
return y * frame_context.orig_height_nocrop / frame_context.track->PlayResY +
FFMAX(global_settings->top_margin, 0) +
@ -727,7 +727,7 @@ static char* parse_tag(char* p, double pwr) {
} else if (mystrcmp(&p, "move")) {
int x1, x2, y1, y2;
long long t1, t2, delta_t, t;
int x, y;
double x, y;
double k;
skip('(');
x1 = strtol(p, &p, 10);
@ -888,6 +888,7 @@ static char* parse_tag(char* p, double pwr) {
render_context.org_x = v1;
render_context.org_y = v2;
render_context.have_origin = 1;
render_context.detect_collisions = 0;
} else if (mystrcmp(&p, "t")) {
double v[3];
int v1, v2;
@ -1072,7 +1073,7 @@ static unsigned get_next_char(char** str)
p += 2;
*str = p;
return '\n';
} else if (*(p+1) == 'n') {
} else if ((*(p+1) == 'n') || (*(p+1) == 'h')) {
p += 2;
*str = p;
return ' ';
@ -1935,7 +1936,7 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
if (render_context.evt_type == EVENT_POSITIONED) {
int base_x = 0;
int base_y = 0;
mp_msg(MSGT_ASS, MSGL_DBG2, "positioned event at %d, %d\n", render_context.pos_x, render_context.pos_y);
mp_msg(MSGT_ASS, MSGL_DBG2, "positioned event at %f, %f\n", render_context.pos_x, render_context.pos_y);
get_base_point(bbox, alignment, &base_x, &base_y);
device_x = x2scr(render_context.pos_x) - base_x;
device_y = y2scr(render_context.pos_y) - base_y;

10
libmenu/menu.c
View File

@ -40,7 +40,7 @@ menu_info_t* menu_info_list[] = {
&menu_info_filesel,
&menu_info_txt,
&menu_info_console,
#ifdef HAS_DVBIN_SUPPORT
#ifdef CONFIG_DVBIN
&menu_info_dvbsel,
#endif
&menu_info_pref,
@ -220,7 +220,7 @@ int menu_init(struct MPContext *mpctx, struct m_config *mconfig,
char* buffer = NULL;
int bl = BUF_STEP, br = 0;
int f, fd;
#ifndef HAVE_FREETYPE
#ifndef CONFIG_FREETYPE
if(vo_font == NULL)
return 0;
#endif
@ -413,7 +413,7 @@ static void render_txt(char *txt)
}
}
#ifdef HAVE_FRIBIDI
#ifdef CONFIG_FRIBIDI
#include <fribidi/fribidi.h>
#include "libavutil/common.h"
char *menu_fribidi_charset = NULL;
@ -469,7 +469,7 @@ void menu_draw_text(mp_image_t* mpi,char* txt, int x, int y) {
return;
}
#ifdef HAVE_FRIBIDI
#ifdef CONFIG_FRIBIDI
txt = menu_fribidi(txt);
#endif
render_txt(txt);
@ -503,7 +503,7 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
return;
}
#ifdef HAVE_FRIBIDI
#ifdef CONFIG_FRIBIDI
txt = menu_fribidi(txt);
#endif
render_txt(txt);

2
libmenu/vf_menu.c
View File

@ -202,7 +202,7 @@ static void uninit(vf_instance_t *vf) {
static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt) {
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
// here is the right place to get screen dimensions
if (force_load_font) {
force_load_font = 0;

18
libmpcodecs/ad_libvorbis.c
View File

@ -20,7 +20,7 @@ static const ad_info_t info =
LIBAD_EXTERN(libvorbis)
#ifdef TREMOR
#ifdef CONFIG_TREMOR
#include <tremor/ivorbiscodec.h>
#else
#include <vorbis/codec.h>
@ -34,7 +34,7 @@ typedef struct ov_struct_st {
vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
vorbis_block vb; /* local working space for packet->PCM decode */
float rg_scale; /* replaygain scale */
#ifdef TREMOR
#ifdef CONFIG_TREMOR
int rg_scale_int;
#endif
} ov_struct_t;
@ -160,7 +160,7 @@ static int init(sh_audio_t *sh)
/* replaygain: security */
if(ov->rg_scale > 15.)
ov->rg_scale = 15.;
#ifdef TREMOR
#ifdef CONFIG_TREMOR
ov->rg_scale_int = (int)(ov->rg_scale*64.f);
#endif
mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel%s, %dHz, %dbit/s %cBR\n",(int)ov->vi.channels,ov->vi.channels>1?"s":"",(int)ov->vi.rate,(int)ov->vi.bitrate_nominal,
@ -218,7 +218,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
{
int len = 0;
int samples;
#ifdef TREMOR
#ifdef CONFIG_TREMOR
ogg_int32_t **pcm;
#else
float scale;
@ -250,7 +250,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
/* convert floats to 16 bit signed ints (host order) and
interleave */
#ifdef TREMOR
#ifdef CONFIG_TREMOR
if (ov->rg_scale_int == 64) {
for(i=0;i<ov->vi.channels;i++){
ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
@ -272,15 +272,15 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
}
}
} else
#endif /* TREMOR */
#endif /* CONFIG_TREMOR */
{
#ifndef TREMOR
#ifndef CONFIG_TREMOR
scale = 32767.f * ov->rg_scale;
#endif
for(i=0;i<ov->vi.channels;i++){
ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
ogg_int16_t *ptr=convbuffer+i;
#ifdef TREMOR
#ifdef CONFIG_TREMOR
ogg_int32_t *mono=pcm[i];
for(j=0;j<bout;j++){
int val=(mono[j]*ov->rg_scale_int)>>(9+6);
@ -297,7 +297,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
val=-32768;
clipflag=1;
}
#endif /* TREMOR */
#endif /* CONFIG_TREMOR */
*ptr=val;
ptr+=ov->vi.channels;
}

10
libmpcodecs/ad_qtaudio.c
View File

@ -5,7 +5,7 @@
#include "config.h"
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
#include <QuickTime/QuickTimeComponents.h>
#endif
@ -30,7 +30,7 @@ static const ad_info_t info = {
LIBAD_EXTERN(qtaudio)
#ifndef HAVE_QUICKTIME
#ifndef CONFIG_QUICKTIME
typedef struct OpaqueSoundConverter* SoundConverter;
typedef unsigned long OSType;
typedef unsigned long UnsignedFixed;
@ -164,7 +164,7 @@ static int loader_init()
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
return 0;
}
#endif /* #ifndef HAVE_QUICKTIME */
#endif /* #ifndef CONFIG_QUICKTIME */
static SoundConverter myConverter = NULL;
static SoundComponentData InputFormatInfo,OutputFormatInfo;
@ -180,7 +180,7 @@ static int preinit(sh_audio_t *sh){
unsigned long WantedBufferSize=0; //the size you want your buffers to be
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
EnterMovies();
#else
if(loader_init()) return 0; // failed to load DLL
@ -280,7 +280,7 @@ static void uninit(sh_audio_t *sh){
// FreeLibrary( qtime_qts );
// qtime_qts = NULL;
// printf("qt dll loader uninit done\n");
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
ExitMovies();
#endif
}

6
libmpcodecs/dec_audio.c
View File

@ -23,7 +23,7 @@
#include <malloc.h>
#endif
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
#include <dlfcn.h>
#endif
@ -167,7 +167,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm,
sh_audio->codec->drv))
break;
mpadec = mpcodecs_ad_drivers[i];
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
if (!mpadec) {
/* try to open shared decoder plugin */
int buf_len;
@ -297,7 +297,7 @@ void uninit_audio(sh_audio_t *sh_audio)
mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr,
sh_audio->codec->drv);
sh_audio->ad_driver->uninit(sh_audio);
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
if (sh_audio->dec_handle)
dlclose(sh_audio->dec_handle);
#endif

6
libmpcodecs/dec_video.c
View File

@ -28,7 +28,7 @@
#include "dec_video.h"
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
#include <dlfcn.h>
#endif
@ -162,7 +162,7 @@ void uninit_video(sh_video_t *sh_video)
return;
mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_UninitVideoStr, sh_video->codec->drv);
sh_video->vd_driver->uninit(sh_video);
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
if (sh_video->dec_handle)
dlclose(sh_video->dec_handle);
#endif
@ -225,7 +225,7 @@ static int init_video(sh_video_t *sh_video, char *codecname, char *vfm,
sh_video->codec->drv))
break;
sh_video->vd_driver = mpcodecs_vd_drivers[i];
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
if (!sh_video->vd_driver) {
/* try to open shared decoder plugin */
int buf_len;

6
libmpcodecs/vd.c
View File

@ -68,10 +68,10 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
#ifdef CONFIG_XANIM
&mpcodecs_vd_xanim,
#endif
#ifdef HAVE_PNG
#ifdef CONFIG_PNG
&mpcodecs_vd_mpng,
#endif
#ifdef HAVE_JPEG
#ifdef CONFIG_JPEG
&mpcodecs_vd_ijpg,
#endif
&mpcodecs_vd_mtga,
@ -80,7 +80,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
&mpcodecs_vd_libmpeg2,
#endif
&mpcodecs_vd_mpegpes,
#ifdef HAVE_ZR
#ifdef CONFIG_ZR
&mpcodecs_vd_zrmjpeg,
#endif
#ifdef CONFIG_REALCODECS

14
libmpcodecs/vd_qtvideo.c
View File

@ -4,7 +4,7 @@
#include "config.h"
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
#include <QuickTime/ImageCodec.h>
#define dump_ImageDescription(x)
#endif
@ -30,7 +30,7 @@ LIBVD_EXTERN(qtvideo)
#include "mpbswap.h"
#ifndef HAVE_QUICKTIME
#ifndef CONFIG_QUICKTIME
#include "loader/qtx/qtxsdk/components.h"
HMODULE WINAPI LoadLibraryA(LPCSTR);
@ -53,7 +53,7 @@ static ImageDescriptionHandle framedescHandle;
static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
static HMODULE handler;
#ifndef HAVE_QUICKTIME
#ifndef CONFIG_QUICKTIME
static Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
static long (*CountComponents)(ComponentDescription* desc);
@ -88,7 +88,7 @@ static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw,
void *baseAddr,
long rowBytes);
static OSErr (*NewHandleClear)(Size byteCount);
#endif /* #ifndef HAVE_QUICKTIME */
#endif /* #ifndef CONFIG_QUICKTIME */
// to set/get/query special features/parameters
static int control(sh_video_t *sh,int cmd,void* arg,...){
@ -107,7 +107,7 @@ static int init(sh_video_t *sh){
ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
codec_initialized = 0;
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
EnterMovies();
#else
@ -154,7 +154,7 @@ static int init(sh_video_t *sh){
mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
// result=EnterMovies();
// printf("EnterMovies->%d\n",result);
#endif /* HAVE_QUICKTIME */
#endif /* CONFIG_QUICKTIME */
#if 0
memset(&desc,0,sizeof(desc));
@ -293,7 +293,7 @@ static int init(sh_video_t *sh){
// uninit driver
static void uninit(sh_video_t *sh){
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
ExitMovies();
#endif
}

2
libmpcodecs/vf.c
View File

@ -128,7 +128,7 @@ static const vf_info_t* const filter_list[]={
&vf_info_lavcdeint,
&vf_info_screenshot,
#endif
#ifdef HAVE_ZR
#ifdef CONFIG_ZR
&vf_info_zrmjpeg,
#endif
&vf_info_dvbscale,

2
libmpdemux/asfheader.c
View File

@ -639,7 +639,7 @@ if(streams) {
// as the servers often do not care about what we requested.
#if 0
uint32_t vr = 0, ar = 0,i;
#ifdef MPLAYER_NETWORK
#ifdef CONFIG_NETWORK
if( demuxer->stream->streaming_ctrl!=NULL ) {
if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) {
best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id;

4
libmpdemux/demux_gif.c
View File

@ -29,7 +29,7 @@ typedef struct {
#define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
#ifndef HAVE_GIF_TVT_HACK
#ifndef CONFIG_GIF_TVT_HACK
// not supported by certain versions of the library
int my_read_gif(GifFileType *gif, uint8_t *buf, int len) {
return stream_read(gif->UserData, buf, len);
@ -230,7 +230,7 @@ static demuxer_t* demux_open_gif(demuxer_t* demuxer)
// go back to the beginning
stream_seek(demuxer->stream,demuxer->stream->start_pos);
#ifdef HAVE_GIF_TVT_HACK
#ifdef CONFIG_GIF_TVT_HACK
// without the TVT functionality of libungif, a hard seek must be
// done to the beginning of the file. this is because libgif is
// unable to use mplayer's cache, and without this lseek libgif will

2
libmpdemux/demux_mov.c
View File

@ -25,7 +25,7 @@
#include "config.h"
#ifdef HAVE_QUICKTIME
#ifdef CONFIG_QUICKTIME
#include <QuickTime/QuickTime.h>
#include <QuickTime/ImageCompression.h>
#include <QuickTime/ImageCodec.h>

8
libmpdemux/demux_ogg.c
View File

@ -20,7 +20,7 @@
#define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ')
#define FOURCC_THEORA mmioFOURCC('t', 'h', 'e', 'o')
#ifdef TREMOR
#ifdef CONFIG_TREMOR
#include <tremor/ogg.h>
#include <tremor/ivorbiscodec.h>
#else
@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) {
mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n",
ogg_sub.lines, ogg_sub.text[0]);
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
subcp_recode(&ogg_sub);
#endif
vo_sub = &ogg_sub;
@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) {
sh_audio_t* sh_a;
sh_video_t* sh_v;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
subcp_open(NULL);
#endif
@ -1487,7 +1487,7 @@ static void demux_close_ogg(demuxer_t* demuxer) {
if(!ogg_d)
return;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
subcp_close();
#endif

10
libmpdemux/demuxer.c
View File

@ -111,7 +111,7 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_fli,
&demuxer_desc_film,
&demuxer_desc_roq,
#ifdef HAVE_GIF
#ifdef CONFIG_GIF
&demuxer_desc_gif,
#endif
#ifdef CONFIG_OGGVORBIS
@ -131,16 +131,16 @@ const demuxer_desc_t *const demuxer_list[] = {
&demuxer_desc_h264_es,
&demuxer_desc_audio,
&demuxer_desc_mpeg_ty,
#ifdef STREAMING_LIVE555
#ifdef CONFIG_LIVE555
&demuxer_desc_rtp,
#endif
#ifdef LIBNEMESI
#ifdef CONFIG_LIBNEMESI
&demuxer_desc_rtp_nemesi,
#endif
#ifdef CONFIG_LIBAVFORMAT
&demuxer_desc_lavf,
#endif
#ifdef MUSEPACK
#ifdef CONFIG_MUSEPACK
&demuxer_desc_mpc,
#endif
#ifdef CONFIG_LIBDV095
@ -150,7 +150,7 @@ const demuxer_desc_t *const demuxer_list[] = {
#ifdef CONFIG_LIBNUT
&demuxer_desc_nut,
#endif
#ifdef HAVE_XMMS
#ifdef CONFIG_XMMS
&demuxer_desc_xmms,
#endif
/* Please do not add any new demuxers here. If you want to implement a new

2
libmpdemux/demuxer.h
View File

@ -11,7 +11,7 @@
struct MPOpts;
#define MAX_PACKS 4096
#ifdef HAVE_TV_BSDBT848
#ifdef CONFIG_TV_BSDBT848
#define MAX_PACK_BYTES 0x2000000
#else
#define MAX_PACK_BYTES 0x800000

4
libmpdemux/stheader.h
View File

@ -39,7 +39,7 @@ typedef struct sh_audio {
// void* audio_out; // the audio_out handle, used for this audio stream
struct af_stream *afilter; // the audio filter stream
struct ad_functions *ad_driver;
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
void *dec_handle;
#endif
// win32-compatible codec parameters:
@ -87,7 +87,7 @@ typedef struct sh_video {
int output_flags; // query_format() results for output filters+vo
const struct vd_functions *vd_driver;
int vf_initialized;
#ifdef DYNAMIC_PLUGINS
#ifdef CONFIG_DYNAMIC_PLUGINS
void *dec_handle;
#endif
// win32-compatible codec parameters:

4
libmpdemux/video.c
View File

@ -25,7 +25,7 @@
/* biCompression constant */
#define BI_RGB 0L
#ifdef STREAMING_LIVE555
#ifdef CONFIG_LIVE555
#include "demux_rtp.h"
#endif
@ -57,7 +57,7 @@ static video_codec_t find_video_codec(sh_video_t *sh_video)
((! sh_video->format) || (sh_video->format==0x10000001) || (sh_video->format==0x10000002))
) ||
(fmt == DEMUXER_TYPE_MPEG_TY)
#ifdef STREAMING_LIVE555
#ifdef CONFIG_LIVE555
|| ((fmt == DEMUXER_TYPE_RTP) && demux_is_mpeg_rtp_stream(d_video->demuxer))
#endif
)

10
libvo/font_load.h
View File

@ -1,7 +1,7 @@
#ifndef MPLAYER_FONT_LOAD_H
#define MPLAYER_FONT_LOAD_H
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
#include <ft2build.h>
#include FT_FREETYPE_H
#endif
@ -10,14 +10,14 @@ typedef struct {
unsigned char *bmp;
unsigned char *pal;
int w,h,c;
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
int charwidth,charheight,pen,baseline,padding;
int current_count, current_alloc;
#endif
} raw_file;
typedef struct font_desc {
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
int dynamic;
#endif
char *name;
@ -34,7 +34,7 @@ typedef struct font_desc {
short width[65536];
int freetype;
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
int face_cnt;
FT_Face faces[16];
@ -63,7 +63,7 @@ typedef struct font_desc {
extern font_desc_t* vo_font;
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
extern char *subtitle_font_encoding;
extern float text_font_scale_factor;

12
libvo/font_load_ft.c
View File

@ -16,7 +16,7 @@
#include <math.h>
#include <string.h>
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
#include <iconv.h>
#endif
@ -24,7 +24,7 @@
#include FT_FREETYPE_H
#include FT_GLYPH_H
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius)
return 0;
}
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
/* decode from 'encoding' to unicode */
static FT_ULong decode_char(iconv_t *cd, char c) {
FT_ULong o;
@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei
}
desc->face_cnt++;
#ifdef HAVE_ICONV
#ifdef CONFIG_ICONV
if (unicode) {
charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
} else {
@ -1124,7 +1124,7 @@ int done_freetype(void)
void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_name, float font_scale_factor)
{
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
FcPattern *fc_pattern;
FcPattern *fc_pattern2;
FcChar8 *s;
@ -1139,7 +1139,7 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n
if (vo_font) free_font_desc(vo_font);
#ifdef HAVE_FONTCONFIG
#ifdef CONFIG_FONTCONFIG
if (font_fontconfig > 0)
{
if (!font_name)

2
libvo/mga_common.c
View File

@ -508,7 +508,7 @@ static void set_window( void ){
vo_dwidth=drwWidth; vo_dheight=drwHeight;
#ifdef VO_XMGA
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
if(XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;

18
libvo/sub.c
View File

@ -14,7 +14,7 @@
#define OSD_NAV_BOX_ALPHA 0x7f
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
#include "stream/tv.h"
#include "osdep/timer.h"
#endif
@ -72,7 +72,7 @@ char * const sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "",
//static int vo_font_loaded=-1;
font_desc_t* vo_font=NULL;
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
void* vo_osd_teletext_page=NULL;
int vo_osd_teletext_half = 0;
int vo_osd_teletext_mode=0;
@ -245,7 +245,7 @@ inline static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys) {
}
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
// renders char to a big per-object buffer where alpha and bitmap are separated
static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha)
{
@ -1072,11 +1072,11 @@ int osd_update(struct osd_state *osd, int dxs, int dys)
{
mp_osd_obj_t* obj=vo_osd_list;
int chg=0;
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
static int defer_counter = 0, prev_dxs = 0, prev_dys = 0;
#endif
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
// here is the right place to get screen dimensions
if (((dxs != vo_image_width)
&& (subtitle_autoscale == 2 || subtitle_autoscale == 3))
@ -1130,7 +1130,7 @@ int osd_update(struct osd_state *osd, int dxs, int dys)
case OSDTYPE_SUBTITLE:
vo_update_text_sub(osd, obj,dxs,dys);
break;
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
case OSDTYPE_TELETEXT:
vo_update_text_teletext(obj,dxs,dys);
break;
@ -1205,10 +1205,10 @@ struct osd_state *osd_create(void)
#ifdef CONFIG_DVDNAV
new_osd_obj(OSDTYPE_DVDNAV);
#endif
#if HAVE_TV_TELETEXT
#if CONFIG_TV_TELETEXT
new_osd_obj(OSDTYPE_TELETEXT);
#endif
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
force_load_font = 1;
#endif
return osd;
@ -1254,7 +1254,7 @@ void osd_draw_text(struct osd_state *osd, int dxs, int dys,
#ifdef CONFIG_DVDNAV
case OSDTYPE_DVDNAV:
#endif
#ifdef HAVE_TV_TELETEXT
#ifdef CONFIG_TV_TELETEXT
case OSDTYPE_TELETEXT:
#endif
case OSDTYPE_OSD:

36
libvo/video_out.c
View File

@ -20,7 +20,7 @@
#include "help_mp.h"
#include "osdep/shmem.h"
#ifdef HAVE_X11
#ifdef CONFIG_X11
#include "x11_common.h"
#endif
@ -67,6 +67,7 @@ extern struct vo_driver video_out_sdl;
extern struct vo_driver video_out_3dfx;
extern struct vo_driver video_out_tdfxfb;
extern struct vo_driver video_out_s3fb;
extern struct vo_driver video_out_wii;
extern struct vo_driver video_out_null;
extern struct vo_driver video_out_zr;
extern struct vo_driver video_out_zr2;
@ -112,10 +113,10 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_DIRECTX
&video_out_directx,
#endif
#ifdef HAVE_COREVIDEO
#ifdef CONFIG_COREVIDEO
&video_out_macosx,
#endif
#ifdef HAVE_QUARTZ
#ifdef CONFIG_QUARTZ
&video_out_quartz,
#endif
#ifdef CONFIG_XMGA
@ -130,13 +131,16 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_S3FB
&video_out_s3fb,
#endif
#ifdef CONFIG_WII
&video_out_wii,
#endif
#ifdef CONFIG_3DFX
&video_out_3dfx,
#endif
#ifdef HAVE_XV
#ifdef CONFIG_XV
&video_out_xv,
#endif
#ifdef HAVE_X11
#ifdef CONFIG_X11
&video_out_x11,
&video_out_xover,
#endif
@ -144,7 +148,7 @@ const struct vo_driver *video_out_drivers[] =
&video_out_gl,
&video_out_gl2,
#endif
#ifdef HAVE_DGA
#ifdef CONFIG_DGA
&video_out_dga,
#endif
#ifdef CONFIG_SDL
@ -166,19 +170,19 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_CACA
&video_out_caca,
#endif
#ifdef HAVE_DXR2
#ifdef CONFIG_DXR2
&video_out_dxr2,
#endif
#ifdef HAVE_DXR3
#ifdef CONFIG_DXR3
&video_out_dxr3,
#endif
#ifdef HAVE_IVTV
#ifdef CONFIG_IVTV
&video_out_ivtv,
#endif
#ifdef HAVE_V4L2_DECODER
#ifdef CONFIG_V4L2_DECODER
&video_out_v4l2,
#endif
#ifdef HAVE_ZR
#ifdef CONFIG_ZR
&video_out_zr,
&video_out_zr2,
#endif
@ -195,7 +199,7 @@ const struct vo_driver *video_out_drivers[] =
&video_out_dfbmga,
#endif
#ifdef CONFIG_VIDIX
#ifdef HAVE_X11
#ifdef CONFIG_X11
&video_out_xvidix,
#endif
#ifdef WIN32
@ -212,19 +216,19 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_YUV4MPEG
&video_out_yuv4mpeg,
#endif
#ifdef HAVE_PNG
#ifdef CONFIG_PNG
&video_out_png,
#endif
#ifdef HAVE_JPEG
#ifdef CONFIG_JPEG
&video_out_jpeg,
#endif
#ifdef HAVE_GIF
#ifdef CONFIG_GIF
&video_out_gif89a,
#endif
#ifdef CONFIG_TGA
&video_out_tga,
#endif
#ifdef HAVE_PNM
#ifdef CONFIG_PNM
&video_out_pnm,
#endif
#ifdef CONFIG_MD5SUM

2
libvo/vo_aa.c
View File

@ -244,7 +244,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width,
vo_font->pic_b[0]=malloc(sizeof(raw_file));
memset(vo_font->pic_b[0],0,sizeof(raw_file));
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
vo_font->dynamic = 0;
#endif

44
libvo/vo_dga.c
View File

@ -37,15 +37,15 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
static const vo_info_t info = {
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
"DGA ( Direct Graphic Access V2.0 )",
#else
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
"DGA ( Direct Graphic Access V1.0+XF86VidModeExt. )",
#else
"DGA ( Direct Graphic Access V1.0 )",
@ -186,7 +186,7 @@ static char *vd_GetModeString(int index)
//-----------------------------------------------------------------
#if defined(HAVE_XF86VM) && !defined(HAVE_DGA2)
#if defined(CONFIG_XF86VM) && !defined(CONFIG_DGA2)
static XF86VidModeModeInfo **vo_dga_vidmodes = NULL;
#endif
@ -213,7 +213,7 @@ static int vo_dga_src_mode = 0; // index in mode list that is used by
// codec
static int vo_dga_XServer_mode = 0; // index in mode list for resolution
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
static XDGAMode *vo_modelines;
static int vo_modecount;
#endif
@ -350,7 +350,7 @@ static void flip_page(void)
{
if (1 < vo_dga_nr_video_buffers)
{
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
XDGASetViewport(mDisplay, mScreen,
0, CURRENT_VIDEO_BUFFER.y, XDGAFlipRetrace);
#else
@ -387,7 +387,7 @@ static int query_format(uint32_t format)
static void uninit(void)
{
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
XDGADevice *dgadevice;
#endif
@ -401,7 +401,7 @@ static void uninit(void)
if (vo_grabpointer)
XUngrabPointer(mDisplay, CurrentTime);
XUngrabKeyboard(mDisplay, CurrentTime);
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
XDGACloseFramebuffer(mDisplay, mScreen);
dgadevice = XDGASetMode(mDisplay, mScreen, 0);
if (dgadevice != NULL)
@ -411,7 +411,7 @@ static void uninit(void)
#else
XF86DGADirectVideo(mDisplay, mScreen, 0);
// first disable DirectVideo and then switch mode back!
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes != NULL)
{
int screen;
@ -537,7 +537,7 @@ static int config(uint32_t width, uint32_t height,
static unsigned char *vo_dga_base;
static int prev_width, prev_height;
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
// needed to change DGA video mode
int mX = VO_DGA_INVALID_RES, mY = VO_DGA_INVALID_RES, mVBI =
100000, mMaxY = 0, i, j = 0;
@ -545,7 +545,7 @@ static int config(uint32_t width, uint32_t height,
XDGAMode *modeline;
XDGADevice *dgadevice;
#else
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
unsigned int vm_event, vm_error;
unsigned int vm_ver, vm_rev;
int i, j = 0, have_vm = 0;
@ -591,7 +591,7 @@ static int config(uint32_t width, uint32_t height,
// choose a suitable mode ...
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
// Code to change the video mode added by Michael Graffam
// mgraffam@idsi.net
@ -664,7 +664,7 @@ static int config(uint32_t width, uint32_t height,
#else
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
mp_msg(MSGT_VO, MSGL_INFO,
"vo_dga: DGA 1.0 compatibility code: Using XF86VidMode for mode switching!\n");
@ -738,8 +738,8 @@ static int config(uint32_t width, uint32_t height,
mp_msg(MSGT_VO, MSGL_ERR,
"vo_dga: Sorry, video larger than viewport is not yet supported!\n");
// ugly, do something nicer in the future ...
#ifndef HAVE_DGA2
#ifdef HAVE_XF86VM
#ifndef CONFIG_DGA2
#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes)
{
XFree(vo_dga_vidmodes);
@ -756,8 +756,8 @@ static int config(uint32_t width, uint32_t height,
"vo_dga: Something is wrong with your DGA. There doesn't seem to be a\n"
" single suitable mode!\n"
" Please file a bug report (see DOCS/HTML/en/bugreports.html)\n");
#ifndef HAVE_DGA2
#ifdef HAVE_XF86VM
#ifndef CONFIG_DGA2
#ifdef CONFIG_XF86VM
if (vo_dga_vidmodes)
{
XFree(vo_dga_vidmodes);
@ -771,7 +771,7 @@ static int config(uint32_t width, uint32_t height,
if (!vo_config_count || width != prev_width || height != prev_height)
{
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
if (!XDGAOpenFramebuffer(mDisplay, mScreen))
{
@ -790,7 +790,7 @@ static int config(uint32_t width, uint32_t height,
#else
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (have_vm)
{
XF86VidModeLockModeSwitch(mDisplay, mScreen, 0);
@ -853,7 +853,7 @@ static int config(uint32_t width, uint32_t height,
init_video_buffers(vo_dga_base,
vo_dga_vp_height,
vo_dga_width * HW_MODE.vdm_bytespp,
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
modeline->maxViewportY,
#else
vo_dga_vp_height,
@ -892,7 +892,7 @@ static int preinit(const char *arg)
if (vo_dga_XServer_mode == 0)
{
#ifndef HAVE_DGA2
#ifndef CONFIG_DGA2
mp_msg(MSGT_VO, MSGL_ERR,
"vo_dga: Your X-Server is not running in a ");
mp_msg(MSGT_VO, MSGL_ERR,
@ -903,7 +903,7 @@ static int preinit(const char *arg)
// vd_GetModeString(vo_dga_XServer_mode));
//}
#ifdef HAVE_DGA2
#ifdef CONFIG_DGA2
vo_modelines = XDGAQueryModes(mDisplay, mScreen, &vo_modecount);
if (vo_modelines)
{

18
libvo/vo_dxr3.c
View File

@ -35,7 +35,7 @@
#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
#ifdef HAVE_X11
#ifdef CONFIG_X11
#include "x11_common.h"
#endif
#include "libavutil/avstring.h"
@ -152,7 +152,7 @@ static int overlay_signalmode(overlay_t *o, int mode);
/* End overlay.h */
#ifdef HAVE_X11
#ifdef CONFIG_X11
#define KEY_COLOR 0x80a040
static XWindowAttributes xwin_attribs;
static overlay_t *overlay_data;
@ -178,7 +178,7 @@ static int control(uint32_t request, void *data)
return VO_ERROR;
}
return VO_TRUE;
#ifdef HAVE_X11
#ifdef CONFIG_X11
case VOCTRL_ONTOP:
vo_x11_ontop();
return VO_TRUE;
@ -418,7 +418,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval);
#ifdef SPU_SUPPORT
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
if (ioval == EM8300_ASPECTRATIO_16_9) {
s_width *= d_height*1.78/s_height*(d_width*1.0/d_height)/2.35;
} else {
@ -458,7 +458,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
#endif
#ifdef HAVE_X11
#ifdef CONFIG_X11
if (dxr3_overlay) {
XVisualInfo vinfo;
XSetWindowAttributes xswa;
@ -634,7 +634,7 @@ static int draw_frame(uint8_t * src[])
static void flip_page(void)
{
#ifdef HAVE_X11
#ifdef CONFIG_X11
if (dxr3_overlay) {
int event = vo_x11_check_events(mDisplay);
if (event & VO_EVENT_RESIZE) {
@ -688,7 +688,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int
static void uninit(void)
{
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing);
#ifdef HAVE_X11
#ifdef CONFIG_X11
if (dxr3_overlay) {
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
overlay_release(overlay_data);
@ -746,7 +746,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingNewSyncEngine);
dxr3_newsync = 1;
} else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) {
#ifdef HAVE_X11
#ifdef CONFIG_X11
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingOverlay);
dxr3_overlay = 1;
#else
@ -846,7 +846,7 @@ static int preinit(const char *arg)
}
strcpy(fds_name, devname);
#ifdef HAVE_X11
#ifdef CONFIG_X11
if (dxr3_overlay) {
/* Fucked up hack needed to enable overlay.

6
libvo/vo_gif89a.c
View File

@ -157,7 +157,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
uint32_t d_height, uint32_t flags, char *title,
uint32_t format)
{
#ifdef HAVE_GIF_4
#ifdef CONFIG_GIF_4
// these are control blocks for the gif looping extension.
char LB1[] = "NETSCAPE2.0";
char LB2[] = { 1, 0, 0 };
@ -190,7 +190,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
// earlier versions of libungif. i don't know exactly which,
// but certainly in all those before v4. if you have problems,
// you need to upgrade your gif library.
#ifdef HAVE_GIF_4
#ifdef CONFIG_GIF_4
EGifSetGifVersion("89a");
#else
mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Your version of libungif needs to be upgraded.\n");
@ -232,7 +232,7 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width,
// set the initial width and height info.
EGifPutScreenDesc(new_gif, s_width, s_height, 256, 0, reduce_cmap);
#ifdef HAVE_GIF_4
#ifdef CONFIG_GIF_4
// version 3 of libungif does not support multiple control blocks.
// looping requires multiple control blocks.
// therefore, looping is only enabled for v4 and up.

2
libvo/vo_gl.c
View File

@ -149,7 +149,7 @@ static void resize(int x,int y){
glLoadIdentity();
if (!scaled_osd) {
#ifdef HAVE_FREETYPE
#ifdef CONFIG_FREETYPE
// adjust font size to display size
force_load_font = 1;
#endif

4
libvo/vo_macosx.m
View File

@ -322,7 +322,7 @@ static int preinit(const char *arg)
if(!shared_buffer)
{
#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
//this chunk of code is heavily based off SDL_macosx.m from SDL
//it uses an Apple private function to request foreground operation
void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
@ -909,7 +909,7 @@ static int control(uint32_t request, void *data)
// Without SDL's bootstrap code (include SDL.h in mplayer.c),
// on Leopard, we got trouble to get the play window auto focused
// when app is actived. Following code fix this problem.
#ifndef HAVE_SDL
#ifndef CONFIG_SDL
if (isLeopardOrLater && [event type] == NSAppKitDefined
&& [event subtype] == NSApplicationActivatedEventType) {
[window makeMainWindow];

8
libvo/vo_mpegpes.c
View File

@ -23,9 +23,7 @@
#include <unistd.h>
#include "mp_msg.h"
#ifdef HAVE_DVB_HEAD
#define HAVE_DVB 1
#endif
#ifdef HAVE_DVB
#ifndef HAVE_DVB_HEAD
#include <sys/poll.h>
@ -67,9 +65,9 @@ extern int vo_mpegpes_fd2;
static const vo_info_t info =
{
#ifdef HAVE_DVB
"Mpeg-PES to DVB card",
"MPEG-PES to DVB card",
#else
"Mpeg-PES file",
"MPEG-PES file",
#endif
"mpegpes",
"A'rpi",

2
libvo/vo_quartz.c
View File

@ -1137,7 +1137,7 @@ static int preinit(const char *arg)
}
}
#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
#if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL)
//this chunk of code is heavily based off SDL_macosx.m from SDL
//it uses an Apple private function to request foreground operation
{

8
libvo/vo_sdl.c
View File

@ -70,7 +70,7 @@
#include "aspect.h"
#include "libmpcodecs/vfcap.h"
#ifdef HAVE_X11
#ifdef CONFIG_X11
#include <X11/Xlib.h>
#include "x11_common.h"
#endif
@ -1189,7 +1189,7 @@ static void check_events (void)
}
else if ( keypressed == SDLK_n ) {
#ifdef HAVE_X11
#ifdef CONFIG_X11
aspect(&priv->dstwidth, &priv->dstheight,A_NOZOOM);
#endif
if (priv->surface->w != priv->dstwidth || priv->surface->h != priv->dstheight) {
@ -1523,7 +1523,7 @@ query_format(uint32_t format)
static void
uninit(void)
{
#ifdef HAVE_X11
#ifdef CONFIG_X11
struct sdl_priv_s *priv = &sdl_priv;
if(priv->X) {
if( mp_msg_test(MSGT_VO,MSGL_V) ) {
@ -1599,7 +1599,7 @@ static int preinit(const char *arg)
mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SDL_UsingDriver, priv->driver);
priv->X = 0;
#ifdef HAVE_X11
#ifdef CONFIG_X11
if(vo_init()) {
if( mp_msg_test(MSGT_VO,MSGL_V) ) {
mp_msg(MSGT_VO,MSGL_V, "SDL: deactivating XScreensaver/DPMS\n"); }

419
libvo/vo_wii.c Normal file
View File

@ -0,0 +1,419 @@
/*
* Video driver for Nintendo Wii/GameCube Framebuffer device
*
* Copyright (C) 2008 Jing Liu <fatersh-1@yahoo.com>
*
* Maintainer: Benjamin Zores <ben@geexbox.org>
*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/*
* This driver handles dedicated ATI GPU, which can be found in:
* - Nintendo GameCube (ATI LSI Flipper @ 162 MHz)
* - Nintendo Wii (ATI Hollywood @ 243 MHz)
*
* Flipper and Hollywood chipsets are pretty similar, except from clock speed:
* - Embedded framebuffer is 2MB.
* - Texture cache is 1MB.
* - Vertex cache is 0.1 MB.
* - Framebuffer is YUY2, not RGB.
* - Best resolution is 480p (854x480)
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/kd.h>
#include <linux/fb.h>
#include "config.h"
#include "video_out.h"
#include "video_out_internal.h"
#include "sub.h"
#include "mp_msg.h"
#define WII_DEV_NAME "/dev/fb0"
#define TTY_DEV_NAME "/dev/tty"
#define FB_PIXEL_SIZE 2
static const vo_info_t info = {
"Nintendo Wii/GameCube Framebuffer Device",
"wii",
"Jing Liu <fartersh-1@yahoo.com>",
""
};
LIBVO_EXTERN(wii)
static signed int pre_init_err = -2;
static FILE *vt_fp = NULL;
static int vt_doit = 1;
static int fb_dev_fd = -1;
static int fb_tty_fd = -1;
static uint8_t *frame_buffer;
static uint8_t *center;
static struct fb_var_screeninfo fb_orig_vinfo;
static struct fb_var_screeninfo fb_vinfo;
static int fb_line_len;
static size_t fb_size;
static int in_width, out_width;
static int in_height, out_height;
static int fs;
static int
fb_preinit (int reset)
{
static int fb_preinit_done = 0;
static int fb_works = 0;
if (reset)
{
fb_preinit_done = 0;
return 0;
}
if (fb_preinit_done)
return fb_works;
if ((fb_dev_fd = open (WII_DEV_NAME, O_RDWR)) == -1)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't open %s: %s\n", WII_DEV_NAME, strerror (errno));
goto err_out;
}
if (ioctl (fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo))
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't get VSCREENINFO: %s\n", strerror (errno));
goto err_out_fd;
}
fb_orig_vinfo = fb_vinfo;
if ((fb_tty_fd = open (TTY_DEV_NAME, O_RDWR)) < 0)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Notice: Can't open %s: %s\n", TTY_DEV_NAME, strerror (errno));
goto err_out_fd;
}
fb_preinit_done = 1;
fb_works = 1;
return 1;
err_out_fd:
close (fb_dev_fd);
fb_dev_fd = -1;
err_out:
fb_preinit_done = 1;
fb_works = 0;
return 0;
}
static void
vt_set_textarea (int u, int l)
{
/* how can I determine the font height?
* just use 16 for now
*/
int urow = ((u + 15) / 16) + 1;
int lrow = l / 16;
mp_msg (MSGT_VO, MSGL_DBG2,
"vt_set_textarea (%d, %d): %d,%d\n", u, l, urow, lrow);
if (vt_fp)
{
fprintf (vt_fp, "\33[%d;%dr\33[%d;%dH", urow, lrow, lrow, 0);
fflush (vt_fp);
}
}
static int
config (uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t flags, char *title, uint32_t format)
{
struct fb_fix_screeninfo fb_finfo;
uint32_t black = 0x00800080;
long temp;
int vt_fd;
fs = flags & VOFLAG_FULLSCREEN;
if (pre_init_err == -2)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Internal fatal error: config() was called before preinit()\n");
return -1;
}
if (pre_init_err)
return 1;
in_width = width;
in_height = height;
out_width = (d_width && fs) ? d_width : width;
out_height = (d_width && fs) ? d_height : height;
fb_vinfo.xres_virtual = fb_vinfo.xres;
fb_vinfo.yres_virtual = fb_vinfo.yres;
if (fb_tty_fd >= 0 && ioctl (fb_tty_fd, KDSETMODE, KD_GRAPHICS) < 0)
{
mp_msg (MSGT_VO, MSGL_V,
"Can't set graphics mode: %s\n", strerror (errno));
close (fb_tty_fd);
fb_tty_fd = -1;
}
if (ioctl (fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo))
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't put VSCREENINFO: %s\n", strerror (errno));
if (fb_tty_fd >= 0 && ioctl (fb_tty_fd, KDSETMODE, KD_TEXT) < 0)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't restore text mode: %s\n", strerror (errno));
}
return 1;
}
if (fs)
{
out_width = fb_vinfo.xres;
out_height = fb_vinfo.yres;
}
if (out_width < in_width || out_height < in_height)
{
mp_msg (MSGT_VO, MSGL_ERR, "Screensize is smaller than video size\n");
return 1;
}
if (ioctl (fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo))
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't get FSCREENINFO: %s\n", strerror (errno));
return 1;
}
if (fb_finfo.type != FB_TYPE_PACKED_PIXELS)
{
mp_msg (MSGT_VO, MSGL_ERR, "Type %d not supported\n", fb_finfo.type);
return 1;
}
fb_line_len = fb_finfo.line_length;
fb_size = fb_finfo.smem_len;
frame_buffer = NULL;
frame_buffer = (uint8_t *) mmap (0, fb_size, PROT_READ | PROT_WRITE,
MAP_SHARED, fb_dev_fd, 0);
if (frame_buffer == (uint8_t *) -1)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't mmap %s: %s\n", WII_DEV_NAME, strerror (errno));
return 1;
}
center = frame_buffer +
((out_width - in_width) / 2) * FB_PIXEL_SIZE +
((out_height - in_height) / 2) * fb_line_len;
mp_msg (MSGT_VO, MSGL_DBG2, "Frame_buffer @ %p\n", frame_buffer);
mp_msg (MSGT_VO, MSGL_DBG2, "Center @ %p\n", center);
mp_msg (MSGT_VO, MSGL_V,
"Pixel per line: %d\n", fb_line_len / FB_PIXEL_SIZE);
/* blanking screen */
for (temp = 0; temp < fb_size; temp += 4)
memcpy (frame_buffer + temp, (void *) &black, 4);
vt_fd = open (TTY_DEV_NAME, O_WRONLY);
if (vt_doit && vt_fd == -1)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't open %s: %s\n", TTY_DEV_NAME, strerror (errno));
vt_doit = 0;
}
vt_fp = fdopen (vt_fd, "w");
if (vt_doit && !vt_fp)
{
mp_msg (MSGT_VO, MSGL_ERR,
"Can't fdopen %s: %s\n", TTY_DEV_NAME, strerror (errno));
vt_doit = 0;
}
if (vt_doit)
vt_set_textarea ((out_height + in_height) / 2, fb_vinfo.yres);
return 0;
}
static int
query_format (uint32_t format)
{
if (!fb_preinit (0))
return 0;
if (format != IMGFMT_YUY2)
return 0;
return VFCAP_ACCEPT_STRIDE | VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
}
static void
draw_alpha (int x0, int y0, int w, int h,
unsigned char *src, unsigned char *srca, int stride)
{
unsigned char *dst;
dst = center + fb_line_len * y0 + FB_PIXEL_SIZE * x0;
vo_draw_alpha_yuy2 (w, h, src, srca, stride, dst, fb_line_len);
}
static int
draw_frame (uint8_t *src[])
{
return 1;
}
static int
draw_slice (uint8_t *src[], int stride[], int w, int h, int x, int y)
{
uint8_t *d, *s;
d = center + fb_line_len * y + FB_PIXEL_SIZE * x;
s = src[0];
while (h)
{
memcpy (d, s, w * FB_PIXEL_SIZE);
d += fb_line_len;
s += stride[0];
h--;
}
return 0;
}
static void
check_events(void)
{
/* unused */
}
static void
flip_page (void)
{
/* unused */
}
static void
draw_osd (void)
{
vo_draw_text (in_width, in_height, draw_alpha);
}
static void
uninit (void)
{
if (ioctl (fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo))
mp_msg (MSGT_VO, MSGL_WARN,
"ioctl FBIOGET_VSCREENINFO: %s\n", strerror (errno));
fb_orig_vinfo.xoffset = fb_vinfo.xoffset;
fb_orig_vinfo.yoffset = fb_vinfo.yoffset;
if (ioctl (fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_orig_vinfo))
mp_msg (MSGT_VO, MSGL_WARN,
"Can't reset original fb_var_screeninfo: %s\n", strerror (errno));
if (fb_tty_fd >= 0)
{
if (ioctl (fb_tty_fd, KDSETMODE, KD_TEXT) < 0)
mp_msg (MSGT_VO, MSGL_WARN,
"Can't restore text mode: %s\n", strerror (errno));
}
if (vt_doit)
vt_set_textarea (0, fb_orig_vinfo.yres);
close (fb_tty_fd);
close (fb_dev_fd);
if (frame_buffer)
munmap (frame_buffer, fb_size);
frame_buffer = NULL;
fb_preinit (1);
}
static int
preinit (const char *vo_subdevice)
{
pre_init_err = 0;
if (!pre_init_err)
return pre_init_err = (fb_preinit (0) ? 0 : -1);
return -1;
}
static uint32_t
get_image(mp_image_t *mpi)
{
if (((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) ||
(mpi->flags & MP_IMGFLAG_PLANAR) ||
(mpi->flags & MP_IMGFLAG_YUV) ||
(mpi->width != in_width) ||
(mpi->height != in_height))
return VO_FALSE;
mpi->planes[0] = center;
mpi->stride[0] = fb_line_len;
mpi->flags |= MP_IMGFLAG_DIRECT;
return VO_TRUE;
}
static int
control (uint32_t request, void *data)
{
if (request == VOCTRL_GET_IMAGE)
return get_image (data);
else if (request == VOCTRL_QUERY_FORMAT)
return query_format (*((uint32_t*) data));
return VO_NOTIMPL;
}

12
libvo/vo_x11.c
View File

@ -11,7 +11,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
#include <X11/extensions/xf86vmode.h>
#endif
#include <errno.h>
@ -317,7 +317,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
unsigned long xswamask;
const struct fmt2Xfmtentry_s *fmte = fmt2Xfmt;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
static uint32_t vm_height;
@ -375,7 +375,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
else
#endif
{
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (vm)
{
if ((d_width == 0) && (d_height == 0))
@ -405,7 +405,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
xswa.colormap = theCmap;
xswamask = CWBackPixel | CWBorderPixel | CWColormap;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (vm)
{
xswa.override_redirect = True;
@ -452,7 +452,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
ButtonReleaseMask |
PointerMotionMask)));
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (vm)
{
/* Grab the mouse pointer in our window */
@ -725,7 +725,7 @@ static void uninit(void)
freeMyXImage();
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif

2
libvo/vo_xmga.c
View File

@ -29,7 +29,7 @@
#include <X11/Xutil.h>
#include <errno.h>
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif

4
libvo/vo_xover.c
View File

@ -24,7 +24,7 @@
#include <X11/Xutil.h>
//#include <X11/keysym.h>
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@ -111,7 +111,7 @@ static void set_window(int force_update)
vo_dwidth=drwWidth; vo_dheight=drwHeight;
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
if (XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;

6
libvo/vo_xv.c
View File

@ -231,7 +231,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
hint.y = vo->dy;
hint.width = d_width;
hint.height = d_height;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
unsigned int modeline_width, modeline_height;
uint32_t vm_width;
uint32_t vm_height;
@ -313,7 +313,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
XFreeGC(x11->display, x11->vo_gc);
x11->vo_gc = XCreateGC(x11->display, x11->window, 0L, &xgcv);
XSync(x11->display, False);
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (vm)
{
/* Grab the mouse pointer in our window */
@ -708,7 +708,7 @@ static void uninit(struct vo *vo)
}
for (i = 0; i < ctx->num_buffers; i++)
deallocate_xvimage(vo, i);
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if (ctx->mode_switched)
vo_vm_close(vo);
#endif

4
libvo/vo_xvidix.c
View File

@ -22,7 +22,7 @@
#include <X11/Xutil.h>
//#include <X11/keysym.h>
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
@ -124,7 +124,7 @@ static void set_window(int force_update)
vo_dwidth = drwWidth;
vo_dheight = drwHeight;
#ifdef HAVE_XINERAMA
#ifdef CONFIG_XINERAMA
if (XineramaIsActive(mDisplay))
{
XineramaScreenInfo *screens;

12
libvo/vo_xvmc.c
View File

@ -38,7 +38,7 @@
#include "libavutil/common.h"
//no chance for xinerama to be supported in the near future
#undef HAVE_XINERAMA
#undef CONFIG_XINERAMA
#undef NDEBUG
#include <assert.h>
@ -463,7 +463,7 @@ XSetWindowAttributes xswa;
XWindowAttributes attribs;
unsigned long xswamask;
int depth;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
int vm=0;
unsigned int modeline_width, modeline_height;
static uint32_t vm_width;
@ -641,7 +641,7 @@ skip_surface_allocation:
vo_mouse_autohide = 1;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if( flags&VOFLAG_MODESWITCHING ) vm = 1;
#endif
@ -655,7 +655,7 @@ skip_surface_allocation:
hint.y = vo_dy;
hint.width = d_width;
hint.height = d_height;
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if ( vm )
{
if ((d_width==0) && (d_height==0))
@ -707,7 +707,7 @@ skip_surface_allocation:
if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
XSync(mDisplay, False);
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
if ( vm )
{
/* Grab the mouse pointer in our window */
@ -1153,7 +1153,7 @@ static void uninit(void){
printf("vo_xvmc: uninit called\n"); }
xvmc_free();
//from vo_xv
#ifdef HAVE_XF86VM
#ifdef CONFIG_XF86VM
vo_vm_close(mDisplay);
#endif
vo_x11_uninit();

Some files were not shown because too many files have changed in this diff Show More