diff options
| author |  Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
Merge svn changes up to r27441
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
131 files changed, 1651 insertions, 1160 deletions
@@ -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 diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 888f3454b4..33301f5fc3 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -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. diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 2b1ebc814f..637bc4c82c 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -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ériphérique fbdev ŕ utiliser (par défaut\ : .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. diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 4710251756..965260bc21 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -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ó kimenet támogatja. 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öngészőbe akarod integrálni az MPlayert (pl.\& a plugger 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íció a \-geometry opcióval állítható be a megadott képernyőhöz 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álasztja a használandó fbdev eszköz nevét (alapértelmezett: /dev/\:f .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őt ad a kvantálónak (lassabb váltás). .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 diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS index 96e58a60b2..3ef66d8b6d 100644 --- a/DOCS/tech/MAINTAINERS +++ b/DOCS/tech/MAINTAINERS @@ -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 @@ -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) diff --git a/cfg-common-opts.h b/cfg-common-opts.h index bed907c14e..68d46c9c51 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -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 */ diff --git a/cfg-common.h b/cfg-common.h index a3a4dcbee7..2b0122c353 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -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 diff --git a/cfg-mplayer.h b/cfg-mplayer.h index b3a4fd0451..25ea24ff1b 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -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 @@ -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: @@ -30,9 +30,9 @@ # _feature=no # cc_check && _feature=yes # if test "$_feature" = yes ; then -# _def_feature='#define HAVE_FEATURE 1' +# _def_feature='#define CONFIG_FEATURE 1' # else -# _def_feature='#undef HAVE_FEATURE' +# _def_feature='#undef CONFIG_FEATURE' # fi # echores "$_feature" # @@ -140,7 +140,7 @@ x86() { ppc() { case "$host_arch" in - ppc|powerpc) return 0;; + ppc|ppc64|powerpc|powerpc64) return 0;; *) return 1;; esac } @@ -159,13 +159,6 @@ arm() { esac } -sh3() { - case "$host_arch" in - sh3) return 0;; - *) return 1;; - esac -} - # Use this before starting a check echocheck() { echo "============ Checking for $@ ============" >> "$TMPLOG" @@ -266,8 +259,8 @@ Optional features: --disable-enca disable ENCA charset oracle library [autodetect] --disable-macosx disable Mac OS X specific features [autodetect] --disable-maemo disable maemo specific features [autodetect] - --enable-macosx-finder-support enable Mac OS X Finder invocation - parameter parsing [disabled] + --enable-macosx-finder enable Mac OS X Finder invocation parameter + parsing [disabled] --enable-macosx-bundle enable Mac OS X bundle file locations [autodetect] --disable-inet6 disable IPv6 support [autodetect] --disable-gethostbyname2 gethostbyname2 part of the C library [autodetect] @@ -382,6 +375,7 @@ Video output: --enable-3dfx enable obsolete /dev/3dfx video output [disable] --enable-tdfxfb enable tdfxfb video output [disable] --enable-s3fb enable s3fb (S3 ViRGE) video output [disable] + --enable-wii enable Nintendo Wii/GameCube video output [disable] --enable-directfb enable DirectFB video output [autodetect] --enable-zr enable ZR360[56]7/ZR36060 video output [autodetect] --enable-bl enable Blinkenlights video output [disable] @@ -626,7 +620,7 @@ _tv_teletext=auto _pvr=auto _network=yes _winsock2=auto -_smbsupport=auto +_smb=auto _vidix=auto _vidix_pcidb=yes _dhahelper=no @@ -649,6 +643,7 @@ _termcap=auto _termios=auto _3dfx=no _s3fb=no +_wii=no _tdfxfb=no _tdfxvid=no _xvr100=auto @@ -675,7 +670,7 @@ _menu=no _qtx=auto _macosx=auto _maemo=auto -_macosx_finder_support=no +_macosx_finder=no _macosx_bundle=auto _sortsub=yes _freetypeconfig='freetype-config' @@ -1027,8 +1022,8 @@ for ac_option do --disable-network) _network=no ;; --enable-winsock2) _winsock2=yes ;; --disable-winsock2) _winsock2=no ;; - --enable-smb) _smbsupport=yes ;; - --disable-smb) _smbsupport=no ;; + --enable-smb) _smb=yes ;; + --disable-smb) _smb=no ;; --enable-vidix) _vidix=yes ;; --disable-vidix) _vidix=no ;; --with-vidix-drivers=*) @@ -1108,6 +1103,8 @@ for ac_option do --disable-3dfx) _3dfx=no ;; --enable-s3fb) _s3fb=yes ;; --disable-s3fb) _s3fb=no ;; + --enable-wii) _wii=yes ;; + --disable-wii) _wii=no ;; --enable-tdfxfb) _tdfxfb=yes ;; --disable-tdfxfb) _tdfxfb=no ;; --disable-tdfxvid) _tdfxvid=no ;; @@ -1184,8 +1181,8 @@ for ac_option do --enable-macosx) _macosx=yes ;; --disable-macosx) _macosx=no ;; - --enable-macosx-finder-support) _macosx_finder_support=yes ;; - --disable-macosx-finder-support) _macosx_finder_support=no ;; + --enable-macosx-finder) _macosx_finder=yes ;; + --disable-macosx-finder) _macosx_finder=no ;; --enable-macosx-bundle) _macosx_bundle=yes;; --disable-macosx-bundle) _macosx_bundle=no;; @@ -1279,7 +1276,7 @@ if test -z "$_target" ; then # host's CPU/instruction set host_arch=`uname -p 2>&1` case "$host_arch" in - i386|sparc|ppc|alpha|arm|sh3|mips|vax) + i386|sparc|ppc|alpha|arm|mips|vax) ;; powerpc) # Darwin returns 'powerpc' host_arch=ppc @@ -1308,7 +1305,7 @@ if test -z "$_target" ; then sparc64) host_arch=sparc64 ;; parisc*|hppa*|9000*) host_arch=hppa ;; arm*|zaurus|cats) host_arch=arm ;; - sh3) host_arch=sh3 ;; + sh3|sh4|sh4a) host_arch=sh ;; s390) host_arch=s390 ;; s390x) host_arch=s390x ;; mips*) host_arch=mips ;; @@ -1635,7 +1632,7 @@ EOF fi -_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L SH3 POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' +_arch_all='X86 X86_32 X86_64 IA64 SPARC ARM ARMV4L SH POWERPC PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) _arch='X86 X86_32' @@ -2008,17 +2005,17 @@ EOF _optimizing='' ;; - sh3) - _arch='SH3' - _target_arch='ARCH_SH3 = yes' - iproc='sh3' + sh) + _arch='SH' + _target_arch='ARCH_SH = yes' + iproc='sh' proc='' - _march='-m3' - _mcpu='-ml' + _march='' + _mcpu='' _optimizing='' ;; - ppc|powerpc) + ppc|ppc64|powerpc|powerpc64) _arch='POWERPC PPC' _def_dcbzl='#undef HAVE_DCBZL' _target_arch='ARCH_POWERPC = yes' @@ -2328,10 +2325,10 @@ cat > $TMPC << EOF __attribute__((noinline)) static int foo3(int i1, int i2, int i3) { return i3; } int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; } EOF - cc_check -O4 -mstackrealign && tmp_run && _stackrealign=-mstackrealign - test -z "$_stackrealign" && cc_check -O4 -mstackrealign -fno-unit-at-a-time \ - && tmp_run && _stackrealign="-mstackrealign -fno-unit-at-a-time" - test -n "$_stackrealign" && echores "yes" || echores "no" + cc_check -O4 -mstackrealign && tmp_run && cflags_stackrealign=-mstackrealign + test -z "$cflags_stackrealign" && cc_check -O4 -mstackrealign -fno-unit-at-a-time \ + && tmp_run && cflags_stackrealign="-mstackrealign -fno-unit-at-a-time" + test -n "$cflags_stackrealign" && echores "yes" || echores "no" fi # if darwin && test "$cc_vendor" = "gnu" ; then @@ -2644,9 +2641,9 @@ echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs echocheck "enable sighandler" if test "$_sighandler" = yes ; then - _def_sighandler='#define ENABLE_SIGHANDLER 1' + _def_sighandler='#define CONFIG_SIGHANDLER 1' else - _def_sighandler='#undef ENABLE_SIGHANDLER' + _def_sighandler='#undef CONFIG_SIGHANDLER' fi echores "$_sighandler" @@ -2885,12 +2882,12 @@ echores "$_socklen_t" echocheck "network" # FIXME network check if test "$_network" = yes ; then - _def_network='#define MPLAYER_NETWORK 1' + _def_network='#define CONFIG_NETWORK 1' _ld_extra="$_ld_extra $_ld_sock" _inputmodules="network $_inputmodules" else _noinputmodules="network $_noinputmodules" - _def_network='#undef MPLAYER_NETWORK' + _def_network='#undef CONFIG_NETWORK' _ftp=no fi echores "$_network" @@ -3070,9 +3067,9 @@ if test "$_dl" = no ; then _dynamic_plugins=no fi if test "$_dynamic_plugins" = yes ; then - _def_dynamic_plugins='#define DYNAMIC_PLUGINS 1' + _def_dynamic_plugins='#define CONFIG_DYNAMIC_PLUGINS 1' else - _def_dynamic_plugins='#undef DYNAMIC_PLUGINS' + _def_dynamic_plugins='#undef CONFIG_DYNAMIC_PLUGINS' fi echores "$_dynamic_plugins" @@ -3169,9 +3166,9 @@ EOF done fi if test "$_iconv" = yes ; then - _def_iconv='#define HAVE_ICONV 1' + _def_iconv='#define CONFIG_ICONV 1' else - _def_iconv='#undef HAVE_ICONV' + _def_iconv='#undef CONFIG_ICONV' fi echores "$_iconv" @@ -3573,21 +3570,21 @@ EOF if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox" _coreaudio=yes - _def_coreaudio='#define HAVE_COREAUDIO 1' + _def_coreaudio='#define CONFIG_COREAUDIO 1' _aosrc="$_aosrc ao_macosx.c" _aomodules="macosx $_aomodules" - _def_quartz='#define HAVE_QUARTZ 1' + _def_quartz='#define CONFIG_QUARTZ 1' _vosrc="$_vosrc vo_quartz.c" _vomodules="quartz $_vomodules" - _def_quicktime='#define HAVE_QUICKTIME 1' + _def_quicktime='#define CONFIG_QUICKTIME 1' else _macosx=no _coreaudio=no - _def_coreaudio='#undef HAVE_COREAUDIO' + _def_coreaudio='#undef CONFIG_COREAUDIO' _noaomodules="macosx $_noaomodules" - _def_quartz='#undef HAVE_QUARTZ' + _def_quartz='#undef CONFIG_QUARTZ' _novomodules="quartz $_novomodules" - _def_quicktime='#undef HAVE_QUICKTIME' + _def_quicktime='#undef CONFIG_QUICKTIME' fi cat > $TMPC <<EOF #include <Carbon/Carbon.h> @@ -3598,37 +3595,37 @@ EOF _vosrc="$_vosrc vo_macosx.m" _vomodules="macosx $_vomodules" _ld_extra="$_ld_extra -framework Cocoa -framework QuartzCore -framework OpenGL" - _def_corevideo='#define HAVE_COREVIDEO 1' + _def_corevideo='#define CONFIG_COREVIDEO 1' _corevideo=yes else _novomodules="macosx $_novomodules" - _def_corevideo='#undef HAVE_COREVIDEO' + _def_corevideo='#undef CONFIG_COREVIDEO' _corevideo=no fi fi echores "$_macosx" echocheck "Mac OS X Finder Support" -if test "$_macosx_finder_support" = auto ; then - _macosx_finder_support=$_macosx +if test "$_macosx_finder" = auto ; then + _macosx_finder=$_macosx fi -if test "$_macosx_finder_support" = yes; then - _def_macosx_finder_support='#define MACOSX_FINDER_SUPPORT 1' - _macosx_finder_support=yes +if test "$_macosx_finder" = yes; then + _def_macosx_finder='#define CONFIG_MACOSX_FINDER 1' + _macosx_finder=yes else - _def_macosx_finder_support='#undef MACOSX_FINDER_SUPPORT' - _macosx_finder_support=no + _def_macosx_finder='#undef CONFIG_MACOSX_FINDER' + _macosx_finder=no fi -echores "$_macosx_finder_support" +echores "$_macosx_finder" echocheck "Mac OS X Bundle file locations" if test "$_macosx_bundle" = auto ; then - _macosx_bundle=$_macosx_finder_support + _macosx_bundle=$_macosx_finder fi if test "$_macosx_bundle" = yes; then - _def_macosx_bundle='#define MACOSX_BUNDLE 1' + _def_macosx_bundle='#define CONFIG_MACOSX_BUNDLE 1' else - _def_macosx_bundle='#undef MACOSX_BUNDLE' + _def_macosx_bundle='#undef CONFIG_MACOSX_BUNDLE' _macosx_bundle=no fi echores "$_macosx_bundle" @@ -3663,10 +3660,10 @@ EOF cc_check -framework IOKit && tmp_run && _apple_remote=yes fi if test "$_apple_remote" = yes ; then - _def_apple_remote='#define HAVE_APPLE_REMOTE 1' + _def_apple_remote='#define CONFIG_APPLE_REMOTE 1' _ld_extra="$_ld_extra -framework IOKit" else - _def_apple_remote='#undef HAVE_APPLE_REMOTE' + _def_apple_remote='#undef CONFIG_APPLE_REMOTE' fi echores "$_apple_remote" @@ -3689,9 +3686,9 @@ EOF cc_check && tmp_run && _apple_ir=yes fi if test "$_apple_ir" = yes ; then - _def_apple_ir='#define HAVE_APPLE_IR 1' + _def_apple_ir='#define CONFIG_APPLE_IR 1' else - _def_apple_ir='#undef HAVE_APPLE_IR' + _def_apple_ir='#undef CONFIG_APPLE_IR' fi echores "$_apple_ir" fi #if linux @@ -3710,29 +3707,29 @@ fi echocheck "Samba support (libsmbclient)" -if test "$_smbsupport" = yes; then +if test "$_smb" = yes; then _ld_extra="$_ld_extra -lsmbclient" fi -if test "$_smbsupport" = auto; then - _smbsupport=no +if test "$_smb" = auto; then + _smb=no cat > $TMPC << EOF #include <libsmbclient.h> int main(void) { smbc_opendir("smb://"); return 0; } EOF for _ld_tmp in "-lsmbclient" "-lsmbclient $_ld_dl" "-lsmbclient $_ld_dl -lnsl" "-lsmbclient $_ld_dl -lssl -lnsl" ; do cc_check $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && \ - _smbsupport=yes && break + _smb=yes && break done fi -if test "$_smbsupport" = yes; then - _def_smbsupport="#define LIBSMBCLIENT" +if test "$_smb" = yes; then + _def_smb="#define CONFIG_LIBSMBCLIENT" _inputmodules="smb $_inputmodules" else - _def_smbsupport="#undef LIBSMBCLIENT" + _def_smb="#undef CONFIG_LIBSMBCLIENT" _noinputmodules="smb $_noinputmodules" fi -echores "$_smbsupport" +echores "$_smb" ######### @@ -3762,6 +3759,17 @@ else fi echores "$_s3fb" +echocheck "wii" +if test "$_wii" = yes ; then + _def_wii='#define CONFIG_WII 1' + _vosrc="$_vosrc vo_wii.c" + _vomodules="wii $_vomodules" +else + _def_wii='#undef CONFIG_WII' + _novomodules="wii $_novomodules" +fi +echores "$_wii" + echocheck "tdfxvid" if test "$_tdfxvid" = yes ; then _def_tdfxvid='#define CONFIG_TDFX_VID 1' @@ -3956,12 +3964,12 @@ EOF done fi if test "$_x11" = yes ; then - _def_x11='#define HAVE_X11 1' + _def_x11='#define CONFIG_X11 1' _vosrc="$_vosrc x11_common.c vo_x11.c vo_xover.c" _vomodules="x11 xover $_vomodules" else _x11=no - _def_x11='#undef HAVE_X11' + _def_x11='#undef CONFIG_X11' _novomodules="x11 $_novomodules" _res_comment="check if the dev(el) packages are installed" # disable stuff that depends on X @@ -3980,10 +3988,10 @@ EOF cc_check -lXss && _xss=yes fi if test "$_xss" = yes ; then - _def_xss='#define HAVE_XSS 1' + _def_xss='#define CONFIG_XSS 1' _libs_mplayer="$_libs_mplayer -lXss" else - _def_xss='#undef HAVE_XSS' + _def_xss='#undef CONFIG_XSS' fi echores "$_xss" @@ -4008,16 +4016,16 @@ EOF cc_check -lXext && _xdpms4=yes fi if test "$_xdpms4" = yes ; then - _def_xdpms='#define HAVE_XDPMS 1' + _def_xdpms='#define CONFIG_XDPMS 1' _res_comment="using Xdpms 4" echores "yes" elif test "$_xdpms3" = yes ; then - _def_xdpms='#define HAVE_XDPMS 1' + _def_xdpms='#define CONFIG_XDPMS 1' _libs_mplayer="$_libs_mplayer -lXdpms" _res_comment="using Xdpms 3" echores "yes" else - _def_xdpms='#undef HAVE_XDPMS' + _def_xdpms='#undef CONFIG_XDPMS' echores "no" fi @@ -4037,12 +4045,12 @@ EOF fi if test "$_xv" = yes ; then - _def_xv='#define HAVE_XV 1' + _def_xv='#define CONFIG_XV 1' _libs_mplayer="$_libs_mplayer -lXv" _vosrc="$_vosrc vo_xv.c" _vomodules="xv $_vomodules" else - _def_xv='#undef HAVE_XV' + _def_xv='#undef CONFIG_XV' _novomodules="xv $_novomodules" fi echores "$_xv" @@ -4090,10 +4098,10 @@ EOF fi if test "$_xinerama" = yes ; then - _def_xinerama='#define HAVE_XINERAMA 1' + _def_xinerama='#define CONFIG_XINERAMA 1' _libs_mplayer="$_libs_mplayer -lXinerama" else - _def_xinerama='#undef HAVE_XINERAMA' + _def_xinerama='#undef CONFIG_XINERAMA' fi echores "$_xinerama" @@ -4114,10 +4122,10 @@ EOF cc_check -lXxf86vm && _vm=yes fi if test "$_vm" = yes ; then - _def_vm='#define HAVE_XF86VM 1' + _def_vm='#define CONFIG_XF86VM 1' _libs_mplayer="$_libs_mplayer -lXxf86vm" else - _def_vm='#undef HAVE_XF86VM' + _def_vm='#undef CONFIG_XF86VM' fi echores "$_vm" @@ -4136,9 +4144,9 @@ EOF cc_check && _xf86keysym=yes fi if test "$_xf86keysym" = yes ; then - _def_xf86keysym='#define HAVE_XF86XK 1' + _def_xf86keysym='#define CONFIG_XF86XK 1' else - _def_xf86keysym='#undef HAVE_XF86XK' + _def_xf86keysym='#undef CONFIG_XF86XK' fi echores "$_xf86keysym" @@ -4163,20 +4171,20 @@ EOF fi _dga=no -_def_dga='#undef HAVE_DGA' -_def_dga1='#undef HAVE_DGA1' -_def_dga2='#undef HAVE_DGA2' +_def_dga='#undef CONFIG_DGA' +_def_dga1='#undef CONFIG_DGA1' +_def_dga2='#undef CONFIG_DGA2' if test "$_dga1" = yes ; then _dga=yes - _def_dga1='#define HAVE_DGA1 1' + _def_dga1='#define CONFIG_DGA1 1' _res_comment="using DGA 1.0" elif test "$_dga2" = yes ; then _dga=yes - _def_dga2='#define HAVE_DGA2 1' + _def_dga2='#define CONFIG_DGA2 1' _res_comment="using DGA 2.0" fi if test "$_dga" = yes ; then - _def_dga='#define HAVE_DGA 1' + _def_dga='#define CONFIG_DGA 1' _libs_mplayer="$_libs_mplayer -lXxf86dga" _vosrc="$_vosrc vo_dga.c" _vomodules="dga $_vomodules" @@ -4316,11 +4324,11 @@ if test "$_vidix" = yes ; then fi echocheck "VIDIX dhahelper support" - test "$_dhahelper" = yes && cflag_dhahelper=-DCONFIG_DHAHELPER + test "$_dhahelper" = yes && cflags_dhahelper=-DCONFIG_DHAHELPER echores "$_dhahelper" echocheck "VIDIX svgalib_helper support" - test "$_svgalib_helper" = yes && cflag_svgalib_helper=-DCONFIG_SVGAHELPER + test "$_svgalib_helper" = yes && cflags_svgalib_helper=-DCONFIG_SVGAHELPER echores "$_svgalib_helper" else @@ -4537,8 +4545,8 @@ EOF fi echores "$_dvb" if test "$_dvb" = yes ; then - _def_dvb='#define HAVE_DVB 1' - _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' + _def_dvb='#define CONFIG_DVB 1' + _def_dvbin='#define CONFIG_DVBIN 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi @@ -4566,15 +4574,17 @@ EOF fi echores "$_dvbhead" if test "$_dvbhead" = yes ; then - _def_dvb='#define HAVE_DVB_HEAD 1' - _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' + _def_dvb='#define CONFIG_DVB 1' + _def_dvb_head='#define CONFIG_DVB_HEAD 1' + _def_dvbin='#define CONFIG_DVBIN 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi if test "$_dvbhead" = no && test "$_dvb" = no ; then - _def_dvb='#undef HAVE_DVB' - _def_dvb_in='#undef HAS_DVBIN_SUPPORT ' + _def_dvb='#undef CONFIG_DVB' + _def_dvb_head='#undef CONFIG_DVB_HEAD' + _def_dvbin='#undef CONFIG_DVBIN ' _aomodules="mpegpes(file) $_aomodules" _vomodules="mpegpes(file) $_vomodules" fi @@ -4618,12 +4628,12 @@ EOF fi echores "$_png" if test "$_png" = yes ; then - _def_png='#define HAVE_PNG 1' + _def_png='#define CONFIG_PNG 1' _ld_extra="$_ld_extra -lpng -lz" _vosrc="$_vosrc vo_png.c" _vomodules="png $_vomodules" else - _def_png='#undef HAVE_PNG' + _def_png='#undef CONFIG_PNG' _novomodules="png $_novomodules" fi @@ -4647,12 +4657,12 @@ fi echores "$_jpeg" if test "$_jpeg" = yes ; then - _def_jpeg='#define HAVE_JPEG 1' + _def_jpeg='#define CONFIG_JPEG 1' _vosrc="$_vosrc vo_jpeg.c" _vomodules="jpeg $_vomodules" _ld_extra="$_ld_extra -ljpeg" else - _def_jpeg='#undef HAVE_JPEG' + _def_jpeg='#undef CONFIG_JPEG' _novomodules="jpeg $_novomodules" fi @@ -4660,11 +4670,11 @@ fi echocheck "PNM support" if test "$_pnm" = yes; then - _def_pnm="#define HAVE_PNM" + _def_pnm="#define CONFIG_PNM" _vosrc="$_vosrc vo_pnm.c" _vomodules="pnm $_vomodules" else - _def_pnm="#undef HAVE_PNM" + _def_pnm="#undef CONFIG_PNM" _novomodules="pnm $_novomodules" fi echores "$_pnm" @@ -4706,12 +4716,12 @@ if test "$_force_gif" = yes && test "$_gif" = no ; then fi if test "$_gif" = yes ; then - _def_gif='#define HAVE_GIF 1' + _def_gif='#define CONFIG_GIF 1' _vosrc="$_vosrc vo_gif89a.c" _codecmodules="gif $_codecmodules" _vomodules="gif89a $_vomodules" _res_comment="old version, some encoding functions disabled" - _def_gif_4='#undef HAVE_GIF_4' + _def_gif_4='#undef CONFIG_GIF_4' _ld_extra="$_ld_extra $_ld_gif" cat > $TMPC << EOF @@ -4726,12 +4736,12 @@ int main(void) { } EOF if cc_check "$_ld_gif" && tmp_run ; then - _def_gif_4='#define HAVE_GIF_4 1' + _def_gif_4='#define CONFIG_GIF_4 1' _res_comment="" fi else - _def_gif='#undef HAVE_GIF' - _def_gif_4='#undef HAVE_GIF_4' + _def_gif='#undef CONFIG_GIF' + _def_gif_4='#undef CONFIG_GIF_4' _novomodules="gif89a $_novomodules" _nocodecmodules="gif $_nocodecmodules" fi @@ -4740,7 +4750,7 @@ echores "$_gif" case "$_gif" in yes*) echocheck "broken giflib workaround" - _def_gif_tvt_hack='#define HAVE_GIF_TVT_HACK 1' + _def_gif_tvt_hack='#define CONFIG_GIF_TVT_HACK 1' cat > $TMPC << EOF #include <gif_lib.h> @@ -4751,7 +4761,7 @@ int main(void) { } EOF if cc_check "$_ld_gif" && tmp_run ; then - _def_gif_tvt_hack='#undef HAVE_GIF_TVT_HACK' + _def_gif_tvt_hack='#undef CONFIG_GIF_TVT_HACK' echores "disabled" else echores "enabled" @@ -4819,7 +4829,7 @@ EOF fi fi if test "$_sdl" = yes ; then - _def_sdl='#define HAVE_SDL 1' + _def_sdl='#define CONFIG_SDL 1' if cygwin ; then _libs_mplayer="$_libs_mplayer `$_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/`" _inc_extra="$_inc_extra `$_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/`" @@ -4836,7 +4846,7 @@ if test "$_sdl" = yes ; then _aomodules="sdl $_aomodules" _res_comment="using $_sdlconfig" else - _def_sdl='#undef HAVE_SDL' + _def_sdl='#undef CONFIG_SDL' _novomodules="sdl $_novomodules" _noaomodules="sdl $_noaomodules" fi @@ -4856,12 +4866,12 @@ EOF cc_check -lwinmm && _win32waveout=yes fi if test "$_win32waveout" = yes ; then - _def_win32waveout='#define HAVE_WIN32WAVEOUT 1' + _def_win32waveout='#define CONFIG_WIN32WAVEOUT 1' _libs_mplayer="$_libs_mplayer -lwinmm" _aosrc="$_aosrc ao_win32.c" _aomodules="win32 $_aomodules" else - _def_win32waveout='#undef HAVE_WIN32WAVEOUT' + _def_win32waveout='#undef CONFIG_WIN32WAVEOUT' _noaomodules="win32 $_noaomodules" fi echores "$_win32waveout" @@ -4878,14 +4888,14 @@ EOF cc_check -lgdi32 && _directx=yes fi if test "$_directx" = yes ; then - _def_directx='#define HAVE_DIRECTX 1' + _def_directx='#define CONFIG_DIRECTX 1' _libs_mplayer="$_libs_mplayer -lgdi32" _vosrc="$_vosrc vo_directx.c" _vomodules="directx $_vomodules" _aosrc="$_aosrc ao_dsound.c" _aomodules="dsound $_aomodules" else - _def_directx='#undef HAVE_DIRECTX' + _def_directx='#undef CONFIG_DIRECTX' _novomodules="directx $_novomodules" _noaomodules="dsound $_noaomodules" fi @@ -4904,13 +4914,13 @@ EOF cc_check $_ld_lm -laudio -lXt && _nas=yes fi if test "$_nas" = yes ; then - _def_nas='#define HAVE_NAS 1' + _def_nas='#define CONFIG_NAS 1' _libs_mplayer="$_libs_mplayer -laudio -lXt" _aosrc="$_aosrc ao_nas.c" _aomodules="nas $_aomodules" else _noaomodules="nas $_noaomodules" - _def_nas='#undef HAVE_NAS' + _def_nas='#undef CONFIG_NAS' fi echores "$_nas" @@ -4927,13 +4937,13 @@ EOF done fi if test "$_dxr2" = yes; then - _def_dxr2='#define HAVE_DXR2 1' + _def_dxr2='#define CONFIG_DXR2 1' _vosrc="$_vosrc vo_dxr2.c" _aosrc="$_aosrc ao_dxr2.c" _aomodules="dxr2 $_aomodules" _vomodules="dxr2 $_vomodules" else - _def_dxr2='#undef HAVE_DXR2' + _def_dxr2='#undef CONFIG_DXR2' _noaomodules="dxr2 $_noaomodules" _novomodules="dxr2 $_novomodules" fi @@ -4949,11 +4959,11 @@ EOF cc_check && _dxr3=yes fi if test "$_dxr3" = yes ; then - _def_dxr3='#define HAVE_DXR3 1' + _def_dxr3='#define CONFIG_DXR3 1' _vosrc="$_vosrc vo_dxr3.c" _vomodules="dxr3 $_vomodules" else - _def_dxr3='#undef HAVE_DXR3' + _def_dxr3='#undef CONFIG_DXR3' _novomodules="dxr3 $_novomodules" fi echores "$_dxr3" @@ -4979,13 +4989,13 @@ EOF cc_check && _ivtv=yes fi if test "$_ivtv" = yes ; then - _def_ivtv='#define HAVE_IVTV 1' + _def_ivtv='#define CONFIG_IVTV 1' _vosrc="$_vosrc vo_ivtv.c" _vomodules="ivtv $_vomodules" _aosrc="$_aosrc ao_ivtv.c" _aomodules="ivtv $_aomodules" else - _def_ivtv='#undef HAVE_IVTV' + _def_ivtv='#undef CONFIG_IVTV' _novomodules="ivtv $_novomodules" _noaomodules="ivtv $_noaomodules" fi @@ -5014,13 +5024,13 @@ EOF cc_check && _v4l2=yes fi if test "$_v4l2" = yes ; then - _def_v4l2='#define HAVE_V4L2_DECODER 1' + _def_v4l2='#define CONFIG_V4L2_DECODER 1' _vosrc="$_vosrc vo_v4l2.c" _vomodules="v4l2 $_vomodules" _aosrc="$_aosrc ao_v4l2.c" _aomodules="v4l2 $_aomodules" else - _def_v4l2='#undef HAVE_V4L2_DECODER' + _def_v4l2='#undef CONFIG_V4L2_DECODER' _novomodules="v4l2 $_novomodules" _noaomodules="v4l2 $_noaomodules" fi @@ -5134,11 +5144,11 @@ if test "$_esd" = yes ; then #include <esd.h> int main(void) { return esd_get_latency(0); } EOF - cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && _def_esd_latency='#define HAVE_ESD_LATENCY' + cc_check `esd-config --libs` `esd-config --cflags` && _esd_latency=yes && _def_esd_latency='#define CONFIG_ESD_LATENCY' echores "$_esd_latency" else _def_esd='#undef CONFIG_ESD' - _def_esd_latency='#undef HAVE_ESD_LATENCY' + _def_esd_latency='#undef CONFIG_ESD_LATENCY' _noaomodules="esd $_noaomodules" fi @@ -5281,9 +5291,10 @@ int main(void) { return 0; } EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' fi -_def_alsa5='#undef HAVE_ALSA5' -_def_alsa9='#undef HAVE_ALSA9' -_def_alsa1x='#undef HAVE_ALSA1X' +_def_alsa='#undef CONFIG_ALSA' +_def_alsa5='#undef CONFIG_ALSA5' +_def_alsa9='#undef CONFIG_ALSA9' +_def_alsa1x='#undef CONFIG_ALSA1X' _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then @@ -5292,35 +5303,39 @@ if test "$_alsaver" ; then _alsa5=yes _aosrc="$_aosrc ao_alsa5.c" _aomodules="alsa5 $_aomodules" - _def_alsa5='#define HAVE_ALSA5 1' + _def_alsa5='#define CONFIG_ALSA5 1' _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.5.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-sys' ; then _alsa9=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa9='#define HAVE_ALSA9 1' + _def_alsa='#define CONFIG_ALSA 1' + _def_alsa9='#define CONFIG_ALSA9 1' _def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then _alsa9=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa9='#define HAVE_ALSA9 1' + _def_alsa='#define CONFIG_ALSA 1' + _def_alsa9='#define CONFIG_ALSA9 1' _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then _alsa1x=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa1x="#define HAVE_ALSA1X 1" + _def_alsa='#define CONFIG_ALSA 1' + _def_alsa1x="#define CONFIG_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then _alsa1x=yes _aosrc="$_aosrc ao_alsa.c" _aomodules="alsa $_aomodules" - _def_alsa1x="#define HAVE_ALSA1X 1" + _def_alsa='#define CONFIG_ALSA 1' + _def_alsa1x="#define CONFIG_ALSA1X 1" _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' _res_comment="using alsa 1.0.x and alsa/asoundlib.h" else @@ -5397,10 +5412,10 @@ fi #if irix echocheck "VCD support" if linux || freebsd || netbsd || dragonfly || bsdos || darwin || sunos || mingw32; then _inputmodules="vcd $_inputmodules" - _def_vcd='#define HAVE_VCD 1' + _def_vcd='#define CONFIG_VCD 1' _vcd="yes" else - _def_vcd='#undef HAVE_VCD' + _def_vcd='#undef CONFIG_VCD' _noinputmodules="vcd $_noinputmodules" _res_comment="not supported on this OS" _vcd="no" @@ -5479,13 +5494,13 @@ if test "$_libdvdcss_internal" = yes ; then _def_dvd_darwin='#define DARWIN_DVD_IOCTL' _ld_extra="$_ld_extra -framework IOKit" elif cygwin ; then - CFLAGS="$CFLAGS -DSYS_CYGWIN" + cflags_libdvdcss="-DSYS_CYGWIN" elif beos ; then - CFLAGS="$CFLAGS -DSYS_BEOS" + cflags_libdvdcss="-DSYS_BEOS" elif os2 ; then - CFLAGS="$CFLAGS -DSYS_OS2" + cflags_libdvdcss="-DSYS_OS2" fi - _libdvdcss_dvdread_flags="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" + cflags_libdvdcss_dvdread="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H" _inputmodules="libdvdcss(internal) $_inputmodules" _largefiles=yes else @@ -5544,40 +5559,40 @@ EOF fi if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then _cdda='yes' - _def_libcdio='#define HAVE_LIBCDIO' + _def_libcdio='#define CONFIG_LIBCDIO' _def_havelibcdio='yes' else if test "$_cdparanoia" = yes ; then _res_comment="using cdparanoia" fi - _def_libcdio='#undef HAVE_LIBCDIO' + _def_libcdio='#undef CONFIG_LIBCDIO' _def_havelibcdio='no' fi echores "$_libcdio" if test "$_cdda" = yes ; then test $_cddb = auto && test $_network = yes && _cddb=yes - _def_cdparanoia='#define HAVE_CDDA' + _def_cdparanoia='#define CONFIG_CDDA' _inputmodules="cdda $_inputmodules" else - _def_cdparanoia='#undef HAVE_CDDA' + _def_cdparanoia='#undef CONFIG_CDDA' _noinputmodules="cdda $_noinputmodules" fi if test "$_cddb" = yes ; then - _def_cddb='#define HAVE_CDDB' + _def_cddb='#define CONFIG_CDDB' _inputmodules="cddb $_inputmodules" else _cddb=no - _def_cddb='#undef HAVE_CDDB' + _def_cddb='#undef CONFIG_CDDB' _noinputmodules="cddb $_noinputmodules" fi echocheck "bitmap font support" if test "$_bitmap_font" = yes ; then - _def_bitmap_font="#define HAVE_BITMAP_FONT 1" + _def_bitmap_font="#define CONFIG_BITMAP_FONT 1" else - _def_bitmap_font="#undef HAVE_BITMAP_FONT" + _def_bitmap_font="#undef CONFIG_BITMAP_FONT" fi echores "$_bitmap_font" @@ -5625,11 +5640,11 @@ EOF fi fi if test "$_freetype" = yes ; then - _def_freetype='#define HAVE_FREETYPE' + _def_freetype='#define CONFIG_FREETYPE' _inc_extra="$_inc_extra `$_freetypeconfig --cflags`" _ld_extra="$_ld_extra `$_freetypeconfig --libs`" else - _def_freetype='#undef HAVE_FREETYPE' + _def_freetype='#undef CONFIG_FREETYPE' fi echores "$_freetype" @@ -5665,9 +5680,9 @@ EOF fi fi if test "$_fontconfig" = yes ; then - _def_fontconfig='#define HAVE_FONTCONFIG' + _def_fontconfig='#define CONFIG_FONTCONFIG' else - _def_fontconfig='#undef HAVE_FONTCONFIG' + _def_fontconfig='#undef CONFIG_FONTCONFIG' fi echores "$_fontconfig" @@ -5725,11 +5740,11 @@ EOF fi fi if test "$_fribidi" = yes ; then - _def_fribidi='#define HAVE_FRIBIDI' + _def_fribidi='#define CONFIG_FRIBIDI' _inc_extra="$_inc_extra `$_fribidiconfig --cflags`" _ld_extra="$_ld_extra `$_fribidiconfig --libs`" else - _def_fribidi='#undef HAVE_FRIBIDI' + _def_fribidi='#undef CONFIG_FRIBIDI' fi echores "$_fribidi" @@ -5750,10 +5765,10 @@ EOF cc_check -lenca $_ld_lm && _enca=yes fi if test "$_enca" = yes ; then - _def_enca='#define HAVE_ENCA 1' + _def_enca='#define CONFIG_ENCA 1' _ld_extra="$_ld_extra -lenca" else - _def_enca='#undef HAVE_ENCA' + _def_enca='#undef CONFIG_ENCA' fi echores "$_enca" @@ -5906,17 +5921,17 @@ fi if test "$_tremor_internal" = yes ; then _vorbis=yes _def_vorbis='#define CONFIG_OGGVORBIS 1' - _def_tremor='#define TREMOR 1' + _def_tremor='#define CONFIG_TREMOR 1' _codecmodules="tremor(internal) $_codecmodules" _res_comment="internal Tremor" if test "$_tremor_low" = yes ; then - CFLAGS="$CFLAGS -D_LOW_ACCURACY_" + cflags_tremor_low="-D_LOW_ACCURACY_" _res_comment="internal low accuracy Tremor" fi elif test "$_tremor_external" = yes ; then _vorbis=yes _def_vorbis='#define CONFIG_OGGVORBIS 1' - _def_tremor='#define TREMOR 1' + _def_tremor='#define CONFIG_TREMOR 1' _codecmodules="tremor(external) $_codecmodules" _res_comment="external Tremor" _ld_extra="$_ld_extra -logg -lvorbisidec" @@ -6166,7 +6181,7 @@ if test "$_faad_internal" = yes ; then if test "$_faad_fixed" = yes ; then # The FIXED_POINT implementation of FAAD2 improves performance # on some platforms, especially for SBR files. - CFLAGS="$CFLAGS -DFIXED_POINT" + cflags_faad_fixed="-DFIXED_POINT" _res_comment="internal fixed-point" fi elif test "$_faad_external" = yes ; then @@ -6201,9 +6216,9 @@ EOF cc_check && _ladspa=yes fi if test "$_ladspa" = yes; then - _def_ladspa="#define HAVE_LADSPA" + _def_ladspa="#define CONFIG_LADSPA" else - _def_ladspa="#undef HAVE_LADSPA" + _def_ladspa="#undef CONFIG_LADSPA" fi echores "$_ladspa" @@ -6325,12 +6340,12 @@ if test "$_nemesi" = auto && test "$_network" = yes ; then fi if test "$_nemesi" = yes; then _native_rtsp=no - _def_nemesi='#define LIBNEMESI 1' + _def_nemesi='#define CONFIG_LIBNEMESI 1' _inputmodules="nemesi $_inputmodules" else _native_rtsp="$_network" _nemesi=no - _def_nemesi='#undef LIBNEMESI' + _def_nemesi='#undef CONFIG_LIBNEMESI' _noinputmodules="nemesi $_noinputmodules" fi echores "$_nemesi" @@ -6368,19 +6383,19 @@ EOF fi if test "$_live" = yes && test "$_network" = yes; then _res_comment="using $_livelibdir" - _def_live='#define STREAMING_LIVE555 1' + _def_live='#define CONFIG_LIVE555 1' _inputmodules="live555 $_inputmodules" elif test "$_live_dist" = yes && test "$_network" = yes; then _res_comment="using distribution version" _live="yes" - _def_live='#define STREAMING_LIVE555 1' + _def_live='#define CONFIG_LIVE555 1' _ld_extra="$_ld_extra -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment -lstdc++" _inc_extraxx="-I/usr/include/liveMedia -I/usr/include/UsageEnvironment \ -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock" _inputmodules="live555 $_inputmodules" else _live=no - _def_live='#undef STREAMING_LIVE555' + _def_live='#undef CONFIG_LIVE555' _noinputmodules="live555 $_noinputmodules" fi echores "$_live" @@ -6794,16 +6809,16 @@ if test "$_zr" = auto ; then fi if test "$_zr" = yes ; then if test "$_libavcodec_a" = yes ; then - _def_zr='#define HAVE_ZR 1' + _def_zr='#define CONFIG_ZR 1' _vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c" _vomodules="zr zr2 $_vomodules" else _res_comment="libavcodec (static) is required by zr, sorry" _novomodules="zr $_novomodules" - _def_zr='#undef HAVE_ZR' + _def_zr='#undef CONFIG_ZR' fi else - _def_zr='#undef HAVE_ZR' + _def_zr='#undef CONFIG_ZR' _novomodules="zr zr2 $_novomodules" fi echores "$_zr" @@ -6972,10 +6987,10 @@ EOF fi fi if test "$_tv_bsdbt848" = yes ; then - _def_tv_bsdbt848='#define HAVE_TV_BSDBT848 1' + _def_tv_bsdbt848='#define CONFIG_TV_BSDBT848 1' _inputmodules="tv-bsdbt848 $_inputmodules" else - _def_tv_bsdbt848='#undef HAVE_TV_BSDBT848' + _def_tv_bsdbt848='#undef CONFIG_TV_BSDBT848' _noinputmodules="tv-bsdbt848 $_noinputmodules" fi echores "$_tv_bsdbt848" @@ -6999,11 +7014,11 @@ EOF fi if test "$_tv_dshow" = yes ; then _inputmodules="tv-dshow $_inputmodules" - _def_tv_dshow='#define HAVE_TV_DSHOW 1' + _def_tv_dshow='#define CONFIG_TV_DSHOW 1' _ld_extra="$_ld_extra -lole32 -luuid" else _noinputmodules="tv-dshow $_noinputmodules" - _def_tv_dshow='#undef HAVE_TV_DSHOW' + _def_tv_dshow='#undef CONFIG_TV_DSHOW' fi echores "$_tv_dshow" @@ -7023,12 +7038,12 @@ fi if test "$_tv_v4l1" = yes ; then _audio_input=yes _tv_v4l=yes - _def_tv_v4l='#define HAVE_TV_V4L 1' - _def_tv_v4l1='#define HAVE_TV_V4L1 1' + _def_tv_v4l='#define CONFIG_TV_V4L 1' + _def_tv_v4l1='#define CONFIG_TV_V4L1 1' _inputmodules="tv-v4l $_inputmodules" else _noinputmodules="tv-v4l1 $_noinputmodules" - _def_tv_v4l='#undef HAVE_TV_V4L' + _def_tv_v4l='#undef CONFIG_TV_V4L' fi echores "$_tv_v4l1" @@ -7049,12 +7064,12 @@ fi if test "$_tv_v4l2" = yes ; then _audio_input=yes _tv_v4l=yes - _def_tv_v4l='#define HAVE_TV_V4L 1' - _def_tv_v4l2='#define HAVE_TV_V4L2 1' + _def_tv_v4l='#define CONFIG_TV_V4L 1' + _def_tv_v4l2='#define CONFIG_TV_V4L2 1' _inputmodules="tv-v4l2 $_inputmodules" else _noinputmodules="tv-v4l2 $_noinputmodules" - _def_tv_v4l2='#undef HAVE_TV_V4L2' + _def_tv_v4l2='#undef CONFIG_TV_V4L2' fi echores "$_tv_v4l2" @@ -7069,11 +7084,11 @@ if test "$_tv_teletext" = auto ; then fi fi if test "$_tv_teletext" = yes ; then - _def_tv_teletext='#define HAVE_TV_TELETEXT 1' + _def_tv_teletext='#define CONFIG_TV_TELETEXT 1' _inputmodules="tv-teletext $_inputmodules" else _noinputmodules="tv-teletext $_noinputmodules" - _def_tv_teletext='#undef HAVE_TV_TELETEXT' + _def_tv_teletext='#undef CONFIG_TV_TELETEXT' fi echores "$_tv_teletext" @@ -7115,9 +7130,9 @@ EOF fi fi if test "$_radio_v4l2" = yes ; then - _def_radio_v4l2='#define HAVE_RADIO_V4L2 1' + _def_radio_v4l2='#define CONFIG_RADIO_V4L2 1' else - _def_radio_v4l2='#undef HAVE_RADIO_V4L2' + _def_radio_v4l2='#undef CONFIG_RADIO_V4L2' fi echores "$_radio_v4l2" @@ -7134,9 +7149,9 @@ EOF fi fi if test "$_radio_v4l" = yes ; then - _def_radio_v4l='#define HAVE_RADIO_V4L 1' + _def_radio_v4l='#define CONFIG_RADIO_V4L 1' else - _def_radio_v4l='#undef HAVE_RADIO_V4L' + _def_radio_v4l='#undef CONFIG_RADIO_V4L' fi echores "$_radio_v4l" @@ -7157,9 +7172,9 @@ echores "$_radio_bsdbt848" fi #if freebsd || netbsd || openbsd || dragonfly || bsdos && _radio && _radio_bsdbt848 if test "$_radio_bsdbt848" = yes ; then - _def_radio_bsdbt848='#define HAVE_RADIO_BSDBT848 1' + _def_radio_bsdbt848='#define CONFIG_RADIO_BSDBT848 1' else - _def_radio_bsdbt848='#undef HAVE_RADIO_BSDBT848' + _def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848' fi if test "$_radio_v4l" = no && test "$_radio_v4l2" = no && \ @@ -7182,11 +7197,11 @@ EOF fi fi if test "$_pvr" = yes ; then - _def_pvr='#define HAVE_PVR 1' + _def_pvr='#define CONFIG_PVR 1' _inputmodules="pvr $_inputmodules" else _noinputmodules="pvr $_noinputmodules" - _def_pvr='#undef HAVE_PVR' + _def_pvr='#undef CONFIG_PVR' fi echores "$_pvr" @@ -7202,11 +7217,11 @@ echores "$_select" echocheck "ftp" if ! beos && test "$_ftp" = yes ; then - _def_ftp='#define HAVE_FTP 1' + _def_ftp='#define CONFIG_FTP 1' _inputmodules="ftp $_inputmodules" else _noinputmodules="ftp $_noinputmodules" - _def_ftp='#undef HAVE_FTP' + _def_ftp='#undef CONFIG_FTP' fi echores "$_ftp" @@ -7221,12 +7236,12 @@ EOF cc_check -lvstream-client && _vstream=yes fi if test "$_vstream" = yes ; then - _def_vstream='#define HAVE_VSTREAM 1' + _def_vstream='#define CONFIG_VSTREAM 1' _inputmodules="vstream $_inputmodules" _ld_extra="$_ld_extra -lvstream-client" else _noinputmodules="vstream $_noinputmodules" - _def_vstream='#undef HAVE_VSTREAM' + _def_vstream='#undef CONFIG_VSTREAM' fi echores "$_vstream" @@ -7287,14 +7302,14 @@ if test "$_xmms" = yes ; then _xmmslibdir=/usr/lib fi - _def_xmms='#define HAVE_XMMS 1' + _def_xmms='#define CONFIG_XMMS 1' if darwin ; then _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.dylib" else _ld_extra="$_ld_extra ${_xmmslibdir}/libxmms.so.1 -export-dynamic" fi else - _def_xmms='#undef HAVE_XMMS' + _def_xmms='#undef CONFIG_XMMS' fi echores "$_xmms" @@ -7387,7 +7402,7 @@ EOF cc_check -lXext && _xshape=yes fi if test "$_xshape" = yes ; then - _def_xshape='#define HAVE_XSHAPE 1' + _def_xshape='#define CONFIG_XSHAPE 1' else die "The GUI requires the X11 extension XShape (which was not found)." fi @@ -7501,9 +7516,9 @@ fi echocheck "automatic gdb attach" if test "$_crash_debug" = yes ; then - _def_crash_debug='#define CRASH_DEBUG 1' + _def_crash_debug='#define CONFIG_CRASH_DEBUG 1' else - _def_crash_debug='#undef CRASH_DEBUG' + _def_crash_debug='#undef CONFIG_CRASH_DEBUG' _crash_debug=no fi echores "$_crash_debug" @@ -7538,11 +7553,11 @@ test "$_debug" != "" && _def_debug='#define MP_DEBUG 1' echocheck "joystick" -_def_joystick='#undef HAVE_JOYSTICK' +_def_joystick='#undef CONFIG_JOYSTICK' if test "$_joystick" = yes ; then if linux ; then # TODO add some check - _def_joystick='#define HAVE_JOYSTICK 1' + _def_joystick='#define CONFIG_JOYSTICK 1' else _joystick="no" _res_comment="unsupported under $system_name" @@ -7560,10 +7575,10 @@ EOF cc_check -llirc_client && _lirc=yes fi if test "$_lirc" = yes ; then - _def_lirc='#define HAVE_LIRC 1' + _def_lirc='#define CONFIG_LIRC 1' _ld_extra="$_ld_extra -llirc_client" else - _def_lirc='#undef HAVE_LIRC' + _def_lirc='#undef CONFIG_LIRC' fi echores "$_lirc" @@ -7577,10 +7592,10 @@ EOF cc_check -llircc && _lircc=yes fi if test "$_lircc" = yes ; then - _def_lircc='#define HAVE_LIRCC 1' + _def_lircc='#define CONFIG_LIRCC 1' _ld_extra="$_ld_extra -llircc" else - _def_lircc='#undef HAVE_LIRCC' + _def_lircc='#undef CONFIG_LIRCC' fi echores "$_lircc" @@ -7597,11 +7612,11 @@ EOF cc_check `$_pkg_config --cflags --libs libosso 2>/dev/null` && _maemo=yes fi if test "$_maemo" = yes ; then - _def_maemo='#define HAVE_MAEMO 1' + _def_maemo='#define CONFIG_MAEMO 1' _inc_extra="$_inc_extra `$_pkg_config --cflags libosso`" _ld_extra="$_ld_extra `$_pkg_config --libs libosso` -lXsp" else - _def_maemo='#undef HAVE_MAEMO' + _def_maemo='#undef CONFIG_MAEMO' fi echores "$_maemo" fi @@ -7703,7 +7718,7 @@ CFLAGS_FFMPEG="-I../.. $CFLAGS" CFLAGS="-I. -Iffmpeg $CFLAGS" CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS" -cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno-omit-leaf-frame-pointer" +cc_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" ############################################################################# echo "Creating config.mak" @@ -7742,12 +7757,15 @@ EXTRAXX_INC = $_inc_extra $_inc_extraxx CFLAGS = $CFLAGS \$(EXTRA_INC) OPTFLAGS = $CFLAGS \$(EXTRA_INC) FFMPEG_OFLAGS = $CFLAGS_FFMPEG \$(EXTRA_INC) -CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) -CFLAG_STACKREALIGN = $_stackrealign -LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags -CFLAG_DHAHELPER = $cflag_dhahelper -CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper +CFLAGS_DHAHELPER = $cflags_dhahelper +CFLAGS_FAAD_FIXED = $cflags_faad_fixed +CFLAGS_LIBDVDCSS = $cflags_libdvdcss +CFLAGS_LIBDVDCSS_DVDREAD = $cflags_libdvdcss_dvdread +CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer +CFLAGS_STACKREALIGN = $cflags_stackrealign +CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper +CFLAGS_TREMOR_LOW = $cflags_tremor_low EXTRALIBS = $_extra_libs EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm @@ -7777,7 +7795,6 @@ LIBA52 = $_liba52 LIBMPEG2 = $_libmpeg2 MP3LIB = $_mp3lib TREMOR_INTERNAL = $_tremor_internal -TREMOR_LOW = $_tremor_low HAVE_SYS_MMAN_H = $_mman HAVE_POSIX_SELECT = $_posix_select @@ -7831,16 +7848,17 @@ LIBMENU = $_menu LIBMENU_DVBIN = $_menu_dvbin LIBNEMESI = $_nemesi LIBNUT = $_libnut -LIBSMBCLIENT = $_smbsupport +LIBSMBCLIENT = $_smb LIBTHEORA = $_theora LIBVORBIS = $_vorbis LIRC = $_lirc +LIVE555 = $_live MACOSX_BUNDLE = $_macosx_bundle -MACOSX_FINDER_SUPPORT = $_macosx_finder_support +MACOSX_FINDER = $_macosx_finder MP3LAME = $_mp3lame -MPLAYER_NETWORK = $_network MUSEPACK = $_musepack NATIVE_RTSP = $_native_rtsp +NETWORK = $_network PE_EXECUTABLE = $_pe_executable PNG = $_png PVR = $_pvr @@ -7852,7 +7870,6 @@ RADIO=$_radio RADIO_CAPTURE=$_radio_capture REAL_CODECS = $_real SPEEX = $_speex -STREAMING_LIVE555 = $_live STREAM_CACHE = $_stream_cache TOOLAME=$_toolame TV = $_tv @@ -8232,7 +8249,7 @@ $_def_win32dll #define WIN32_PATH "$_win32codecsdir" /* Mac OS X specific features */ -$_def_macosx_finder_support +$_def_macosx_finder $_def_macosx_bundle $_def_coreaudio $_def_corevideo @@ -8350,6 +8367,7 @@ $_def_gtk2 $_def_ossaudio $_def_ossaudio_devdsp $_def_ossaudio_devmixer +$_def_alsa $_def_alsa5 $_def_alsa9 $_def_alsa1x @@ -8486,7 +8504,7 @@ $_def_mkstemp $_def_nanosleep /* SMB support */ -$_def_smbsupport +$_def_smb /* termcap flag for getch2.c */ $_def_termcap @@ -8658,6 +8676,7 @@ $_def_ggi $_def_ggiwmh $_def_3dfx $_def_s3fb +$_def_wii $_def_tdfxfb $_def_tdfxvid $_def_xvr100 @@ -8674,7 +8693,8 @@ $_def_dxr3 $_def_ivtv $_def_v4l2 $_def_dvb -$_def_dvb_in +$_def_dvb_head +$_def_dvbin $_def_svga $_def_vesa $_def_xss @@ -8688,7 +8708,7 @@ $_def_twolame /* used by GUI: */ $_def_xshape -#if defined(CONFIG_GL) || defined(HAVE_X11) || defined(HAVE_XV) +#if defined(CONFIG_GL) || defined(CONFIG_X11) || defined(CONFIG_XV) #define X11_FULLSCREEN 1 #endif diff --git a/get_path.c b/get_path.c index b1f119e450..76a0169519 100644 --- a/get_path.c +++ b/get_path.c @@ -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()); @@ -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",>kDXR3Device,CONF_TYPE_STRING,0,0,0,NULL }, #endif @@ -139,12 +139,12 @@ static const m_option_t gui_opts[] = { "ao_oss_mixer_channel",>kAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_oss_device",>kAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA { "ao_alsa_mixer",>kAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_mixer_channel",>kAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_device",>kAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL { "ao_sdl_subdriver",>kAOSDLDriver,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 }, diff --git a/gui/interface.c b/gui/interface.c index a0e5ae72c5..f41c5332bf 100644 --- a/gui/interface.c +++ b/gui/interface.c @@ -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( >kEquChannels,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; diff --git a/gui/interface.h b/gui/interface.h index 372c888d15..a739d2c640 100644 --- a/gui/interface.h +++ b/gui/interface.h @@ -90,7 +90,7 @@ typedef struct int Chapter; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD int VCDTracks; #endif diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c index 043f999ebb..fb774dead8 100644 --- a/gui/mplayer/gtk/fs.c +++ b/gui/mplayer/gtk/fs.c @@ -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" }, diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c index d54d4fe1e3..beac3325c1 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/menu.c @@ -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 ); diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c index 281f49de71..2a638b3f55 100644 --- a/gui/mplayer/gtk/opts.c +++ b/gui/mplayer/gtk/opts.c @@ -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(>kAOALSADevice); 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(>kAOSDLDriver); 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; diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c index b422fc4a0b..957e85d3b1 100644 --- a/gui/mplayer/gui_common.c +++ b/gui/mplayer/gui_common.c @@ -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; diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c index d6d269eb52..6f8866c640 100644 --- a/gui/mplayer/mw.c +++ b/gui/mplayer/mw.c @@ -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 ); diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c index a06370c2b8..63b639d5d1 100644 --- a/gui/mplayer/play.c +++ b/gui/mplayer/play.c @@ -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; diff --git a/gui/skin/skin.c b/gui/skin/skin.c index c5a6ec0b92..064bde68cb 100644 --- a/gui/skin/skin.c +++ b/gui/skin/skin.c @@ -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 diff --git a/gui/win32/gui.c b/gui/win32/gui.c index a56a4c77a7..35268938a6 100644 --- a/gui/win32/gui.c +++ b/gui/win32/gui.c @@ -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 */ diff --git a/gui/win32/interface.c b/gui/win32/interface.c index 6b3eaafc54..209a1889d4 100644 --- a/gui/win32/interface.c +++ b/gui/win32/interface.c @@ -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; diff --git a/gui/wm/ws.c b/gui/wm/ws.c index 34aa58c842..65ec992d58 100644 --- a/gui/wm/ws.c +++ b/gui/wm/ws.c @@ -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,¬hing,¬hing ) ) @@ -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,¬hing,¬hing ) ) { 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 ) { diff --git a/gui/wm/ws.h b/gui/wm/ws.h index e782edd6d3..73321c6ae9 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -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 diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h index 47e393b1be..cd989fe00b 100644 --- a/help/help_mp-bg.h +++ b/help/help_mp-bg.h @@ -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 diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index 635173d71a..dc1c4e7f26 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -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 diff --git a/help/help_mp-de.h b/help/help_mp-de.h index af44eb856e..5d37b13415 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -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 diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h index a3b5472153..3b633a5067 100644 --- a/help/help_mp-dk.h +++ b/help/help_mp-dk.h @@ -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 diff --git a/help/help_mp-el.h b/help/help_mp-el.h index e7a3a3fcb2..e01ef40e06 100644 --- a/help/help_mp-el.h +++ b/help/help_mp-el.h @@ -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 diff --git a/help/help_mp-en.h b/help/help_mp-en.h index aff75d2703..5a82a3943f 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -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 diff --git a/help/help_mp-es.h b/help/help_mp-es.h index f0303fa3a5..e8762c6731 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -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 diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 7389a82b7d..a83950b8ca 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -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 diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index c637adcd81..7744291dc1 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -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 diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 9bdd4195f2..af006a3b69 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -2,7 +2,7 @@ // Updated by: Roberto Togni <see AUTHORS for email address> // Updated by: PaulTT <see AUTHORS for email address> -// Updated to help_mp-en.h r26649 +// Updated to help_mp-en.h r26795 // ========================= MPlayer help =========================== @@ -13,11 +13,11 @@ static char help_text[]= "Opzioni di base: (vedi la pagina man per la lista completa)\n" " -vo <drv[:dev]> sceglie driver di uscita video ('-vo help' lista)\n" " -ao <drv[:dev]> sceglie driver di uscita audio ('-ao help' lista)\n" -#ifdef HAVE_VCD +#ifdef CONFIG_VCD " vcd://<trackno> legge (S)VCD (Super Video CD) (dispositivo raw, non montato)\n" #endif #ifdef CONFIG_DVDREAD -" dvd://<titleno> legge titolo/traccia DVD dal dispositivo anziché da file\n" +" dvd://<titleno> legge titolo/traccia DVD dal dispositivo anzichĂŠ da file\n" " -alang/-slang sceglie lingua audio/sottotitoli DVD (cod naz. 2 caratteri)\n" #endif " -ss <posizione> cerca una determinata posizione (in secondi o in hh:mm:ss) \n" @@ -33,13 +33,13 @@ static char help_text[]= "\n" "Tasti principali: (vedi pagina man per lista, controlla anche input.conf)\n" " <- o -> va indietro/avanti di 10 secondi\n" -" su o giů va avanti/indietro di 1 minuto\n" -" pagsu o paggiů va avanti/indietro di 10 minuti\n" +" su o giĂš va avanti/indietro di 1 minuto\n" +" pagsu o paggiĂš va avanti/indietro di 10 minuti\n" " < o > va indietro/avanti nella playlist\n" " p o SPAZIO pausa (premere un qualunque tasto per continuare)\n" " q o ESC ferma la riproduzione ed esce dal programma\n" " + o - regola il ritardo audio di +/- 0.1 secondi\n" -" o modalitŕ OSD: niente / barra ricerca / barra ricerca + tempo\n" +" o modalitĂ OSD: niente / barra ricerca / barra ricerca + tempo\n" " * o / incrementa o decrementa il volume PCM\n" " x o z regola il ritardo dei sottotitoli di +/- 0.1 secondi\n" " r o t posizione alto/basso dei sottotitoli, vedi anche -vf expand\n" @@ -82,12 +82,12 @@ static char help_text[]= #define MSGTR_SystemTooSlow "\n\n"\ " ****************************************************************\n"\ -" **** Il tuo sistema č troppo LENTO per questa riproduzione! ****\n"\ +" **** Il tuo sistema è troppo LENTO per questa riproduzione! ****\n"\ " ****************************************************************\n"\ "Possibili cause, problemi, soluzioni:\n"\ "- Nella maggior parte dei casi: driver _audio_ danneggiato/bacato\n"\ " - Prova -ao sdl o usa l'emulazione OSS di ALSA.\n"\ -" - Puoi anche provare con diversi valori di -autosync, 30 č un buon inizio.\n"\ +" - Puoi anche provare con diversi valori di -autosync, 30 è un buon inizio.\n"\ "- Output video lento\n"\ " - Prova un altro -vo driver (-vo help per la lista) o prova con -framedrop!\n"\ "- CPU lenta\n"\ @@ -100,9 +100,9 @@ static char help_text[]= "- Stai usando -cache per riprodurre un file AVI senza interleave?\n"\ " - Prova con -nocache.\n"\ "Leggi DOCS/HTML/it/video.html per suggerimenti su regolazione/accelerazione.\n"\ -"Se nulla di ciň ti aiuta, allora leggi DOCS/HTML/it/bugreports.html!\n\n" +"Se nulla di ciò ti aiuta, allora leggi DOCS/HTML/it/bugreports.html!\n\n" -#define MSGTR_NoGui "MPlayer č stato compilato senza il supporto della GUI!\n" +#define MSGTR_NoGui "MPlayer è stato compilato senza il supporto della GUI!\n" #define MSGTR_GuiNeedsX "La GUI di MPlayer richiede X11!\n" #define MSGTR_Playing "\nRiproduco %s.\n" #define MSGTR_NoSound "Audio: nessun suono!!!\n" @@ -117,7 +117,7 @@ static char help_text[]= #define MSGTR_AvailableVideoFm "Famiglie/driver di codec video disponibili (compilati):\n" #define MSGTR_AvailableFsType "Modi disponibili a schermo intero:\n" #define MSGTR_UsingRTCTiming "Sto utilizzando la temporizzazione hardware RTC di Linux (%ldHz)\n" -#define MSGTR_CannotReadVideoProperties "Video: impossibile leggere le proprietŕ\n" +#define MSGTR_CannotReadVideoProperties "Video: impossibile leggere le proprietĂ \n" #define MSGTR_NoStreamFound "Nessun flusso trovato\n" #define MSGTR_ErrorInitializingVODevice "Errore aprendo/inizializzando il dispositivo uscita video (-vo) selezionato!\n" #define MSGTR_ForcedVideoCodec "Codec video forzato: %s\n" @@ -127,21 +127,21 @@ static char help_text[]= #define MSGTR_Paused "\n ===== PAUSA =====\r" #define MSGTR_PlaylistLoadUnable "\nImpossibile caricare la playlist %s\n" #define MSGTR_Exit_SIGILL_RTCpuSel \ -"- MPlayer č stato interrotto dal segnale 'Istruzione illegale'.\n"\ +"- MPlayer è stato interrotto dal segnale 'Istruzione illegale'.\n"\ " Potrebbe essere un errore nel codice di rilevamento tipo di processore...\n"\ " leggi DOCS/HTML/it/bugreports.html.\n" #define MSGTR_Exit_SIGILL \ -"- MPlayer č stato interrotto dal segnale 'Istruzione illegale'.\n"\ +"- MPlayer è stato interrotto dal segnale 'Istruzione illegale'.\n"\ " Solitamente questo avviene quando si esegue il programma su un processore\n"\ -" diverso da quello per cui č stato compilato/ottimizzato.\n"\ +" diverso da quello per cui è stato compilato/ottimizzato.\n"\ " Verificalo!\n" #define MSGTR_Exit_SIGSEGV_SIGFPE \ -"- MPlayer č stato interrotto per un errore nell'uso della CPU/FPU/RAM.\n"\ +"- MPlayer è stato interrotto per un errore nell'uso della CPU/FPU/RAM.\n"\ " Ricompila MPlayer con --enable-debug e crea un backtrace ed un disassemblato\n"\ " con 'gdb'. Per dettagli DOCS/HTML/it/bugreports_what.html#bugreports_crash.\n" #define MSGTR_Exit_SIGCRASH \ -"- MPlayer č andato in crash. Questo non dovrebbe accadere.\n"\ -" Puň essere un errore nel codice di MPlayer _o_ nei tuoi driver _o_ nella tua\n"\ +"- MPlayer è andato in crash. Questo non dovrebbe accadere.\n"\ +" Può essere un errore nel codice di MPlayer _o_ nei tuoi driver _o_ nella tua\n"\ " versione di gcc. Se ritieni sia colpa di MPlayer, per favore leggi\n"\ " DOCS/HTML/it/bugreports.html e segui quelle istruzioni. Non possiamo\n"\ " aiutarti, e non lo faremo, se non ci dai queste informazioni quando segnali\n"\ @@ -159,7 +159,7 @@ static char help_text[]= "agli script di avvio del sistema.\n" #define MSGTR_LinuxRTCInitErrorPieOn "Linux RTC: errore di init in ioctl (rtc_pie_on): %s\n" #define MSGTR_UsingTimingType "Uso la temporizzazione %s.\n" -#define MSGTR_NoIdleAndGui "L'opzione -idle non puň essere usata con GMPlayer.\n" +#define MSGTR_NoIdleAndGui "L'opzione -idle non può essere usata con GMPlayer.\n" #define MSGTR_MenuInitialized "Menu inizializzato: %s\n" #define MSGTR_MenuInitFailed "Inizializzazione Menu fallita.\n" #define MSGTR_Getch2InitializedTwice "WARNING: getch2_init chiamata 2 volte!\n" @@ -199,7 +199,7 @@ static char help_text[]= #define MSGTR_EdloutBadStop "Salto EDL ingnorato, ultimo start > stop\n" #define MSGTR_EdloutStartSkip "Tempo di start EDL impostato, ripremere 'i' per impostare lo stop.\n" #define MSGTR_EdloutEndSkip "Fine del blocco EDL, riga scritta.\n" -#define MSGTR_MPEndposNoSizeBased "L'opzione -endpos in MPlayer non supporta ancora unitŕ di mis. di dimensione.\n" +#define MSGTR_MPEndposNoSizeBased "L'opzione -endpos in MPlayer non supporta ancora unitĂ di mis. di dimensione.\n" // mplayer.c OSD @@ -208,7 +208,7 @@ static char help_text[]= #define MSGTR_OSDAudio "Audio: %s" #define MSGTR_OSDChannel "Canale: %s" #define MSGTR_OSDSubDelay "Ritardo sottotitoli: %d ms" -#define MSGTR_OSDSpeed "Velocitŕ: x %6.2f" +#define MSGTR_OSDSpeed "VelocitĂ : x %6.2f" #define MSGTR_OSDosd "OSD: %so" #define MSGTR_OSDChapter "Capitolo: (%d) %s" #define MSGTR_OSDAngle "Angolazione: %d/%d" @@ -228,10 +228,10 @@ static char help_text[]= #define MSGTR_Volume "Volume" #define MSGTR_Panscan "Panscan" #define MSGTR_Gamma "Gamma" -#define MSGTR_Brightness "Luminositŕ" +#define MSGTR_Brightness "LuminositĂ " #define MSGTR_Contrast "Contrasto" #define MSGTR_Saturation "Saturazione" -#define MSGTR_Hue "Tonalitŕ" +#define MSGTR_Hue "TonalitĂ " #define MSGTR_Balance "Bilanciamento" // property state @@ -262,8 +262,8 @@ static char help_text[]= #define MSGTR_NoVideoEncoderSelected "\nNessun encoder video (-ovc) scelto! Selezionane uno (vedi -ovc help).\n" #define MSGTR_CannotOpenOutputFile "Impossibile aprire il file di output '%s'.\n" #define MSGTR_EncoderOpenFailed "Errore nell'apertura dell'encoder.\n" -#define MSGTR_MencoderWrongFormatAVI "\nATTENZIONE: IL FORMATO DEL FILE DI OUTPUT č _AVI_. Vedi -of help.\n" -#define MSGTR_MencoderWrongFormatMPG "\nATTENZIONE: IL FORMATO DEL FILE DI OUTPUT č _MPEG_. Vedi -of help.\n" +#define MSGTR_MencoderWrongFormatAVI "\nATTENZIONE: IL FORMATO DEL FILE DI OUTPUT è _AVI_. Vedi -of help.\n" +#define MSGTR_MencoderWrongFormatMPG "\nATTENZIONE: IL FORMATO DEL FILE DI OUTPUT è _MPEG_. Vedi -of help.\n" #define MSGTR_MissingOutputFilename "Nessun file di output specificato, per favore verifica l'opzione -o." #define MSGTR_ForcingOutputFourcc "Forzo il fourcc di output a %x [%.4s].\n" #define MSGTR_ForcingOutputAudiofmtTag "Forzo la tag del formato audio a 0x%x.\n" @@ -273,12 +273,12 @@ static char help_text[]= #define MSGTR_FrameCopyFileMismatch "\nTutti i file video devono avere stessi fps, risoluz., e codec per -ovc copy.\n" #define MSGTR_AudioCopyFileMismatch "\nTutti i file devono avere lo stesso codec audio e formato per -oac copy.\n" #define MSGTR_NoAudioFileMismatch "\nImpossibile mescolare file solo audio con file video. Prova con -nosound.\n" -#define MSGTR_NoSpeedWithFrameCopy "WARNING: -speed non č detto che funzioni correttamente con -oac copy!\n"\ +#define MSGTR_NoSpeedWithFrameCopy "WARNING: -speed non è detto che funzioni correttamente con -oac copy!\n"\ "La codifica potrebbe risultare danneggiata!\n" #define MSGTR_ErrorWritingFile "%s: errore nella scrittura del file.\n" #define MSGTR_FlushingVideoFrames "\nScaricamento fotogrammi video.\n" #define MSGTR_FiltersHaveNotBeenConfiguredEmptyFile "I filtri non son stati configurati! File vuoto?\n" -#define MSGTR_RecommendedVideoBitrate "Il bitrate video consigliato per %s CD č: %d\n" +#define MSGTR_RecommendedVideoBitrate "Il bitrate video consigliato per %s CD è: %d\n" #define MSGTR_VideoStreamResult "\nFlusso video: %8.3f kbit/s (%d B/s) dim.: %"PRIu64" byte %5.3f sec %d fotogrammi\n" #define MSGTR_AudioStreamResult "\nFlusso audio: %8.3f kbit/s (%d B/s) dim.: %"PRIu64" byte %5.3f secondi\n" #define MSGTR_OpenedStream "successo: formato: %d dati: 0x%X - 0x%x\n" @@ -292,12 +292,12 @@ static char help_text[]= #define MSGTR_SettingAudioInputGain "Imposto il guadagno di ingresso audio a %f.\n" #define MSGTR_LamePresetEquals "\npreset=%s\n\n" #define MSGTR_LimitingAudioPreload "Limito il preload audio a 0.4s.\n" -#define MSGTR_IncreasingAudioDensity "Aumento la densitŕ audio a 4.\n" +#define MSGTR_IncreasingAudioDensity "Aumento la densitĂ audio a 4.\n" #define MSGTR_ZeroingAudioPreloadAndMaxPtsCorrection "Forzo il preload audio a 0, max pts correction a 0.\n" #define MSGTR_CBRAudioByterate "\n\nCBR audio: %d byte/sec, %d byte/blocco\n" #define MSGTR_LameVersion "LAME versione %s (%s)\n\n" #define MSGTR_InvalidBitrateForLamePreset ""\ -"Errore: il bitrate specificato č fuori gamma per questo Preset.\n"\ +"Errore: il bitrate specificato è fuori gamma per questo Preset.\n"\ "\n"\ "Quando usi questo metodo devi usare un valore tra \"8\" e \"320\".\n"\ "\n"\ @@ -310,7 +310,7 @@ static char help_text[]= " <fast> standard\n"\ " <fast> extreme\n"\ " insane\n"\ -" <cbr> (ABR Mode) - La modalitŕ ABR č implicita. Per usarla,\n"\ +" <cbr> (ABR Mode) - La modalitĂ ABR è implicita. Per usarla,\n"\ " specifica un bitrate. Per esempio:\n"\ " \"preset=185\" attiva questo\n"\ " preset e usa 185 come kbps medi.\n"\ @@ -324,68 +324,68 @@ static char help_text[]= "\n"\ "Per altre informazioni usa: \"-lameopts preset=help\"\n" #define MSGTR_LamePresetsLongInfo "\n"\ -"I Presets sono costruiti in modo da dare la piů alta qualitŕ possibile.\n"\ +"I Presets sono costruiti in modo da dare la piĂš alta qualitĂ possibile.\n"\ "\n"\ "Sono stati per la maggior parte sottosposti a test e rifiniti attraverso\n"\ "doppi test di ascolto per verificare e ottenere tale obiettivo.\n"\ "\n"\ "Vengono aggiornati continuamente per coincidere con gli ultimi sviluppi che\n"\ -"ci sono e come risultato dovrebbero dare probabilmente la miglior qualitŕ\n"\ +"ci sono e come risultato dovrebbero dare probabilmente la miglior qualitĂ \n"\ "attualmente possibile con LAME.\n"\ "\n"\ "Per attivare questi Presets:\n"\ "\n"\ -" Per le modalitŕ VBR (di solito qualitŕ piů alta):\n"\ +" Per le modalitĂ VBR (di solito qualitĂ piĂš alta):\n"\ "\n"\ " \"preset=standard\" Questo Preset di solito dovrebbe essere trasparente\n"\ -" per molte persone per molta musica ed č giŕ\n"\ -" di qualitŕ piuttosto alta.\n"\ +" per molte persone per molta musica ed è giĂ \n"\ +" di qualitĂ piuttosto alta.\n"\ "\n"\ -" \"preset=extreme\" Se hai una sensibilitŕ sonora buona e equivalente\n"\ -" equipaggiamento, questo Preset avrŕ solitamente\n"\ -" una qualitŕ un po' piů alta della modalitŕ\n"\ +" \"preset=extreme\" Se hai una sensibilitĂ sonora buona e equivalente\n"\ +" equipaggiamento, questo Preset avrĂ solitamente\n"\ +" una qualitĂ un po' piĂš alta della modalitĂ \n"\ " \"standard\".\n"\ "\n"\ -" Per modalitŕ CBR a 320kbps (la qualitŕ piů alta possibile per i Presets):\n"\ +" Per modalitĂ CBR a 320kbps (la qualitĂ piĂš alta possibile per i Presets):\n"\ "\n"\ " \"preset=insane\" Questo Preset dovrebbe essere decisamente buono\n"\ " per la maggior parte di persone e situazioni,\n"\ -" ma se devi avere assoluta alta qualitŕ e nessun\n"\ +" ma se devi avere assoluta alta qualitĂ e nessun\n"\ " rispetto per la dimensione, devi usare questo.\n"\ "\n"\ -" Per modalitŕ ABR (alta qualitŕ per dato bitrate ma non alta come VBR):\n"\ +" Per modalitĂ ABR (alta qualitĂ per dato bitrate ma non alta come VBR):\n"\ "\n"\ -" \"preset=<kbps>\" Usare questo Preset darŕ solitamente buona qualitŕ\n"\ +" \"preset=<kbps>\" Usare questo Preset darĂ solitamente buona qualitĂ \n"\ " a un dato bitrate. In dipendenza dal bitrate\n"\ -" indicato, questo Preset determinerŕ ottimali\n"\ +" indicato, questo Preset determinerĂ ottimali\n"\ " impostazioni per quella particolare situazione.\n"\ -" Anche se questo approccio funge, non č per\n"\ -" niente flessibile come VBR, e di solito non dŕ\n"\ -" la stessa qualitŕ di VBR a bitrate piů alti.\n"\ +" Anche se questo approccio funge, non è per\n"\ +" niente flessibile come VBR, e di solito non dĂ \n"\ +" la stessa qualitĂ di VBR a bitrate piĂš alti.\n"\ "\n"\ "Le seguenti opzioni sono disponibili anche per i corrispondenti profili:\n"\ "\n"\ " <fast> standard\n"\ " <fast> extreme\n"\ " insane\n"\ -" <cbr> (Modalitŕ ABR) - La modalitŕ ABR č implicita. Per usarla,\n"\ +" <cbr> (ModalitĂ ABR) - La modalitĂ ABR è implicita. Per usarla,\n"\ " indicare semplicemente un bitrate. Per esempio:\n"\ " \"preset=185\" attiva questo Preset e viene\n"\ " usato 185 come media kbps.\n"\ "\n"\ " \"fast\" - Abilita il nuovo VBR \"veloce\" per un dato profilo. Lo\n"\ -" svantaggio dell'alta velocitŕ č che spesso il bitrate\n"\ -" risulta leggermente piů alto rispetto alla modalitŕ normale\n"\ -" e la qualitŕ leggermente inferiore.\n"\ -" Attenzione: nell'attuale versione l'utilizzo di Preset \"veloce\" puň\n"\ +" svantaggio dell'alta velocità è che spesso il bitrate\n"\ +" risulta leggermente piĂš alto rispetto alla modalitĂ normale\n"\ +" e la qualitĂ leggermente inferiore.\n"\ +" Attenzione: nell'attuale versione l'utilizzo di Preset \"veloce\" può\n"\ " portare un bitrate troppo alto del normale.\n"\ "\n"\ -" \"cbr\" - se usi la modalitŕ ABR (leggi sopra) con un certo bitrate\n"\ +" \"cbr\" - se usi la modalitĂ ABR (leggi sopra) con un certo bitrate\n"\ " significativo come 80, 96, 112, 128, 160, 192, 224, 256, 320,\n"\ -" puoi usare l'opzione \"cbr\" per forzare la codifica in modalitŕ\n"\ -" CBR al posto dello standard abr. ABR dŕ una piů alta qualitŕ,\n"\ +" puoi usare l'opzione \"cbr\" per forzare la codifica in modalitĂ \n"\ +" CBR al posto dello standard abr. ABR dĂ una piĂš alta qualitĂ ,\n"\ " ma CBR torna utile in quelle situazioni dove ad esempio\n"\ -" trasmettere un MP3 su internet puň essere importante.\n"\ +" trasmettere un MP3 su internet può essere importante.\n"\ "\n"\ " Per esempio:\n"\ "\n"\ @@ -395,7 +395,7 @@ static char help_text[]= " o \"-lameopts preset=extreme \"\n"\ "\n"\ "\n"\ -"Ci sono alcuni sinonimi per le modalitŕ ABR:\n"\ +"Ci sono alcuni sinonimi per le modalitĂ ABR:\n"\ "phone => 16kbps/mono phon+/lw/mw-eu/sw => 24kbps/mono\n"\ "mw-us => 40kbps/mono voice => 56kbps/mono\n"\ "fm/radio/tape => 112kbps hifi => 160kbps\n"\ @@ -406,7 +406,7 @@ static char help_text[]= "Se ogni altra cosa non funziona, prova un Preset." #define MSGTR_ConfigFileError "errore file di configurazione" #define MSGTR_ErrorParsingCommandLine "errore leggendo la riga comando" -#define MSGTR_VideoStreamRequired "Il flusso video č obbligatorio!\n" +#define MSGTR_VideoStreamRequired "Il flusso video è obbligatorio!\n" #define MSGTR_ForcingInputFPS "i fps saranno interpretati come %5.3f.\n" #define MSGTR_RawvideoDoesNotSupportAudio "Il formato output RAWVIDEO non supporta l'audio - lo disabilito.\n" #define MSGTR_DemuxerDoesntSupportNosound "Questo demuxer non supporta ancora -nosound.\n" @@ -417,7 +417,7 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, Non trovo l'encoder per il codec %s.\n" #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, non posso allocare il contesto!\n" #define MSGTR_CouldntOpenCodec "Non posso aprire il codec %s, br=%d.\n" -#define MSGTR_CantCopyAudioFormat "Il formato audio 0x%x č incompatibile con '-oac copy', prova invece '-oac pcm' o usa '-fafmttag' per forzare.\n" +#define MSGTR_CantCopyAudioFormat "Il formato audio 0x%x è incompatibile con '-oac copy', prova invece '-oac pcm' o usa '-fafmttag' per forzare.\n" // cfg-mencoder.h: @@ -436,9 +436,9 @@ static char help_text[]= "\n"\ " br=<0-1024> specifica il bitrate in kBit (solo CBR e ABR)\n"\ "\n"\ -" q=<0-9> qualitŕ (0-massima, 9-minima) (solo per VBR)\n"\ +" q=<0-9> qualitĂ (0-massima, 9-minima) (solo per VBR)\n"\ "\n"\ -" aq=<0-9> qualitŕ algoritmo (0-migliore/piů lento, 9-peggiore/piů veloce)\n"\ +" aq=<0-9> qualitĂ algoritmo (0-migliore/piĂš lento, 9-peggiore/piĂš veloce)\n"\ "\n"\ " ratio=<1-100> rapporto di compressione\n"\ "\n"\ @@ -455,17 +455,17 @@ static char help_text[]= " 1: tutto\n"\ " 2: regola\n"\ "\n"\ -" fast attiva la codifica piů veloce sui successivi preset VBR,\n"\ -" qualitŕ leggermente inferiore ai bitrate piů alti.\n"\ +" fast attiva la codifica piĂš veloce sui successivi preset VBR,\n"\ +" qualitĂ leggermente inferiore ai bitrate piĂš alti.\n"\ "\n"\ -" preset=<value> fornisce le migliori impostazioni possibili di qualitŕ.\n"\ -" medium: codifica VBR, buona qualitŕ\n"\ +" preset=<value> fornisce le migliori impostazioni possibili di qualitĂ .\n"\ +" medium: codifica VBR, buona qualitĂ \n"\ " (intervallo bitrate 150-180 kbps)\n"\ -" standard: codifica VBR, qualitŕ alta\n"\ +" standard: codifica VBR, qualitĂ alta\n"\ " (intervallo bitrate 170-210 kbps)\n"\ -" extreme: codifica VBR, qualitŕ molto alta\n"\ +" extreme: codifica VBR, qualitĂ molto alta\n"\ " (intervallo bitrate 200-240 kbps)\n"\ -" insane: codifica CBR, massima qualitŕ via preset\n"\ +" insane: codifica CBR, massima qualitĂ via preset\n"\ " (bitrate 320 kbps)\n"\ " <8-320>: codifica ABR con bitrate medio impostato in kbps.\n\n" @@ -473,8 +473,8 @@ static char help_text[]= #define MSGTR_DuplicateFourcc "FourCC duplicato" #define MSGTR_TooManyFourccs "troppi FourCCs/formati..." #define MSGTR_ParseError "errore lettura" -#define MSGTR_ParseErrorFIDNotNumber "errore lettura (ID formato non č un numero?)" -#define MSGTR_ParseErrorFIDAliasNotNumber "errore lettura (l'alias ID formato non č un numero?)" +#define MSGTR_ParseErrorFIDNotNumber "errore lettura (ID formato non è un numero?)" +#define MSGTR_ParseErrorFIDAliasNotNumber "errore lettura (l'alias ID formato non è un numero?)" #define MSGTR_DuplicateFID "ID formato duplicato" #define MSGTR_TooManyOut "troppi out..." #define MSGTR_InvalidCodecName "\nnome codec(%s) non valido!\n" @@ -488,45 +488,45 @@ static char help_text[]= #define MSGTR_CantOpenFileError "Non posso aprire '%s': %s\n" #define MSGTR_CantGetMemoryForLine "Non posso aver la memoria per 'line': %s\n" #define MSGTR_CantReallocCodecsp "Non posso riallocare '*codecsp': %s\n" -#define MSGTR_CodecNameNotUnique "Il nome codec '%s' non č univoco." +#define MSGTR_CodecNameNotUnique "Il nome codec '%s' non è univoco." #define MSGTR_CantStrdupName "Non posso far strdup -> 'name': %s\n" #define MSGTR_CantStrdupInfo "Non posso far strdup -> 'info': %s\n" #define MSGTR_CantStrdupDriver "Non posso far strdup -> 'driver': %s\n" #define MSGTR_CantStrdupDLL "Non posso far strdup -> 'dll': %s" #define MSGTR_AudioVideoCodecTotals "%d audio & %d video codecs\n" -#define MSGTR_CodecDefinitionIncorrect "Il codec non č correttamente definito." -#define MSGTR_OutdatedCodecsConf "Il codecs.conf č troppo vecchio/incompatibile con questa versione di MPlayer!" +#define MSGTR_CodecDefinitionIncorrect "Il codec non è correttamente definito." +#define MSGTR_OutdatedCodecsConf "Il codecs.conf è troppo vecchio/incompatibile con questa versione di MPlayer!" // fifo.c #define MSGTR_CannotMakePipe "Non posso costruire una PIPE!\n" // parser-mecmd.c, parser-mpcmd.c -#define MSGTR_NoFileGivenOnCommandLine "'--' indica la fine opzioni, ma nessun nome file č stato fornito sulla riga comando.\n" +#define MSGTR_NoFileGivenOnCommandLine "'--' indica la fine opzioni, ma nessun nome file è stato fornito sulla riga comando.\n" #define MSGTR_TheLoopOptionMustBeAnInteger "L'opzione loop deve essere un numero intero: %s\n" #define MSGTR_UnknownOptionOnCommandLine "Opzione sconosciuta sulla riga comando: -%s\n" #define MSGTR_ErrorParsingOptionOnCommandLine "Errore durante la lettura opzioni della riga comando: -%s\n" #define MSGTR_InvalidPlayEntry "Voce da riprodurre %s non valida\n" -#define MSGTR_NotAnMEncoderOption "-%s non č un'opzione di MEncoder\n" +#define MSGTR_NotAnMEncoderOption "-%s non è un'opzione di MEncoder\n" #define MSGTR_NoFileGiven "Nessun file fornito\n" // m_config.c -#define MSGTR_SaveSlotTooOld "Lo slot salvato da lvl %d č troppo vecchio: %d !!!\n" -#define MSGTR_InvalidCfgfileOption "L'opzione %s non si puň usare nel file di configurazione.\n" -#define MSGTR_InvalidCmdlineOption "L'opzione %s non si puň usare da riga comando.\n" +#define MSGTR_SaveSlotTooOld "Lo slot salvato da lvl %d è troppo vecchio: %d !!!\n" +#define MSGTR_InvalidCfgfileOption "L'opzione %s non si può usare nel file di configurazione.\n" +#define MSGTR_InvalidCmdlineOption "L'opzione %s non si può usare da riga comando.\n" #define MSGTR_InvalidSuboption "Errore: l'opzione '%s' non ha la sottoopzione '%s'.\n" #define MSGTR_MissingSuboptionParameter "Errore: la sottoopzione '%s' di '%s' deve avere un parametro!\n" #define MSGTR_MissingOptionParameter "Errore: l'opzione '%s' deve avere un parametro!\n" #define MSGTR_OptionListHeader "\n Nome Tipo Min Max Global CL Cfg\n\n" #define MSGTR_TotalOptions "\nTotale: %d opzioni\n" #define MSGTR_ProfileInclusionTooDeep "ATTENZIONE: Livello di inclusione troppo profondo nel profilo.\n" -#define MSGTR_NoProfileDefined "Non č stato definito alcun profilo.\n" +#define MSGTR_NoProfileDefined "Non è stato definito alcun profilo.\n" #define MSGTR_AvailableProfiles "Profili disponibili:\n" #define MSGTR_UnknownProfile "Profilo '%s' sconosciuto.\n" #define MSGTR_Profile "Profilo %s: %s\n" // m_property.c #define MSGTR_PropertyListHeader "\n Nome Tipo Min Max\n\n" -#define MSGTR_TotalProperties "\nTotale: %d proprietŕ\n" +#define MSGTR_TotalProperties "\nTotale: %d proprietĂ \n" // open.c, stream.c: #define MSGTR_CdDevNotfound "Dispositivo CD-ROM '%s' non trovato!\n" @@ -538,16 +538,16 @@ static char help_text[]= #define MSGTR_SMBInitError "Impossibile inizializzare la libreria libsmbclient: %d\n" #define MSGTR_SMBFileNotFound "Impossibile aprire dalla rete: '%s'\n" -#define MSGTR_SMBNotCompiled "MPlayer non č stato compilato con supporto di lettura da SMB.\n" +#define MSGTR_SMBNotCompiled "MPlayer non è stato compilato con supporto di lettura da SMB.\n" // stream_dvd.c -#define MSGTR_DVDspeedCantOpen "Impossibile aprire il dispositivo DVD in scrittura, modificarne la velocitŕ\nrichiede accesso in scrittura.\n" -#define MSGTR_DVDrestoreSpeed "Ripristino la velocitŕ del DVD... " -#define MSGTR_DVDlimitSpeed "Limitazione della velocitŕ del DVD a %dKB/s... " +#define MSGTR_DVDspeedCantOpen "Impossibile aprire il dispositivo DVD in scrittura, modificarne la velocitĂ \nrichiede accesso in scrittura.\n" +#define MSGTR_DVDrestoreSpeed "Ripristino la velocitĂ del DVD... " +#define MSGTR_DVDlimitSpeed "Limitazione della velocitĂ del DVD a %dKB/s... " #define MSGTR_DVDlimitFail "non riuscita\n" #define MSGTR_DVDlimitOk "riuscita\n" #define MSGTR_CantOpenDVD "Impossibile aprire il dispositivo DVD: %s (%s)\n" -#define MSGTR_NoDVDSupport "MPlayer č stato compilato senza il supporto per DVD, esco\n" +#define MSGTR_NoDVDSupport "MPlayer è stato compilato senza il supporto per DVD, esco\n" #define MSGTR_DVDnumTitles "Ci sono %d titolo/i su questo DVD.\n" #define MSGTR_DVDinvalidTitle "Numero del titolo del DVD non valido: %d\n" #define MSGTR_DVDnumChapters "Ci sono %d capitolo/i in questo titolo del DVD.\n" @@ -573,10 +573,10 @@ static char help_text[]= #define MSGTR_RawMuxerOnlyOneStream "Il muxer rawaudio supporta solo un flusso audio!\n" #define MSGTR_IgnoringVideoStream "Ignoro il flusso video!\n" #define MSGTR_UnknownStreamType "Attenzione, Tipo flusso sconosciuto: %d\n" -#define MSGTR_WarningLenIsntDivisible "Attenzione, len non č divisibile per samplesize!\n" +#define MSGTR_WarningLenIsntDivisible "Attenzione, len non è divisibile per samplesize!\n" // TODO: muxer frame buffer ??? -#define MSGTR_MuxbufMallocErr "Il buffer fotogrammi del muxer non puň allocare la memoria!\n" -#define MSGTR_MuxbufReallocErr "Il buffer fotogrammi del muxer non puň riallocare la memoria!\n" +#define MSGTR_MuxbufMallocErr "Il buffer fotogrammi del muxer non può allocare la memoria!\n" +#define MSGTR_MuxbufReallocErr "Il buffer fotogrammi del muxer non può riallocare la memoria!\n" #define MSGTR_MuxbufSending "Il buffer fotogrammi del muxer sta inviando %d fotogramma/i al muxer.\n" #define MSGTR_WritingHeader "Scrittura intestazione in corso...\n" #define MSGTR_WritingTrailer "Scrittura indice in corso...\n" @@ -587,24 +587,24 @@ static char help_text[]= #define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Troppi (%d in %d byte) pacchetti audio nel buffer!\n" #define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Troppi (%d in %d byte) pacchetti video nel buffer!\n" #define MSGTR_MaybeNI "Forse stai riproducendo un flusso/file non-interleaved o il codec non funziona?\n" \ - "Per i file .AVI, prova a forzare la modalitŕ 'non-interleaved' con l'opz. -ni.\n" + "Per i file .AVI, prova a forzare la modalitĂ 'non-interleaved' con l'opz. -ni.\n" // TODO XXX working around #define MSGTR_WorkAroundBlockAlignHeaderBug "AVI: XXX il bug dell'intestazione nBlockAlign CBR-MP3!\n" -#define MSGTR_SwitchToNi "\nRilevato file .AVI con interleave errato - passo alla modalitŕ -ni!\n" +#define MSGTR_SwitchToNi "\nRilevato file .AVI con interleave errato - passo alla modalitĂ -ni!\n" #define MSGTR_InvalidAudioStreamNosound "AVI: ID flusso audio invalido: %d - lo ignoro (nosound)\n" #define MSGTR_InvalidAudioStreamUsingDefault "AVI: ID flusso video invalido: %d - lo ignoro (uso il default)\n" #define MSGTR_ON2AviFormat "Formato AVI ON2" #define MSGTR_Detected_XXX_FileFormat "Rilevato formato file %s!\n" #define MSGTR_DetectedAudiofile "Rilevato file audio!\n" -#define MSGTR_NotSystemStream "il formato non č 'MPEG System Stream'... (č forse 'Transport Stream'?)\n" -#define MSGTR_InvalidMPEGES "Flusso MPEG-ES non valido??? Contatta l'autore, puň essere un baco :(\n" -#define MSGTR_FormatNotRecognized "===== Mi dispiace, questo formato file non č riconosciuto/supportato ======\n"\ - "=== Se questo č un file AVI, ASF o MPEG, per favore contatta l'autore! ===\n" -#define MSGTR_SettingProcessPriority "Imposto la prioritŕ del processo: %s\n" +#define MSGTR_NotSystemStream "il formato non è 'MPEG System Stream'... (è forse 'Transport Stream'?)\n" +#define MSGTR_InvalidMPEGES "Flusso MPEG-ES non valido??? Contatta l'autore, può essere un baco :(\n" +#define MSGTR_FormatNotRecognized "===== Mi dispiace, questo formato file non è riconosciuto/supportato ======\n"\ + "=== Se questo è un file AVI, ASF o MPEG, per favore contatta l'autore! ===\n" +#define MSGTR_SettingProcessPriority "Imposto la prioritĂ del processo: %s\n" #define MSGTR_CannotInitializeMuxer "Impossibile inizializzare il muxer." #define MSGTR_MissingVideoStream "Nessun flusso video trovato!\n" #define MSGTR_MissingAudioStream "Nessun flusso audio trovato -> nessun suono\n" -#define MSGTR_MissingVideoStreamBug "Manca il flusso video!? Contatta l'autore, puň essere un baco :(\n" +#define MSGTR_MissingVideoStreamBug "Manca il flusso video!? Contatta l'autore, può essere un baco :(\n" #define MSGTR_DoesntContainSelectedStream "demux: il file non contiene il flusso audio o video selezionato\n" @@ -630,7 +630,7 @@ static char help_text[]= #define MSGTR_OpeningAudioDemuxerFailed "Errore nell'apertura del demuxer audio: %s\n" #define MSGTR_OpeningSubtitlesDemuxerFailed "Errore nell'apertura del demuxer dei sottotitoli: %s\n" #define MSGTR_TVInputNotSeekable "Impossibile spostarsi in un programma TV!\n"\ -"(Probabilmente lo spostamento verrŕ usato per cambiare canale ;)\n" +"(Probabilmente lo spostamento verrĂ usato per cambiare canale ;)\n" #define MSGTR_DemuxerInfoChanged "Info demuxer %s cambiate a %s\n" #define MSGTR_ClipInfo "Informazioni file multimediale:\n" @@ -666,7 +666,7 @@ static char help_text[]= #define MSGTR_UsingExternalPP "[PP] Utilizzo un filtro di postprocessing esterno, max q = %d\n" #define MSGTR_UsingCodecPP "[PP] Utilizzo il postprocessing del codec, max q = %d\n" -#define MSGTR_VideoAttributeNotSupportedByVO_VD "L'attributo video '%s' non č gestibile dal vo & vd selezionati! \n" +#define MSGTR_VideoAttributeNotSupportedByVO_VD "L'attributo video '%s' non è gestibile dal vo & vd selezionati! \n" #define MSGTR_VideoCodecFamilyNotAvailableStr "Famiglia di codec video voluta [%s] (vfm=%s) non disponibile.\nAbilitala in compilazione.\n" #define MSGTR_AudioCodecFamilyNotAvailableStr "Famiglia di codec audio voluta [%s] (afm=%s) non disponibile.\nAbilitala in compilazione.\n" #define MSGTR_OpeningVideoDecoder "Apertura decoder video: [%s] %s\n" @@ -698,7 +698,7 @@ static char help_text[]= #define MSGTR_VoConfigRequest "VDec: configurazione chiesta dal vo - %d x %d (sp.col. preferito: %s)\n" #define MSGTR_UsingXAsOutputCspNoY "VDec: uso %s come sp.colore di uscita (non %d)\n" #define MSGTR_CouldNotFindColorspace "Impossibile trovare uno spazio colore adatto - riprovo con -vf scale...\n" -#define MSGTR_MovieAspectIsSet "Movie-Aspect č %.2f:1 - riscalo per ottenere un rapporto corretto.\n" +#define MSGTR_MovieAspectIsSet "Movie-Aspect è %.2f:1 - riscalo per ottenere un rapporto corretto.\n" #define MSGTR_MovieAspectUndefined "Movie-Aspect non definito - nessuna scalatura.\n" // vd_dshow.c, vd_dmo.c @@ -709,7 +709,7 @@ static char help_text[]= // x11_common.c #define MSGTR_EwmhFullscreenStateFailed "\nX11: Impossibile inviare l'evento schermo pieno EWMH!\n" #define MSGTR_CouldNotFindXScreenSaver "xscreensaver_disable: Non riesco a trovare la finestra di XScreenSaver.\n" -#define MSGTR_SelectedVideoMode "XF86VM: Scelta modalitŕ video %dx%d per la dimensione immagine %dx%d.\n" +#define MSGTR_SelectedVideoMode "XF86VM: Scelta modalitĂ video %dx%d per la dimensione immagine %dx%d.\n" #define MSGTR_InsertingAfVolume "[Mixer] Nessun mixer hardware, filtro volume inserito automaticamente.\n" #define MSGTR_NoVolume "[Mixer] Regolazione del volume non disponibile.\n" @@ -750,8 +750,8 @@ static char help_text[]= #define MSGTR_Browse "Sfoglia" // --- error messages --- -#define MSGTR_NEMDB "Mi dispiace, non c'č abbastanza memoria per tracciare il buffer." -#define MSGTR_NEMFMR "Mi dispiace, non c'č abbastanza memoria per visualizzare il menu." +#define MSGTR_NEMDB "Mi dispiace, non c'è abbastanza memoria per tracciare il buffer." +#define MSGTR_NEMFMR "Mi dispiace, non c'è abbastanza memoria per visualizzare il menu." #define MSGTR_IDFGCVD "Mi dispiace, non ho trovato un driver di output video compatibile con la GUI." #define MSGTR_NEEDLAVC "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc nella finestra di configurazione DXR3/H+." #define MSGTR_UNKNOWNWINDOWTYPE "Trovato tipo finestra sconosciuto..." @@ -760,10 +760,10 @@ static char help_text[]= #define MSGTR_SKIN_ERRORMESSAGE "[skin] errore nel file di configurazione della skin alla riga %d: %s" #define MSGTR_SKIN_WARNING1 "[skin] attenzione: nel file di configurazione della skin alla riga %d:\nwidget trovato ma non trovata prima la \"section\" (%s)" #define MSGTR_SKIN_WARNING2 "[skin] attenzione: nel file di configurazione della skin alla riga %d:\nwidget trovato ma non trovata prima la \"subsection\" (%s)" -#define MSGTR_SKIN_WARNING3 "[skin] attenzione: nel file di configurazione della skin alla riga %d:\nquesta sottosezione non č supportata dal widget (%s)" +#define MSGTR_SKIN_WARNING3 "[skin] attenzione: nel file di configurazione della skin alla riga %d:\nquesta sottosezione non è supportata dal widget (%s)" #define MSGTR_SKIN_SkinFileNotFound "[skin] file ( %s ) non trovato.\n" #define MSGTR_SKIN_SkinFileNotReadable "[skin] file ( %s ) non leggibile.\n" -#define MSGTR_SKIN_BITMAP_16bit "Bitmap con profonditŕ di 16 bit o inferiore non supportate (%s).\n" +#define MSGTR_SKIN_BITMAP_16bit "Bitmap con profonditĂ di 16 bit o inferiore non supportate (%s).\n" #define MSGTR_SKIN_BITMAP_FileNotFound "File non trovato (%s)\n" #define MSGTR_SKIN_BITMAP_BMPReadError "BMP, errore di lettura (%s)\n" #define MSGTR_SKIN_BITMAP_TGAReadError "TGA, errore di lettura (%s)\n" @@ -833,8 +833,8 @@ static char help_text[]= // Note: If you change MSGTR_EQU_Video please see if it still fits MSGTR_PREFERENCES_Video #define MSGTR_EQU_Video "Video" #define MSGTR_EQU_Contrast "Contrasto: " -#define MSGTR_EQU_Brightness "Luminositŕ: " -#define MSGTR_EQU_Hue "Tonalitŕ: " +#define MSGTR_EQU_Brightness "LuminositĂ : " +#define MSGTR_EQU_Hue "TonalitĂ : " #define MSGTR_EQU_Saturation "Saturazione: " #define MSGTR_EQU_Front_Left "Anteriore Sinistro" #define MSGTR_EQU_Front_Right "Anteriore Destro" @@ -896,7 +896,7 @@ static char help_text[]= #define MSGTR_PREFERENCES_Codecs "Codec e demuxer" #define MSGTR_PREFERENCES_FontFactor "Fattore Carattere:" #define MSGTR_PREFERENCES_PostProcess "Abilita postprocessing" -#define MSGTR_PREFERENCES_AutoQuality "Qualitŕ automatica: " +#define MSGTR_PREFERENCES_AutoQuality "QualitĂ automatica: " #define MSGTR_PREFERENCES_NI "Utilizza un analizzatore non-interleaved per i file AVI" #define MSGTR_PREFERENCES_IDX "Ricostruisci l'indice, se necessario" #define MSGTR_PREFERENCES_VideoCodecFamily "Famiglia codec video:" @@ -911,7 +911,7 @@ static char help_text[]= #define MSGTR_PREFERENCES_Audio_Device "Dispositivo:" #define MSGTR_PREFERENCES_Audio_Mixer "Mixer:" #define MSGTR_PREFERENCES_Audio_MixerChannel "Canale mixer:" -#define MSGTR_PREFERENCES_Message "Ricorda che devi riavviare la riproduzione affinché alcune opzioni abbiano effetto!" +#define MSGTR_PREFERENCES_Message "Ricorda che devi riavviare la riproduzione affinchĂŠ alcune opzioni abbiano effetto!" #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" #define MSGTR_PREFERENCES_DXR3_LAVC "Usa LAVC (FFmpeg)" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" @@ -958,11 +958,11 @@ static char help_text[]= #define MSGTR_PREFERENCES_CDROMDevice "Dispositivo CD-ROM:" #define MSGTR_PREFERENCES_DVDDevice "Dispositivo DVD:" #define MSGTR_PREFERENCES_FPS "FPS del filmato:" -#define MSGTR_PREFERENCES_ShowVideoWindow "Mostra la finestra video anche quando non č attiva" +#define MSGTR_PREFERENCES_ShowVideoWindow "Mostra la finestra video anche quando non è attiva" #define MSGTR_PREFERENCES_ArtsBroken "Le nuove versioni di aRts sono incompatibili "\ - "con GTK 1.x e GMPlayer crasherŕ!" + "con GTK 1.x e GMPlayer crasherĂ !" -#define MSGTR_ABOUT_UHU "Lo sviluppo della GUI č sponsorizzato da UHU Linux\n" +#define MSGTR_ABOUT_UHU "Lo sviluppo della GUI è sponsorizzato da UHU Linux\n" #define MSGTR_ABOUT_Contributors "Contributori codice e documentazione\n" #define MSGTR_ABOUT_Codecs_libs_contributions "Codec e librerie di terze parti\n" #define MSGTR_ABOUT_Translations "Traduzioni\n" @@ -975,8 +975,8 @@ static char help_text[]= // bitmap.c -#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] non c'č abbastanza memoria per l'immagine\n" -#define MSGTR_NotEnoughMemoryC1To32 "[c1to32] non c'č abbastanza memoria per l'immagine\n" +#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] non c'è abbastanza memoria per l'immagine\n" +#define MSGTR_NotEnoughMemoryC1To32 "[c1to32] non c'è abbastanza memoria per l'immagine\n" // cfg.c @@ -1000,7 +1000,7 @@ static char help_text[]= #define MSGTR_WS_RemoteDisplay "[ws] Display remoto, disabilito XMITSHM.\n" #define MSGTR_WS_NoXshm "[ws] Spiacente, il tuo sistema non supporta l'estensione 'X shared memory'.\n" #define MSGTR_WS_NoXshape "[ws] Spiacente, il tuo sistema non supporta l'estensione XShape.\n" -#define MSGTR_WS_ColorDepthTooLow "[ws] Spiacente, la profonditŕ colore č troppo bassa.\n" +#define MSGTR_WS_ColorDepthTooLow "[ws] Spiacente, la profonditĂ colore è troppo bassa.\n" #define MSGTR_WS_TooManyOpenWindows "[ws] Ci sono troppe finestre aperte.\n" #define MSGTR_WS_ShmError "[ws] errore estensione 'shared memory'\n" #define MSGTR_WS_NotEnoughMemoryDrawBuffer "[ws] Spiacente, non abbastanza memoria per il tracciare il buffer.\n" @@ -1016,14 +1016,14 @@ static char help_text[]= // ======================= VO Video Output drivers ======================== -#define MSGTR_VOincompCodec "Il dispositivo di uscita video_out scelto č incompatibile con questo codec.\n"\ +#define MSGTR_VOincompCodec "Il dispositivo di uscita video_out scelto è incompatibile con questo codec.\n"\ "Prova aggiungendo il filtro scale alla sequenza dei filtri,\n"\ "per esempio -vf spp,scale invece di -vf spp.\n" #define MSGTR_VO_GenericError "E' accaduto questo errore" #define MSGTR_VO_UnableToAccess "Impossibile accedere a" -#define MSGTR_VO_ExistsButNoDirectory "giŕ esiste, ma non č una directory." -#define MSGTR_VO_DirExistsButNotWritable "La directory di output esiste giŕ ma non č scrivibile." -#define MSGTR_VO_DirExistsAndIsWritable "La directory di output esiste giŕ ed č scrivibile." +#define MSGTR_VO_ExistsButNoDirectory "giĂ esiste, ma non è una directory." +#define MSGTR_VO_DirExistsButNotWritable "La directory di output esiste giĂ ma non è scrivibile." +#define MSGTR_VO_DirExistsAndIsWritable "La directory di output esiste giĂ ed è scrivibile." #define MSGTR_VO_CantCreateDirectory "Non posso creare la directory di output." #define MSGTR_VO_CantCreateFile "Non posso creare il file di output." #define MSGTR_VO_DirectoryCreateSuccess "Directory di output creata con successo." @@ -1055,26 +1055,26 @@ static char help_text[]= #define MSGTR_VO_JPEG_NoBaselineJPEG "Baseline JPEG disabilitata." // vo_pnm.c -#define MSGTR_VO_PNM_ASCIIMode "Modalitŕ ASCII abilitata." -#define MSGTR_VO_PNM_RawMode "Modalitŕ Raw abilitata." -#define MSGTR_VO_PNM_PPMType "Scriverň files PPM." -#define MSGTR_VO_PNM_PGMType "Scriverň files PGM." -#define MSGTR_VO_PNM_PGMYUVType "Scriverň files PGMYUV." +#define MSGTR_VO_PNM_ASCIIMode "ModalitĂ ASCII abilitata." +#define MSGTR_VO_PNM_RawMode "ModalitĂ Raw abilitata." +#define MSGTR_VO_PNM_PPMType "Scriverò files PPM." +#define MSGTR_VO_PNM_PGMType "Scriverò files PGM." +#define MSGTR_VO_PNM_PGMYUVType "Scriverò files PGMYUV." // vo_yuv4mpeg.c -#define MSGTR_VO_YUV4MPEG_InterlacedHeightDivisibleBy4 "La modalitŕ interlacciata richiede l'altezza immagine divisibile per 4." -#define MSGTR_VO_YUV4MPEG_InterlacedLineBufAllocFail "Impossibile allocare il buffer di linea per la modalitŕ interlacciata." -#define MSGTR_VO_YUV4MPEG_InterlacedInputNotRGB "L'input non č RGB, non posso separare la crominanza per campi!" +#define MSGTR_VO_YUV4MPEG_InterlacedHeightDivisibleBy4 "La modalitĂ interlacciata richiede l'altezza immagine divisibile per 4." +#define MSGTR_VO_YUV4MPEG_InterlacedLineBufAllocFail "Impossibile allocare il buffer di linea per la modalitĂ interlacciata." +#define MSGTR_VO_YUV4MPEG_InterlacedInputNotRGB "L'input non è RGB, non posso separare la crominanza per campi!" #define MSGTR_VO_YUV4MPEG_WidthDivisibleBy2 "La larghezza immagine dev'essere divisibile per 2." -#define MSGTR_VO_YUV4MPEG_NoMemRGBFrameBuf "Non c'č abbastanza memoria per allocare il framebuffer RGB." +#define MSGTR_VO_YUV4MPEG_NoMemRGBFrameBuf "Non c'è abbastanza memoria per allocare il framebuffer RGB." #define MSGTR_VO_YUV4MPEG_OutFileOpenError "Non posso allocare memoria o spazio per scrivere \"%s\"!" #define MSGTR_VO_YUV4MPEG_OutFileWriteError "Errore di scrittura dell'immagine in uscita!" #define MSGTR_VO_YUV4MPEG_UnknownSubDev "Subdispositivo sconosciuto: %s" // 'top-field first'/'bottom-field first' should be left as they are written, // since there's a reference to these in the man page -#define MSGTR_VO_YUV4MPEG_InterlacedTFFMode "Uso modalitŕ di uscita interlacciata, top-field first." -#define MSGTR_VO_YUV4MPEG_InterlacedBFFMode "Uso modalitŕ di uscita interlacciata, bottom-field first." -#define MSGTR_VO_YUV4MPEG_ProgressiveMode "Uso la modalitŕ fotogramma progressivo (default)." +#define MSGTR_VO_YUV4MPEG_InterlacedTFFMode "Uso modalitĂ di uscita interlacciata, top-field first." +#define MSGTR_VO_YUV4MPEG_InterlacedBFFMode "Uso modalitĂ di uscita interlacciata, bottom-field first." +#define MSGTR_VO_YUV4MPEG_ProgressiveMode "Uso la modalitĂ fotogramma progressivo (default)." // sub.c #define MSGTR_VO_SUB_Seekbar "Barra ricerca" @@ -1087,17 +1087,17 @@ static char help_text[]= #define MSGTR_VO_SUB_Contrast "Contrasto" #define MSGTR_VO_SUB_Saturation "Saturazione" #define MSGTR_VO_SUB_Volume "Volume" -#define MSGTR_VO_SUB_Brightness "Luminositŕ" -#define MSGTR_VO_SUB_Hue "Tonalitŕ" +#define MSGTR_VO_SUB_Brightness "LuminositĂ " +#define MSGTR_VO_SUB_Hue "TonalitĂ " #define MSGTR_VO_SUB_Balance "Bilanciamento" // vo_xv.c -#define MSGTR_VO_XV_ImagedimTooHigh "Dimensioni dell'immagine origine troppo grandi: %ux%u (il massimo č %ux%u)\n" +#define MSGTR_VO_XV_ImagedimTooHigh "Dimensioni dell'immagine origine troppo grandi: %ux%u (il massimo è %ux%u)\n" // Old vo drivers that have been replaced -#define MSGTR_VO_PGM_HasBeenReplaced "Il driver di uscita video pgm č stato sostituito con -vo pnm:pgmyuv.\n" -#define MSGTR_VO_MD5_HasBeenReplaced "Il driver di uscita video md5 č stato sostituito con -vo md5sum.\n" +#define MSGTR_VO_PGM_HasBeenReplaced "Il driver di uscita video pgm è stato sostituito con -vo pnm:pgmyuv.\n" +#define MSGTR_VO_MD5_HasBeenReplaced "Il driver di uscita video md5 è stato sostituito con -vo md5sum.\n" // ======================= AO Audio Output drivers ======================== @@ -1140,7 +1140,7 @@ static char help_text[]= // ao_pcm.c #define MSGTR_AO_PCM_FileInfo "[AO PCM] File: %s (%s)\nPCM: Samplerate: %iHz Canali: %s Formato %s\n" -#define MSGTR_AO_PCM_HintInfo "[AO PCM] Info: Un dump piů veloce si ottiene con -vc null -vo null -ao pcm:fast\n[AO PCM] Info: Per scrivere file WAVE usa -ao pcm:waveheader (default).\n" +#define MSGTR_AO_PCM_HintInfo "[AO PCM] Info: Un dump piĂš veloce si ottiene con -vc null -vo null -ao pcm:fast\n[AO PCM] Info: Per scrivere file WAVE usa -ao pcm:waveheader (default).\n" #define MSGTR_AO_PCM_CantOpenOutputFile "[AO PCM] Non posso aprire %s in scrittura!\n" // ao_sdl.c @@ -1155,9 +1155,9 @@ static char help_text[]= #define MSGTR_AO_SGI_InitInfo "[AO SGI] init: Samplerate: %iHz Canali: %s Formato %s\n" #define MSGTR_AO_SGI_InvalidDevice "[AO SGI] play: dispositivo non valido.\n" #define MSGTR_AO_SGI_CantSetParms_Samplerate "[AO SGI] init: setparams fallito: %s\nNon posso impostare il samplerate voluto.\n" -#define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE non č stato accettato dalla risorsa.\n" +#define MSGTR_AO_SGI_CantSetAlRate "[AO SGI] init: AL_RATE non è stato accettato dalla risorsa.\n" #define MSGTR_AO_SGI_CantGetParms "[AO SGI] init: getparams fallito: %s\n" -#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: il samplerate ora č %lf (la frequenza voluta č %lf)\n" +#define MSGTR_AO_SGI_SampleRateInfo "[AO SGI] init: il samplerate ora è %lf (la frequenza voluta è %lf)\n" #define MSGTR_AO_SGI_InitConfigError "[AO SGI] init: %s\n" #define MSGTR_AO_SGI_InitOpenAudioFailed "[AO SGI] init: Non posso apire il canale audio: %s\n" #define MSGTR_AO_SGI_Uninit "[AO SGI] uninit: ...\n" @@ -1216,12 +1216,12 @@ static char help_text[]= "[AO_ALSA] device=<nome-dispositivo>\n"\ "[AO_ALSA] Seleziona il dispositivo (cambia i , in . e i : in =)\n" #define MSGTR_AO_ALSA_ChannelsNotSupported "[AO_ALSA] non sono supportati %d canali.\n" -#define MSGTR_AO_ALSA_OpenInNonblockModeFailed "[AO_ALSA] Apertura in modalitŕ non bloccante fallita, provo con la bloccante.\n" +#define MSGTR_AO_ALSA_OpenInNonblockModeFailed "[AO_ALSA] Apertura in modalitĂ non bloccante fallita, provo con la bloccante.\n" #define MSGTR_AO_ALSA_PlaybackOpenError "[AO_ALSA] Errore aprendo il Playback: %s\n" -#define MSGTR_AO_ALSA_ErrorSetBlockMode "[AL_ALSA] Errore impostando la modalitŕ bloccante %s.\n" +#define MSGTR_AO_ALSA_ErrorSetBlockMode "[AL_ALSA] Errore impostando la modalitĂ bloccante %s.\n" #define MSGTR_AO_ALSA_UnableToGetInitialParameters "[AO_ALSA] Impossibile impostare i paramtri iniziali: %s\n" #define MSGTR_AO_ALSA_UnableToSetAccessType "[AO_ALSA] Impossibile impostare il tipo di accesso: %s\n" -#define MSGTR_AO_ALSA_FormatNotSupportedByHardware "[AO_ALSA] Il formato %s non č supportato dall'hardware, provo col default.\n" +#define MSGTR_AO_ALSA_FormatNotSupportedByHardware "[AO_ALSA] Il formato %s non è supportato dall'hardware, provo col default.\n" #define MSGTR_AO_ALSA_UnableToSetFormat "[AO_ALSA] Impossibile impostare il formato: %s\n" #define MSGTR_AO_ALSA_UnableToSetChannels "[AO_ALSA] Impossibile impostare i canali: %s\n" #define MSGTR_AO_ALSA_UnableToDisableResampling "[AO_ALSA] Impossibile disabilitare il ricampionamento: %s\n" @@ -1247,7 +1247,7 @@ static char help_text[]= #define MSGTR_AO_ALSA_PcmDropError "[AO_ALSA] errore scarto pcm: %s\n" #define MSGTR_AO_ALSA_PcmResumeError "[AO_ALSA] errore ripresa pcm: %s\n" #define MSGTR_AO_ALSA_DeviceConfigurationError "[AO_ALSA] Errore configurazione dispositivo." -#define MSGTR_AO_ALSA_PcmInSuspendModeTryingResume "[AO_ALSA] Pcm in modalitŕ sospesa, provo a riprendere.\n" +#define MSGTR_AO_ALSA_PcmInSuspendModeTryingResume "[AO_ALSA] Pcm in modalitĂ sospesa, provo a riprendere.\n" #define MSGTR_AO_ALSA_WriteError "[AO_ALSA] Errore in scrittura: %s\n" #define MSGTR_AO_ALSA_TryingToResetSoundcard "[AO_ALSA] Provo a reimpostare la scheda audio.\n" #define MSGTR_AO_ALSA_CannotGetPcmStatus "[AO_ALSA] Impossibile ricavare lo stato pcm: %s\n" @@ -1263,7 +1263,7 @@ static char help_text[]= // af_ladspa.c #define MSGTR_AF_LADSPA_AvailableLabels "etichette disponibili in" -#define MSGTR_AF_LADSPA_WarnNoInputs "WARNING! Questo plugin LADSPA non ha entrate audio.\n Il segnale audio in entrata verrŕ perso." +#define MSGTR_AF_LADSPA_WarnNoInputs "WARNING! Questo plugin LADSPA non ha entrate audio.\n Il segnale audio in entrata verrĂ perso." #define MSGTR_AF_LADSPA_ErrMultiChannel "I plugin multi-canale (>2) non sono supportati (finora).\n Usare solo i plugin mono e stereo." #define MSGTR_AF_LADSPA_ErrNoOutputs "Questo plugin LADSPA non ha uscite audio." #define MSGTR_AF_LADSPA_ErrInOutDiff "Il numero delle entrate e uscite audio del plugin LADSPA differiscono." @@ -1274,8 +1274,8 @@ static char help_text[]= #define MSGTR_AF_LADSPA_ErrNoLibFile "Nessuna libreria specificata." #define MSGTR_AF_LADSPA_ErrNoLabel "Nessuna etichetta di filtro specificata." #define MSGTR_AF_LADSPA_ErrNotEnoughControls "Non sono stati specificati abbastanza controlli sulla riga comando." -#define MSGTR_AF_LADSPA_ErrControlBelow "%s: Il controllo di input #%d č sotto il limite inferiore di %0.4f.\n" -#define MSGTR_AF_LADSPA_ErrControlAbove "%s: Il controllo di input #%d č sopra al limite superiore di %0.4f.\n" +#define MSGTR_AF_LADSPA_ErrControlBelow "%s: Il controllo di input #%d è sotto il limite inferiore di %0.4f.\n" +#define MSGTR_AF_LADSPA_ErrControlAbove "%s: Il controllo di input #%d è sopra al limite superiore di %0.4f.\n" // format.c @@ -1292,17 +1292,21 @@ static char help_text[]= #define MSGTR_INPUT_JOYSTICK_WarnLostSync "Joystick: Evento di attenzione in inizializzazione, persa sincronia col driver.\n" #define MSGTR_INPUT_JOYSTICK_WarnUnknownEvent "Joystick: Avviso: tipo di evento %d sconosciuto\n" -// input.c +// appleir.c +#define MSGTR_INPUT_APPLE_IR_Init "Inizializzo l'Apple IR su %s\n" +#define MSGTR_INPUT_APPLE_IR_Detect "Rilevato Apple IR su %s\n" +#define MSGTR_INPUT_APPLE_IR_CantOpen "Impossibile aprire il dispositivo Apple IR: %s\n" +// input.c #define MSGTR_INPUT_INPUT_ErrCantRegister2ManyCmdFds "Troppi descrittori comandi, non posso registrare il descrittore %d.\n" #define MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds "Troppi descrittori tasti, non posso registrare il descrittore %d.\n" -#define MSGTR_INPUT_INPUT_ErrArgMustBeInt "Comando %s: l'argomento %d non č un intero.\n" -#define MSGTR_INPUT_INPUT_ErrArgMustBeFloat "Comando %s: l'argomento %d non čun decimale.\n" -#define MSGTR_INPUT_INPUT_ErrUnterminatedArg "Comando %s: l'argomento %d č indeterminato.\n" +#define MSGTR_INPUT_INPUT_ErrArgMustBeInt "Comando %s: l'argomento %d non è un intero.\n" +#define MSGTR_INPUT_INPUT_ErrArgMustBeFloat "Comando %s: l'argomento %d non èun decimale.\n" +#define MSGTR_INPUT_INPUT_ErrUnterminatedArg "Comando %s: l'argomento %d è indeterminato.\n" #define MSGTR_INPUT_INPUT_ErrUnknownArg "Argomento %d sconosciuto\n" #define MSGTR_INPUT_INPUT_Err2FewArgs "Il comando %s richiede almeno %d argomenti, trovati solo %d finora.\n" #define MSGTR_INPUT_INPUT_ErrReadingCmdFd "Errore in lettura descrittore comandi %d: %s\n" -#define MSGTR_INPUT_INPUT_ErrCmdBufferFullDroppingContent "Il buffer cmd del descrittore %d č pieno: ne scarto il contenuto.\n" +#define MSGTR_INPUT_INPUT_ErrCmdBufferFullDroppingContent "Il buffer cmd del descrittore %d è pieno: ne scarto il contenuto.\n" #define MSGTR_INPUT_INPUT_ErrInvalidCommandForKey "Controllo non valido legato al tasto '%s'" #define MSGTR_INPUT_INPUT_ErrSelect "Errore selezione: %s\n" #define MSGTR_INPUT_INPUT_ErrOnKeyInFd "Errore nel descrittore input tasto %d\n" @@ -1310,11 +1314,11 @@ static char help_text[]= #define MSGTR_INPUT_INPUT_Err2ManyKeyDowns "Troppi eventi di 'tasto premuto' contemporaneamente\n" #define MSGTR_INPUT_INPUT_ErrOnCmdFd "Errore nel descrittore comando %d\n" #define MSGTR_INPUT_INPUT_ErrReadingInputConfig "Fallimento nella lettura del file di configurazione dell'input %s: %s\n" -#define MSGTR_INPUT_INPUT_ErrUnknownKey "Il tasto '%s' č sconosciuto\n" +#define MSGTR_INPUT_INPUT_ErrUnknownKey "Il tasto '%s' è sconosciuto\n" #define MSGTR_INPUT_INPUT_ErrUnfinishedBinding "Legame %s non completato\n" -#define MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName "Il buffer č troppo piccolo per questo nome tasto: %s\n" +#define MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName "Il buffer è troppo piccolo per questo nome tasto: %s\n" #define MSGTR_INPUT_INPUT_ErrNoCmdForKey "Nessun comando trovato per il tasto %s" -#define MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd "Il buffer č troppo piccolo per il comando %s\n" +#define MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd "Il buffer è troppo piccolo per il comando %s\n" #define MSGTR_INPUT_INPUT_ErrWhyHere "Cosa ci stiamo facendo qui?\n" #define MSGTR_INPUT_INPUT_ErrCantInitJoystick "Impossibile inizializzare i controlli del joystick\n" #define MSGTR_INPUT_INPUT_ErrCantStatFile "Impossibile fare stat di %s: %s\n" @@ -1325,7 +1329,7 @@ static char help_text[]= // url.c -#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "La stringa sembra essere giŕ filtrata in url_escape %c%c1%c2\n" +#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "La stringa sembra essere giĂ filtrata in url_escape %c%c1%c2\n" // ai_alsa1x.c @@ -1359,20 +1363,20 @@ static char help_text[]= #define MSGTR_MPDEMUX_AIOSS_Unable2SetSamplerate "Impossibile impostare il samplerate: %d\n" #define MSGTR_MPDEMUX_AIOSS_Unable2SetTrigger "Impossibile impostare il trigger: %d\n" #define MSGTR_MPDEMUX_AIOSS_Unable2GetBlockSize "Non posso ricavare la dimensione del blocco!\n" -#define MSGTR_MPDEMUX_AIOSS_AudioBlockSizeZero "La dimensione del blocco audio č zero, la imposto a %d!\n" -#define MSGTR_MPDEMUX_AIOSS_AudioBlockSize2Low "La dimensione del blocco audio č troppo bassa, la imposto a %d!\n" +#define MSGTR_MPDEMUX_AIOSS_AudioBlockSizeZero "La dimensione del blocco audio è zero, la imposto a %d!\n" +#define MSGTR_MPDEMUX_AIOSS_AudioBlockSize2Low "La dimensione del blocco audio è troppo bassa, la imposto a %d!\n" // asfheader.c -#define MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB "FATALE: la dimensione dell'intestazione č piů grande di 1 MB (%d)!\nPerfavore contatta gli autori di MPlayer e invia/rendi disponibile questo file.\n" +#define MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB "FATALE: la dimensione dell'intestazione è piĂš grande di 1 MB (%d)!\nPerfavore contatta gli autori di MPlayer e invia/rendi disponibile questo file.\n" #define MSGTR_MPDEMUX_ASFHDR_HeaderMallocFailed "Non ho potuto allocare %d byte per l'intestazione.\n" #define MSGTR_MPDEMUX_ASFHDR_EOFWhileReadingHeader "EOF durante la lettura dell'intestazione ASF, file danneggiato/incompleto?\n" -#define MSGTR_MPDEMUX_ASFHDR_DVRWantsLibavformat "DVR funzionerŕ probabilmente solo con libavformat, prova -demuxer 35 se hai problemi\n" +#define MSGTR_MPDEMUX_ASFHDR_DVRWantsLibavformat "DVR funzionerĂ probabilmente solo con libavformat, prova -demuxer 35 se hai problemi\n" #define MSGTR_MPDEMUX_ASFHDR_NoDataChunkAfterHeader "Nessun dato trovato dopo l'intestazione!\n" #define MSGTR_MPDEMUX_ASFHDR_AudioVideoHeaderNotFound "ASF: nessuna intestazione audio o video trovata - file danneggiato?\n" #define MSGTR_MPDEMUX_ASFHDR_InvalidLengthInASFHeader "Lunghezza non valida nell'intestazione ASF!\n" #define MSGTR_MPDEMUX_ASFHDR_DRMLicenseURL "URL Licenza DRM: %s\n" -#define MSGTR_MPDEMUX_ASFHDR_DRMProtected "Questo file č stato oscurato con protezione DRM, non potrŕ esser riprodotto in MPlayer!\n" +#define MSGTR_MPDEMUX_ASFHDR_DRMProtected "Questo file è stato oscurato con protezione DRM, non potrĂ esser riprodotto in MPlayer!\n" // asf_mmst_streaming.c @@ -1399,7 +1403,7 @@ static char help_text[]= // asf_streaming.c -#define MSGTR_MPDEMUX_ASF_StreamChunkSize2Small "Ahhhh, la dimensione stream_chunk č troppo piccola: %d\n" +#define MSGTR_MPDEMUX_ASF_StreamChunkSize2Small "Ahhhh, la dimensione stream_chunk è troppo piccola: %d\n" #define MSGTR_MPDEMUX_ASF_SizeConfirmMismatch "disallineamento size_confirm!: %d %d\n" #define MSGTR_MPDEMUX_ASF_WarnDropHeader "Attenzione: scarto intestazione ????\n" #define MSGTR_MPDEMUX_ASF_ErrorParsingChunkHeader "Errore durante l'interpretazione di una parte di intestazione\n" @@ -1407,8 +1411,8 @@ static char help_text[]= #define MSGTR_MPDEMUX_ASF_BufferMallocFailed "Errore non posso allocare un buffer di %d byte.\n" #define MSGTR_MPDEMUX_ASF_ErrReadingNetworkStream "Errore durante la lettura del flusso via rete.\n" #define MSGTR_MPDEMUX_ASF_ErrChunk2Small "Errore chunk troppo piccolo.\n" -#define MSGTR_MPDEMUX_ASF_ErrSubChunkNumberInvalid "Errore il numero delle sotto-parti non č valido.\n" -#define MSGTR_MPDEMUX_ASF_Bandwidth2SmallCannotPlay "banda troppo piccola, il file non puň esser riprodotto!\n" +#define MSGTR_MPDEMUX_ASF_ErrSubChunkNumberInvalid "Errore il numero delle sotto-parti non è valido.\n" +#define MSGTR_MPDEMUX_ASF_Bandwidth2SmallCannotPlay "banda troppo piccola, il file non può esser riprodotto!\n" #define MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedAudio "banda troppo piccola, deselezionato flusso audio.\n" #define MSGTR_MPDEMUX_ASF_Bandwidth2SmallDeselectedVideo "banda troppo piccola, deselezionato flusso video.\n" #define MSGTR_MPDEMUX_ASF_InvalidLenInHeader "Lunghezza non valida nell'intestazione ASF!\n" @@ -1447,12 +1451,12 @@ static char help_text[]= #define MSGTR_MPDEMUX_AVIHDR_FoundAVIV2Header "AVI: dmlh trovato (dimensione=%d) (fotogrammi totali=%d)\n" #define MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames "Leggo blocco INDEX, %d parti per %d fotogrammi (fpos=%"PRId64").\n" #define MSGTR_MPDEMUX_AVIHDR_AdditionalRIFFHdr "intestazione RIFF supplementare...\n" -#define MSGTR_MPDEMUX_AVIHDR_WarnNotExtendedAVIHdr "** Attenzione: questa non č un'intestazione AVI estesa..\n" +#define MSGTR_MPDEMUX_AVIHDR_WarnNotExtendedAVIHdr "** Attenzione: questa non è un'intestazione AVI estesa..\n" #define MSGTR_MPDEMUX_AVIHDR_BrokenChunk "Blocco (chunk) danneggiato? chunksize=%d (id=%.4s)\n" #define MSGTR_MPDEMUX_AVIHDR_BuildingODMLidx "AVI: ODML: Costruisco indice ODML (%d superindexchunks).\n" -#define MSGTR_MPDEMUX_AVIHDR_BrokenODMLfile "AVI: ODML: Rilevato file rovinato (incompleto?). SarĂ usato un indice tradizionale.\n" +#define MSGTR_MPDEMUX_AVIHDR_BrokenODMLfile "AVI: ODML: Rilevato file rovinato (incompleto?). SarĂÂĂ usato un indice tradizionale.\n" #define MSGTR_MPDEMUX_AVIHDR_CantReadIdxFile "Impossibile leggere il file indice %s: %s\n" -#define MSGTR_MPDEMUX_AVIHDR_NotValidMPidxFile "%s non č un file indice di MPlayer valido.\n" +#define MSGTR_MPDEMUX_AVIHDR_NotValidMPidxFile "%s non è un file indice di MPlayer valido.\n" #define MSGTR_MPDEMUX_AVIHDR_FailedMallocForIdxFile "Impossibile allocare la memoria per i dati dell'indice da %s.\n" #define MSGTR_MPDEMUX_AVIHDR_PrematureEOF "fine prematura del file indice %s\n" #define MSGTR_MPDEMUX_AVIHDR_IdxFileLoaded "Caricato file indice: %s\n" @@ -1464,7 +1468,7 @@ static char help_text[]= // cache2.c #define MSGTR_MPDEMUX_CACHE2_NonCacheableStream "\rNon posso riempire la cache per questo flusso.\n" -#define MSGTR_MPDEMUX_CACHE2_ReadFileposDiffers "!!! read_filepos č differente!!! Riporta questo errore...\n" +#define MSGTR_MPDEMUX_CACHE2_ReadFileposDiffers "!!! read_filepos è differente!!! Riporta questo errore...\n" // cdda.c @@ -1502,7 +1506,7 @@ static char help_text[]= #define MSGTR_MPDEMUX_CUEREAD_BinFilenameTested "[bincue] Verificato nome del file bin: %s\n" #define MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile "[bincue] Impossibile trovare il file bin - mi arrendo.\n" #define MSGTR_MPDEMUX_CUEREAD_UsingBinFile "[bincue] Uso il file bin %s\n" -#define MSGTR_MPDEMUX_CUEREAD_UnknownModeForBinfile "[bincue] Modalitŕ del file bin sconosciuta. Non dovrebbe capitare. Annullamento.\n" +#define MSGTR_MPDEMUX_CUEREAD_UnknownModeForBinfile "[bincue] ModalitĂ del file bin sconosciuta. Non dovrebbe capitare. Annullamento.\n" #define MSGTR_MPDEMUX_CUEREAD_CannotOpenCueFile "[bincue] Impossibile aprire %s.\n" #define MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile "[bincue] Errore in lettura da %s\n" #define MSGTR_MPDEMUX_CUEREAD_ErrGettingBinFileSize "[bincue] Errore nell'ottenere la dimensione del file bin.\n" @@ -1524,7 +1528,7 @@ static char help_text[]= #define MSGTR_MPDEMUX_NW_ConnectError "Errore di connessione: %s\n" #define MSGTR_MPDEMUX_NW_InvalidProxySettingTryingWithout "Impostazioni proxy non valide... Provo senza proxy.\n" #define MSGTR_MPDEMUX_NW_CantResolvTryingWithoutProxy "Non ho potuto risolvere il nome host remoto per AF_INET. Provo senza proxy.\n" -#define MSGTR_MPDEMUX_NW_ErrSendingHTTPRequest "Errore nell'invio della richiesta HTTP: Non č stata inviata tutta la richiesta.\n" +#define MSGTR_MPDEMUX_NW_ErrSendingHTTPRequest "Errore nell'invio della richiesta HTTP: Non è stata inviata tutta la richiesta.\n" #define MSGTR_MPDEMUX_NW_ReadFailed "Lettura fallita.\n" #define MSGTR_MPDEMUX_NW_Read0CouldBeEOF "http_read_response ha letto uno 0 (per esempio EOF).\n" #define MSGTR_MPDEMUX_NW_AuthFailed "Autenticazione fallita. Per favore usa le opzioni -user e -passwd per fornire\nun nome utente/password per una lista di URL, o indica un URL come questo:\nhttp://utente:password@nomehost/file\n" @@ -1547,18 +1551,18 @@ static char help_text[]= #define MSGTR_MPDEMUX_MKV_ZlibDecompressionFailed "[mkv] decompressione zlib fallita.\n" #define MSGTR_MPDEMUX_MKV_LzoInitializationFailed "[mkv] inizializzazione lzo fallita.\n" #define MSGTR_MPDEMUX_MKV_LzoDecompressionFailed "[mkv] decompressione lzo fallita.\n" -#define MSGTR_MPDEMUX_MKV_TrackEncrypted "[mkv] La traccia numero %u č criptata e la decodifica non č stata ancora\n[mkv] implementata. Ignoro la traccia.\n" +#define MSGTR_MPDEMUX_MKV_TrackEncrypted "[mkv] La traccia numero %u è criptata e la decodifica non è stata ancora\n[mkv] implementata. Ignoro la traccia.\n" #define MSGTR_MPDEMUX_MKV_UnknownContentEncoding "[mkv] Tipo di codifica sconosciuto per la traccia %u. Ignoro la traccia.\n" -#define MSGTR_MPDEMUX_MKV_UnknownCompression "[mkv] La traccia %u č stata compressa con un algoritmo di compressione (%u)\nsconosciuto/non supportato. Ignoro la traccia.\n" -#define MSGTR_MPDEMUX_MKV_ZlibCompressionUnsupported "[mkv] La traccia %u č stata compressa con zlib ma mplayer non č stato compilato\n[mkv] con il supporto per tale compressione. Ignoro la traccia.\n" +#define MSGTR_MPDEMUX_MKV_UnknownCompression "[mkv] La traccia %u è stata compressa con un algoritmo di compressione (%u)\nsconosciuto/non supportato. Ignoro la traccia.\n" +#define MSGTR_MPDEMUX_MKV_ZlibCompressionUnsupported "[mkv] La traccia %u è stata compressa con zlib ma mplayer non è stato compilato\n[mkv] con il supporto per tale compressione. Ignoro la traccia.\n" #define MSGTR_MPDEMUX_MKV_UnknownCodecID "[mkv] Codec ID '%s' sconosciuto/non supportato per la traccia %u o dati\n[mkv] interni del codec mancanti/errati.\n" #define MSGTR_MPDEMUX_MKV_FlacTrackDoesNotContainValidHeaders "[mkv] La traccia FLAC non contiene intestazioni valide.\n" #define MSGTR_MPDEMUX_MKV_UnknownAudioCodec "[mkv] Codec audio ID '%s' sconosciuto/non supportato per la traccia %u o dati\n[mkv] interni del codec mancanti/errati.\n" -#define MSGTR_MPDEMUX_MKV_SubtitleTypeNotSupported "[mkv] Il tipo di sottotitoli '%s' non č gestito.\n" -#define MSGTR_MPDEMUX_MKV_WillPlayVideoTrack "[mkv] Riprodurrň la traccia video %u.\n" +#define MSGTR_MPDEMUX_MKV_SubtitleTypeNotSupported "[mkv] Il tipo di sottotitoli '%s' non è gestito.\n" +#define MSGTR_MPDEMUX_MKV_WillPlayVideoTrack "[mkv] Riprodurrò la traccia video %u.\n" #define MSGTR_MPDEMUX_MKV_NoVideoTrackFound "[mkv] Nessuna traccia video trovata/voluta.\n" #define MSGTR_MPDEMUX_MKV_NoAudioTrackFound "[mkv] Nessuna traccia audio trovata/voluta.\n" -#define MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack "[mkv] Mostrerň la traccia sottotitoli %u.\n" +#define MSGTR_MPDEMUX_MKV_WillDisplaySubtitleTrack "[mkv] Mostrerò la traccia sottotitoli %u.\n" #define MSGTR_MPDEMUX_MKV_NoBlockDurationForSubtitleTrackFound "[mkv] Attenzione: Non trovata BlockDuration per la traccia sottotitoli.\n" #define MSGTR_MPDEMUX_MKV_TooManySublines "[mkv] Attenzione: troppe sottolinee da visualizzare, le salto.\n" #define MSGTR_MPDEMUX_MKV_TooManySublinesSkippingAfterFirst "\n[mkv] Attenzione: troppe sottolinee da visualizzare, le salto dopo le prime %i.\n" @@ -1585,8 +1589,8 @@ static char help_text[]= #define MSGTR_LIBMENU_BadAttrib "[MENU] attributo %s=%s invalido nel menu '%s' alla riga %d\n" #define MSGTR_LIBMENU_UnknownMenuType "[MENU] tipo di menu '%s' invalido alla riga %d\n" #define MSGTR_LIBMENU_CantOpenConfigFile "[MENU] Impossibile aprire il file di configurazione menu: %s\n" -#define MSGTR_LIBMENU_ConfigFileIsTooBig "[MENU] Il file di configurazione č troppo grande (> %d KB)\n" -#define MSGTR_LIBMENU_ConfigFileIsEmpty "[MENU] Il file di configurazione č vuoto.\n" +#define MSGTR_LIBMENU_ConfigFileIsTooBig "[MENU] Il file di configurazione è troppo grande (> %d KB)\n" +#define MSGTR_LIBMENU_ConfigFileIsEmpty "[MENU] Il file di configurazione è vuoto.\n" #define MSGTR_LIBMENU_MenuNotFound "[MENU] Menu %s non trovato.\n" #define MSGTR_LIBMENU_MenuInitFailed "[MENU] Menu '%s': Inizializzazione fallita.\n" #define MSGTR_LIBMENU_UnsupportedOutformat "[MENU] Formato di uscita non supportato!!!!\n" @@ -1600,7 +1604,7 @@ static char help_text[]= #define MSGTR_LIBMENU_SelectError "[MENU] Errore di selezione.\n" #define MSGTR_LIBMENU_ReadErrorOnChildFD "[MENU] Errore di lettura sul descrittore file del processo figlio: %s.\n" #define MSGTR_LIBMENU_ConsoleRun "[MENU] Esecuzione in console: %s ...\n" -#define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Un processo figlio č giŕ in esecuzione.\n" +#define MSGTR_LIBMENU_AChildIsAlreadyRunning "[MENU] Un processo figlio è giĂ in esecuzione.\n" #define MSGTR_LIBMENU_ForkFailed "[MENU] Fork fallito !!!\n" #define MSGTR_LIBMENU_WriteError "[MENU] errore di scrittura\n" @@ -1613,7 +1617,7 @@ static char help_text[]= // libmenu/menu_param.c #define MSGTR_LIBMENU_SubmenuDefinitionNeedAMenuAttribut "[MENU] per le definizioni di Submenu serve un attributo 'menu'.\n" -#define MSGTR_LIBMENU_InvalidProperty "[MENU] Proprietŕ '%s' non valida nella definizione di Menu Pref (riga %d).\n" +#define MSGTR_LIBMENU_InvalidProperty "[MENU] ProprietĂ '%s' non valida nella definizione di Menu Pref (riga %d).\n" #define MSGTR_LIBMENU_PrefMenuEntryDefinitionsNeed "[MENU] per le definizioni di Menu Pref serve un attributo 'property' o 'txt' valido (riga %d).\n" #define MSGTR_LIBMENU_PrefMenuNeedsAnArgument "[MENU] per i Menu Pref serve un argomento.\n" @@ -1652,12 +1656,12 @@ static char help_text[]= #define MSGTR_MPCODECS_OnlyBuffersAllocatedByVoXvmcAllowed "[VD_FFMPEG] Sono permessi solo i buffer allocati da vo_xvmc.\n" // libmpcodecs/ve_lavc.c -#define MSGTR_MPCODECS_HighQualityEncodingSelected "[VE_LAVC] Scelta codifica ad alta qualitŕ (non-realtime)!\n" +#define MSGTR_MPCODECS_HighQualityEncodingSelected "[VE_LAVC] Scelta codifica ad alta qualitĂ (non-realtime)!\n" #define MSGTR_MPCODECS_UsingConstantQscale "[VE_LAVC] Uso qscale costante = %f (VBR).\n" // libmpcodecs/ve_raw.c #define MSGTR_MPCODECS_OutputWithFourccNotSupported "[VE_RAW] Output grezzo con FourCC [%x] non supportato!\n" -#define MSGTR_MPCODECS_NoVfwCodecSpecified "[VE_RAW] Il codec VfW richiesto non č specificato!!\n" +#define MSGTR_MPCODECS_NoVfwCodecSpecified "[VE_RAW] Il codec VfW richiesto non è specificato!!\n" // libmpcodecs/vf_crop.c #define MSGTR_MPCODECS_CropBadPositionWidthHeight "[CROP] Posizione/larghezza/altezza invalide - area ritagliata al di fuori dell'originaria!\n" @@ -1676,12 +1680,12 @@ static char help_text[]= #define MSGTR_MPCODECS_CompressorSubtype "Sottotipo compressore: %.4lx\n" #define MSGTR_MPCODECS_CompressorFlags "Flag del compressore: %lu, versione %lu, versione ICM: %lu\n" #define MSGTR_MPCODECS_Flags "Flag:" -#define MSGTR_MPCODECS_Quality " qualitŕ" +#define MSGTR_MPCODECS_Quality " qualitĂ " // libmpcodecs/vf_expand.c #define MSGTR_MPCODECS_FullDRNotPossible "DR completo non possibile, provo invece gli SLICES!\n" #define MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices "ATTENZIONE! Il filtro successivo non supporta gli SLICES, aspettati un sig11...\n" -#define MSGTR_MPCODECS_FunWhydowegetNULL "Perché abbiamo avuto un NULL??\n" +#define MSGTR_MPCODECS_FunWhydowegetNULL "PerchĂŠ abbiamo avuto un NULL??\n" // libmpcodecs/vf_test.c, vf_yuy2.c, vf_yvu9.c #define MSGTR_MPCODECS_WarnNextFilterDoesntSupport "%s non supportato dal filtro/vo successivo :(\n" @@ -1695,21 +1699,21 @@ static char help_text[]= #define MSGTR_LIBVO_MGA_CouldNotSetLumaValuesFromTheKernelModule "[MGA] Impossibile impostare i valori di luminanza dal modulo del kernel!\n" #define MSGTR_LIBVO_MGA_ScreenWidthHeightUnknown "[MGA] Larghezza/altezza schermo sconosciute!\n" #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] formato di uscita %0X invalido\n" -#define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versione del tuo driver mga_vid č incompatibile con questo MPlayer!\n" +#define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] La versione del tuo driver mga_vid è incompatibile con questo MPlayer!\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Impossibile aprire: %s\n" #define MGSTR_LIBVO_MGA_ResolutionTooHigh "[MGA] La risoluzione del sorgente ha almeno una delle due dimensioni maggiore di 1023x1023. Per favore ridimensiona via software o usa -lavdopts lowres=1\n" // libvo/vesa_lvo.c -#define MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported "[VESA_LVO] Questo branch non č piů supportato.\n[VESA_LVO] Per favore usa al suo posto -vo vesa:vidix.\n" +#define MSGTR_LIBVO_VESA_ThisBranchIsNoLongerSupported "[VESA_LVO] Questo branch non è piĂš supportato.\n[VESA_LVO] Per favore usa al suo posto -vo vesa:vidix.\n" #define MSGTR_LIBVO_VESA_CouldntOpen "[VESA_LVO] Impossibile aprire: '%s'\n" #define MSGTR_LIBVO_VESA_InvalidOutputFormat "[VESA_LVI] formato di uscita non valido: %s(%0X)\n" -#define MSGTR_LIBVO_VESA_IncompatibleDriverVersion "[VESA_LVO] La versione del tuo driver fb_vid č incompatibile con questo MPlayer!\n" +#define MSGTR_LIBVO_VESA_IncompatibleDriverVersion "[VESA_LVO] La versione del tuo driver fb_vid è incompatibile con questo MPlayer!\n" // libvo/vo_3dfx.c #define MSGTR_LIBVO_3DFX_Only16BppSupported "[VO_3DFX] Supportati solo 16bpp!" -#define MSGTR_LIBVO_3DFX_VisualIdIs "[VO_3DFX] L'ID visuale č %lx.\n" +#define MSGTR_LIBVO_3DFX_VisualIdIs "[VO_3DFX] L'ID visuale è %lx.\n" #define MSGTR_LIBVO_3DFX_UnableToOpenDevice "[VO_3DFX] Impossibile aprire /dev/3dfx.\n" #define MSGTR_LIBVO_3DFX_Error "[VO_3DFX] Errore: %d.\n" #define MSGTR_LIBVO_3DFX_CouldntMapMemoryArea "[VO_3DFX] Impossibile mappare le aree di memoria 3dfx: %p,%p,%d.\n" @@ -1723,8 +1727,8 @@ static char help_text[]= // libvo/vo_dxr3.c #define MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette "[VO_DXR3] Impossibile caricare una nuova palette SPU!\n" -#define MSGTR_LIBVO_DXR3_UnableToSetPlaymode "[VO_DXR3] Impossibile impostare la modalitŕ riproduzione!\n" -#define MSGTR_LIBVO_DXR3_UnableToSetSubpictureMode "[VO_DXR3] Impossibile impostare la modalitŕ subpicture!\n" +#define MSGTR_LIBVO_DXR3_UnableToSetPlaymode "[VO_DXR3] Impossibile impostare la modalitĂ riproduzione!\n" +#define MSGTR_LIBVO_DXR3_UnableToSetSubpictureMode "[VO_DXR3] Impossibile impostare la modalitĂ subpicture!\n" #define MSGTR_LIBVO_DXR3_UnableToGetTVNorm "[VO_DXR3] Impossibile ricavare la norma TV!\n" #define MSGTR_LIBVO_DXR3_AutoSelectedTVNormByFrameRate "[VO_DXR3] Scelta automaticamente la norma TV dalla frequenza: " #define MSGTR_LIBVO_DXR3_UnableToSetTVNorm "[VO_DXR3] Impossibile impostare la norma TV!\n" @@ -1734,14 +1738,14 @@ static char help_text[]= #define MSGTR_LIBVO_DXR3_SettingAspectRatioTo169 "[VO_DXR3] Imposto il rapporto di aspetto a 16:9.\n" #define MSGTR_LIBVO_DXR3_OutOfMemory "[VO_DXR3] memoria esaurita\n" #define MSGTR_LIBVO_DXR3_UnableToAllocateKeycolor "[VO_DXR3] Impossibile allocare keycolor!\n" -#define MSGTR_LIBVO_DXR3_UnableToAllocateExactKeycolor "[VO_DXR3] Impossibile allocare keycolor esatto, uso il piů vicino (0x%lx).\n" +#define MSGTR_LIBVO_DXR3_UnableToAllocateExactKeycolor "[VO_DXR3] Impossibile allocare keycolor esatto, uso il piĂš vicino (0x%lx).\n" #define MSGTR_LIBVO_DXR3_Uninitializing "[VO_DXR3] De-inizializzo.\n" #define MSGTR_LIBVO_DXR3_FailedRestoringTVNorm "[VO_DXR3] Ripristino norma TV fallito!\n" #define MSGTR_LIBVO_DXR3_EnablingPrebuffering "[VO_DXR3] Abilito il prebuffering.\n" #define MSGTR_LIBVO_DXR3_UsingNewSyncEngine "[VO_DXR3] Uso il nuovo motore di sincronizzazione.\n" #define MSGTR_LIBVO_DXR3_UsingOverlay "[VO_DXR3] Uso l'overlay.\n" #define MSGTR_LIBVO_DXR3_ErrorYouNeedToCompileMplayerWithX11 "[VO_DXR3] Errore: Overlay richiede la compilazione con gli header/librerie X11 installati.\n" -#define MSGTR_LIBVO_DXR3_WillSetTVNormTo "[VO_DXR3] Imposterň la norma TV a: " +#define MSGTR_LIBVO_DXR3_WillSetTVNormTo "[VO_DXR3] Imposterò la norma TV a: " #define MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALPAL60 "imposto automaticamente alla frequenza filmato (PAL/PAL-60)" #define MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALNTSC "imposto automaticamente alla frequenza filmato (PAL/NTSC)" #define MSGTR_LIBVO_DXR3_UseCurrentNorm "Uso la norma attuale." @@ -1767,7 +1771,7 @@ static char help_text[]= // libvo/font_load_ft.c -#define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face in errore. Forse il percorso del font č errato.\nPer favore indica il file dei font per il testo (~/.mplayer/subfont.ttf).\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face in errore. Forse il percorso del font è errato.\nPer favore indica il file dei font per il testo (~/.mplayer/subfont.ttf).\n" #define MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed "New_Memory_Face in errore..\n" #define MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed "font sottotitoli: load_sub_face in errore.\n" #define MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed "font sottotitoli: prepare_charset in errore.\n" @@ -1788,22 +1792,22 @@ static char help_text[]= #define MSGTR_LIBVO_PNG_Warning1 "[VO_PNG] Attenzine: livello compressione a 0, compressione disabilitata!\n" #define MSGTR_LIBVO_PNG_Warning2 "[VO_PNG] Info: Usa -vo png:z=<n> per impostare il livello compressione da 0 a 9.\n" -#define MSGTR_LIBVO_PNG_Warning3 "[VO_PNG] Info: (0 = nessuna, 1 = piů veloce e peggiore - 9 migliore e piů lenta)\n" +#define MSGTR_LIBVO_PNG_Warning3 "[VO_PNG] Info: (0 = nessuna, 1 = piĂš veloce e peggiore - 9 migliore e piĂš lenta)\n" #define MSGTR_LIBVO_PNG_ErrorOpeningForWriting "\n[VO_PNG] Errore aprendo '%s' in scrittura!\n" #define MSGTR_LIBVO_PNG_ErrorInCreatePng "[VO_PNG] Errore in create_png.\n" // libvo/vo_sdl.c -#define MSGTR_LIBVO_SDL_CouldntGetAnyAcceptableSDLModeForOutput "[VO_SDL] Impossibile ottenere una modalitŕ SDL accettabile per l'output.\n" +#define MSGTR_LIBVO_SDL_CouldntGetAnyAcceptableSDLModeForOutput "[VO_SDL] Impossibile ottenere una modalitĂ SDL accettabile per l'output.\n" #define MSGTR_LIBVO_SDL_SetVideoModeFailed "[VO_SDL] set_video_mode: SDL_SetVideoMode fallito: %s.\n" #define MSGTR_LIBVO_SDL_SetVideoModeFailedFull "[VO_SDL] Set_fullmode: SDL_SetVideoMode fallito: %s.\n" #define MSGTR_LIBVO_SDL_MappingI420ToIYUV "[VO_SDL] Mappo I420 su IYUV.\n" #define MSGTR_LIBVO_SDL_UnsupportedImageFormat "[VO_SDL] Formato immagine non supportato (0x%X).\n" #define MSGTR_LIBVO_SDL_InfoPleaseUseVmOrZoom "[VO_SDL] Info - per favore usa -vm or -zoom per passare alla risoluzione migliore.\n" -#define MSGTR_LIBVO_SDL_FailedToSetVideoMode "[VO_SDL] Impossibile impostare la modalitŕ video: %s.\n" +#define MSGTR_LIBVO_SDL_FailedToSetVideoMode "[VO_SDL] Impossibile impostare la modalitĂ video: %s.\n" #define MSGTR_LIBVO_SDL_CouldntCreateAYUVOverlay "[VO_SDL] Impossibile creare un overlay YUV: %s.\n" #define MSGTR_LIBVO_SDL_CouldntCreateARGBSurface "[VO_SDL] Impossibile creare una superficie RGB: %s.\n" -#define MSGTR_LIBVO_SDL_UsingDepthColorspaceConversion "[VO_SDL] Uso conversione profonditŕ/sp.colore, per questo sarŕ piů lento (%ibpp -> %ibpp).\n" +#define MSGTR_LIBVO_SDL_UsingDepthColorspaceConversion "[VO_SDL] Uso conversione profonditĂ /sp.colore, per questo sarĂ piĂš lento (%ibpp -> %ibpp).\n" #define MSGTR_LIBVO_SDL_UnsupportedImageFormatInDrawslice "[VO_SDL] Formato immagine non supportato in draw_slice, contatta gli sviluppatori di MPlayer!\n" #define MSGTR_LIBVO_SDL_BlitFailed "[VO_SDL] Blit fallito: %s.\n" #define MSGTR_LIBVO_SDL_InitializationFailed "[VO_SDL] Inizializzazione SDL fallita: %s.\n" @@ -1818,9 +1822,9 @@ static char help_text[]= #define MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled "[VO_SUB_VIDIX] Chiamata alla funzione posticcia vidix_draw_frame().\n" #define MSGTR_LIBVO_SUB_VIDIX_UnsupportedFourccForThisVidixDriver "[VO_SUB_VIDIX] FourCC non supportato per questo driver VIDIX: %x (%s).\n" #define MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedResolution "[VO_SUB_VIDIX] Il server grafico ha una risoluzione non supportata (%dx%d), supportate: %dx%d-%dx%d.\n" -#define MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedColorDepth "[VO_SUB_VIDIX] Il server grafico ha una profonditŕ colore non supportata da vidix (%d).\n" -#define MSGTR_LIBVO_SUB_VIDIX_DriverCantUpscaleImage "[VO_SUB_VIDIX] Il driver VIDIX non puň ingrandire l'immagine (%d%d -> %d%d).\n" -#define MSGTR_LIBVO_SUB_VIDIX_DriverCantDownscaleImage "[VO_SUB_VIDIX] Il driver VIDIX non puň rimpicciolire l'immagine (%d%d -> %d%d).\n" +#define MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedColorDepth "[VO_SUB_VIDIX] Il server grafico ha una profonditĂ colore non supportata da vidix (%d).\n" +#define MSGTR_LIBVO_SUB_VIDIX_DriverCantUpscaleImage "[VO_SUB_VIDIX] Il driver VIDIX non può ingrandire l'immagine (%d%d -> %d%d).\n" +#define MSGTR_LIBVO_SUB_VIDIX_DriverCantDownscaleImage "[VO_SUB_VIDIX] Il driver VIDIX non può rimpicciolire l'immagine (%d%d -> %d%d).\n" #define MSGTR_LIBVO_SUB_VIDIX_CantConfigurePlayback "[VO_SUB_VIDIX] Impossibile configurare la riproduzione: %s.\n" #define MSGTR_LIBVO_SUB_VIDIX_YouHaveWrongVersionOfVidixLibrary "[VO_SUB_VIDIX] Hai la versione errata della libreria VIDIX.\n" #define MSGTR_LIBVO_SUB_VIDIX_CouldntFindWorkingVidixDriver "[VO_SUB_VIDIX] Impossibile trovare un driver VIDIX che possa funzionare.\n" @@ -1828,13 +1832,13 @@ static char help_text[]= // libvo/vo_svga.c -#define MSGTR_LIBVO_SVGA_ForcedVidmodeNotAvailable "[VO_SVGA] Il vid_mode %d (%s) forzato non č disponibile.\n" -#define MSGTR_LIBVO_SVGA_ForcedVidmodeTooSmall "[VO_SVGA] Il vid_mode %d (%s) č troppo piccolo.\n" +#define MSGTR_LIBVO_SVGA_ForcedVidmodeNotAvailable "[VO_SVGA] Il vid_mode %d (%s) forzato non è disponibile.\n" +#define MSGTR_LIBVO_SVGA_ForcedVidmodeTooSmall "[VO_SVGA] Il vid_mode %d (%s) è troppo piccolo.\n" #define MSGTR_LIBVO_SVGA_VgasetmodeFailed "[VO_SVGA] Errore in vga_setmode(%d).\n" #define MSGTR_LIBVO_SVGA_VideoModeIsLinearAndMemcpyCouldBeUsed "[VO_SVGA] Video mode is linear and memcpy could be used for image transfer.\n" #define MSGTR_LIBVO_SVGA_VideoModeHasHardwareAcceleration "[VO_SVGA] Video mode has hardware acceleration and put_image could be used.\n" #define MSGTR_LIBVO_SVGA_IfItWorksForYouIWouldLikeToKnow "[VO_SVGA] If it works for you I would like to know.\n[VO_SVGA] (send log with `mplayer test.avi -v -v -v -v &> svga.log`). Thx!\n" -#define MSGTR_LIBVO_SVGA_VideoModeHas "[VO_SVGA] La modalitŕ video ha %d pagina/e.\n" +#define MSGTR_LIBVO_SVGA_VideoModeHas "[VO_SVGA] La modalitĂ video ha %d pagina/e.\n" #define MSGTR_LIBVO_SVGA_CenteringImageStartAt "[VO_SVGA] Centro l'immagine. Partendo da (%d,%d)\n" #define MSGTR_LIBVO_SVGA_UsingVidix "[VO_SVGA] Uso VIDIX. l=%i a=%i lm=%i am=%i\n" @@ -1846,10 +1850,10 @@ static char help_text[]= #define MSGTR_LIBVO_TDFXFB_ThisDriverOnlySupports "[VO_TDFXFB] Questo driver supporta solo le 3Dfx Banshee, Voodoo3 e Voodoo 5.\n" #define MSGTR_LIBVO_TDFXFB_OutputIsNotSupported "[VO_TDFXFB] Uscita con %d bpp non supportata.\n" #define MSGTR_LIBVO_TDFXFB_CouldntMapMemoryAreas "[VO_TDFXFB] Impossibile mappare le aree di memoria: %s.\n" -#define MSGTR_LIBVO_TDFXFB_BppOutputIsNotSupported "[VO_TDFXFB] Uscita con %d bpp non supportata (CiĂ² non sarebbe dovuto accadere).\n" +#define MSGTR_LIBVO_TDFXFB_BppOutputIsNotSupported "[VO_TDFXFB] Uscita con %d bpp non supportata (CiĂÂĂ² non sarebbe dovuto accadere).\n" #define MSGTR_LIBVO_TDFXFB_SomethingIsWrongWithControl "[VO_TDFXFB] Eik! Qualche problema in control().\n" #define MSGTR_LIBVO_TDFXFB_NotEnoughVideoMemoryToPlay "[VO_TDFXFB] Troppo poca memoria video per la riproduzione. Prova una risoluzione inferiore.\n" -#define MSGTR_LIBVO_TDFXFB_ScreenIs "[VO_TDFXFB] screen č %dx%d a %d bpp, in č %dx%d a %d bpp, norm č %dx%d.\n" +#define MSGTR_LIBVO_TDFXFB_ScreenIs "[VO_TDFXFB] screen è %dx%d a %d bpp, in è %dx%d a %d bpp, norm è %dx%d.\n" // libvo/vo_tdfx_vid.c @@ -1881,11 +1885,11 @@ static char help_text[]= #define MSGTR_LIBVO_VESA_FatalErrorOccurred "[VO_VESA] Errore fatale! Impossibile continuare.\n" #define MSGTR_LIBVO_VESA_UnknownSubdevice "[VO_VESA] Sottodispositivo sconosciuto: '%s'.\n" -#define MSGTR_LIBVO_VESA_YouHaveTooLittleVideoMemory "[VO_VESA] Hai troppo poca memoria video per questa modalitŕ:\n[VO_VESA] Richiesta: %08lX presente: %08lX.\n" +#define MSGTR_LIBVO_VESA_YouHaveTooLittleVideoMemory "[VO_VESA] Hai troppo poca memoria video per questa modalitĂ :\n[VO_VESA] Richiesta: %08lX presente: %08lX.\n" #define MSGTR_LIBVO_VESA_YouHaveToSpecifyTheCapabilitiesOfTheMonitor "[VO_VESA] Devi specificare le caratteristiche del monitor. Non cambio frequenza di refresh.\n" -#define MSGTR_LIBVO_VESA_UnableToFitTheMode "[VO_VESA] Modalitŕ al di fuori dei limiti del monitor. Non cambio frequenza di refresh.\n" +#define MSGTR_LIBVO_VESA_UnableToFitTheMode "[VO_VESA] ModalitĂ al di fuori dei limiti del monitor. Non cambio frequenza di refresh.\n" #define MSGTR_LIBVO_VESA_DetectedInternalFatalError "[VO_VESA] Errore interno fatale rilevato: init eseguito prima di preinit.\n" -#define MSGTR_LIBVO_VESA_SwitchFlipIsNotSupported "[VO_VESA] L'opzione -flip non č gestita.\n" +#define MSGTR_LIBVO_VESA_SwitchFlipIsNotSupported "[VO_VESA] L'opzione -flip non è gestita.\n" #define MSGTR_LIBVO_VESA_PossibleReasonNoVbe2BiosFound "[VO_VESA] Ragione possibile: Nessun BIOS VBE2 trovato.\n" #define MSGTR_LIBVO_VESA_FoundVesaVbeBiosVersion "[VO_VESA] Trovato BIOS VESA VBE Versione %x.%x Revisione: %x.\n" #define MSGTR_LIBVO_VESA_VideoMemory "[VO_VESA] Memoria video: %u Kb.\n" @@ -1894,23 +1898,23 @@ static char help_text[]= #define MSGTR_LIBVO_VESA_YouShouldSee5OemRelatedLines "[VO_VESA] Dovresti vedere qui sotto 5 righe relative all'OEM; Se no, hai una vm86 bacata.\n" #define MSGTR_LIBVO_VESA_Hint "[VO_VESA] Suggerimento: Per utilizzare l'uscita-TV devi avere il connettore TV attaccato\n"\ "[VO_VESA] prima dell'avvio visto che il BIOS VESA si inizializza solo durante il POST.\n" -#define MSGTR_LIBVO_VESA_UsingVesaMode "[VO_VESA] Uso modalitŕ VESA (%u) = %x [%ux%u@%u]\n" +#define MSGTR_LIBVO_VESA_UsingVesaMode "[VO_VESA] Uso modalitĂ VESA (%u) = %x [%ux%u@%u]\n" #define MSGTR_LIBVO_VESA_CantInitializeSwscaler "[VO_VESA] Impossibile inizializzare il ridimensionatore sotfware.\n" -#define MSGTR_LIBVO_VESA_CantUseDga "[VO_VESA] Impossibile usare DGA. Forzo la modalitŕ 'bank switching mode'. :(\n" +#define MSGTR_LIBVO_VESA_CantUseDga "[VO_VESA] Impossibile usare DGA. Forzo la modalitĂ 'bank switching mode'. :(\n" #define MSGTR_LIBVO_VESA_UsingDga "[VO_VESA] Uso DGA (risorse fisiche: %08lXh, %08lXh)" #define MSGTR_LIBVO_VESA_CantUseDoubleBuffering "[VO_VESA] Impossibile usare il double buffering: non abbastanza memoria video.\n" -#define MSGTR_LIBVO_VESA_CantFindNeitherDga "[VO_VESA] Non riesco a trovare né DGA né un frame di finestra riposizionabile.\n" +#define MSGTR_LIBVO_VESA_CantFindNeitherDga "[VO_VESA] Non riesco a trovare nĂŠ DGA nĂŠ un frame di finestra riposizionabile.\n" #define MSGTR_LIBVO_VESA_YouveForcedDga "[VO_VESA] Hai forzato DGA. Esco\n" #define MSGTR_LIBVO_VESA_CantFindValidWindowAddress "[VO_VESA] Impossibile trovare un indirizzo finestra valido.\n" -#define MSGTR_LIBVO_VESA_UsingBankSwitchingMode "[VO_VESA] Uso la modalitŕ 'bank switching mode' (risorse fisiche: %08lXh, %08lXh).\n" +#define MSGTR_LIBVO_VESA_UsingBankSwitchingMode "[VO_VESA] Uso la modalitĂ 'bank switching mode' (risorse fisiche: %08lXh, %08lXh).\n" #define MSGTR_LIBVO_VESA_CantAllocateTemporaryBuffer "[VO_VESA] Imposibile allocare un buffer temporaneo.\n" -#define MSGTR_LIBVO_VESA_SorryUnsupportedMode "[VO_VESA] Spiacente, modalitŕ non supportata -- prova -x 640 -zoom.\n" +#define MSGTR_LIBVO_VESA_SorryUnsupportedMode "[VO_VESA] Spiacente, modalitĂ non supportata -- prova -x 640 -zoom.\n" #define MSGTR_LIBVO_VESA_OhYouReallyHavePictureOnTv "[VO_VESA] Oh, hai davvero un'immagine sulla Tivu!\n" #define MSGTR_LIBVO_VESA_CantInitialozeLinuxVideoOverlay "[VO_VESA] Impossibile inizializzare l'Overlay Video Linux.\n" #define MSGTR_LIBVO_VESA_UsingVideoOverlay "[VO_VESA] Uso l'overlay video: %s.\n" #define MSGTR_LIBVO_VESA_CantInitializeVidixDriver "[VO_VESA] Impossibile inizializzare il driver VIDIX.\n" #define MSGTR_LIBVO_VESA_UsingVidix "[VO_VESA] Uso VIDIX.\n" -#define MSGTR_LIBVO_VESA_CantFindModeFor "[VO_VESA] Impossibile trovare una modalitŕ per: %ux%u@%u.\n" +#define MSGTR_LIBVO_VESA_CantFindModeFor "[VO_VESA] Impossibile trovare una modalitĂ per: %ux%u@%u.\n" #define MSGTR_LIBVO_VESA_InitializationComplete "[VO_VESA] Inizializzazione VESA completa.\n" // libvo/vo_x11.c @@ -1921,13 +1925,13 @@ static char help_text[]= #define MSGTR_LIBVO_XV_DrawFrameCalled "[VO_XV] chiamata a draw_frame()!!!!!!\n" #define MSGTR_LIBVO_XV_SharedMemoryNotSupported "[VO_XV] Memoria condivisa non supportata\nRitorno a Xv normale.\n" -#define MSGTR_LIBVO_XV_XvNotSupportedByX11 "[VO_XV] Scusa, Xv non č gestito dalla versione/driver di X11 corrente\n[VO_XV] ******** Prova con -vo x11 o -vo sdl *********\n" +#define MSGTR_LIBVO_XV_XvNotSupportedByX11 "[VO_XV] Scusa, Xv non è gestito dalla versione/driver di X11 corrente\n[VO_XV] ******** Prova con -vo x11 o -vo sdl *********\n" #define MSGTR_LIBVO_XV_XvQueryAdaptorsFailed "[VO_XV] Funzione XvQueryAdaptors fallita.\n" #define MSGTR_LIBVO_XV_InvalidPortParameter "[VO_XV] Parametro porta non valido, lo sovrascrivo con la porta 0.\n" #define MSGTR_LIBVO_XV_CouldNotGrabPort "[VO_XV] Impossibile aprire la porta %i.\n" #define MSGTR_LIBVO_XV_CouldNotFindFreePort "[VO_XV] Impossibile trovare una porta Xvideo libera - forse un altro processo\n"\ -"[VO_XV] la sta giŕ usando. Chiudi tutte le applicazioni video, e riprova.\n"\ -"[VO_XV] Se ciň non ti aiuta, vedi 'mplayer -vo help' per altri (non-xv)\n"\ +"[VO_XV] la sta giĂ usando. Chiudi tutte le applicazioni video, e riprova.\n"\ +"[VO_XV] Se ciò non ti aiuta, vedi 'mplayer -vo help' per altri (non-xv)\n"\ "[VO_XV] driver di uscita video.\n" #define MSGTR_LIBVO_XV_NoXvideoSupport "[VO_XV] Sembra non sia disponibile il supporto Xvideo per la tua scheda video.\n"\ "[VO_XV] Esegui 'xvinfo' per verificare il supporto Xv e leggi\n"\ @@ -1938,13 +1942,13 @@ static char help_text[]= // loader/ldt_keeper.c -#define MSGTR_LOADER_DYLD_Warning "ATTENZIONE: Tentativo di utilizzare codec DLL, senza la variabile d'ambiente\n DYLD_BIND_AT_LAUNCH impostata. Ciň porterŕ probabilmente a un crash.\n" +#define MSGTR_LOADER_DYLD_Warning "ATTENZIONE: Tentativo di utilizzare codec DLL, senza la variabile d'ambiente\n DYLD_BIND_AT_LAUNCH impostata. Ciò porterĂ probabilmente a un crash.\n" // stream/stream_radio.c #define MSGTR_RADIO_ChannelNamesDetected "[radio] Rilevati i nomi dei canali radio.\n" -#define MSGTR_RADIO_FreqRange "[radio] La gamma delle frequenze permesse č %.2f-%.2f MHz.\n" +#define MSGTR_RADIO_FreqRange "[radio] La gamma delle frequenze permesse è %.2f-%.2f MHz.\n" #define MSGTR_RADIO_WrongFreqForChannel "[radio] Frequenza errata per il canale %s\n" #define MSGTR_RADIO_WrongChannelNumberFloat "[radio] Numero canale errato: %.2f\n" #define MSGTR_RADIO_WrongChannelNumberInt "[radio] Numero canale errato: %d\n" @@ -1952,9 +1956,9 @@ static char help_text[]= #define MSGTR_RADIO_FreqParameterDetected "[radio] Rilevato parametro frequenza radio.\n" #define MSGTR_RADIO_DoneParsingChannels "[radio] Lettura canali terminata.\n" #define MSGTR_RADIO_GetTunerFailed "[radio] Attenzione: ioctl tuner fallito: %s. Imposto frac a %d.\n" -#define MSGTR_RADIO_NotRadioDevice "[radio] %s non č un dispositivo radio!\n" -#define MSGTR_RADIO_TunerCapLowYes "[radio] il tuner č low:yes frac=%d\n" -#define MSGTR_RADIO_TunerCapLowNo "[radio] il tuner č low:no frac=%d\n" +#define MSGTR_RADIO_NotRadioDevice "[radio] %s non è un dispositivo radio!\n" +#define MSGTR_RADIO_TunerCapLowYes "[radio] il tuner è low:yes frac=%d\n" +#define MSGTR_RADIO_TunerCapLowNo "[radio] il tuner è low:no frac=%d\n" #define MSGTR_RADIO_SetFreqFailed "[radio] ioctl impostazione frequenza 0x%x (%.2f) fallito: %s\n" #define MSGTR_RADIO_GetFreqFailed "[radio] ioctl rilevazione frequenza fallito: %s\n" #define MSGTR_RADIO_SetMuteFailed "[radio] ioctl impostazione muto fallito: %s\n" @@ -1989,7 +1993,7 @@ static char help_text[]= // ass_bitmap.c #define MSGTR_LIBASS_FT_Glyph_To_BitmapError "[ass] Errore FT_Glyph_To_Bitmap %d \n" -#define MSGTR_LIBASS_UnsupportedPixelMode "[ass] Modalitŕ pixel non supportata: %d\n" +#define MSGTR_LIBASS_UnsupportedPixelMode "[ass] ModalitĂ pixel non supportata: %d\n" #define MSGTR_LIBASS_GlyphBBoxTooLarge "[ass] Glyph Bounding Box troppo ampio: %dx%dpx\n" // ass.c @@ -2002,19 +2006,19 @@ static char help_text[]= #define MSGTR_LIBASS_ErrorRecodingFile "[ass] errore ricodificando il file.\n" #define MSGTR_LIBASS_FopenFailed "[ass] ass_read_file(%s): fopen fallita\n" #define MSGTR_LIBASS_FseekFailed "[ass] ass_read_file(%s): fseek fallita\n" -#define MSGTR_LIBASS_RefusingToLoadSubtitlesLargerThan10M "[ass] ass_read_file(%s): Mi rifiuto di caricare sottotitoli piů grandi di 10M\n" +#define MSGTR_LIBASS_RefusingToLoadSubtitlesLargerThan10M "[ass] ass_read_file(%s): Mi rifiuto di caricare sottotitoli piĂš grandi di 10M\n" #define MSGTR_LIBASS_ReadFailed "Lettura fallita, %d: %s\n" #define MSGTR_LIBASS_AddedSubtitleFileMemory "[ass] Aggiunto file sottotitoli: <memoria> (%d stili, %d eventi)\n" #define MSGTR_LIBASS_AddedSubtitleFileFname "[ass] Added subtitle file: %s (%d stili, %d eventi)\n" #define MSGTR_LIBASS_FailedToCreateDirectory "[ass] Impossibile creare la directory %s\n" -#define MSGTR_LIBASS_NotADirectory "[ass] Non č una directory: %s\n" +#define MSGTR_LIBASS_NotADirectory "[ass] Non è una directory: %s\n" // ass_cache.c #define MSGTR_LIBASS_TooManyFonts "[ass] Troppi font\n" #define MSGTR_LIBASS_ErrorOpeningFont "[ass] Errore aprendo il font: %s, %d\n" // ass_fontconfig.c -#define MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne "[ass] fontconfig: Il font selezionato non č quello richiesto: '%s' != '%s'\n" +#define MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne "[ass] fontconfig: Il font selezionato non è quello richiesto: '%s' != '%s'\n" #define MSGTR_LIBASS_UsingDefaultFontFamily "[ass] fontconfig_select: Uso la famiglia di default dei font: (%s, %d, %d) -> %s, %d\n" #define MSGTR_LIBASS_UsingDefaultFont "[ass] fontconfig_select: Uso il font di default: (%s, %d, %d) -> %s, %d\n" #define MSGTR_LIBASS_UsingArialFontFamily "[ass] fontconfig_select: Uso la famiglia dei font 'Arial': (%s, %d, %d) -> %s, %d\n" @@ -2025,11 +2029,11 @@ static char help_text[]= #define MSGTR_LIBASS_FcDirScanFailed "[ass] FcDirScan fallita.\n" #define MSGTR_LIBASS_FcDirSave "[ass] FcDirSave fallita.\n" #define MSGTR_LIBASS_FcConfigAppFontAddDirFailed "[ass] FcConfigAppFontAddDir fallita\n" -#define MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed "[ass] Fontconfig disabilitato, sarŕ usato solo il font di default.\n" +#define MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed "[ass] Fontconfig disabilitato, sarĂ usato solo il font di default.\n" #define MSGTR_LIBASS_FunctionCallFailed "[ass] %s fallita\n" // ass_render.c -#define MSGTR_LIBASS_NeitherPlayResXNorPlayResYDefined "[ass] Non son definite PlayResX né PlayResY. Assumo 384x288.\n" +#define MSGTR_LIBASS_NeitherPlayResXNorPlayResYDefined "[ass] Non son definite PlayResX nĂŠ PlayResY. Assumo 384x288.\n" #define MSGTR_LIBASS_PlayResYUndefinedSettingY "[ass] PlayResY non definita, la imposto a %d.\n" #define MSGTR_LIBASS_PlayResXUndefinedSettingX "[ass] PlayResX non definita, la imposto a %d.\n" #define MSGTR_LIBASS_FT_Init_FreeTypeFailed "[ass] FT_Init_FreeType fallita.\n" @@ -2042,7 +2046,7 @@ static char help_text[]= #define MSGTR_LIBASS_NoStyleFound "[ass] Nessuno stile trovato!\n" #define MSGTR_LIBASS_EmptyEvent "[ass] Evento vuoto!\n" #define MSGTR_LIBASS_MAX_GLYPHS_Reached "[ass] Raggiunto MAX_GLYPHS: evento %d, inizio = %llu, durata = %llu\n Testo = %s\n" -#define MSGTR_LIBASS_EventHeightHasChanged "[ass] Attenzione! L'evento altezza č cambiato! \n" +#define MSGTR_LIBASS_EventHeightHasChanged "[ass] Attenzione! L'evento altezza è cambiato! \n" // ass_font.c #define MSGTR_LIBASS_GlyphNotFoundReselectingFont "[ass] Glifo 0x%X non trovato, seleziono un altro font per (%s, %d, %d)\n" @@ -2057,8 +2061,8 @@ static char help_text[]= #define MSGTR_TV_UnknownImageFormat ""\ "========================================================================\n"\ " ATTENZIONE: FORMATO IMMAGINE DI USCITA NON TESTATO O SCONOSCIUTO (0x%x)\n"\ -" CiĂ² potrebbe causare una riproduzione errata o bloccare il programma!\n"\ -" I bug report saranno ignorati! Dovresti riprovare con YV12 (che č lo\n"\ +" CiĂÂĂ² potrebbe causare una riproduzione errata o bloccare il programma!\n"\ +" I bug report saranno ignorati! Dovresti riprovare con YV12 (che è lo\n"\ " spazio colore di default) e leggere la documentazione!\n"\ "========================================================================\n" #define MSGTR_TV_SelectedNormId "Selezionato id norma: %d\n" @@ -2100,7 +2104,7 @@ static char help_text[]= #define MSGTR_TV_Bt848UnableToStopCapture "tvi_bsdbt848: Impossibile interrompere l'aquisizione. Errore: %s\n" #define MSGTR_TV_TTSupportedLanguages "Lingue del televideo utilizzabili:\n" #define MSGTR_TV_TTSelectedLanguage "Selezionata la lingua di default del televideo: %s\n" -#define MSGTR_TV_ScannerNotAvailableWithoutTuner "La scansione automatica canali non č disponibile senza un sintonizzatore\n" +#define MSGTR_TV_ScannerNotAvailableWithoutTuner "La scansione automatica canali non è disponibile senza un sintonizzatore\n" //tvi_dshow.c #define MSGTR_TVI_DS_UnableConnectInputVideoDecoder "Impossibile collegare al decodificatore video l'ingresso indicato. Errore:0x%x\n" @@ -2113,8 +2117,8 @@ static char help_text[]= #define MSGTR_TVI_DS_UnableGetDeviceName "tvi_dshow: Impossibile ricavare il nome per il dispositivo #%d\n" #define MSGTR_TVI_DS_UsingDevice "tvi_dshow: Uso il dispositivo #%d: %s\n" #define MSGTR_TVI_DS_DeviceName "tvi_dshow: Dispositivo #%d: %s\n" -#define MSGTR_TVI_DS_DirectGetFreqFailed "tvi_dshow: Impossibile ricavare direttamente la frequenza. Sarŕ usata la la tabella di sistema dei canali.\n" -#define MSGTR_TVI_DS_DirectSetFreqFailed "tvi_dshow: Impossibile impostare direttamente la frequenza. Sarŕ usata la la tabella di sistema dei canali.\n" +#define MSGTR_TVI_DS_DirectGetFreqFailed "tvi_dshow: Impossibile ricavare direttamente la frequenza. SarĂ usata la la tabella di sistema dei canali.\n" +#define MSGTR_TVI_DS_DirectSetFreqFailed "tvi_dshow: Impossibile impostare direttamente la frequenza. SarĂ usata la la tabella di sistema dei canali.\n" #define MSGTR_TVI_DS_SupportedNorms "tvi_dshow: norme disponibili:" #define MSGTR_TVI_DS_AvailableVideoInputs "tvi_dshow: ingressi video disponibili:" #define MSGTR_TVI_DS_AvailableAudioInputs "tvi_dshow: ingressi audio disponibili:" @@ -2127,14 +2131,14 @@ static char help_text[]= #define MSGTR_TVI_DS_WrongADeviceIndex "tvi_dshow: Indice di adevice errato: %d\n" #define MSGTR_TVI_DS_SamplerateNotsupported "tvi_dshow: Campionamento %d non supportato dal dispositivo. Provo con il primo disponibile.\n" -#define MSGTR_TVI_DS_VideoAdjustigNotSupported "tvi_dshow: Impostazione di luminositŕ/tonalitŕ/saturazione/contrasto non disponibile per il dispositivo\n" +#define MSGTR_TVI_DS_VideoAdjustigNotSupported "tvi_dshow: Impostazione di luminositĂ /tonalitĂ /saturazione/contrasto non disponibile per il dispositivo\n" #define MSGTR_TVI_DS_ChangingWidthHeightNotSupported "tvi_dshow: Modifica di larghezza/altezza video non disponibile per il dispositivo.\n" #define MSGTR_TVI_DS_SelectingInputNotSupported "tvi_dshow: Selezione della sorgente di acquisizione non disponibile per il dispositivo.\n" #define MSGTR_TVI_DS_FreqTableLoaded "tvi_dshow: caricata la tabella delle frequenze di sistema (%s) per la zona id=%d (canali:%d).\n" #define MSGTR_TVI_DS_ErrorParsingAudioFormatStruct "tvi_dshow: Impossibile interpretare la struttura del formato audio.\n" #define MSGTR_TVI_DS_ErrorParsingVideoFormatStruct "tvi_dshow: Impossibile interpretare la struttura del formato video.\n" -#define MSGTR_TVI_DS_UnableSetAudioMode "tvi_dshow: Impossibile impostare la modalitŕ audio %d. Errore:0x%x\n" +#define MSGTR_TVI_DS_UnableSetAudioMode "tvi_dshow: Impossibile impostare la modalitĂ audio %d. Errore:0x%x\n" #define MSGTR_TVI_DS_UnsupportedMediaType "tvi_dshow: Tipo di media non gestibile passato a %s\n" #define MSGTR_TVI_DS_UnableGetsupportedVideoFormats "tvi_dshow: Impossibile ricavare dal pin video i formati media supportati. Errore:0x%x\n" #define MSGTR_TVI_DS_UnableGetsupportedAudioFormats "tvi_dshow: Impossibile ricavare dal pin audio i formati media supportati. Errore:0x%x Disabilito l'audio.\n" diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h index f7355685a3..7fd1c0b2b2 100644 --- a/help/help_mp-ja.h +++ b/help/help_mp-ja.h @@ -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 diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h index 0fb904e0a8..6a9a13066f 100644 --- a/help/help_mp-ko.h +++ b/help/help_mp-ko.h @@ -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 diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h index 8d590ec552..fb0c6fc872 100644 --- a/help/help_mp-mk.h +++ b/help/help_mp-mk.h @@ -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 diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h index 003b0fb65e..dabb187f8e 100644 --- a/help/help_mp-nl.h +++ b/help/help_mp-nl.h @@ -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 diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index 2c1f9ef2b3..7bd652881e 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -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 diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h index 9d3481c16a..8cc56a1880 100644 --- a/help/help_mp-pt_BR.h +++ b/help/help_mp-pt_BR.h @@ -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 diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h index 61641ebf9e..7da2fbf5f0 100644 --- a/help/help_mp-ro.h +++ b/help/help_mp-ro.h @@ -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 diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index ff6f6f960f..bea7b2fbd9 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -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 diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h index 64b0bd8e81..ed54ec2492 100644 --- a/help/help_mp-sk.h +++ b/help/help_mp-sk.h @@ -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 diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h index 94d1f192c2..6ce5f43e13 100644 --- a/help/help_mp-sv.h +++ b/help/help_mp-sv.h @@ -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 diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 22a58bcd66..22488319fd 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -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 diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h index 9481918d12..564e4d3b2c 100644 --- a/help/help_mp-uk.h +++ b/help/help_mp-uk.h @@ -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 diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index 05e7ae8d36..f7305fef7a 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -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 diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index a1050cf5fa..d89c1701b9 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -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 diff --git a/input/input.c b/input/input.c index be272929a3..3802957178 100644 --- a/input/input.c +++ b/input/input.c @@ -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) diff --git a/libaf/af.c b/libaf/af.c index de84807875..06e2a065d2 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -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, diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c index 83b52093d9..3eb1c2a8bd 100644 --- a/libao2/ao_esd.c +++ b/libao2/ao_esd.c @@ -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 * diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 3e9f51725a..b1fb17ffde 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -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", diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 77dd8b61ad..38fad281be 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -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, diff --git a/libass/ass.c b/libass/ass.c index 3f78afa994..1ee81773b3 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -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); diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c index 9fb77a6924..3d85300d11 100644 --- a/libass/ass_bitmap.c +++ b/libass/ass_bitmap.c @@ -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) diff --git a/libass/ass_font.c b/libass/ass_font.c index f70b7c59e3..f2214a345d 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -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, diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 6cf59ff144..fa15087652 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -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) diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 83e6123543..e9a1ce1567 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -28,7 +28,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 2e56a93518..ae6d3943e0 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -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; diff --git a/libass/ass_render.c b/libass/ass_render.c index d6e94a7544..0ed4054ffa 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -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; diff --git a/libmenu/menu.c b/libmenu/menu.c index 9ceae087cb..cb02e5bb51 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -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); diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 0cbf35cf53..cb0af69afa 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -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; diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index eebcd298fe..6f37e27710 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -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; } diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 4a9bf313e2..cfc5dd26f8 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -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 } diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 28dc529318..23f19ac405 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -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 diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 9d8ce75af4..7a3e826e45 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -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; diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index e8c02798ab..1e23d2eced 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -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 diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index a79f7db490..33aa7b517a 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -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 } diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index af80a47a66..085e2b641b 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -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, diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 0228dc87f9..93bd1354a9 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -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; diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 99135db0c8..99aa134d92 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -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 diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index f31285bef2..d23459d3c7 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -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> diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index fe5697fc3d..d4e10d29b9 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -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 diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 6d27566d71..7c55ddcab7 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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 diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 5e5a54558f..db44a33ca4 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -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 diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 6ca9866ec3..203556bdda 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -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: diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 95348a8efa..0e7dfe618c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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 ) diff --git a/libvo/font_load.h b/libvo/font_load.h index 282c9cdc7c..38c1e321ec 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -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; diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index ee7c1dae9b..9d887573da 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -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) diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 9fe2777b4f..34eee958e3 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -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; diff --git a/libvo/sub.c b/libvo/sub.c index 58541bcbb9..c7d3fb516e 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -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: diff --git a/libvo/video_out.c b/libvo/video_out.c index e932e3c59c..90634fecab 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -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 diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index ca547f0e87..19d55da804 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -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 diff --git a/libvo/vo_dga.c b/libvo/vo_dga.c index 1aa0050337..3383a30df5 100644 --- a/libvo/vo_dga.c +++ b/libvo/vo_dga.c @@ -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) { diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 982a8eb265..69038ae0eb 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -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. diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index 58da54e8cb..869276d9c4 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -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. diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index f1431e227c..9d538a8447 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -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 diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index 485202d285..9cd0a1a008 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -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]; diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index 27f002e693..6499326189 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -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", diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 18eb397fbb..164d00b79d 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -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 { diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 4adc38be82..7bf359dc26 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -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"); } diff --git a/libvo/vo_wii.c b/libvo/vo_wii.c new file mode 100644 index 0000000000..bccf6f02ef --- /dev/null +++ b/libvo/vo_wii.c @@ -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; +} diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 4c2e1e5ff8..ac8c0191bd 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -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 diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 1e1edd91aa..0a91b57415 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -29,7 +29,7 @@ #include <X11/Xutil.h> #include <errno.h> -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA #include <X11/extensions/Xinerama.h> #endif diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 1a2f833913..38a3a585e6 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -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; diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index b7082ed44c..6dfd8a8cf4 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -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 diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 9e14eac9e7..7470034f24 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -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; diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 56d57c16c2..749e4f4364 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -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(); diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index da93ce571d..f95cbb60ad 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -213,6 +213,34 @@ static int vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,i return 0; } +static int vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y) +{ + uint8_t *src; + uint8_t *dest; + int i; + + /* Plane Y */ + dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y; + dest += dstrides.y*y + x; + src = image[0]; + for(i=0;i<h;i++){ + memcpy(dest,src,w); + src+=stride[0]; + dest += dstrides.y; + } + + /* Plane UV */ + dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.u; + dest += dstrides.u*y/2 + x; + src = image[1]; + for(i=0;i<h/2;i++){ + memcpy(dest,src,w); + src+=stride[1]; + dest+=dstrides.u; + } + return 0; +} + static int vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled); @@ -255,6 +283,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned lvo_mem = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y; apitch = vidix_play.dest.pitch.y-1; switch(vidix_play.fourcc){ + case IMGFMT_NV12: case IMGFMT_YV12: case IMGFMT_IYUV: case IMGFMT_I420: @@ -450,6 +479,7 @@ int vidix_init(unsigned src_width,unsigned src_height, switch(format) { + case IMGFMT_NV12: case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: @@ -496,6 +526,8 @@ int vidix_init(unsigned src_width,unsigned src_height, vo_server->draw_slice = vidix_draw_slice_420; else if (src_format == IMGFMT_YVU9 || src_format == IMGFMT_IF09) vo_server->draw_slice = vidix_draw_slice_410; + else if (src_format == IMGFMT_NV12) + vo_server->draw_slice = vidix_draw_slice_nv12; else vo_server->draw_slice = vidix_draw_slice_packed; } return 0; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index de3a8411fd..bb47a4b187 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -28,27 +28,27 @@ #include <X11/Xutil.h> #include <X11/Xatom.h> -#ifdef HAVE_XSS +#ifdef CONFIG_XSS #include <X11/extensions/scrnsaver.h> #endif -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS #include <X11/extensions/dpms.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 -#ifdef HAVE_XF86XK +#ifdef CONFIG_XF86XK #include <X11/XF86keysym.h> #endif -#ifdef HAVE_XV +#ifdef CONFIG_XV #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> @@ -82,7 +82,7 @@ char **vo_fstype_list; /* 1 means that the WM is metacity (broken as hell) */ int metacity_hack = 0; -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM XF86VidModeModeInfo **vidmodes = NULL; XF86VidModeModeLine modeline; #endif @@ -344,7 +344,7 @@ void update_xinerama_info(struct vo *vo) { struct MPOpts *opts = vo->opts; int screen = xinerama_screen; xinerama_x = xinerama_y = 0; -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA if (screen >= -1 && XineramaIsActive(vo->x11->display)) { XineramaScreenInfo *screens; @@ -427,7 +427,7 @@ int vo_init(struct vo *vo) init_atoms(vo->x11); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM { int clock; @@ -1600,7 +1600,7 @@ void xscreensaver_heartbeat(struct vo_x11_state *x11) static int xss_suspend(Display *mDisplay, Bool suspend) { -#ifndef HAVE_XSS +#ifndef CONFIG_XSS return 0; #else int event, error, major, minor; @@ -1626,7 +1626,7 @@ static void saver_on(Display * mDisplay) screensaver_off = 0; if (xss_suspend(mDisplay, False)) return; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if (dpms_disabled) { int nothing; @@ -1667,7 +1667,7 @@ static void saver_off(Display * mDisplay) screensaver_off = 1; if (xss_suspend(mDisplay, True)) return; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing)) { BOOL onoff; @@ -1739,7 +1739,7 @@ void vo_x11_selectinput_witherr(Display * display, Window w, } } -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM void vo_vm_switch(struct vo *vo, uint32_t X, uint32_t Y, int *modeline_width, int *modeline_height) { @@ -2035,7 +2035,7 @@ uint32_t vo_x11_get_equalizer(char *name, int *value) return VO_TRUE; } -#ifdef HAVE_XV +#ifdef CONFIG_XV int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char *name, int value) { XvAttribute *attributes; diff --git a/libvo/x11_common.h b/libvo/x11_common.h index fdd4336924..5602680257 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -140,7 +140,7 @@ int xv_test_ckm( void * arg ); void vo_x11_putkey(struct vo *vo, int key); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM void vo_vm_switch(struct vo *vo, uint32_t, uint32_t, int*, int*); void vo_vm_close(struct vo *vo); #endif diff --git a/mencoder.c b/mencoder.c index 7ea685ee24..4a8575e75d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -531,14 +531,14 @@ if (frameno_filename) { #endif // check font -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE init_freetype(); #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name); @@ -549,7 +549,7 @@ if (frameno_filename) { vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1); } #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG } #endif @@ -5,7 +5,7 @@ #include "config.h" -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #include <errno.h> extern char* get_term_charset(void); @@ -29,7 +29,7 @@ int mp_msg_level_all = MSGL_STATUS; int verbose = 0; int mp_msg_color = 0; int mp_msg_module = 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV char *mp_msg_charset = NULL; static char *old_charset = NULL; static iconv_t msgiconv; @@ -37,7 +37,7 @@ static iconv_t msgiconv; const char* filename_recode(const char* filename) { -#if !defined(HAVE_ICONV) || !defined(MSG_CHARSET) +#if !defined(CONFIG_ICONV) || !defined(MSG_CHARSET) return filename; #else static iconv_t inv_msgiconv = (iconv_t)(-1); @@ -73,7 +73,7 @@ void mp_msg_init(void){ verbose = atoi(env); for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2; mp_msg_levels[MSGT_IDENTIFY] = -1; // no -identify output by default -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV mp_msg_charset = getenv("MPLAYER_CHARSET"); if (!mp_msg_charset) mp_msg_charset = get_term_charset(); @@ -184,7 +184,7 @@ void mp_msg(int mod, int lev, const char *format, ... ){ guiMessageBox(lev, tmp); #endif -#if defined(HAVE_ICONV) && defined(MSG_CHARSET) +#if defined(CONFIG_ICONV) && defined(MSG_CHARSET) if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) { char tmp2[MSGSIZE_MAX]; size_t inlen = strlen(tmp), outlen = MSGSIZE_MAX; diff --git a/mpcommon.c b/mpcommon.c index 980da30d4e..c6a8559013 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -8,7 +8,7 @@ #include "libvo/video_out.h" #include "spudec.h" #include "vobsub.h" -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT #include "stream/tv.h" #endif #include "libavutil/intreadwrite.h" @@ -167,7 +167,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) { -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT tvi_handle_t* tvh=demuxer->priv; int page_changed; @@ -60,7 +60,7 @@ #include "libvo/font_load.h" #include "libvo/sub.h" -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #include "libvo/x11_common.h" #endif @@ -114,7 +114,7 @@ char *heartbeat_cmd; #include "stream/stream_radio.h" #endif -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN #include "stream/dvbin.h" #include "stream/cache2.h" #endif @@ -654,7 +654,7 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){ #ifdef WIN32 timeEndPeriod(1); #endif -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #ifdef CONFIG_GUI if ( !use_gui ) #endif @@ -668,7 +668,7 @@ void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc){ menu_uninit(); #endif -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE current_module="uninit_font"; if (mpctx->osd && mpctx->osd->sub_font != vo_font) free_font_desc(mpctx->osd->sub_font); @@ -712,14 +712,14 @@ static void child_sighandler(int x){ } #endif -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG static char *prog_path; static int crash_debug = 0; #endif static void exit_sighandler(int x){ static int sig_count=0; -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (!crash_debug || x != SIGTRAP) #endif ++sig_count; @@ -762,7 +762,7 @@ static void exit_sighandler(int x){ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE); default: mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH); -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (crash_debug) { int gdb_pid; mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); @@ -1004,7 +1004,7 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr subd = sub_read_file(filename, fps); #ifdef CONFIG_ASS if (ass_enabled) -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV asst = ass_read_file(ass_library, filename, sub_cp); #else asst = ass_read_file(ass_library, filename, 0); @@ -1121,7 +1121,7 @@ void init_vo_spudec(struct MPContext *mpctx) * make it all work is to use the builtin SDL-bootstrap code, which * will be done automatically by replacing our main() if we include SDL.h. */ -#if defined(__APPLE__) && defined(HAVE_SDL) +#if defined(__APPLE__) && defined(CONFIG_SDL) #include <SDL.h> #endif @@ -2580,7 +2580,7 @@ int gui_no_filename=0; mp_msg_init(); -#ifdef HAVE_X11 +#ifdef CONFIG_X11 mpctx->x11_state = vo_x11_init_state(); #endif struct MPOpts *opts = &mpctx->opts; @@ -2759,7 +2759,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ printf("\n"); opt_exit = 1; } -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){ fstype_help(); mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); @@ -2809,14 +2809,14 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ mpctx->osd = osd_create(); // check font -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE init_freetype(); #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont, @@ -2833,7 +2833,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ else mpctx->osd->sub_font = vo_font; #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG } #endif @@ -2920,7 +2920,7 @@ current_module = NULL; signal(SIGCHLD,child_sighandler); #endif -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG prog_path = argv[0]; #endif //========= Catch terminate signals: ================ @@ -2932,14 +2932,14 @@ current_module = NULL; signal(SIGQUIT,exit_sighandler); // Quit from keyboard signal(SIGPIPE,exit_sighandler); // Some window managers cause this -#ifdef ENABLE_SIGHANDLER +#ifdef CONFIG_SIGHANDLER // fatal errors: signal(SIGBUS,exit_sighandler); // bus error signal(SIGSEGV,exit_sighandler); // segfault signal(SIGILL,exit_sighandler); // illegal instruction signal(SIGFPE,exit_sighandler); // floating point exc. signal(SIGABRT,exit_sighandler); // abort() -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (crash_debug) signal(SIGTRAP,exit_sighandler); #endif @@ -3442,7 +3442,7 @@ if(mpctx->sh_video){ if(!mpctx->sh_video && !mpctx->sh_audio){ mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound); -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN if(mpctx->stream->type == STREAMTYPE_DVB) { int dir; @@ -3575,7 +3575,7 @@ if(!reinit_video_chain(mpctx)) { if(mpctx->sh_video->output_flags & 0x08 && vo_spudec) spudec_set_hw_spu(vo_spudec,mpctx->video_out); -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE force_load_font = 1; #endif @@ -3779,7 +3779,7 @@ if(!mpctx->sh_video) { current_module="vo_check_events"; vo_check_events(mpctx->video_out); -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (stop_xscreensaver) { current_module = "stop_xscreensaver"; xscreensaver_heartbeat(mpctx->x11_state); @@ -3952,7 +3952,7 @@ if(mpctx->rel_seek_secs || mpctx->abs_seek_pos){ mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",mpctx->eof); -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN if(mpctx->dvbin_reopen) { mpctx->eof = 0; diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c index 3b94b4d736..0b6e84683e 100644 --- a/osdep/getch2-os2.c +++ b/osdep/getch2-os2.c @@ -33,7 +33,7 @@ #include "mp_fifo.h" #include "getch2.h" -#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV) +#if defined(HAVE_LANGINFO) && defined(CONFIG_ICONV) #include <locale.h> #include <langinfo.h> #endif @@ -183,7 +183,7 @@ void getch2_disable( void ) getch2_status = 0; } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV char *get_term_charset( void ) { char *charset = NULL; diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index feaf5f74d9..49ec9c46b3 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -144,7 +144,7 @@ void getch2_disable(){ getch2_status=0; } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV static const struct { unsigned cp; char* alias; diff --git a/osdep/getch2.c b/osdep/getch2.c index c9cb4f6319..51ef8c77f0 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -28,7 +28,7 @@ #endif #endif -#if defined(HAVE_LANGINFO) && defined(HAVE_ICONV) +#if defined(HAVE_LANGINFO) && defined(CONFIG_ICONV) #include <locale.h> #include <langinfo.h> #endif @@ -271,7 +271,7 @@ void getch2_disable(void){ getch2_status=0; } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV char* get_term_charset(void) { char* charset = NULL; diff --git a/parser-mpcmd.c b/parser-mpcmd.c index cba28e538a..5d15dc3e55 100644 --- a/parser-mpcmd.c +++ b/parser-mpcmd.c @@ -76,7 +76,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) int no_more_opts = 0; int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything play_tree_t *last_parent, *last_entry = NULL, *root; -#ifdef MACOSX_FINDER_SUPPORT +#ifdef CONFIG_MACOSX_FINDER extern play_tree_t *macosx_finder_args(m_config_t *, int , char **); #endif @@ -88,7 +88,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv) config->mode = M_COMMAND_LINE; mode = GLOBAL; -#ifdef MACOSX_FINDER_SUPPORT +#ifdef CONFIG_MACOSX_FINDER root=macosx_finder_args(config, argc, argv); if(root) return root; diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index 6301711176..aaf43ff49a 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -46,10 +46,10 @@ #endif #ifndef CONFIG_SETLOCALE -#undef HAVE_ICONV +#undef CONFIG_ICONV #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #ifdef HAVE_LANGINFO #include <langinfo.h> @@ -143,13 +143,13 @@ static void send_command (int s, int command, uint32_t switches, } } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV static iconv_t url_conv; #endif static void string_utf16(char *dest, char *src, int len) { int i; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV size_t len1, len2; char *ip, *op; @@ -172,7 +172,7 @@ static void string_utf16(char *dest, char *src, int len) { /* trailing zeroes */ dest[i*2] = 0; dest[i*2+1] = 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV } #endif } @@ -575,7 +575,7 @@ int asf_mmst_streaming_start(stream_t *stream) * */ /* prepare for the url encoding conversion */ -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #ifdef HAVE_LANGINFO url_conv = iconv_open("UTF-16LE",nl_langinfo(CODESET)); #else @@ -691,7 +691,7 @@ int asf_mmst_streaming_start(stream_t *stream) packet_length1 = packet_length; mp_msg(MSGT_NETWORK,MSGL_INFO,"mmst packet_length = %d\n", packet_length); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (url_conv != (iconv_t)(-1)) iconv_close(url_conv); #endif diff --git a/stream/audio_in.c b/stream/audio_in.c index 2b2497a8d9..45b1e9b79d 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -23,7 +23,7 @@ int audio_in_init(audio_in_t *ai, int type) ai->samplesize = -1; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->alsa.handle = NULL; ai->alsa.log = NULL; @@ -45,7 +45,7 @@ int audio_in_setup(audio_in_t *ai) { switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai_alsa_init(ai) < 0) return -1; ai->setup = 1; @@ -65,7 +65,7 @@ int audio_in_setup(audio_in_t *ai) int audio_in_set_samplerate(audio_in_t *ai, int rate) { switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->req_samplerate = rate; if (!ai->setup) return 0; @@ -87,7 +87,7 @@ int audio_in_set_samplerate(audio_in_t *ai, int rate) int audio_in_set_channels(audio_in_t *ai, int channels) { switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->req_channels = channels; if (!ai->setup) return 0; @@ -108,12 +108,12 @@ int audio_in_set_channels(audio_in_t *ai, int channels) int audio_in_set_device(audio_in_t *ai, char *device) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA int i; #endif if (ai->setup) return -1; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai->alsa.device) free(ai->alsa.device); ai->alsa.device = strdup(device); @@ -138,7 +138,7 @@ int audio_in_uninit(audio_in_t *ai) { if (ai->setup) { switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai->alsa.log) snd_output_close(ai->alsa.log); @@ -162,7 +162,7 @@ int audio_in_uninit(audio_in_t *ai) int audio_in_start_capture(audio_in_t *ai) { switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: return snd_pcm_start(ai->alsa.handle); #endif @@ -180,7 +180,7 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) int ret; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); if (ret != ai->alsa.chunk_size) { diff --git a/stream/audio_in.h b/stream/audio_in.h index 735e9f4e0e..855d613964 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -6,7 +6,7 @@ #include "config.h" -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA #include <alsa/asoundlib.h> typedef struct { @@ -43,7 +43,7 @@ typedef struct int bytes_per_sample; int samplesize; -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA ai_alsa_t alsa; #endif #ifdef CONFIG_OSS_AUDIO @@ -60,7 +60,7 @@ int audio_in_uninit(audio_in_t *ai); int audio_in_start_capture(audio_in_t *ai); int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer); -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA int ai_alsa_setup(audio_in_t *ai); int ai_alsa_init(audio_in_t *ai); int ai_alsa_xrun(audio_in_t *ai); diff --git a/stream/cdd.h b/stream/cdd.h index 10fb64763f..1208684769 100644 --- a/stream/cdd.h +++ b/stream/cdd.h @@ -2,7 +2,7 @@ #define MPLAYER_CDD_H #include "config.h" -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO #include <cdda_interface.h> #include <cdda_paranoia.h> #else @@ -54,7 +54,7 @@ typedef struct { } cd_info_t; typedef struct { -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cd; cdrom_paranoia* cdp; #else diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index b438cac5f8..2235541fe1 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -34,7 +34,7 @@ #include <errno.h> #include "config.h" -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD #include <linux/dvb/dmx.h> #include <linux/dvb/frontend.h> #else @@ -50,7 +50,7 @@ int dvb_get_tuner_type(int fe_fd) { -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD struct dvb_frontend_info fe_info; #else FrontendInfo fe_info; @@ -98,7 +98,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt) int i; char frontend_dev[32], dvr_dev[32], demux_dev[32], sec_dev[32]; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD sprintf(frontend_dev, "/dev/dvb/adapter%d/frontend0", n); sprintf(dvr_dev, "/dev/dvb/adapter%d/dvr0", n); sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", n); @@ -114,7 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt) mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno); return 0; } -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD priv->sec_fd=0; #else priv->sec_fd = open(sec_dev, O_RDWR); @@ -159,7 +159,7 @@ int dvb_fix_demuxes(dvb_priv_t *priv, int cnt) int i; char demux_dev[32]; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD sprintf(demux_dev, "/dev/dvb/adapter%d/demux0", priv->card); #else sprintf(demux_dev, "/dev/ost/demux%d", priv->card); @@ -202,7 +202,7 @@ int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype) pesFilterParams.pid = pid; pesFilterParams.input = DMX_IN_FRONTEND; pesFilterParams.output = DMX_OUT_TS_TAP; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD pesFilterParams.pes_type = pestype; #else pesFilterParams.pesType = pestype; @@ -268,7 +268,7 @@ int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int to } -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD static int SecGetStatus (int fd, struct secStatus *state) { if(ioctl(fd, SEC_GET_STATUS, state) < 0) @@ -331,7 +331,7 @@ static void print_status(fe_status_t festatus) { mp_msg(MSGT_DEMUX, MSGL_V, "FE_STATUS:"); if (festatus & FE_HAS_SIGNAL) mp_msg(MSGT_DEMUX, MSGL_V," FE_HAS_SIGNAL"); -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD if (festatus & FE_TIMEDOUT) mp_msg(MSGT_DEMUX, MSGL_V, " FE_TIMEDOUT"); #else if (festatus & FE_HAS_POWER) mp_msg(MSGT_DEMUX, MSGL_V, " FE_HAS_POWER"); @@ -346,7 +346,7 @@ static void print_status(fe_status_t festatus) } -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD static int check_status(int fd_frontend, int tmout) { int32_t strength; @@ -500,7 +500,7 @@ static int check_status(int fd_frontend, int tmout) } #endif -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD struct diseqc_cmd { struct dvb_diseqc_master_cmd cmd; @@ -585,7 +585,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout) { int res, hi_lo, dfd; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD struct dvb_frontend_parameters feparams; struct dvb_frontend_info fe_info; #else @@ -608,14 +608,14 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int } -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD mp_msg(MSGT_DEMUX, MSGL_V, "Using DVB card \"%s\"\n", fe_info.name); #endif switch(fe_info.type) { case FE_OFDM: -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD if (freq < 1000000) freq*=1000UL; feparams.frequency=freq; feparams.inversion=specInv; @@ -646,7 +646,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int // this must be an absolute frequency if (freq < SLOF) { -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD freq = feparams.frequency=(freq-LOF1); #else freq = feparams.Frequency=(freq-LOF1); @@ -655,7 +655,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int } else { -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD freq = feparams.frequency=(freq-LOF2); #else freq = feparams.Frequency=(freq-LOF2); @@ -666,14 +666,14 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int else { // this is an L-Band frequency -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD feparams.frequency=freq; #else feparams.Frequency=freq; #endif } -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD feparams.inversion=specInv; feparams.u.qpsk.symbol_rate=srate; feparams.u.qpsk.fec_inner=HP_CodeRate; @@ -697,7 +697,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int break; case FE_QAM: mp_msg(MSGT_DEMUX, MSGL_V, "tuning DVB-C to %d, srate=%d\n",freq,srate); -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD feparams.frequency=freq; feparams.inversion=specInv; feparams.u.qam.symbol_rate = srate; @@ -724,7 +724,7 @@ static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int } usleep(100000); -#ifndef HAVE_DVB_HEAD +#ifndef CONFIG_DVB_HEAD if (fd_sec) SecGetStatus(fd_sec, &sec_state); while(1) { diff --git a/stream/dvbin.h b/stream/dvbin.h index c24832c4d2..172cd1299d 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -14,7 +14,7 @@ #define LOF1 (9750*1000UL) #define LOF2 (10600*1000UL) -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD #include <linux/dvb/dmx.h> #include <linux/dvb/frontend.h> #include <linux/dvb/version.h> diff --git a/stream/stream.c b/stream/stream.c index af43b6da69..47d55be71f 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -67,19 +67,19 @@ extern const stream_info_t stream_info_ifo; extern const stream_info_t stream_info_dvd; static const stream_info_t* const auto_open_streams[] = { -#ifdef HAVE_VCD +#ifdef CONFIG_VCD &stream_info_vcd, #endif -#ifdef HAVE_CDDA +#ifdef CONFIG_CDDA &stream_info_cdda, #endif -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK &stream_info_netstream, &stream_info_http1, &stream_info_asf, &stream_info_pnm, &stream_info_rtsp, -#ifdef STREAMING_LIVE555 +#ifdef CONFIG_LIVE555 &stream_info_sdp, &stream_info_rtsp_sip, #endif @@ -87,7 +87,7 @@ static const stream_info_t* const auto_open_streams[] = { &stream_info_udp, &stream_info_http2, #endif -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN &stream_info_dvb, #endif #ifdef CONFIG_TV @@ -96,16 +96,16 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_RADIO &stream_info_radio, #endif -#ifdef HAVE_PVR +#ifdef CONFIG_PVR &stream_info_pvr, #endif -#ifdef HAVE_FTP +#ifdef CONFIG_FTP &stream_info_ftp, #endif -#ifdef HAVE_VSTREAM +#ifdef CONFIG_VSTREAM &stream_info_vstream, #endif -#ifdef LIBSMBCLIENT +#ifdef CONFIG_LIBSMBCLIENT &stream_info_smb, #endif &stream_info_cue, @@ -151,7 +151,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename, s->flags |= mode; *ret = sinfo->open(s,mode,arg,file_format); if((*ret) != STREAM_OK) { -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if (*ret == STREAM_REDIRECTED && redirected_url) { if (s->streaming_ctrl && s->streaming_ctrl->url && s->streaming_ctrl->url->url) @@ -245,7 +245,7 @@ int stream_fill_buffer(stream_t *s){ if (/*s->fd == NULL ||*/ s->eof) { s->buf_pos = s->buf_len = 0; return 0; } switch(s->type){ case STREAMTYPE_STREAM: -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; } else { @@ -312,7 +312,7 @@ if(newpos==0 || newpos!=s->pos){ // Some streaming protocol allow to seek backward and forward // A function call that return -1 can tell that the protocol // doesn't support seeking. -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one if(!s->seek(s,newpos)) { mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); diff --git a/stream/stream.h b/stream/stream.h index e058dcfaf2..a2f78307de 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -65,7 +65,7 @@ #define STREAM_CTRL_GET_ANGLE 10 #define STREAM_CTRL_SET_ANGLE 11 -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK #include "network.h" #endif @@ -113,7 +113,7 @@ typedef struct stream { void* priv; // used for DVD, TV, RTSP etc char* url; // strdup() of filename/url struct MPOpts *opts; -#ifdef MPLAYER_NETWORK +#ifdef CONFIG_NETWORK streaming_ctrl_t *streaming_ctrl; #endif unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 00c8a4934e..fb6f2e9358 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -147,7 +147,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { struct cdda_params* p = (struct cdda_params*)opts; int mode = p->paranoia_mode; int offset = p->toc_offset; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdrom_drive* cdd = NULL; #else cdrom_drive_t* cdd = NULL; @@ -171,7 +171,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { p->device = strdup(DEFAULT_CDROM_DEVICE); } -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB // cdd_identify returns -1 if it cannot read the TOC, // in which case there is no point in calling cddb_resolve if(cdd_identify(p->device) >= 0 && strncmp(st->url,"cddb",4) == 0) { @@ -183,7 +183,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { } #endif -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO if(p->generic_dev) cdd = cdda_identify_scsi(p->generic_dev,p->device,0,NULL); else @@ -205,7 +205,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->sector_size) { cdd->nsectors = p->sector_size; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO cdd->bigbuff = p->sector_size * CD_FRAMESIZE_RAW; #endif } @@ -283,7 +283,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { if(p->no_skip) mode |= PARANOIA_MODE_NEVERSKIP; -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO paranoia_modeset(cdd, mode); if(p->search_overlap >= 0) @@ -298,7 +298,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { paranoia_seek(priv->cdp,priv->start_sector,SEEK_SET); priv->sector = priv->start_sector; -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB if(cddb_info) { cd_info_free(cd_info); priv->cd_info = cddb_info; @@ -324,7 +324,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) { return STREAM_OK; } -#ifndef HAVE_LIBCDIO +#ifndef CONFIG_LIBCDIO static void cdparanoia_callback(long inpos, int function) { #else static void cdparanoia_callback(long int inpos, paranoia_cb_mode_t function) { @@ -438,7 +438,7 @@ const stream_info_t stream_info_cdda = { "", open_cdda, { "cdda", -#ifdef HAVE_CDDB +#ifdef CONFIG_CDDB "cddb", #endif NULL }, diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index b65152f1e8..948bd70c81 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -288,7 +288,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type) ptr->cr =FEC_2_3; else if(! strcmp(cr, "FEC_3_4")) ptr->cr =FEC_3_4; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD else if(! strcmp(cr, "FEC_4_5")) ptr->cr =FEC_4_5; else if(! strcmp(cr, "FEC_6_7")) @@ -358,7 +358,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type) ptr->cr_lp =FEC_2_3; else if(! strcmp(tmp_lcr, "FEC_3_4")) ptr->cr_lp =FEC_3_4; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD else if(! strcmp(tmp_lcr, "FEC_4_5")) ptr->cr_lp =FEC_4_5; else if(! strcmp(tmp_lcr, "FEC_6_7")) @@ -381,7 +381,7 @@ static dvb_channels_list *dvb_get_channels(char *filename, int type) ptr->hier = HIERARCHY_2; else if(! strcmp(tmp_hier, "HIERARCHY_4")) ptr->hier = HIERARCHY_4; -#ifdef HAVE_DVB_HEAD +#ifdef CONFIG_DVB_HEAD else if(! strcmp(tmp_hier, "HIERARCHY_AUTO")) ptr->hier = HIERARCHY_AUTO; #endif @@ -611,7 +611,7 @@ static void dvbin_close(stream_t *stream) close(priv->dvr_fd); close(priv->fe_fd); -#ifdef HAVE_DVB +#ifdef CONFIG_DVB close(priv->sec_fd); #endif diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 68c5a29b45..f0b9745a5f 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -35,21 +35,21 @@ #include <errno.h> #include <unistd.h> -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 #include <sys/param.h> #ifdef IOCTL_BT848_H_NAME #include IOCTL_BT848_H_NAME #endif -#else // HAVE_RADIO_BSDBT848 +#else /* CONFIG_RADIO_BSDBT848 */ #include <linux/types.h> -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 #include <linux/videodev2.h> #endif -#ifdef HAVE_RADIO_V4L +#ifdef CONFIG_RADIO_V4L #include <linux/videodev.h> #warning "V4L is deprecated and will be removed in future" #endif @@ -91,7 +91,7 @@ typedef struct radio_channels_s { /// default values for options radio_param_t stream_radio_defaults={ -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 "/dev/tuner0", //device 87.50, //freq_min 108.00, //freq_max @@ -252,7 +252,7 @@ static int parse_channels(radio_priv_t* priv,float freq_channel,float* pfreq){ return STREAM_OK; } -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency * \return STREAM_OK if success, STREAM_ERROR otherwise @@ -409,8 +409,8 @@ static const radio_driver_t radio_driver_v4l2={ set_frequency_v4l2, get_frequency_v4l2 }; -#endif //HAVE_RADIO_V4L2 -#ifdef HAVE_RADIO_V4L +#endif /* CONFIG_RADIO_V4L2 */ +#ifdef CONFIG_RADIO_V4L /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency * \return STREAM_OK if success, STREAM_ERROR otherwise @@ -540,8 +540,8 @@ static const radio_driver_t radio_driver_v4l={ set_frequency_v4l, get_frequency_v4l }; -#endif //HAVE_RADIO_V4L -#ifdef HAVE_RADIO_BSDBT848 +#endif /* CONFIG_RADIO_V4L */ +#ifdef CONFIG_RADIO_BSDBT848 /***************************************************************** * \brief get fraction value for using in set_frequency and get_frequency @@ -652,7 +652,7 @@ static const radio_driver_t radio_driver_bsdbt848={ set_frequency_bsdbt848, get_frequency_bsdbt848 }; -#endif //HAVE_RADIO_BSDBT848 +#endif /* CONFIG_RADIO_BSDBT848 */ static inline int init_frac(radio_priv_t* priv){ return priv->driver->init_frac(priv); @@ -715,7 +715,7 @@ static int read_chunk(audio_in_t *ai, unsigned char *buffer) int ret; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: //device opened in non-blocking mode ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); @@ -836,7 +836,7 @@ static int init_audio(radio_priv_t *priv) priv->do_capture=1; mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_CaptureStarting); -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA while ((tmp = strrchr(priv->radio_param->adevice, '='))){ tmp[0] = ':'; //adevice option looks like ALSA device name. Switching to ALSA @@ -862,7 +862,7 @@ static int init_audio(radio_priv_t *priv) if(is_oss) ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0); #endif -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA if(!is_oss) snd_pcm_nonblock(priv->audio_in.alsa.handle,1); #endif @@ -1080,13 +1080,13 @@ static int fill_buffer_s(struct stream *s, char *buffer, int max_len){ when no driver explicitly specified first available will be used */ static const radio_driver_t* radio_drivers[]={ -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 &radio_driver_bsdbt848, #endif -#ifdef HAVE_RADIO_V4L2 +#ifdef CONFIG_RADIO_V4L2 &radio_driver_v4l2, #endif -#ifdef HAVE_RADIO_V4L +#ifdef CONFIG_RADIO_V4L &radio_driver_v4l, #endif 0 diff --git a/stream/stream_radio.h b/stream/stream_radio.h index 1c76cb9cc7..69066970e3 100644 --- a/stream/stream_radio.h +++ b/stream/stream_radio.h @@ -9,7 +9,7 @@ typedef struct radio_param_s{ /** name of radio device file */ char* device; -#ifdef HAVE_RADIO_BSDBT848 +#ifdef CONFIG_RADIO_BSDBT848 /** minimal allowed frequency */ float freq_min; /** maximal allowed frequency */ diff --git a/stream/tv.c b/stream/tv.c index 1d31f1daf7..58321d5302 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -49,16 +49,16 @@ extern const tvi_info_t tvi_info_bsdbt848; /** List of drivers in autodetection order */ static const tvi_info_t* tvi_driver_list[]={ -#ifdef HAVE_TV_V4L2 +#ifdef CONFIG_TV_V4L2 &tvi_info_v4l2, #endif -#ifdef HAVE_TV_V4L1 +#ifdef CONFIG_TV_V4L1 &tvi_info_v4l, #endif -#ifdef HAVE_TV_BSDBT848 +#ifdef CONFIG_TV_BSDBT848 &tvi_info_bsdbt848, #endif -#ifdef HAVE_TV_DSHOW +#ifdef CONFIG_TV_DSHOW &tvi_info_dshow, #endif &tvi_info_dummy, @@ -404,12 +404,12 @@ static int open_tv(tvi_handle_t *tvh) /* set some params got from cmdline */ funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input); -#if defined(HAVE_TV_V4L2) || defined(HAVE_TV_DSHOW) +#if defined(CONFIG_TV_V4L2) || defined(CONFIG_TV_DSHOW) if (0 -#ifdef HAVE_TV_V4L2 +#ifdef CONFIG_TV_V4L2 || (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0) #endif -#ifdef HAVE_TV_DSHOW +#ifdef CONFIG_TV_DSHOW || (!strcmp(tvh->tv_param->driver, "dshow") && tvh->tv_param->normid >= 0) #endif ) @@ -418,7 +418,7 @@ static int open_tv(tvi_handle_t *tvh) #endif tv_set_norm(tvh,tvh->tv_param->norm); -#ifdef HAVE_TV_V4L1 +#ifdef CONFIG_TV_V4L1 if ( tvh->tv_param->mjpeg ) { /* set width to expected value */ diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 3cf574cee4..438ce7288f 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -2306,7 +2306,7 @@ static int get_audio_framesize(priv_t * priv) return priv->chains[1]->rbuf->blocksize; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT static int vbi_get_props(priv_t* priv,tt_stream_props* ptsp) { if(!priv || !ptsp) @@ -2352,7 +2352,7 @@ static void vbi_grabber(priv_t* priv) } free(buf); } -#endif //HAVE_TV_TELETEXT +#endif /* CONFIG_TV_TELETEXT */ /** * \brief fills given buffer with video data (usually one frame) @@ -2397,7 +2397,7 @@ static double grab_video_frame(priv_t * priv, char *buffer, int len) rb->count--; LeaveCriticalSection(rb->pMutex); -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT vbi_grabber(priv); #endif return pts; @@ -2588,7 +2588,7 @@ static HRESULT build_audio_chain(priv_t *priv) */ static HRESULT build_vbi_chain(priv_t *priv) { -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT HRESULT hr; if(priv->chains[2]->rbuf) @@ -2944,7 +2944,7 @@ static int init(priv_t * priv) OLE_QUERYINTERFACE(priv->pBuilder,IID_IBaseFilter,pBF); OLE_CALL_ARGS(pBF,SetSyncSource,rc); } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT if(vbi_get_props(priv,&(priv->tsp))!=TVI_CONTROL_TRUE) break; #endif @@ -3017,7 +3017,7 @@ static int uninit(priv_t * priv) if (priv->dwRegister) { RemoveFromRot(priv->dwRegister); } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT teletext_control(priv->priv_vbi,TV_VBI_CONTROL_STOP,(void*)1); #endif //stop audio grabber thread @@ -3524,7 +3524,7 @@ static int control(priv_t * priv, int cmd, void *arg) case TVI_CONTROL_IMMEDIATE: priv->immediate_mode = 1; return TVI_CONTROL_TRUE; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT case TVI_CONTROL_VBI_INIT: { void* ptr; diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index 72af5c4d14..8979691776 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -141,7 +141,7 @@ typedef struct { long audio_recv_blocks_total; long audio_sent_blocks_total; long mjpeg_bufsize; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT char *vbi_dev; int vbi_fd; int vbi_bufsize; @@ -627,7 +627,7 @@ static int init(priv_t *priv) /* audio init */ if (!priv->tv_param->noaudio) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (priv->tv_param->alsa) audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); else @@ -675,7 +675,7 @@ static int uninit(priv_t *priv) { unsigned long num; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT priv->vbi_shutdown=1; if(priv->vbi_grabber_thread) pthread_join(priv->vbi_grabber_thread, NULL); @@ -781,7 +781,7 @@ static int get_capture_buffer_size(priv_t *priv) return cnt; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT static int vbi_init(priv_t* priv,char* device) { int vbi_fd=0; @@ -897,7 +897,7 @@ static void *vbi_grabber(void *data) free(buf); return NULL; } -#endif //HAVE_TV_TELETEXT +#endif /* CONFIG_TV_TELETEXT */ static int start(priv_t *priv) { @@ -1111,7 +1111,7 @@ static int start(priv_t *priv) ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT /* start vbi thread */ if(priv->priv_vbi){ priv->vbi_shutdown = 0; @@ -1511,7 +1511,7 @@ static int control(priv_t *priv, int cmd, void *arg) priv->immediate_mode = 1; return TVI_CONTROL_TRUE; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT case TVI_CONTROL_VBI_INIT: { void* ptr; diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 97bce47754..fc23727f9f 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -77,7 +77,7 @@ typedef struct { /* video */ char *video_dev; int video_fd; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT char *vbi_dev; int vbi_fd; int vbi_bufsize; @@ -378,7 +378,7 @@ static void init_audio(priv_t *priv) if (priv->audio_initialized) return; if (!priv->tv_param->noaudio) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (priv->tv_param->alsa) audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); else @@ -580,7 +580,7 @@ static int get_control(priv_t *priv, struct v4l2_control *control, int val_signe return TVI_CONTROL_TRUE; } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT static int vbi_init(priv_t* priv,char* device) { int vbi_fd=0; @@ -703,7 +703,7 @@ static void *vbi_grabber(void *data) free(buf); return NULL; } -#endif //HAVE_TV_TELETEXT +#endif /* CONFIG_TV_TELETEXT */ static int control(priv_t *priv, int cmd, void *arg) { @@ -1019,7 +1019,7 @@ static int control(priv_t *priv, int cmd, void *arg) if (audio_in_set_samplerate(&priv->audio_in, *(int*)arg) < 0) return TVI_CONTROL_FALSE; // setup_audio_buffer_sizes(priv); return TVI_CONTROL_TRUE; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT case TVI_CONTROL_VBI_INIT: { void* ptr; @@ -1086,7 +1086,7 @@ static int uninit(priv_t *priv) { int i, frames, dropped = 0; -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT priv->vbi_shutdown=1; if(priv->vbi_grabber_thread) pthread_join(priv->vbi_grabber_thread, NULL); @@ -1540,7 +1540,7 @@ static int start(priv_t *priv) } } -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT /* start vbi thread */ if(priv->priv_vbi){ priv->vbi_shutdown = 0; diff --git a/subreader.c b/subreader.c index 3d607a6a10..c64ff460cc 100644 --- a/subreader.c +++ b/subreader.c @@ -20,17 +20,17 @@ #include "subreader.h" #include "stream/stream.h" -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA #include <enca.h> #endif #define ERR ((void *) -1) -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> char *sub_cp=NULL; #endif -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI #include <fribidi/fribidi.h> char *fribidi_charset = NULL; ///character set that will be passed to FriBiDi int flip_hebrew = 1; ///flip subtitles using fribidi @@ -1071,7 +1071,7 @@ int sub_utf8_prev=0; extern float sub_delay; extern float sub_fps; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV static iconv_t icdsc = (iconv_t)(-1); void subcp_open (stream_t *st) @@ -1080,7 +1080,7 @@ void subcp_open (stream_t *st) if (sub_cp){ const char *cp_tmp = sub_cp; -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA char enca_lang[3], enca_fallback[100]; if (sscanf(sub_cp, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 || sscanf(sub_cp, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { @@ -1146,7 +1146,7 @@ subtitle* subcp_recode (subtitle *sub) } #endif -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI #ifndef max #define max(a,b) (((a)>(b))?(a):(b)) #endif @@ -1270,7 +1270,7 @@ struct subreader { const char *name; }; -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback) { const char **languages; @@ -1369,7 +1369,7 @@ sub_data* sub_read_file (char *filename, float fps) { stream_reset(fd); stream_seek(fd,0); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV sub_utf8_prev=sub_utf8; { int l,k; @@ -1389,7 +1389,7 @@ sub_data* sub_read_file (char *filename, float fps) { sub_num=0;n_max=32; first=malloc(n_max*sizeof(subtitle)); if(!first){ -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); sub_utf8=sub_utf8_prev; #endif @@ -1413,15 +1413,15 @@ sub_data* sub_read_file (char *filename, float fps) { memset(sub, '\0', sizeof(subtitle)); sub=srp->read(fd,sub); if(!sub) break; // EOF -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if ((sub!=ERR) && (sub_utf8 & 2)) sub=subcp_recode(sub); #endif -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI if (sub!=ERR) sub=sub_fribidi(sub,sub_utf8); #endif if ( sub == ERR ) { -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); #endif if ( first ) free(first); @@ -1474,7 +1474,7 @@ sub_data* sub_read_file (char *filename, float fps) { free_stream(fd); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); #endif @@ -1876,8 +1876,8 @@ char** sub_filenames(const char* path, char *fname) // does it end with a subtitle extension? found = 0; -#ifdef HAVE_ICONV -#ifdef HAVE_ENCA +#ifdef CONFIG_ICONV +#ifdef CONFIG_ENCA for (i = ((sub_cp && strncasecmp(sub_cp, "enca", 4) != 0) ? 3 : 0); sub_exts[i]; i++) { #else for (i = (sub_cp ? 3 : 0); sub_exts[i]; i++) { @@ -1931,7 +1931,7 @@ char** sub_filenames(const char* path, char *fname) if (prio) { prio += prio; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (i<3){ // prefer UTF-8 coded prio++; } diff --git a/subreader.h b/subreader.h index ce033618dd..b29551e3f9 100644 --- a/subreader.h +++ b/subreader.h @@ -71,7 +71,7 @@ subtitle* subcp_recode (subtitle *sub); struct stream; void subcp_open (struct stream *st); /* for demux_ogg.c */ void subcp_close (void); /* for demux_ogg.c */ -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA const char* guess_buffer_cp(unsigned char* buffer, int buflen, const char *preferred_language, const char *fallback); const char* guess_cp(struct stream *st, const char *preferred_language, const char *fallback); #endif diff --git a/vidix/fourcc.h b/vidix/fourcc.h index 3b4c7919b5..e2ce256cca 100644 --- a/vidix/fourcc.h +++ b/vidix/fourcc.h @@ -51,6 +51,7 @@ #define IMGFMT_YV12 vid_fourcc('Y','V','1','2') /* 12 YVU 4:2:0 */ #define IMGFMT_I420 vid_fourcc('I','4','2','0') /* 12 YUV 4:2:0 */ #define IMGFMT_IYUV vid_fourcc('I','Y','U','V') /* 12 YUV 4:2:0 */ +#define IMGFMT_NV12 vid_fourcc('N','V','1','2') #define IMGFMT_CLPL vid_fourcc('C','L','P','L') /* 12 */ #define IMGFMT_Y800 vid_fourcc('Y','8','0','0') /* 8 Y Grayscale */ #define IMGFMT_Y8 vid_fourcc('Y','8',' ',' ') /* 8 Y Grayscale */ diff --git a/vidix/radeon_vid.c b/vidix/radeon_vid.c index b72391b51d..d0bb5b878a 100644 --- a/vidix/radeon_vid.c +++ b/vidix/radeon_vid.c @@ -41,7 +41,7 @@ #include "dha.h" #include "radeon.h" -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) #include <X11/Xlib.h> static uint32_t firegl_shift = 0; #endif @@ -1168,7 +1168,7 @@ static vidix_capability_t def_cap = { 0, 0, 0, 0} }; -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) static void probe_fireGL_driver(void) { Display *dp = XOpenDisplay ((void*)0); int n = 0; @@ -1243,7 +1243,7 @@ static int radeon_probe(int verbose, int force) #endif besr.chip_flags=R_100|R_OVL_SHIFT; } -#if !defined(RAGE128) && defined(HAVE_X11) +#if !defined(RAGE128) && defined(CONFIG_X11) probe_fireGL_driver(); #endif if(idx != -1) besr.chip_flags=ati_card_ids[idx].flags; @@ -3098,7 +3098,7 @@ static int radeon_config_playback(vidix_playback_t *info) for(;nfr>0; nfr--) { radeon_overlay_off = radeon_video_size - info->frame_size*nfr; -#if !defined (RAGE128) && defined(HAVE_X11) +#if !defined (RAGE128) && defined(CONFIG_X11) radeon_overlay_off -= firegl_shift; #endif radeon_overlay_off &= 0xffff0000; @@ -3110,7 +3110,7 @@ static int radeon_config_playback(vidix_playback_t *info) for(;nfr>0; nfr--) { radeon_overlay_off = radeon_video_size - info->frame_size*nfr; -#if !defined (RAGE128) && defined(HAVE_X11) +#if !defined (RAGE128) && defined(CONFIG_X11) radeon_overlay_off -= firegl_shift; #endif radeon_overlay_off &= 0xffff0000; |