From: Sam Hocevar Date: Fri, 27 Jun 2003 13:50:13 +0000 (+0000) Subject: * bootstrap: X-Git-Tag: 0.6.1~277 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fe17002d429a3d681e191a1af4f6495bb317d5d6;p=vlc * bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level. --- diff --git a/.cvsignore b/.cvsignore index b021dd92e7..621c46b0bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,10 +15,11 @@ config.status confdefs.h conftest.cc autom4te.cache -Makefile Makefile.in +Makefile Modules.am build-stamp +configure-stamp stamp-h* aclocal.m4 vlc-debug.* diff --git a/HACKING b/HACKING index 2ee0317201..e5317f57a6 100644 --- a/HACKING +++ b/HACKING @@ -1,4 +1,4 @@ -$Id: HACKING,v 1.7 2003/06/21 17:04:20 sam Exp $ +$Id: HACKING,v 1.8 2003/06/27 13:50:07 sam Exp $ Hacking vlc =========== @@ -35,16 +35,19 @@ The bootstrap sequence The bootstrap script does the following actions: - - browse the modules/ directory for all available modules. A module "foo" - exists if there is a Modules.am file in the modules/ directory which - defines SOURCES_foo. + - parse configure.ac for all Makefiles in the modules/ directory that need + to be generated, and look for available modules in the corresponding + Modules.am file. A module "foo" exists if there is a Modules.am file in + the modules/ directory which defines SOURCES_foo. - create a top-level Modules.am file (which will be included by Makefile.am) which contains additional build rules for modules, and includes all the Modules.am files that were found in modules/ - - create an m4/vlc.m4 from configure.ac, generating the AC_SUBST and - AM_CONDITIONAL rules that will be needed by configure.ac. + - create an m4/private.m4 from configure.ac, generating m4 macros that will + be needed by configure.ac. + + - create a Makefile.am file for each Modules.am file found in modules/ . - run autopoint (previously gettextize) to create an intl/ directory, needed when libgettext is not available. diff --git a/Makefile.am b/Makefile.am index b2a111b221..81e1042037 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ NULL = # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. -SUBDIRS = po intl m4 share +SUBDIRS = intl . share po m4 DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools EXTRA_DIST = \ @@ -20,25 +20,15 @@ EXTRA_DIST = \ install-win32 \ src/extras/COPYING \ toolbox \ + vlc-config.in.in \ vlc.ebuild \ vlc.spec \ vlc.spec.redhat \ $(NULL) -MOSTLYCLEANFILES = BUILT_SOURCES = SUFFIXES = -# List of programs, libraries and headers that need to be built and/or -# distributed. Initialized to empty because we'll use += later. -bin_PROGRAMS = - -lib_LIBRARIES = -libvlc_LIBRARIES = -noinst_LIBRARIES = - -noinst_HEADERS = - # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 @@ -46,103 +36,8 @@ ACLOCAL_AMFLAGS = -I m4 # because old versions of automake don't support them in configure.ac. AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects -############################################################################### -# Compilation flags for debug mode, profiling, and others -############################################################################### - -# Standard flags used everywhere to build things in the distribution. Some -# of them are empty but might be extended later in the Makefile. *_default -# is the default flag list for all files in the distribution, for instance -# the vlc code. *_pic is for PIC code, such as the Mozilla plugin. *_plugin -# is for plugin code, *_builtin is for builtin code, and *_builtin_pic is -# for PIC builtin code, for instance builtin modules in the mozilla plugin. - -CPPFLAGS_default = -I$(top_srcdir)/include -CFLAGS_default = -CXXFLAGS_default = -OBJCFLAGS_default = -LDFLAGS_default = $(LDFLAGS_gprof) - -CPPFLAGS_pic = $(CPPFLAGS_default) -CFLAGS_pic = $(CFLAGS_default) @CFLAGS_pics@ -CXXFLAGS_pic = $(CXXFLAGS_default) @CFLAGS_pics@ -OBJCFLAGS_pic = $(OBJCFLAGS_default) @CFLAGS_pics@ -LDFLAGS_pic = $(LDFLAGS_default) - -CPPFLAGS_plugin = $(CPPFLAGS_default) -D__VLC__ -D__PLUGIN__ -CFLAGS_plugin = $(CFLAGS_default) @CFLAGS_plugins@ -CXXFLAGS_plugin = $(CXXFLAGS_default) @CFLAGS_plugins@ -OBJCFLAGS_plugin = $(OBJCFLAGS_default) @CFLAGS_plugins@ -LDFLAGS_plugin = @LDFLAGS_plugins@ - -CPPFLAGS_builtin = $(CPPFLAGS_default) -D__VLC__ -D__BUILTIN__ -CFLAGS_builtin = $(CFLAGS_default) @CFLAGS_builtins@ -CXXFLAGS_builtin = $(CXXFLAGS_default) @CFLAGS_builtins@ -OBJCFLAGS_builtin = $(OBJCFLAGS_default) @CFLAGS_builtins@ -LDFLAGS_builtin = -L_builtin = - -CPPFLAGS_builtin_pic = $(CPPFLAGS_builtin) $(CPPFLAGS_pic) -CFLAGS_builtin_pic = $(CFLAGS_builtin) $(CFLAGS_pic) -CXXFLAGS_builtin_pic = $(CXXFLAGS_builtin) $(CXXFLAGS_pic) -OBJCFLAGS_builtin_pic = $(OBJCFLAGS_builtin) $(OBJCFLAGS_pic) -LDFLAGS_builtin_pic = $(LDFLAGS_builtin) $(LDFLAGS_pic) -L_builtin_pic = - -# On Linux and Solaris, activate 64-bit off_t (by default under BSD) -CPPFLAGS_default += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -CPPFLAGS_default += -D_REENTRANT -D_THREAD_SAFE -CPPFLAGS_default += -D_GNU_SOURCE - -# Gettext support -CPPFLAGS_default += -DLOCALEDIR=\"$(datadir)/locale\" - -# Data and plugin location -CPPFLAGS_default += -DDATA_PATH=\"@prefix@/share/vlc\" -CPPFLAGS_default += -DPLUGIN_PATH=\"@prefix@/lib/vlc\" - -# Conditional flags that get added to *FLAGS_default -if RELEASE -CPPFLAGS_release = -DHAVE_RELEASE -endif -if DEBUG -CPPFLAGS_debug = -DDEBUG -CFLAGS_debug = -g -endif -if GPROF -CPPFLAGS_gprof = -DGPROF -CFLAGS_gprof = -pg -LDFLAGS_gprof = -pg -endif -if CPROF -CPPFLAGS_cprof = -DCPROF -CFLAGS_cprof = -finstrument-functions -endif -if OPTIM -CFLAGS_optim = @CFLAGS_OPTIM@ @CFLAGS_TUNING@ -if DEBUG -else -if GPROF -else -if CPROF -else -CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ -endif -endif -endif -else -# !OPTIM -CFLAGS_optim = @CFLAGS_NOOPTIM@ -endif - -CPPFLAGS_default += $(CPPFLAGS_release) \ - $(CPPFLAGS_debug) $(CPPFLAGS_gprof) $(CPPFLAGS_cprof) -CFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) -CXXFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) -OBJCFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) +# Don't forget to build plugins +all: plugins ############################################################################### # Headers @@ -166,7 +61,7 @@ dist_pkginclude_HEADERS = \ include/vlc/intf.h \ $(NULL) -noinst_HEADERS += $(HEADERS_include) $(HEADERS_include_built) +noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built) HEADERS_include = \ include/aout_internal.h \ @@ -215,13 +110,13 @@ HEADERS_include_built = \ $(NULL) include/vlc_symbols.h: Makefile $(HEADERS_include) - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + cd $(srcdir) && $(srcdir)/toolbox --update-includes src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + cd $(srcdir) && $(srcdir)/toolbox --update-includes src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + cd $(srcdir) && $(srcdir)/toolbox --update-includes # These dependencies are mandatory $(SOURCES): include/vlc_symbols.h @@ -325,18 +220,18 @@ dist-hook: bin_SCRIPTS = vlc-config -lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic) +lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic) lib_libvlc_a_SOURCES = $(SOURCES_libvlc) dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h -lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@ -lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default) -lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default) +lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` +lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc) -lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@ -lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic) -lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic) +lib_libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` +lib_libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` +lib_libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` if HAVE_BEOS OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) @@ -445,32 +340,25 @@ SOURCES_libvlc = \ # Building vlc ############################################################################### -bin_PROGRAMS += vlc +bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c -# @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin) -# but we don't write it directly, otherwise automake will go amok and eat all -# the memory because of its 2^N crap algorithm. So we fool him. Nuahaha. -vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \ - $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@ -vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default) +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` +vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) +vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an # old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl) +DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) builtins vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f $(srcdir)/vlc$(EXEEXT) -if HAVE_BEOS - $(CXXLINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) -else -if HAVE_DARWIN - $(CXXLINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) -else - $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) -endif -endif + case `$(VLC_CONFIG) --linkage vlc builtin` in \ + c++) $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ + objc) $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ + c|*) $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ + esac if HAVE_BEOS xres -o $@ $(srcdir)/share/vlc_beos.rsrc @@ -483,28 +371,34 @@ if HAVE_BEOS done endif -# Install the symlinks +# Install the modules and the symlinks install-exec-local: + for i in dummy `$(srcdir)/vlc-config --target plugin` ; do if test "x$$i" != "xdummy" ; then \ + $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`/" ; \ + fi ; done + for i in dummy `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test "x$$i" != "xdummy" ; then \ + $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc/" ; \ + fi ; done for i in dummy $(ALIASES) ; do if test "x$$i" != "xdummy" ; then \ - rm -f $(DESTDIR)$(bindir)/$$i && \ - ln -s vlc $(DESTDIR)$(bindir)/$$i ; \ + rm -f "$(DESTDIR)$(bindir)/$$i" && \ + ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = VLC.app vlc_appdir = $(bindir) -VLC.app: vlc $(PLUGIN_FILES) +VLC.app: vlc plugins rm -Rf VLC.app cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules - for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ - $(INSTALL) $(srcdir)/$$i \ - $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \ - fi ; done + for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \ + if test "x$$i" != "xdummy" ; then $(INSTALL) $(srcdir)/$$i$(LIBEXT) \ + $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \ + fi ; done $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \ $(srcdir)/VLC.app/Contents/MacOS/share @@ -528,6 +422,18 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@ endif +############################################################################### +# Building modules +############################################################################### +plugins: FORCE + $(MAKE) `$(VLC_CONFIG) --target plugin` FORCE + +builtins: FORCE + $(MAKE) `$(VLC_CONFIG) --target builtin` FORCE + +builtins_pic: FORCE + $(MAKE) `$(VLC_CONFIG) --target builtin pic` FORCE + ############################################################################### # Building architecture-specific binary packages ############################################################################### @@ -555,9 +461,10 @@ package-win32: unix2dos $(srcdir)/tmp/$${file}.txt ; done mkdir $(srcdir)/tmp/plugins - for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ - $(INSTALL) $(srcdir)/$$i $(srcdir)/tmp/plugins/ ; \ - fi ; done + for i in dummy `$(srcdir)/vlc-config --target plugin` ; do \ + if test "x$$i" != "xdummy" ; then \ + $(INSTALL) $(srcdir)/$$i$(LIBEXT) $(srcdir)/tmp/plugins/ ; \ + fi ; done for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done @@ -652,9 +559,9 @@ package-macosx: # Building the Mozilla plugin ############################################################################### -noinst_LIBRARIES += $(noinst_LIBRARIES_mozilla) +noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla) -MOSTLYCLEANFILES += $(LIBRARIES_mozilla) +MOSTLYCLEANFILES = $(LIBRARIES_mozilla) EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl @@ -695,13 +602,11 @@ noinst_LIBRARIES_mozilla = mozilla/libplugin.a endif mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) -mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \ +mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \ $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \ +mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc) +mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic BUILT_SOURCES_mozilla = mozilla/vlcintf.h $(SOURCES_mozilla): mozilla/vlcintf.h @@ -709,11 +614,10 @@ $(SOURCES_mozilla): mozilla/vlcintf.h mozilla_plugin_DATA = $(LIBRARIES_mozilla) mozilla_plugindir = $(libdir)/mozilla/plugins $(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \ - $(mozilla_libplugin_a_DEPENDENCIES) \ - $(L_builtin_pic) + $(mozilla_libplugin_a_DEPENDENCIES) $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ - lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \ - $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic) + lib/libvlc_pic.a -shared \ + `$(VLC_CONFIG) --libs vlc mozilla builtin pic` mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt mozilla_vlcintf_xptdir = $(libdir)/mozilla/components @@ -737,11 +641,6 @@ endif ############################################################################### # Modules ############################################################################### -MOSTLYCLEANFILES += $(PLUGIN_FILES) -PLUGIN_FILES = - -libvlcdir = $(libdir)/vlc - include Modules.am ############################################################################### diff --git a/bootstrap b/bootstrap index fc7f4c3bb9..f8cc45a8fe 100755 --- a/bootstrap +++ b/bootstrap @@ -1,14 +1,14 @@ #! /bin/sh ## bootstrap file for the VLC media player -## $Id: bootstrap,v 1.51 2003/06/23 10:21:25 sam Exp $ +## $Id: bootstrap,v 1.52 2003/06/27 13:50:07 sam Exp $ ## -## Authors: Samuel Hocevar +## Authors: Sam Hocevar -if test x$# != x0; then - echo "Usage: ./bootstrap" - echo " Calls automake, autoconf, autoheader, autopoint and other auto* to build" - echo " Makefiles." +if test "$#" != "0"; then + echo "Usage: $0" + echo " Calls automake, autoconf, autoheader, autopoint and other auto* to generate" + echo " m4 macros and prepare Makefiles." exit 1 fi @@ -23,147 +23,203 @@ export CYGWIN ## ## Naively assume our system doesn't suck. Unfortunately it seldom doesn't. ## -SEDSUCKS=no -PERLSUCKS=no AUTOMAKESUCKS=no INSTALLSUCKS=no ## ## Check that our tools don't suck ## -if test ! 20000 -eq `perl -e 'printf "%s\n","a"x20000' | sed -e 's/.//' 2>/dev/null | wc -c` -then - SEDSUCKS=yes -fi - -# Mac OS X stacksize sucks -if test x`uname -s` = xDarwin; then ulimit -s 20000; fi ## ## Generate the modules makefile, by parsing modules/**/Modules.am ## -printf "generating Modules.am and vlc.m4" +printf "generating modules/**/Makefile.am and m4/private.m4" -# Prepare Modules.am and m4/vlc.m4 +# Prepare Modules.am and m4/private.m4 rm -f Modules.am && echo > Modules.am -rm -f m4/vlc.m4 && cat > m4/vlc.m4 << EOF +rm -f m4/private.m4 && cat > m4/private.m4 << EOF dnl Private VLC macros - generated by bootstrap -dnl The required AM_CONDITIONAL an AC_SUBST calls -AC_DEFUN([VLC_VARIABLES], [ EOF - -ALL_FLAGS="`sed -n -e '/^[^=A-Z]*[A-Z]*FLAGS_[^=]*=/s/[^=A-Z]*\([A-Z]*FLAGS_[^=]*=\).*/\1/p' < configure.ac | sort | uniq`" +rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF +dnl The required AM_CONDITIONAL calls +dnl XXX: too many conditionals make the build very slow, disabled them +AC_DEFUN([AX_VLC_CONDITIONALS], [ +EOF +rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF +dnl The required AC_SUBST calls +AC_DEFUN([AX_VLC_SUBSTS], [ +EOF +rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF +dnl The required AC_OUTPUT calls +dnl XXX: this feature is only supported starting from automake-1.7 +AC_DEFUN([AX_VLC_MAKEFILES], [AC_OUTPUT([ +EOF +rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF +dnl Helper macro for vlc-config generation +AC_DEFUN([AX_VLC_CONFIG_HELPER], [ + cat >> vlc-config.in << BLAH +EOF modules="" -for mf in `sed -ne 's@[^a-z]*\([^ ]*\)am.*@modules/\1am@p' < modules/Makefile.am` -do - printf "." - dir=`echo ${mf} | sed -e 's@\(.*\)/.*@\1@'` - topdir=`echo ${dir} | cut -f2 -d/` - sym=`echo ${dir} | sed -e 'y@/@_@'` - cat >> Modules.am << EOF -# Directory ${dir} +count=0 -include ${dir}/Modules.am +rm -f modules/Makefile.am && cat > modules/Makefile.am << EOF +# Autogenerated by bootstrap - DO NOT EDIT +EXTRA_DIST = LIST +SUBDIRS = . +DIST_SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs` +EOF +for dir in `sed -ne 's,\(modules/.*\)/Makefile,\1,p' configure.ac` +do + printf "." + mf="${dir}/Modules.am" + basedir="`echo ${dir} | cut -f2 -d/`" + # automake will not recurse for make dist if we don't define SUBDIRS = . + subdirs="`sed -ne 's,'${dir}'/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`" + #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'` + #echo " ${dir}/Makefile" >> m4/private.m4-tmp3 + rm -f ${dir}/Makefile.am && cat > ${dir}/Makefile.am << EOF + +# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead + +NULL = +libvlc_LIBRARIES = +noinst_LIBRARIES = +noinst_HEADERS = +EXTRA_DIST = Modules.am +BUILT_SOURCES = +SUBDIRS = . +DIST_SUBDIRS = ${subdirs} +libvlcdir = \$(libdir)/vlc/${basedir} +include Modules.am EOF - sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod + for mod in `sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf}` do - LINKER="LINK" - if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then - echo "AC_SUBST(CPPFLAGS_${mod})" >> m4/vlc.m4; fi - if echo "$ALL_FLAGS" | grep '^CFLAGS_'${mod}'=$' >/dev/null 2>&1; then - echo "AC_SUBST(CFLAGS_${mod})" >> m4/vlc.m4; fi - if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then - LINKER="CXXLINK" - echo "AC_SUBST(CXXFLAGS_${mod})" >> m4/vlc.m4; fi - if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then - LINKER="OBJCLINK" - echo "AC_SUBST(OBJCFLAGS_${mod})" >> m4/vlc.m4; fi - if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then - echo "AC_SUBST(LDFLAGS_${mod})" >> m4/vlc.m4; fi + count="`expr ${count} + 1`" if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < ${mf} >/dev/null 2>&1; then PRIVATE='#'; else PRIVATE=''; fi if grep '^nodist_SOURCES_'${mod}'' < ${mf} >/dev/null 2>&1; then NODIST=''; else NODIST='#'; fi - cat >> m4/vlc.m4 << EOF -AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes) -AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes) +# cat >> m4/private.m4-tmp1 << EOF +#dnl AM_CONDITIONAL(${mod}_p, test x\$${mod}_p = xyes) +#dnl AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes) +#EOF + cat >> Modules.am << EOF +${dir}/lib${mod}_plugin: ${dir}/lib${mod}_plugin\$(LIBEXT) +${dir}/lib${mod}_plugin\$(LIBEXT): include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}_plugin\$(LIBEXT) +${dir}/lib${mod}.a: include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}.a +${dir}/lib${mod}_pic.a: include/vlc_symbols.h FORCE + cd ${dir} && \$(MAKE) lib${mod}_pic.a + +EOF + cat >> m4/private.m4-tmp4 << EOF + ${mod}) list="\\\${list} ${dir}/lib${mod}" ;; EOF -# Generation of Modules.am -# ~~~~~~~~~~~~~~~~~~~~~~~~ +# Generation of modules/**/Makefile.am +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # - L_ is for LIBRARIES_, D_ for DATA_, B_ for BUILT_SOURCES_, F_ for LDFLAGS_, # S_ for SOURCES_, _p is for _plugin, _b is for _builtin. This is to reduce # the resulting file size. -# - *_CFLAGS, *_CXXFLAGS etc. include *_CPPFLAGS because per-object CPPFLAGS -# does not seem to work properly with any automake version I tested. - cat >> Modules.am << EOF +# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to +# work properly with any automake version I tested. + cat >> ${dir}/Makefile.am << EOF # The ${mod} plugin -if ${mod}_p if UNTRUE -L_${mod}_p = ${dir}/lib${mod}_plugin.a -endif -D_${mod}_p = ${dir}/lib${mod}_plugin\$(LIBEXT) -${NODIST}B_${mod}_p = \$(nodist_SOURCES_${mod}) -endif -if ${mod}_b -L_${mod}_b = ${dir}/lib${mod}.a -F_${mod}_b = \$(LDFLAGS_${mod}) -if BUILD_MOZILLA -L_${mod}_pic = ${dir}/lib${mod}_pic.a -endif -${NODIST}B_${mod}_b = \$(nodist_SOURCES_${mod}) +L${count}p = lib${mod}_plugin.a +D${count}p = lib${mod}_plugin\$(LIBEXT) +L${count}b = lib${mod}.a +L${count}pic = lib${mod}_pic.a +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +B${count}p = \$(nodist_SOURCES_${mod}) +B${count}b = \$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF endif -L_builtin += \$(L_${mod}_b) -L_builtin_pic += \$(L_${mod}_pic) -LDFLAGS_builtin += \$(F_${mod}_b) -${PRIVATE}BUILT_SOURCES += \$(B_${mod}_p) \$(B_${mod}_b) -PLUGIN_FILES += \$(D_${mod}_p) - -${PRIVATE}${sym}_lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) -${NODIST}${PRIVATE}nodist_${sym}_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) -${sym}_lib${mod}_plugin_a_CPPFLAGS = \$(CPPFLAGS_plugin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod} -${sym}_lib${mod}_plugin_a_CFLAGS = \$(CFLAGS_plugin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS) -${sym}_lib${mod}_plugin_a_CXXFLAGS = \$(CXXFLAGS_plugin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS) -${sym}_lib${mod}_plugin_a_OBJCFLAGS = \$(OBJCFLAGS_plugin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_plugin_a_CPPFLAGS) - -${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) -${NODIST}nodist_${sym}_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) -${sym}_lib${mod}_pic_a_CPPFLAGS = \$(CPPFLAGS_builtin_pic) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod} -${sym}_lib${mod}_pic_a_CFLAGS = \$(CFLAGS_builtin_pic) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS) -${sym}_lib${mod}_pic_a_CXXFLAGS = \$(CXXFLAGS_builtin_pic) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS) -${sym}_lib${mod}_pic_a_OBJCFLAGS = \$(OBJCFLAGS_builtin_pic) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_pic_a_CPPFLAGS) - -${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) -${NODIST}nodist_${sym}_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) -${sym}_lib${mod}_a_CPPFLAGS = \$(CPPFLAGS_builtin) \$(CPPFLAGS_${mod}) -DMODULE_NAME=${mod} -DMODULE_NAME_IS_${mod} -${sym}_lib${mod}_a_CFLAGS = \$(CFLAGS_builtin) \$(CFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS) -${sym}_lib${mod}_a_CXXFLAGS = \$(CXXFLAGS_builtin) \$(CXXFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS) -${sym}_lib${mod}_a_OBJCFLAGS = \$(OBJCFLAGS_builtin) \$(OBJCFLAGS_${mod}) \$(${sym}_lib${mod}_a_CPPFLAGS) - -libvlc_LIBRARIES += \$(L_${mod}_b) \$(L_${mod}_pic) -lib${mod}_DATA = \$(D_${mod}_p) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\` +lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\` +lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\` + +lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\` +lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\` +lib${mod}_pic_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin pic ${mod}\` + +lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod}) +EOF + if [ "${NODIST}" != "#" ]; then cat >> ${dir}/Makefile.am << EOF +nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod}) +EOF + fi + cat >> ${dir}/Makefile.am << EOF +lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\` +lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\` +lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\` + +libvlc_LIBRARIES += \$(L${count}b) \$(L${count}pic) +lib${mod}_DATA = \$(D${count}p) lib${mod}dir = \$(libdir)/vlc/${topdir} -${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p) -${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS) -${PRIVATE} \$(${LINKER}) \$(${sym}_lib${mod}_plugin_a_OBJECTS) \$(LDFLAGS_plugins) \$(LDFLAGS_${mod}) +${PRIVATE}noinst_LIBRARIES += \$(L${count}p) +${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS) +${PRIVATE} case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\ +${PRIVATE} c++) \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} objc) \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} c|*) \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\ +${PRIVATE} esac EOF done done -cat >> m4/vlc.m4 << EOF -AM_CONDITIONAL(UNTRUE, false) +cat >> m4/private.m4-tmp1 << EOF + AM_CONDITIONAL(UNTRUE, false) +]) +EOF +cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1 +cat >> m4/private.m4-tmp2 << EOF +]) +EOF +cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2 +cat >> m4/private.m4-tmp3 << EOF +])]) +EOF +cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3 +cat >> m4/private.m4-tmp4 << EOF +BLAH ]) EOF +cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4 echo "done." @@ -185,12 +241,10 @@ rm -f m4/oldgettext.m4 ABOUT-NLS rm -Rf intl # Check for gettext -if gettextize --version >/dev/null 2>&1 -then +if gettextize --version >/dev/null 2>&1; then # Autopoint is available from 0.11.3, but we need 0.11.5 if expr `gettextize --version | sed -e '1s/[^0-9]*//' -e q` \ - '>=' 0.11.5 >/dev/null 2>&1 -then + '>=' 0.11.5 >/dev/null 2>&1; then # We have gettext, and a recent version! Everything is cool. autopoint || exit 1 GETTEXT=yes @@ -199,7 +253,7 @@ else echo > ABOUT-NLS mkdir -p intl echo > intl/Makefile.am - cat >> m4/vlc.m4 << EOF + cat >> m4/private.m4 << EOF dnl User's gettext is too old, so this is a no-op AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) @@ -210,7 +264,7 @@ fi;else echo > ABOUT-NLS mkdir -p intl echo > intl/Makefile.am - cat >> m4/vlc.m4 << EOF + cat >> m4/private.m4 << EOF dnl User does not have gettext, so this is a no-op AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) @@ -219,13 +273,12 @@ EOF fi # Check for pkg-config -if pkg-config --version >/dev/null 2>&1 -then +if pkg-config --version >/dev/null 2>&1; then # We have pkg-config, everything is cool. PKGCONFIG=yes else # Not present, use a workaround. - cat >> m4/vlc.m4 << EOF + cat >> m4/private.m4 << EOF dnl User does not have pkg-config, so this is a no-op AC_DEFUN([PKG_CHECK_MODULES], []) @@ -235,81 +288,55 @@ fi # Check for automake amvers="none" -if automake-1.7 --version >/dev/null 2>&1 -then +if automake-1.7 --version >/dev/null 2>&1; then amvers="-1.7" -else - if automake-1.6 --version >/dev/null 2>&1 - then - amvers="-1.6" - if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1 - then AUTOMAKESUCKS=yes - fi - else - if automake-1.5 --version >/dev/null 2>&1 - then - INSTALLSUCKS=yes - amvers="-1.5" - else - if automake --version > /dev/null 2>&1 - then - amvers=`automake --version | sed -e '1s/[^0-9]*//' -e q` - case $amvers in - 1.6|1.6.0|1.6.1) - AUTOMAKESUCKS=yes ;; - 1.5|1.5.*) - INSTALLSUCKS=yes ;; - esac - - if expr "$amvers" "<" "1.5" > /dev/null 2>&1 - then amvers="none" - else amvers="" - fi - fi + # If we also have 1.6, use it instead because it is faster + if automake-1.6 --version >/dev/null 2>&1; then + if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1 + then amvers="-1.6" fi fi +elif automake-1.6 --version >/dev/null 2>&1; then + amvers="-1.6" + if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1 + then AUTOMAKESUCKS=yes + fi +elif automake-1.5 --version >/dev/null 2>&1; then + INSTALLSUCKS=yes + amvers="-1.5" +elif automake --version > /dev/null 2>&1; then + amvers="" + case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in + 0|0.*|1|1.[01234]|1.[01234].*) + amvers="none" ;; + 1.5|1.5.*) + INSTALLSUCKS=yes ;; + 1.6|1.6.0|1.6.1) + AUTOMAKESUCKS=yes ;; + esac fi -if test x$amvers = xnone -then +if test "${amvers}" = "none"; then set +x echo "you need automake version 1.5 or later" exit 1 fi +# Automake complains if this is not present +rm -f vlc-config.in && printf "" > vlc-config.in + # Do the rest aclocal${amvers} -I m4 || exit 1 autoheader || exit 1 -automake${amvers} --add-missing --copy || PERLSUCKS=yes - -case "$PERLSUCKS" in - no) - ;; - yes) - set +x - cat << EOF - -======================================================================= -IMPORTANT NOTE: automake failed, please check the error messages. If it -actually segfaulted, it might be because of insufficient stack size; set -the stack size to something bigger or unlimited (\`unlimit stacksize') -and try again. -EOF - exit 1 - ;; -esac - -# Wrap automake's long lines, because the Solaris sed doesn't support lines -# longer than 3999 characters, and ./configure calls sed. We use Perl instead -# of sed for obvious reasons :) -perl -ne 'if(/^.{500}/) {s/(.{200}[^ ]* )/$1\\\n\t/g} print $_' < Makefile.in > Makefile.in.tmp && mv Makefile.in.tmp Makefile.in +automake${amvers} --add-missing --copy autoconf || exit 1 ## -## headers which need to be regenerated +## files which need to be regenerated ## +rm -f vlc-config.in vlc-config rm -f src/misc/modules_builtin.h src/misc/modules_plugin.h rm -f include/vlc_symbols.h rm -f mozilla/vlcintf.h @@ -322,7 +349,7 @@ set +x ## ## Tell the user about gettext, pkg-config and sed ## -case "$GETTEXT" in +case "${GETTEXT}" in yes) ;; no) @@ -390,18 +417,3 @@ EOF ;; esac -case "$SEDSUCKS" in - no) - ;; - yes) - cat << EOF - -============================================================= -IMPORTANT NOTE: the version of 'sed' on your system is unable -to handle long lines. bootstrap will try its best to generate -a correct Makefile, but you should expect problems. We highly -recommend installing GNU sed. -EOF - ;; -esac - diff --git a/configure.ac b/configure.ac index bac6fca6bf..62839885b4 100644 --- a/configure.ac +++ b/configure.ac @@ -18,11 +18,7 @@ AM_CONFIG_HEADER(config.h) dnl dnl Save *FLAGS dnl -CPPFLAGS_save="${CPPFLAGS}" -CFLAGS_save="${CFLAGS}" -CXXFLAGS_save="${CXXFLAGS}" -OBJCFLAGS_save="${OBJCFLAGS}" -LDFLAGS_save="${LDFLAGS}" +AX_SAVE_FLAGS dnl dnl Check for tools @@ -82,10 +78,7 @@ case "${target_os}" in bsdi*) SYS=bsdi CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" - LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd" - LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvd" - LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd" - LDFLAGS_cdda="${LDFLAGS_cdda} -ldvd" + AX_ADD_LDFLAGS([dvd dvdcss vcd cdda],[-ldvd]) ;; *bsd*) SYS="${target_os}" @@ -96,8 +89,7 @@ case "${target_os}" in CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" - LDFLAGS_vlc="${LDFLAGS_vlc} -all_load" - LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load" + AX_ADD_LDFLAGS([vlc ffmpeg],[-all_load]) LIBEXT=".dylib" ;; *mingw32* | *cygwin*) @@ -121,26 +113,14 @@ case "${target_os}" in if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long" - CPPFLAGS="${CPPFLAGS_save}" - LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -lwinmm -mwindows" - LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32" - LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32" - LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32" - LDFLAGS_access_mms="${LDFLAGS_access_mms} -lws2_32" - LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32" - LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32" - LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32" - LDFLAGS_sap="${LDFLAGS_sap} -lws2_32" - LDFLAGS_slp="${LDFLAGS_slp} -lws2_32" - LDFLAGS_http="${LDFLAGS_http} -lws2_32" - LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32" + CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" + AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) + AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd],[-lws2_32]) fi ;; *nto*) SYS=nto - LDFLAGS_x11="${LDFLAGS_x11} -lsocket" - LDFLAGS_xvideo="${LDFLAGS_xvideo} -lsocket" + AX_ADD_LDFLAGS([x11 xvideo],[-lsocket]) ;; solaris*) SYS=solaris @@ -153,15 +133,12 @@ case "${target_os}" in SYS=beos CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" - LDFLAGS_vlc="${LDFLAGS_vlc} -lbe" - CXXFLAGS_beos="${CXXFLAGS_beos}" - LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -ltranslation -ltracker -lgame" + AX_ADD_LDFLAGS([vlc beos],[-lbe]) + AX_ADD_CXXFLAGS([beos],[]) + AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame]) dnl Check if we have BONE (old net_server doesn't have libsocket.so) - AC_CHECK_LIB( socket, connect, - LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket -lbind" - LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket -lbind" - LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind" - LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind" ) + AC_CHECK_LIB(socket, connect, + AX_ADD_LDFLAGS([vlc access_mms ipv4 httpd],[-lsocket -lbind])) ;; *) SYS="${target_os}" @@ -183,7 +160,7 @@ if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then else AC_CHECK_FUNCS(textdomain,,[ AC_CHECK_LIB(intl,textdomain, - LDFLAGS_vlc="${LDFLAGS_vlc} ${LIBINTL}",, + AX_ADD_LDFLAGS([vlc],[${LIBINTL}]),, ${LIBINTL} ) ]) @@ -198,9 +175,8 @@ dnl Check for the need to include the mingwex lib for mingw32 if test "${SYS}" = "mingw32" then AC_CHECK_LIB(mingwex,opendir, - AC_CHECK_LIB(mingw32,opendir,LDFLAGS_vlc="${LDFLAGS_vlc}", - [LDFLAGS_vlc="${LDFLAGS_vlc} -lmingwex" - LDFLAGS_gtk="${LDFLAGS_gtk} -lmingwex"]) + AC_CHECK_LIB(mingw32,opendir,AX_ADD_LDFLAGS([vlc],[]), + [AX_ADD_LDFLAGS([vlc gtk],[-lmingwex])]) ) fi @@ -241,29 +217,22 @@ AC_LANG_PUSH(C++) CXXFLAGS_mingw32_special="-fvtable-thunks" fi - CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}" - CXXFLAGS="${CXXFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"; CXXFLAGS="${CXXFLAGS_save}" AC_LANG_POP(C++) fi dnl Flags for plugin compilation case "${SYS}" in mingw32|cygwin) - CFLAGS_pics="${CFLAGS_pics} ${CFLAGS_mingw32_special}" - CXXFLAGS_pics="${CXXFLAGS_pics} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}" - OBJCFLAGS_pics="${OBJCFLAGS_pics} ${CFLAGS_mingw32_special}" - CFLAGS_plugins="${CFLAGS_plugins} ${CFLAGS_mingw32_special}" - CXXFLAGS_plugins="${CXXFLAGS_plugins} ${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}" - OBJCFLAGS_plugins="${OBJCFLAGS_plugins} ${CFLAGS_mingw32_special}" + AX_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) + AX_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) + AX_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) ;; *) - CFLAGS_pics="${CFLAGS_pics} -fPIC" - CXXFLAGS_pics="${CXXFLAGS_pics} -fPIC" - OBJCFLAGS_pics="${OBJCFLAGS_pics} -fPIC" - CFLAGS_plugins="${CFLAGS_plugins} -fPIC" - CXXFLAGS_plugins="${CXXFLAGS_plugins} -fPIC" - OBJCFLAGS_plugins="${OBJCFLAGS_plugins} -fPIC" - LDFLAGS_plugins="${LDFLAGS_plugins} -fPIC" + AX_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC]) + AX_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC]) + AX_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC]) + AX_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC]) ;; esac @@ -281,25 +250,25 @@ AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(connect,,[ - AC_CHECK_LIB(socket,connect, - LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket" - LDFLAGS_vlc="${LDFLAGS_vlc} -lsocket" -)]) + AC_CHECK_LIB(socket,connect,[ + AX_ADD_LDFLAGS([vlc ipv4],-lsocket) + ]) +]) AC_CHECK_FUNCS(send,,[ - AC_CHECK_LIB(socket,send, - LDFLAGS_access_http="${LDFLAGS_access_http} -lsocket" - LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket" - LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket" - LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket" - LDFLAGS_sap="${LDFLAGS_sap} -lsocket" - LDFLAGS_http="${LDFLAGS_http} -lsocket" - LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket" -)]) + AC_CHECK_LIB(socket,send,[ + AX_ADD_LDFLAGS([access_http access_mms access_udp access_ftp sap http access_output_udp],[-lsocket]) + ]) +]) AC_CHECK_FUNCS(gethostbyname,,[ - AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl" LDFLAGS_httpd="${LDFLAGS_httpd} -lnsl" LDFLAGS_vlc="${LDFLAGS_vlc} -lnsl",[ - AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind" LDFLAGS_httpd="${LDFLAGS_httpd} -lbind")]) + AC_CHECK_LIB(nsl,gethostbyname,[ + AX_ADD_LDFLAGS([ipv4 httpd vlc],[-lnsl]) + ],[ + AC_CHECK_LIB(bind,gethostbyname,[ + AX_ADD_LDFLAGS([ipv4 httpd],[-lbind]) + ]) + ]) ]) dnl Check for socklen_t @@ -335,7 +304,9 @@ if test "${ac_cv_c___va_copy}" = "yes"; then fi AC_CHECK_FUNCS(inet_aton,,[ - AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv" LDFLAGS_httpd="${LDFLAGS_httpd} -lresolv") + AC_CHECK_LIB(resolv,inet_aton,[ + AX_ADD_LDFLAGS([ipv4 httpd],[-lresolv]) + ]) ]) dnl Check for getopt @@ -343,30 +314,25 @@ need_getopt=false AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [ # FreeBSD has a gnugetopt library for this: AC_CHECK_LIB([gnugetopt],[getopt_long], - [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) LDFLAGS_vlc="${LDFLAGS_vlc} -lgnugetopt"], + [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) + AX_ADD_LDFLAGS([vlc],[-lgnugetopt])], [need_getopt=:])]) AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) if test "${SYS}" != "mingw32"; then AC_TYPE_SIGNAL -AC_CHECK_LIB(dl,dlopen,LDFLAGS_vlc="${LDFLAGS_vlc} -ldl") -AC_CHECK_LIB(m,cos, - LDFLAGS_imdct="${LDFLAGS_imdct} -lm" - LDFLAGS_adjust="${LDFLAGS_adjust} -lm" - LDFLAGS_distort="${LDFLAGS_distort} -lm" - LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -lm") -AC_CHECK_LIB(m,pow, - LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lm" - LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -lm" - LDFLAGS_imdct="${LDFLAGS_imdct} -lm" - LDFLAGS_imdct3dn="${LDFLAGS_imdct3dn} -lm" - LDFLAGS_imdctsse="${LDFLAGS_imdctsse} -lm" - LDFLAGS_i420_rgb="${LDFLAGS_i420_rgb} -lm" - LDFLAGS_faad="${LDFLAGS_faad} -lm" -) -AC_CHECK_LIB(m,sqrt, - LDFLAGS_headphone_channel_mixer="${LDFLAGS_headphone_channel_mixer} -lm" -) +AC_CHECK_LIB(dl,dlopen,[ + AX_ADD_LDFLAGS([vlc],[-ldl]) +]) +AC_CHECK_LIB(m,cos,[ + AX_ADD_LDFLAGS([imdct adjust distort a52tofloat32],[-lm]) +]) +AC_CHECK_LIB(m,pow,[ + AX_ADD_LDFLAGS([ffmpeg stream_out_transcode imdct imdct3dn imdctsse i420_rgb faad],[-lm]) +]) +AC_CHECK_LIB(m,sqrt,[ + AX_ADD_LDFLAGS([headphone_channel_mixer],[-lm]) +]) fi # end "${SYS}" != "mingw32" if test "${SYS}" != "mingw32"; then @@ -427,20 +393,19 @@ AC_ARG_ENABLE(st, fi ]) -LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}" -LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}" +AX_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) dnl Don't link with rt when using GNU-pth if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"]) + AC_CHECK_LIB(rt,sem_init, [AX_ADD_LDFLAGS([vlc],[-lrt])]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ AC_CHECK_LIB(rt,nanosleep, - [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:], + [AX_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:], [AC_CHECK_LIB(posix4,nanosleep, - [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])] + [AX_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])] ) ]) if ${have_nanosleep}; then @@ -674,7 +639,7 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], if test "${ac_cv_c_omit_frame_pointer}" != "no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" # this plugin does not compile without -fomit-frame-pointer, damn gcc! - CFLAGS_i420_yuy2_mmx="${CFLAGS_i420_yuy2_mmx} -fomit-frame-pointer" + AX_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer]) fi dnl Check for -mdynamic-no-pic @@ -683,8 +648,8 @@ AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic], [CFLAGS="${CFLAGS_save} -mdynamic-no-pic" AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)]) if test "${ac_cv_c_dynamic_no_pic}" != "no"; then - CFLAGS_builtins="${CFLAGS_builtins} -mdynamic-no-pic" - CFLAGS_libvlc="${CFLAGS_libvlc} -mdynamic-no-pic" + AX_ADD_CFLAGS([builtin],[-mdynamic-no-pic]) + AX_ADD_CFLAGS([libvlc],[-mdynamic-no-pic]) fi dnl Check for Darwin plugin linking flags @@ -693,21 +658,21 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], [CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test "${ac_cv_ld_darwin}" != "no"; then - LDFLAGS_plugins="${LDFLAGS_plugins} -bundle -undefined error -lcc_dynamic" + AX_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic]) fi dnl Check for standard plugin linking flags dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning) if test "${SYS}" = "beos"; then - LDFLAGS_plugins="${LDFLAGS_plugins} -nostart" + AX_ADD_LDFLAGS([plugin mozilla],[-nostart]) else - AC_CACHE_CHECK([if \$CC accepts -shared], - [ac_cv_ld_plugins], - [CFLAGS="${CFLAGS_save} -shared" - AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) - if test "${ac_cv_ld_plugins}" != "no"; then - LDFLAGS_plugins="${LDFLAGS_plugins} -shared" - fi + AC_CACHE_CHECK([if \$CC accepts -shared], + [ac_cv_ld_plugins], + [CFLAGS="${CFLAGS_save} -shared" + AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) + if test "${ac_cv_ld_plugins}" != "no"; then + AX_ADD_LDFLAGS([plugin mozilla],[-shared]) + fi fi dnl Check for variadic macros @@ -767,7 +732,7 @@ esac case "${ARCH}" in hppa64) - CFLAGS_mpeg_video_old="${CFLAGS_mpeg_video_old} -ffunction-sections" + AX_ADD_CFLAGS([mpeg_video_old],[-ffunction-sections]) ;; esac @@ -778,29 +743,29 @@ AC_ARG_ENABLE(gprof, [ --enable-gprof gprof profiling (default disabled)]) AC_ARG_ENABLE(cprof, [ --enable-cprof cprof profiling (default disabled)]) -AM_CONDITIONAL(GPROF, test "${enable_gprof}" = "yes") -AM_CONDITIONAL(CPROF, test "${enable_gprof}" = "yes") +test "${enable_gprof}" != "yes" && enable_gprof="no" +test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -#BUILTINS="${BUILTINS} mpeg_video_old idct idctclassic motion" -PLUGINS="${PLUGINS} dummy rc logger gestures memcpy" -PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv" -PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak" -PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur" -PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32" -PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler bandlimited_resampler" -PLUGINS="${PLUGINS} trivial_channel_mixer headphone_channel_mixer" -PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer" -PLUGINS="${PLUGINS} aout_file" -#PLUGINS="${PLUGINS} scope" -PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga" -PLUGINS="${PLUGINS} id3 m3u" -PLUGINS="${PLUGINS} rawvideo" -PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au" -PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms" -PLUGINS="${PLUGINS} access_ftp access_directory sap httpd http" +#AX_ADD_BUILTINS([mpeg_video_old idct idctclassic motion]) +AX_ADD_PLUGINS([dummy rc logger gestures memcpy]) +AX_ADD_PLUGINS([es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv]) +AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak]) +AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur]) +AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32]) +AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler]) +AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer]) +AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer]) +AX_ADD_PLUGINS([aout_file]) +#AX_ADD_PLUGINS([scope]) +AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga]) +AX_ADD_PLUGINS([id3 m3u]) +AX_ADD_PLUGINS([rawvideo]) +AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys au]) +AX_ADD_PLUGINS([access_file access_udp access_http ipv4 access_mms]) +AX_ADD_PLUGINS([access_ftp access_directory sap httpd http]) dnl dnl Switch to enable a version of VLC where most modules will be builtin @@ -808,7 +773,7 @@ dnl AC_ARG_ENABLE(mostly-builtin, [ --enable-mostly-builtin most modules will be built-in (default disabled)]) if test "${enable_mostly_builtin}" = "yes"; then - BUILTINS="${BUILTINS} ${PLUGINS}" + AX_ADD_BUILTINS([${PLUGINS}]) PLUGINS="" fi @@ -816,7 +781,7 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32"; then - PLUGINS="${PLUGINS} screensaver" + AX_ADD_PLUGINS([screensaver]) fi dnl @@ -888,10 +853,10 @@ AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], if test "${ac_cv_altivec_inline}" != "no"; then AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.) if test "${ac_cv_altivec_inline}" != "yes"; then - CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_altivec_inline}" - CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_altivec_inline}" - CFLAGS_memcpyaltivec="${CFLAGS_memcpyaltivec} ${ac_cv_altivec_inline}" - CFLAGS_vlc="${CFLAGS_vlc} ${ac_cv_altivec_inline}" + AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) + AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) + AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) + AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}]) fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -910,10 +875,7 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], CFLAGS="${CFLAGS_save}"]) if test "${ac_cv_c_altivec}" != "no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) - CFLAGS_idctaltivec="${CFLAGS_idctaltivec} ${ac_cv_c_altivec}" - CFLAGS_motionaltivec="${CFLAGS_motionaltivec} ${ac_cv_c_altivec}" - CFLAGS_memcpyaltivec="${CFLAGS_memcpyaltivec} ${ac_cv_c_altivec}" - CFLAGS_vlc="${CFLAGS_vlc} ${ac_cv_c_altivec}" + AX_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[${ac_cv_c_altivec}]) ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -924,10 +886,7 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS="${LDFLAGS_save}" ]) if test "${ac_cv_ld_altivec}" != "no"; then - LDFLAGS_idctaltivec="${LDFLAGS_idctaltivec} -framework vecLib" - LDFLAGS_motionaltivec="${LDFLAGS_motionaltivec} -framework vecLib" - LDFLAGS_memcpyaltivec="${LDFLAGS_memcpyaltivec} -framework vecLib" - LDFLAGS_vlc="${LDFLAGS_vlc} -framework vecLib" + AX_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) fi fi # end "${SYS}" != "mingw32" @@ -959,7 +918,7 @@ dnl if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "x86" -o "${target_cpu}" = "i386" then ARCH="${ARCH} mmx" - BUILTINS="${BUILTINS} ${ACCEL_MODULES}" + AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi dnl @@ -967,7 +926,7 @@ dnl Enable/disable optimizations dnl AC_ARG_ENABLE(optimizations, [ --disable-optimizations disable compiler optimizations (default enabled)]) -AM_CONDITIONAL(OPTIM, test "${enable_optimizations}" != "no") +test "${enable_optimizations}" != "no" && enable_optimizations="yes" dnl dnl AltiVec acceleration @@ -975,23 +934,23 @@ dnl AC_ARG_ENABLE(altivec, [ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], [ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ], + AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ], [ if test "${target_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; - BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ]) + AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ]) dnl dnl Debugging mode dnl AC_ARG_ENABLE(debug, [ --enable-debug debug mode (default disabled)]) -AM_CONDITIONAL(DEBUG, test "${enable_debug}" = "yes") +test "${enable_debug}" != "yes" && enable_debug="no" dnl dnl Enable release-specific flags dnl AC_ARG_ENABLE(release, [ --enable-release activate extra optimizations (default disabled)]) -AM_CONDITIONAL(RELEASE, test "${enable_release}" = "yes") +test "${enable_release}" != "yes" && enable_release="no" dnl dnl Stream output @@ -1000,14 +959,14 @@ AC_ARG_ENABLE(sout, [ --enable-sout Stream output modules (default enabled)]) if test "${enable_sout}" != "no" then - PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file access_output_http" - PLUGINS="${PLUGINS} mux_ts mux_ps mux_avi mux_dummy" - PLUGINS="${PLUGINS} packetizer_mpegaudio packetizer_mpegvideo packetizer_a52" - PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_mpeg4audio" - PLUGINS="${PLUGINS} packetizer_copy" + AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http]) + AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_dummy]) + AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo packetizer_a52]) + AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) + AX_ADD_PLUGINS([packetizer_copy]) - PLUGINS="${PLUGINS} stream_out_dummy stream_out_standard stream_out_es" - PLUGINS="${PLUGINS} stream_out_duplicate stream_out_display" + AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es]) + AX_ADD_PLUGINS([stream_out_duplicate stream_out_display]) dnl Ogg and vorbis are handled in their respective section fi @@ -1035,9 +994,8 @@ then if test "${with_dvdcss_tree}" = "" then AC_CHECK_HEADERS(dvdcss/dvdcss.h, - [ PLUGINS="${PLUGINS} dvd" - LDFLAGS_dvd="${LDFLAGS_dvd} -ldvdcss" - LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvdcss" ], + [ AX_ADD_PLUGINS([dvd]) + AX_ADD_LDFLAGS([dvd dvdcss],[-ldvdcss])], [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) AC_MSG_ERROR([cannot find libdvdcss headers]) ]) else @@ -1053,10 +1011,9 @@ then then dnl Use a custom libdvdcss AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) - BUILTINS="${BUILTINS} dvd" - LDFLAGS_dvd="${LDFLAGS_dvd} -L${real_dvdcss_tree}/src/.libs -ldvdcss" - LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -L${real_dvdcss_tree}/src/.libs -ldvdcss" - CPPFLAGS_dvd="${CPPFLAGS_dvd} -I${real_dvdcss_tree}/src" + AX_ADD_BUILTINS([dvd]) + AX_ADD_LDFLAGS([dvd dvdcss],[-L${real_dvdcss_tree}/src/.libs -ldvdcss]) + AX_ADD_CPPFLAGS([dvd],[-I${real_dvdcss_tree}/src]) else dnl The given libdvdcss wasn't built AC_MSG_RESULT(no) @@ -1066,9 +1023,9 @@ then ;; no) dnl Compile without dvdcss (dlopen version, works only under Linux) - PLUGINS="${PLUGINS} dvd" - CPPFLAGS_dvd="${CPPFLAGS_dvd} -DGOD_DAMN_DMCA" - LDFLAGS_dvd="${LDFLAGS_dvd} -ldl" + AX_ADD_PLUGINS([dvd]) + AX_ADD_CPPFLAGS([dvd],[-DGOD_DAMN_DMCA]) + AX_ADD_LDFLAGS([dvd],[-ldl]) ;; *) AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) @@ -1076,10 +1033,9 @@ then then dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} dvd" - LDFLAGS_dvd="${LDFLAGS_dvd} -L${with_dvdcss}/lib -ldvdcss" - LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -L${with_dvdcss}/lib -ldvdcss" - CPPFLAGS_dvd="${CPPFLAGS_dvd} -I${with_dvdcss}/include" + AX_ADD_PLUGINS([dvd]) + AX_ADD_LDFLAGS([dvd dvdcss],[-L${with_dvdcss}/lib -ldvdcss]) + AX_ADD_CPPFLAGS([dvd],[-I${with_dvdcss}/include]) else dnl No libdvdcss could be found, sorry AC_MSG_RESULT(no) @@ -1105,13 +1061,15 @@ then if test "${with_dvdread_tree}" = "" then AC_CHECK_HEADERS(dvdread/dvd_reader.h, - [ PLUGINS="${PLUGINS} dvdread" - LDFLAGS_dvdread="${LDFLAGS_dvdread} -ldvdread ${LDFLAGS_dvdcss}" ], - [ if test "${enable_dvdread}" != "" + [ AX_ADD_PLUGINS([dvdread]) + AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) + ],[ + if test "${enable_dvdread}" != "" then AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml]) AC_MSG_ERROR([cannot find libdvdread headers]) - fi ]) + fi + ]) else AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" @@ -1125,9 +1083,9 @@ then then dnl Use a custom libdvdread AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) - BUILTINS="${BUILTINS} dvdread" - LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}" + AX_ADD_BUILTINS([dvdread]) + AX_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) + AX_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) else dnl The given libdvdread wasn't built AC_MSG_RESULT(no) @@ -1140,9 +1098,9 @@ then then dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} dvdread" - LDFLAGS_dvdread="${LDFLAGS_dvdread} -L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${with_dvdread}/include" + AX_ADD_PLUGINS([dvdread]) + AX_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) + AX_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) else dnl No libdvdread could be found, sorry AC_MSG_RESULT(no) @@ -1166,15 +1124,17 @@ then then if test "${with_dvdplay_tree}" = "" then - AC_CHECK_HEADERS(dvdplay/dvdplay.h, - [ PLUGINS="${PLUGINS} dvdplay" - LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread}" ], - [ if test "${enable_dvdplay}" != "" + AC_CHECK_HEADERS(dvdplay/dvdplay.h,[ + AX_ADD_PLUGINS([dvdplay]) + AX_ADD_LDFLAGS([dvdplay],[-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) + AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}]) + ],[ + if test "${enable_dvdplay}" != "" then AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.]) AC_MSG_ERROR([cannot find libdvdplay headers]) - fi ]) + fi + ]) else AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree}) real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`" @@ -1188,9 +1148,9 @@ then then dnl Use a custom libdvdplay AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a) - BUILTINS="${BUILTINS} dvdplay" - LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src" + AX_ADD_BUILTINS([dvdplay]) + AX_ADD_LDFLAGS([dvdplay],[-L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) + AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src]) else dnl The given libdvdplay wasn't built AC_MSG_RESULT(no) @@ -1199,13 +1159,13 @@ then fi else AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay}) - if test -f ${with_dvdplay}/include/dvdplay/dvdplay.h + if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h" then dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} dvdplay" - LDFLAGS_dvdplay="${LDFLAGS_dvdplay} -L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}" - CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${with_dvdplay}/include" + AX_ADD_PLUGINS([dvdplay]) + AX_ADD_LDFLAGS([dvdplay],[-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) + AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${with_dvdplay}/include]) else dnl No libdvdplay could be found, sorry AC_MSG_RESULT(no) @@ -1230,10 +1190,8 @@ then if test "${with_dvbpsi_tree}" = "" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ PLUGINS="${PLUGINS} ts_dvbpsi" - LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -ldvbpsi" - PLUGINS="${PLUGINS} mux_ts_dvbpsi" - LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ], + [ AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi]) + AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -1257,14 +1215,9 @@ then then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - BUILTINS="${BUILTINS} ts_dvbpsi" - LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi" - CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} -I${real_dvbpsi_tree}/src" - - BUILTINS="${BUILTINS} mux_ts_dvbpsi" - LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -L${real_dvbpsi_tree}/src/.libs -ldvbpsi" - CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} -I${real_dvbpsi_tree}/src" - + AX_ADD_BUILTINS([ts_dvbpsi mux_ts_dvbpsi]) + AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-I${real_dvbpsi_tree}/src]) + AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -1286,15 +1239,12 @@ then CPPFLAGS_test="-I${with_dvbpsi}/include" fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" - AC_CHECK_HEADER([dvbpsi/dr.h],[ - PLUGINS="${PLUGINS} ts_dvbpsi" - LDFLAGS_ts_dvbpsi="${LDFLAGS_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi" - CPPFLAGS_ts_dvbpsi="${CPPFLAGS_ts_dvbpsi} ${CPPFLAGS_test}" - PLUGINS="${PLUGINS} mux_ts_dvbpsi" - LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} ${LDFLAGS_test} -ldvbpsi" - CPPFLAGS_mux_ts_dvbpsi="${CPPFLAGS_mux_ts_dvbpsi} ${CPPFLAGS_test}" + AC_CHECK_HEADERS([dvbpsi/dr.h],[ + AX_ADD_PLUGINS([ts_dvbpsi mux_ts_dvbpsi]) + AX_ADD_CPPFLAGS([ts_dvbpsi mux_ts_dvbpsi],[${CPPFLAGS_test}]) + AX_ADD_LDFLAGS([ts_dvbpsi mux_ts_dvbpsi],[${LDFLAGS_test} -ldvbpsi]) - ],[ + ],[ if test "${enable_dvbpsi}" != "" then AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1]) @@ -1313,7 +1263,7 @@ AC_ARG_ENABLE(v4l, if test "${enable_v4l}" = "yes" then AC_CHECK_HEADERS(linux/videodev.h, [ - PLUGINS="${PLUGINS} v4l" + AX_ADD_PLUGINS([v4l]) ],[]) fi @@ -1324,7 +1274,7 @@ AC_ARG_ENABLE(pvr, [ --enable-pvr PVR cards access module (default disabled)]) if test "${enable_pvr}" = "yes" then - PLUGINS="${PLUGINS} pvr" + AX_ADD_PLUGINS([pvr]) fi dnl @@ -1338,7 +1288,7 @@ then AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h) AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} vcd cdda" + AX_ADD_PLUGINS([vcd cdda]) ],[ AC_MSG_RESULT(no) ]) @@ -1346,7 +1296,7 @@ then AC_MSG_CHECKING(for scsireq in sys/scsiio.h) AC_EGREP_HEADER(scsireq,sys/scsiio.h,[ AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} vcd cdda" + AX_ADD_PLUGINS([vcd cdda]) AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -1355,7 +1305,7 @@ then AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h) AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} vcd cdda" + AX_ADD_PLUGINS([vcd cdda]) AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -1363,14 +1313,13 @@ then if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" then - PLUGINS="${PLUGINS} vcd cdda" + AX_ADD_PLUGINS([vcd cdda]) fi if test "${SYS}" = "darwin" then - PLUGINS="${PLUGINS} vcd cdda" - LDFLAGS_vcd="${LDFLAGS_vcd} -framework IOKit -framework CoreFoundation" - LDFLAGS_cdda="${LDFLAGS_cdda} -framework IOKit -framework CoreFoundation" + AX_ADD_PLUGINS([vcd cdda]) + AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation]) fi fi @@ -1381,7 +1330,7 @@ AC_ARG_ENABLE(satellite, [ --enable-satellite satellite card support (default disabled)], [ if test "${enable_satellite}" = "yes" then - PLUGINS="${PLUGINS} satellite" + AX_ADD_PLUGINS([satellite]) fi]) dnl @@ -1393,20 +1342,20 @@ then AC_CHECK_FUNCS(inet_pton,[have_ipv6=:],[ AC_CHECK_LIB(resolv,inet_pton, [have_ipv6=: - LDFLAGS_ipv6="${LDFLAGS_ipv6} -lresolv"]) + AX_ADD_LDFLAGS([ipv6],[-lresolv])]) ]) AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h) AC_EGREP_HEADER(sockaddr_in6,netinet/in.h, - [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=false]) + [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) have_ipv6=false]) if ${have_ipv6}; then - PLUGINS="${PLUGINS} ipv6" + AX_ADD_PLUGINS([ipv6]) fi fi if test "${SYS}" = "mingw32" then AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h) AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)]) + AX_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)]) fi dnl @@ -1418,12 +1367,10 @@ if test "${enable_ogg}" != "no" then AC_CHECK_HEADERS(ogg/ogg.h, [ AC_CHECK_LIB( ogg, oggpack_read, [ - PLUGINS="${PLUGINS} ogg" - LDFLAGS_ogg="${LDFLAGS_ogg} -logg" AC_CHECK_LIB( ogg, oggpackB_read, [ - CPPFLAGS_ogg="${CPPFLAGS_ogg} -DHAVE_OGGPACKB"]) - PLUGINS="${PLUGINS} mux_ogg" - LDFLAGS_mux_ogg="${LDFLAGS_mux_ogg} -logg"]) + AX_ADD_CPPFLAGS([ogg],[-DHAVE_OGGPACKB])]) + AX_ADD_PLUGINS([ogg mux_ogg]) + AX_ADD_LDFLAGS([ogg mux_ogg],[-logg])]) ],[]) fi @@ -1436,11 +1383,15 @@ if test "${enable_mkv}" = "yes" then AC_LANG_PUSH(C++) dnl matroska headers include ebml headers directly... pouah that stinks - AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [ - PLUGINS="${PLUGINS} mkv" - CXXFLAGS_mkv="${CXXFLAGS_mkv}" - LDFLAGS_mkv="${LDFLAGS_mkv} -lmatroska -lebml" - ],[]) + CPPFLAGS="${CPPFLAGS_save} -I/usr/include/ebml -I/usr/include/matroska" + AC_CHECK_HEADERS(EbmlVersion.h KaxVersion.h, [ + AX_ADD_PLUGINS([mkv]) + AX_ADD_CXXFLAGS([mkv],[-I/usr/include/ebml -I/usr/include/matroska]) + AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + ],[ + AC_MSG_ERROR([libebml or libmatroska include files not found]) + ]) + CPPFLAGS="${CPPFLAGS_save}" AC_LANG_POP(C++) fi @@ -1461,8 +1412,8 @@ then [ --with-mad=PATH path to libmad],[],[]) if test "${with_mad}" != "no" -a "${with_mad}" != "" then - CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${with_mad}/include" - LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${with_mad}/lib" + AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include]) + AX_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib]) fi AC_ARG_WITH(mad-tree, @@ -1481,12 +1432,12 @@ then if test -f ${real_mad_tree}/libmad/mad.h then AC_MSG_RESULT(yes) - CPPFLAGS_mpgatofixed32="${CPPFLAGS_mpgatofixed32} -I${real_mad_tree}/libmad" - LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -L${real_mad_tree}/libmad/.libs" + AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}/libmad]) + AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/libmad/.libs]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ - BUILTINS="${BUILTINS} mpgatofixed32" - LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad" + AX_ADD_BUILTINS([mpgatofixed32]) + AX_ADD_LDFLAGS([mpgatofixed32],[-lmad]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) ],[]) LDFLAGS="${LDFLAGS_save}" @@ -1500,8 +1451,8 @@ then AC_CHECK_HEADERS(mad.h, , [ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ]) AC_CHECK_LIB(mad, mad_bit_init, [ - PLUGINS="${PLUGINS} mpgatofixed32" - LDFLAGS_mpgatofixed32="${LDFLAGS_mpgatofixed32} -lmad" ], + AX_ADD_PLUGINS([mpgatofixed32]) + AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])], [ AC_MSG_ERROR([Cannot find libmad library...]) ]) CPPFLAGS="${CPPFLAGS_save}" LDFLAGS="${LDFLAGS_save}" @@ -1513,8 +1464,8 @@ dnl libid3tag support dnl AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ - LDFLAGS_id3tag="${LDFLAGS_id3tag} -lid3tag -lz" - PLUGINS="${PLUGINS} id3tag"]) ]) + AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) + AX_ADD_PLUGINS([id3tag])]) ]) dnl dnl ffmpeg decoder plugin @@ -1534,11 +1485,11 @@ then LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" AC_CHECK_HEADERS(ffmpeg/avcodec.h postproc/postprocess.h) AC_CHECK_LIB(avcodec, avcodec_init, [ - BUILTINS="${BUILTINS} ffmpeg stream_out_transcode" - LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lavcodec" + AX_ADD_BUILTINS([ffmpeg stream_out_transcode]) + AX_ADD_LDFLAGS([ffmpeg],[-lavcodec]) dnl XXX: we don't link with -lavcodec a 2nd time because the OS X dnl linker would miserably barf on multiple definitions. - LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode}" ], + AX_ADD_LDFLAGS([stream_out_transcode],[]) ], [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" @@ -1558,14 +1509,14 @@ then if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - BUILTINS="${BUILTINS} ffmpeg stream_out_transcode" - LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec" - CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec" + AX_ADD_BUILTINS([ffmpeg stream_out_transcode]) + AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec]) + AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec]) dnl XXX: we don't link with -lavcodec a 2nd time because the OS X dnl linker would miserably barf on multiple definitions. - LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${real_ffmpeg_tree}/libavcodec" - CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${real_ffmpeg_tree}/libavcodec" + AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec]) + AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec]) else dnl The given libavcodec wasn't built AC_MSG_RESULT(no) @@ -1574,9 +1525,9 @@ then fi dnl Duplicate the ffmpeg CPPFLAGS and LDFLAGS for the encoder - CPPFLAGS_encoder_ffmpeg="${CPPFLAGS_ffmpeg}" + AX_ADD_CPPFLAGS([encoder_ffmpeg],[${CPPFLAGS_ffmpeg}]) dnl XXX: we don't link with -lavcodec blah blah blah - #LDFLAGS_encoder_ffmpeg="${LDFLAGS_ffmpeg}" + dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}]) fi dnl @@ -1602,9 +1553,9 @@ then then dnl Use a custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) - BUILTINS="${BUILTINS} faad" - LDFLAGS_faad="${LDFLAGS_faad} -L${real_faad_tree}/libfaad/.libs -lfaad" - CPPFLAGS_faad="${CPPFLAGS_faad} -I${real_faad_tree}/include" + AX_ADD_BUILTINS([faad]) + AX_ADD_LDFLAGS([faad],[-L${real_faad_tree}/libfaad/.libs -lfaad]) + AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_faad}" AC_TRY_COMPILE([#include ], @@ -1624,8 +1575,8 @@ then AC_CHECK_HEADERS(faad.h, , [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) AC_CHECK_LIB(faad, faacDecOpen, [ - PLUGINS="${PLUGINS} faad" - LDFLAGS_faad="${LDFLAGS_faad} -lfaad" + AX_ADD_PLUGINS([faad]) + AX_ADD_LDFLAGS([faad],[-lfaad]) AC_TRY_COMPILE([#include ], [faacDecHandle a; faacDecFrameInfo *b; unsigned char *c; unsigned long d; faacDecDecode(a,b,c,d);], @@ -1648,10 +1599,9 @@ then [ --with-xvid=PATH path to xvid installation],[],[]) if test "${with_xvid}" != "no" -a "${with_xvid}" != "" then - CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${with_xvid}/include" - LDFLAGS_xvid="${LDFLAGS_xvid} -L${with_xvid}/lib" + AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include]) + AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib]) fi - LDFLAGS_xvid="${LDFLAGS_xvid}" AC_ARG_WITH(xvid-tree, [ --with-xvid-tree=PATH xvid tree for static linking]) @@ -1669,9 +1619,9 @@ then then dnl Use a custom xvid AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a) - BUILTINS="${BUILTINS} xvid" - LDFLAGS_xvid="${LDFLAGS_xvid} -L${real_xvid_tree}/build/generic -lxvidcore" - CPPFLAGS_xvid="${CPPFLAGS_xvid} -I${real_xvid_tree}/src" + AX_ADD_BUILTINS([xvid]) + AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore]) + AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src]) else dnl The given libxvidcore wasn't built AC_MSG_RESULT(no) @@ -1683,16 +1633,16 @@ then AC_CHECK_HEADERS(xvid.h, , [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ]) AC_CHECK_LIB(xvidcore, xvid_init, [ - PLUGINS="${PLUGINS} xvid" - LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ], + AX_ADD_PLUGINS([xvid]) + AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ], [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" fi dnl Duplicate the xvid CPPFLAGS and LDFLAGS for the encoder - LDFLAGS_encoder_xvid=${LDFLAGS_xvid} - CPPFLAGS_encoder_xvid=${CPPFLAGS_xvid} + AX_ADD_LDFLAGS([encoder_xvid],[${LDFLAGS_xvid}]) + AX_ADD_CPPFLAGS([encoder_xvid],[${CPPFLAGS_xvid}]) fi dnl @@ -1704,8 +1654,8 @@ if test "${enable_quicktime}" != "no" && (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes") then AC_CHECK_HEADERS(QuickTime/QuickTime.h, - [ BUILTINS="${BUILTINS} quicktime" - LDFLAGS_quicktime="${LDFLAGS_quicktime} -framework QuickTime -framework Carbon" + [ AX_ADD_BUILTINS([quicktime]) + AX_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -1713,9 +1663,7 @@ dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - LDFLAGS_mp4="${LDFLAGS_mp4} -lz" - LDFLAGS_skins="${LDFLAGS_skins} -lz" - LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lz" + AX_ADD_LDFLAGS([mp4 skins basic_skins],[-lz]) ] ) @@ -1723,8 +1671,7 @@ dnl dnl skins module dnl AC_CHECK_HEADERS(libtar.h, [ - LDFLAGS_skins="${LDFLAGS_skins} -ltar" - LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -ltar" + AX_ADD_LDFLAGS([skins basic_skins],[-ltar]) ] ) @@ -1754,13 +1701,13 @@ then if test -f ${real_a52_tree}/include/a52.h then AC_MSG_RESULT(yes) - CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} -I${real_a52_tree}" - LDFLAGS_a52tofloat32="${LDFLAGS_a52tofloat32} -L${real_a52_tree}/liba52/.libs" + AX_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}]) + AX_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ - BUILTINS="${BUILTINS} a52tofloat32" - LDFLAGS_a52tofloat32="-la52 ${LDFLAGS_a52tofloat32}" - CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} -DUSE_A52DEC_TREE" + AX_ADD_BUILTINS([a52tofloat32]) + AX_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) + AX_ADD_LDFLAGS([a52tofloat32],[-la52]) ],[ if test -f ${real_a52_tree}/liba52/.libs/liba52.a then @@ -1787,9 +1734,9 @@ then LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - PLUGINS="${PLUGINS} a52tofloat32" - LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}" - CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}" + AX_ADD_PLUGINS([a52tofloat32]) + AX_ADD_LDFLAGS([a52tofloat32],[${LDFLAGS_test} -la52]) + AX_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}]) ],[ AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.]) ]) @@ -1807,8 +1754,8 @@ AC_ARG_ENABLE(dv, if test "${enable_dv}" = "yes" then AC_CHECK_HEADERS(libdv/dv.h, [ - PLUGINS="${PLUGINS} dv" - LDFLAGS_dv="${LDFLAGS_dv} -ldv" + AX_ADD_PLUGINS([dv]) + AX_ADD_LDFLAGS([dv],[-ldv]) ],[]) fi @@ -1820,8 +1767,8 @@ AC_ARG_ENABLE(flac, if test "${enable_flac}" = "yes" then AC_CHECK_HEADERS(FLAC/stream_decoder.h, [ - PLUGINS="${PLUGINS} flac flacdec" - LDFLAGS_flacdec="${LDFLAGS_flacdec} -lFLAC" + AX_ADD_PLUGINS([flac flacdec]) + AX_ADD_LDFLAGS([flacdec],[-lFLAC]) ],[]) fi @@ -1848,9 +1795,9 @@ then then dnl Use a custom libmpeg2 AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a) - PLUGINS="${PLUGINS} libmpeg2" - LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2" - CFLAGS_libmpeg2="${CFLAGS_libmpeg2} -I${real_libmpeg2_tree}/include" + AX_ADD_PLUGINS([libmpeg2]) + AX_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) + AX_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include]) eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`" else dnl The given libmpeg2 wasn't built @@ -1868,8 +1815,8 @@ then #endif #endif], [AC_MSG_RESULT([yes]) - PLUGINS="${PLUGINS} libmpeg2" - LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"], + AX_ADD_PLUGINS([libmpeg2]) + AX_ADD_LDFLAGS([libmpeg2],[-lmpeg2])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])], @@ -1886,11 +1833,11 @@ AC_ARG_ENABLE(vorbis, if test "${enable_vorbis}" != "no" then AC_CHECK_HEADERS(vorbis/codec.h, [ - PLUGINS="${PLUGINS} vorbis" - LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg" + AX_ADD_PLUGINS([vorbis]) + AX_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) if test "${enable_sout}" != "no"; then - PLUGINS="${PLUGINS} packetizer_vorbis" - LDFLAGS_packetizer_vorbis="${LDFLAGS_packetizer_vorbis} -lvorbis -logg" + AX_ADD_PLUGINS([packetizer_vorbis]) + AX_ADD_LDFLAGS([packetizer_vorbis],[-lvorbis -logg]) fi ],[]) fi @@ -1902,8 +1849,8 @@ AC_ARG_ENABLE(tremor, if test "${enable_tremor}" = "yes" then AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [ - PLUGINS="${PLUGINS} tremor" - LDFLAGS_tremor="${LDFLAGS_tremor} -lvorbisidec -logg" + AX_ADD_PLUGINS([tremor]) + AX_ADD_LDFLAGS([tremor],[-lvorbisidec -logg]) ],[]) fi @@ -1922,9 +1869,9 @@ then real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`" if test -f "${real_tarkin_tree}/tarkin.o" then - BUILTINS="${BUILTINS} tarkin" - CPPFLAGS_tarkin="${CPPFLAGS_tarkin} -I${real_tarkin_tree}" - LDFLAGS_tarkin="${LDFLAGS_tarkin} ${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg" + AX_ADD_BUILTINS([tarkin]) + AX_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}]) + AX_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg]) AC_MSG_RESULT(yes) else dnl The given tarkin tree wasn't built @@ -1944,8 +1891,8 @@ if test "${enable_theora}" = "yes" then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ - BUILTINS="${BUILTINS} theora" - LDFLAGS_theora="${LDFLAGS_theora} -ltheora -logg" ],[ + AX_ADD_BUILTINS([theora]) + AX_ADD_LDFLAGS([theora],[-ltheora -logg]) ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on you system. You also need to check that you have a libogg posterior to the 1.0 release.])], [-logg]) @@ -1987,14 +1934,15 @@ if test "${enable_x11}" != "no" && (test "${SYS}" != "mingw32" || test "${enable_x11}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" AC_CHECK_HEADERS(X11/Xlib.h, [ - PLUGINS="${PLUGINS} x11" - LDFLAGS_x11="${LDFLAGS_x11} -L${x_libraries} -lX11 -lXext" - CPPFLAGS_x11="${CPPFLAGS_x11} -I${x_includes}" + AX_ADD_PLUGINS([x11]) + AX_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext]) + AX_ADD_CPPFLAGS([x11],[-I${x_includes}]) AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [ CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + AC_CHECK_LIB(Xinerama, XineramaQueryExtension, [ AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - LDFLAGS_x11="${LDFLAGS_x11} -lXinerama") + AX_ADD_LDFLAGS([x11],[-lXinerama]) + ]) CFLAGS="${CFLAGS_save}" ]) ]) @@ -2014,22 +1962,24 @@ if test "${enable_xvideo}" != "no" && CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" AC_CHECK_LIB(Xv_pic,XvPutImage, # We have Xv_pic, that's good, we can build an xvideo.so plugin ! - PLUGINS="${PLUGINS} xvideo" - LDFLAGS_xvideo="${LDFLAGS_xvideo} -L${x_libraries} -lX11 -lXext -lXv_pic" - CPPFLAGS_xvideo="${CPPFLAGS_xvideo} -I${x_includes}", - AC_CHECK_LIB(Xv,XvPutImage, + AX_ADD_PLUGINS([xvideo]) + AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) + AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]), + AC_CHECK_LIB(Xv,XvPutImage,[ # We don't have Xv_pic, but we have Xv, let's make xvideo.a as builtin - PLUGINS="${PLUGINS} xvideo" - LDFLAGS_xvideo="${LDFLAGS_xvideo} -L${x_libraries} -lX11 -lXext -lXv" - CPPFLAGS_xvideo="${CPPFLAGS_xvideo} -I${x_includes}", + AX_ADD_PLUGINS([xvideo]) + AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + ],[ # Otherwise... well, do nothing. : - ) + ]) ) - AC_CHECK_HEADERS(X11/extensions/Xinerama.h, [ - AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ + AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed]) - LDFLAGS_xvideo="${LDFLAGS_xvideo} -lXinerama") + AX_ADD_LDFLAGS([xvideo],[-lXinerama]) + ]) ]) CFLAGS="${CFLAGS_save}" ] @@ -2076,11 +2026,9 @@ then fi if test "${SDL_CONFIG}" != "no" then - PLUGINS="${PLUGINS} vout_sdl aout_sdl" - CFLAGS_vout_sdl="${CFLAGS_vout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`" - LDFLAGS_vout_sdl="${LDFLAGS_vout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`" - CFLAGS_aout_sdl="${CFLAGS_aout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`" - LDFLAGS_aout_sdl="${LDFLAGS_aout_sdl} `${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`" + AX_ADD_PLUGINS([vout_sdl aout_sdl]) + AX_ADD_CFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`]) + AX_ADD_LDFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`]) CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}" AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h), @@ -2123,9 +2071,9 @@ then if test "${FREETYPE_CONFIG}" != "no" then - PLUGINS="${PLUGINS} osdtext" - CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`" - LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`" + AX_ADD_PLUGINS([osdtext]) + AX_ADD_CFLAGS([osdtext],[`${FREETYPE_CONFIG} --cflags`]) + AX_ADD_LDFLAGS([osdtext],[`${FREETYPE_CONFIG} --libs`]) CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}" elif test "${enable_freetype}" = "yes" then @@ -2147,13 +2095,13 @@ then [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a "${with_qte}" != "" then - LDFLAGS_qte="${LDFLAGS_qte} -L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" - CPPFLAGS_qte="${CPPFLAGS_qte} -I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) else - LDFLAGS_qte="${LDFLAGS_qte} -L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" - CPPFLAGS_qte="${CPPFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) fi - PLUGINS="${PLUGINS} qte" + AX_ADD_PLUGINS([qte]) NEED_QTE_MAIN=yes CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -2176,16 +2124,15 @@ then if test "${with_directx}" = "" then AC_CHECK_HEADERS(ddraw.h, - [ PLUGINS="${PLUGINS} vout_directx aout_directx" - LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32" ]) + [ AX_ADD_PLUGINS([vout_directx aout_directx]) + AX_ADD_LDFLAGS([vout_directx],[-lgdi32]) ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - PLUGINS="${PLUGINS} vout_directx aout_directx" - LDFLAGS_vout_directx="${LDFLAGS_directx} -lgdi32" - CPPFLAGS_vout_directx="${CPPFLAGS_vout_directx} -I${with_directx}" - CPPFLAGS_aout_directx="${CPPFLAGS_aout_directx} -I${with_directx}" + AX_ADD_PLUGINS([vout_directx aout_directx]) + AX_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) + AX_ADD_LDFLAGS([vout_directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -2203,7 +2150,7 @@ AC_ARG_ENABLE(fb, if test "${enable_fb}" != "no" then AC_CHECK_HEADERS(linux/fb.h, [ - PLUGINS="${PLUGINS} fb" + AX_ADD_PLUGINS([fb]) ]) fi @@ -2214,7 +2161,7 @@ AC_ARG_ENABLE(mga, [ --enable-mga Linux kernel Matrox support (default disabled)], [ if test "${enable_mga}" = "yes" then - PLUGINS="${PLUGINS} mga xmga" + AX_ADD_PLUGINS([mga xmga]) fi ]) dnl @@ -2224,8 +2171,8 @@ AC_ARG_ENABLE(svgalib, [ --enable-svgalib SVGAlib support (default disabled)]) if test "${enable_svgalib}" = "yes" then - PLUGINS="${PLUGINS} svgalib" - LDFLAGS_svgalib="${LDFLAGS_svgalib} -lvgagl -lvga" + AX_ADD_PLUGINS([svgalib]) + AX_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) fi dnl @@ -2235,14 +2182,14 @@ AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) if test "${enable_ggi}" = "yes" then - PLUGINS="${PLUGINS} ggi" - LDFLAGS_ggi="${LDFLAGS_ggi} -lggi" + AX_ADD_PLUGINS([ggi]) + AX_ADD_LDFLAGS([ggi],[-lggi]) AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], [ if test "${with_ggi}" != "no" -a "${with_ggi}" != "" then - CPPFLAGS_ggi="${CPPFLAGS_ggi} -I${with_ggi}/include" - LDFLAGS_ggi="${LDFLAGS_ggi} -L${with_ggi}/lib" + AX_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include]) + AX_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib]) fi ]) fi @@ -2253,15 +2200,15 @@ AC_ARG_ENABLE(glide, [ --enable-glide Glide (3dfx) support (default disabled)]) if test "${enable_glide}" = "yes" then - PLUGINS="${PLUGINS} glide" - LDFLAGS_glide="${LDFLAGS_glide} -lglide2x -lm" - CPPFLAGS_glide="${CPPFLAGS_glide} -I/usr/include/glide" + AX_ADD_PLUGINS([glide]) + AX_ADD_LDFLAGS([glide],[-lglide2x -lm]) + AX_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) AC_ARG_WITH(glide, [ --with-glide=PATH path to libglide], [ if test "${with_glide}" != "no" -a "${with_glide}" != "" then - CPPFLAGS_glide="${CPPFLAGS_glide} -I${with_glide}/include" - LDFLAGS_glide="${LDFLAGS_glide} -L${with_glide}/lib" + AX_ADD_CPPFLAGS([glide],[-I${with_glide}/include]) + AX_ADD_LDFLAGS([glide],[-L${with_glide}/lib]) fi ]) fi @@ -2275,8 +2222,8 @@ then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") if test "${have_aa}" = "true" then - PLUGINS="${PLUGINS} aa" - LDFLAGS_aa="${LDFLAGS_aa} -laa" + AX_ADD_PLUGINS([aa]) + AX_ADD_LDFLAGS([aa],[-laa]) fi fi @@ -2287,8 +2234,8 @@ AC_ARG_ENABLE(wingdi, [ --enable-wingdi Win32 GDI module (default enabled on Win32)]) if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - PLUGINS="${PLUGINS} wingdi" - LDFLAGS_wingdi="${LDFLAGS_wingdi} -lgdi32" + AX_ADD_PLUGINS([wingdi]) + AX_ADD_LDFLAGS([wingdi],[-lgdi32]) fi fi @@ -2308,8 +2255,8 @@ if test "${enable_oss}" != "no" && (test "${SYS}" != "mingw32" || test "${enable_oss}" = "yes") then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ - PLUGINS="${PLUGINS} oss" - AC_CHECK_LIB(ossaudio,main,LDFLAGS_oss="${LDFLAGS_oss} -lossaudio") + AX_ADD_PLUGINS([oss]) + AC_CHECK_LIB(ossaudio,main,AX_ADD_LDFLAGS([oss],[-lossaudio])) ]) fi @@ -2323,9 +2270,9 @@ AC_ARG_ENABLE(esd, AC_PATH_PROG(ESD_CONFIG, esd-config, no) if test "${ESD_CONFIG}" != "no" then - PLUGINS="${PLUGINS} esd" - CFLAGS_esd="${CFLAGS_esd} `${ESD_CONFIG} --cflags`" - LDFLAGS_esd="${LDFLAGS_esd} `${ESD_CONFIG} --libs`" + AX_ADD_PLUGINS([esd]) + AX_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) + AX_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`]) fi fi]) @@ -2339,9 +2286,9 @@ AC_ARG_ENABLE(arts, AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) if test "${ARTS_CONFIG}" != "no" then - PLUGINS="${PLUGINS} arts" - CFLAGS_arts="${CFLAGS_arts} `${ARTS_CONFIG} --cflags`" - LDFLAGS_arts="${LDFLAGS_arts} `${ARTS_CONFIG} --libs `" + AX_ADD_PLUGINS([arts]) + AX_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) + AX_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `]) fi fi]) @@ -2360,8 +2307,8 @@ AC_ARG_ENABLE(alsa, #include ], [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }], AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) - PLUGINS="${PLUGINS} alsa" - LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl" + AX_ADD_PLUGINS([alsa]) + AX_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) else AC_MSG_ERROR([Could not find ALSA development headers]) fi @@ -2374,8 +2321,8 @@ AC_ARG_ENABLE(waveout, [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) if test "${enable_waveout}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - PLUGINS="${PLUGINS} waveout" - LDFLAGS_waveout="-lwinmm" + AX_ADD_PLUGINS([waveout]) + AX_ADD_LDFLAGS([waveout],[-lwinmm]) fi fi @@ -2388,13 +2335,13 @@ if test "${enable_coreaudio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ BUILTINS="${BUILTINS} coreaudio" - LDFLAGS_coreaudio="${LDFLAGS_coreaudio} -framework CoreAudio" + [ AX_ADD_BUILTINS([coreaudio]) + AX_ADD_LDFLAGS([coreaudio],[-framework CoreAudio]) AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h) AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[ AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} coreaudio_resampler" - LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox" + AX_ADD_PLUGINS([coreaudio_resampler]) + AX_ADD_LDFLAGS([coreaudio_resampler],[-framework AudioToolbox]) ],[ AC_MSG_RESULT(no) ]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -2408,7 +2355,7 @@ AC_ARG_WITH(,[Interface plugins:]) dnl special case for BeOS if test "${SYS}" = "beos" then - PLUGINS="${PLUGINS} beos" + AX_ADD_PLUGINS([beos]) fi dnl @@ -2432,15 +2379,15 @@ if test "${enable_skins}" != "no"; then then AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.]) fi - CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS" - LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`" + AX_ADD_CPPFLAGS([skins],[`${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS]) + AX_ADD_LDFLAGS([skins],[`${WX_CONFIG_SKINS} --libs`]) fi if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - PLUGINS="${PLUGINS} skins" - CPPFLAGS_skins="${CPPFLAGS_skins} -U_OFF_T_ -U_off_t -Imodules/gui/skins" - CXXFLAGS_skins="${CXXFLAGS_skins} -O2 -fno-rtti" - LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32" + AX_ADD_PLUGINS([skins]) + AX_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins]) + AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) + AX_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) else if test "${enable_skins}" = "yes"; then IMLIB2_PATH="${PATH}" @@ -2449,11 +2396,11 @@ if test "${enable_skins}" != "no"; then AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-skins.]) fi - PLUGINS="${PLUGINS} skins" - CPPFLAGS_skins="${CPPFLAGS_skins} -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS" - CXXFLAGS_skins="${CXXFLAGS_skins} -O2 -fno-rtti" - LDFLAGS_skins="${LDFLAGS_skins} -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`" - PLUGINS="${PLUGINS} skins" + AX_ADD_PLUGINS([skins]) + AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS]) + AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) + AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`]) + AX_ADD_PLUGINS([skins]) fi fi fi @@ -2466,9 +2413,9 @@ AC_ARG_ENABLE(basic-skins, if test "${enable_basic_skins}" = "yes"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -U_OFF_T_ -U_off_t -Imodules/gui/skins" - CXXFLAGS_basic_skins="${CXXFLAGS_basic_skins} -O2 -fno-rtti" - LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32" + AX_ADD_CPPFLAGS([basic_skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins]) + AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti]) + AX_ADD_LDFLAGS([basic_skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) else IMLIB2_PATH="${PATH}" @@ -2477,12 +2424,12 @@ if test "${enable_basic_skins}" = "yes"; then AC_MSG_ERROR([Couldn't find the imlib2 package. You can download imlib2 from http://enlightenment.org/, or configure with --disable-basic-skins.]) fi - CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS" - CXXFLAGS_basic_skins="${CXXFLAGS_basic_skins} -O2 -fno-rtti" - LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`" + AX_ADD_CPPFLAGS([basic_skins],[-Imodules/gui/skins -I${x_includes} `${IMLIB2_CONFIG_SKINS} --cflags` -DX11_SKINS]) + AX_ADD_CXXFLAGS([basic_skins],[-O2 -fno-rtti]) + AX_ADD_LDFLAGS([basic_skins],[-L${x_libraries} -lXext -lX11 `${IMLIB2_CONFIG_SKINS} --libs`]) fi - PLUGINS="${PLUGINS} basic_skins" + AX_ADD_PLUGINS([basic_skins]) fi dnl @@ -2513,11 +2460,11 @@ then AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) fi if test "${SYS}" != "mingw32"; then - CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk gthread`" - LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`" + AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) + AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) else - CFLAGS_gtk="${CFLAGS_gtk} `${GTK_CONFIG} --cflags gtk`" - LDFLAGS_gtk="${LDFLAGS_gtk} `${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`" + AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) + AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) fi # now look for the gtk.h header CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}" @@ -2528,7 +2475,7 @@ then ]) if test "${ac_cv_gtk_headers}" = "yes" then - PLUGINS="${PLUGINS} gtk" + AX_ADD_PLUGINS([gtk]) if test "${SYS}" != "mingw32"; then NEED_GTK_MAIN=yes fi @@ -2546,9 +2493,9 @@ AC_ARG_ENABLE(gtk2, if test "${enable_gtk2}" = "yes" then PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) - CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}" - LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}" - PLUGINS="${PLUGINS} gtk2" + AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) + AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) + AX_ADD_PLUGINS([gtk2]) if test "${SYS}" != "mingw32"; then NEED_GTK2_MAIN=yes fi @@ -2591,8 +2538,8 @@ then then AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-familiar.]) fi - CFLAGS_familiar="${CFLAGS_familiar} `${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`" - LDFLAGS_familiar="${LDFLAGS_familiar} `${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`" + AX_ADD_CFLAGS([familiar],[`${GTK_CONFIG} ${GTK_PREFIX} --cflags gtk gthread`]) + AX_ADD_LDFLAGS([familiar],[`${GTK_CONFIG} ${GTK_PREFIX} --libs gtk gthread | sed 's,-rdynamic,,'`]) # now look for the gtk.h header CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_familiar}" ac_cv_gtk_headers=yes @@ -2602,7 +2549,7 @@ then ]) if test "${ac_cv_gtk_headers}" = "yes" then - PLUGINS="${PLUGINS} familiar" + AX_ADD_PLUGINS([familiar]) fi CPPFLAGS="${CPPFLAGS_save}" @@ -2611,8 +2558,8 @@ then [ --with-gpe-prefix=PATH gpe installation path prefix (default search in \$PATH)],[],[]) if test "${with_gpe_prefix}" != "no" -a "${with_gpe_prefix}" != "" then - CFLAGS_gpe="-I${with_gpe_prefix}/include" - LDFLAGS_gpe="-lXi -lgdk_pixbuf -L${with_gpe_prefix}/lib -lgpewidget" + AX_ADD_CFLAGS([gpe],[-I${with_gpe_prefix}/include]) + AX_ADD_LDFLAGS([gpe],[-lXi -lgdk_pixbuf -L${with_gpe_prefix}/lib -lgpewidget]) # now look for gpe/init.h header file CFLAGS_save="${CFLAGS}" LDFLAGS_save="${LDFLAGS}" @@ -2627,8 +2574,8 @@ then LDFLAGS="${LDFLAG_save}" if test "${ac_cv_gpe_headers}" = "yes" then - CFLAGS_familiar="${CFLAGS_familiar} ${CFLAGS_gpe}" - LDFLAGS_familiar="${LDFLAGS_familiar} ${LDFLAGS_gpe}" + AX_ADD_CFLAGS([familiar],[${CFLAGS_gpe}]) + AX_ADD_LDFLAGS([familiar],[${LDFLAGS_gpe}]) fi else NEED_GTK_MAIN=yes @@ -2646,13 +2593,13 @@ AC_ARG_ENABLE(gnome, AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) if test -x ${GNOME_CONFIG} then - CFLAGS_gnome="${CFLAGS_gnome} `${GNOME_CONFIG} --cflags gtk gnomeui`" - LDFLAGS_gnome="${LDFLAGS_gnome} `${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`" + AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) + AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) fi # now look for the gnome.h header CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}" AC_CHECK_HEADERS(gnome.h, [ - PLUGINS="${PLUGINS} gnome" + AX_ADD_PLUGINS([gnome]) NEED_GTK_MAIN=yes NEED_GNOME_MAIN=yes ALIASES="${ALIASES} gnome-vlc" @@ -2678,9 +2625,9 @@ AC_ARG_ENABLE(gnome2, if test "${enable_gnome2}" = "yes" then PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0]) - CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}" - LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}" - PLUGINS="${PLUGINS} gnome2" + AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}]) + AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}]) + AX_ADD_PLUGINS([gnome2]) if test "${SYS}" != "mingw32"; then NEED_GNOME2_MAIN=yes fi @@ -2708,8 +2655,8 @@ then then AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.]) fi - CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cxxflags`" - LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`" + AX_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`]) + AX_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`]) # now look for the wxprec.h header CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwindows}" ac_cv_wx_headers=yes @@ -2719,7 +2666,7 @@ then ]) if test "${ac_cv_wx_headers}" = "yes" then - PLUGINS="${PLUGINS} wxwindows" + AX_ADD_PLUGINS([wxwindows]) ALIASES="${ALIASES} wxvlc" fi CPPFLAGS="${CPPFLAGS_save}" @@ -2732,19 +2679,19 @@ dnl AC_ARG_ENABLE(qt, [ --enable-qt Qt interface support (default disabled)], [if test "${enable_qt}" = "yes"; then - PLUGINS="${PLUGINS} qt" + AX_ADD_PLUGINS([qt]) ALIASES="${ALIASES} qvlc" - LDFLAGS_qt="${LDFLAGS_qt} -L${QTDIR}/lib" + AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" AC_CHECK_LIB(qt-mt,main,[ - LDFLAGS_qt="${LDFLAGS_qt} -lqt-mt" + AX_ADD_LDFLAGS([qt],[-lqt-mt]) ],[ AC_CHECK_LIB(qt,main,[ - LDFLAGS_qt="${LDFLAGS_qt} -lqt" + AX_ADD_LDFLAGS([qt],[-lqt]) ]) ]) LDFLAGS="${LDFLAGS_save}" - CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include" + AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -2759,25 +2706,25 @@ dnl AC_ARG_ENABLE(kde, [ --enable-kde KDE interface support (default disabled)], [if test "${enable_kde}" = "yes"; then - PLUGINS="${PLUGINS} kde" + AX_ADD_PLUGINS([kde]) ALIASES="${ALIASES} kvlc" - LDFLAGS_kde="${LDFLAGS_kde} -L${KDEDIR}/lib" + AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" AC_CHECK_LIB(kfile,main,[ - LDFLAGS_kde="${LDFLAGS_kde} -lkfile" + AX_ADD_LDFLAGS([kde],[-lkfile]) ]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" AC_CHECK_LIB(kdeui,main,[ - LDFLAGS_kde="${LDFLAGS_kde} -lkdeui" + AX_ADD_LDFLAGS([kde],[-lkdeui]) ]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" AC_CHECK_LIB(kio,main,[ - LDFLAGS_kde="${LDFLAGS_kde} -lkio" + AX_ADD_LDFLAGS([kde],[-lkio]) ]) LDFLAGS="${LDFLAGS_save}" - CPPFLAGS_kde="${CPPFLAGS_kde} -I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt" - CPPFLAGS_kde="${CPPFLAGS_kde} -I${KDEDIR}/include -I${QTDIR}/include" + AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) + AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include]) if test -x ${QTDIR}/bin/moc then MOC=${QTDIR}/bin/moc @@ -2796,11 +2743,11 @@ AC_ARG_ENABLE(opie, [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a "${with_qte}" != "" then - LDFLAGS_qte="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" - CPPFLAGS_qte="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) else - LDFLAGS_qte="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`" - CPPFLAGS_qte="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`" + AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) + AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`]) fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -2808,10 +2755,10 @@ AC_ARG_ENABLE(opie, ] ) CPPFLAGS="${CPPFLAGS_save}" - PLUGINS="${PLUGINS} opie" + AX_ADD_PLUGINS([opie]) NEED_QTE_MAIN=yes - LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}" - CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}" + AX_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}]) + AX_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) if test "${with_qte}" != "no" -a "${with_qte}" != "" then MOC=${with_qte}/bin/moc @@ -2827,12 +2774,12 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx MacOS X support (default enabled on MacOS X)], [if test "${enable_macosx}" = "yes" then - BUILTINS="${BUILTINS} macosx" - LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" + AX_ADD_BUILTINS([macosx]) + AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC]) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - BUILTINS="${BUILTINS} macosx" - LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC" + AX_ADD_BUILTINS([macosx]) + AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC]) )]) dnl @@ -2843,8 +2790,8 @@ AC_ARG_ENABLE(qnx, if test "${enable_qnx}" != "no" then AC_CHECK_HEADERS(Ph.h, [ - PLUGINS="${PLUGINS} qnx" - LDFLAGS_qnx="${LDFLAGS_qnx} -lasound -lph" + AX_ADD_PLUGINS([qnx]) + AX_ADD_LDFLAGS([qnx],[-lasound -lph]) ]) fi @@ -2854,8 +2801,8 @@ dnl AC_ARG_ENABLE(ncurses, [ --enable-ncurses ncurses interface support (default disabled)], [if test "${enable_ncurses}" = "yes"; then - PLUGINS="${PLUGINS} ncurses" - LDFLAGS_ncurses="${LDFLAGS_ncurses} -lncurses" + AX_ADD_PLUGINS([ncurses]) + AX_ADD_LDFLAGS([ncurses],[-lncurses]) fi]) dnl @@ -2875,8 +2822,8 @@ then AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if is pre-1.0.0)))) if test "${have_xosd}" = "true" then - PLUGINS="${PLUGINS} xosd" - LDFLAGS_xosd="${LDFLAGS_xosd} -lxosd" + AX_ADD_PLUGINS([xosd]) + AX_ADD_LDFLAGS([xosd],[-lxosd]) fi fi @@ -2894,8 +2841,8 @@ then AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false") if test "${have_slp}" = "true" then - PLUGINS="${PLUGINS} slp" - LDFLAGS_slp="-lslp ${LDFLAGS_slp}" + AX_ADD_PLUGINS([slp]) + AX_ADD_LDFLAGS([slp],[-lslp]) fi else AC_MSG_CHECKING(for slp headers in ${with_slp}) @@ -2903,9 +2850,9 @@ then then dnl Use ${with_slp}/libslp/slp.h AC_MSG_RESULT(yes) - PLUGINS="${PLUGINS} slp" - LDFLAGS_slp="-L${with_slp} -lslp ${LDFLAGS_slp}" - CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}" + AX_ADD_PLUGINS([slp]) + AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp]) + AX_ADD_CPPFLAGS([slp],[-I${with_slp}]) else dnl No libslp could be found, sorry AC_MSG_RESULT(no) @@ -2924,8 +2871,8 @@ then AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") if test "${have_lirc}" = "true" then - PLUGINS="${PLUGINS} lirc" - LDFLAGS_lirc="${LDFLAGS_lirc} -llirc_client" + AX_ADD_PLUGINS([lirc]) + AX_ADD_LDFLAGS([lirc],[-llirc_client]) fi fi @@ -3004,15 +2951,14 @@ then if test "${SYS}" != "mingw32"; then LDFLAGS="${LDFLAGS_save} -L${x_libraries}" AC_CHECK_LIB(Xt,XtStrings,[ - LDFLAGS_mozilla="${LDFLAGS_mozilla} -L${x_libraries} -lXt" + AX_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt]) ]) LDFLAGS="${LDFLAGS_save}" fi mozilla=: dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 - [CPPFLAGS_mozilla="${CPPFLAGS_mozilla} `${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"] - #[CPPFLAGS_mozilla="${CPPFLAGS_mozilla} `${MOZILLA_CONFIG} --cflags plugin xpcom java --defines | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`"] - LDFLAGS_mozilla="${LDFLAGS_mozilla} `${MOZILLA_CONFIG} --libs plugin xpcom`" + AX_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) + AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) dnl Not necessarily in ${PATH} if test "${XPIDL}" = "" -o ! -x "${XPIDL}" then @@ -3032,13 +2978,13 @@ then TESTS="test1 test2 test3 test4" dnl we define those so that bootstrap sets the right linker - CXXFLAGS_test2="${CXXFLAGS_test2}" - OBJCFLAGS_test3="${OBJCFLAGS_test3}" + AX_ADD_CXXFLAGS([test2],[]) + AX_ADD_OBJCFLAGS([test3],[]) dnl this one is needed until automake knows what to do - LDFLAGS_test3="${LDFLAGS_test3} -lobjc" + AX_ADD_LDFLAGS([test3],[-lobjc]) - PLUGINS="${PLUGINS} ${TESTS}" - #BUILTINS="${BUILTINS} ${TESTS}" + AX_ADD_PLUGINS([${TESTS}]) + #AX_ADD_BUILTINS([${TESTS}]) fi dnl @@ -3046,33 +2992,32 @@ dnl gtk_main plugin dnl if test "${NEED_GTK_MAIN}" != "no" then - PLUGINS="${PLUGINS} gtk_main" - CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN" - CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN" - CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}" - LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}" + AX_ADD_PLUGINS([gtk_main]) + AX_ADD_CFLAGS([gtk familiar],[-DNEED_GTK_MAIN]) + AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_familiar}]) + AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar}]) fi if test "${NEED_GNOME_MAIN}" != "no" then - PLUGINS="${PLUGINS} gnome_main" - CFLAGS_gnome_main="${CFLAGS_gnome_main} ${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}" - LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}" + AX_ADD_PLUGINS([gnome_main]) + AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_familiar} ${CFLAGS_gnome}]) + AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}]) fi if test "${NEED_GTK2_MAIN}" != "no" then - PLUGINS="${PLUGINS} gtk2_main" - CFLAGS_gtk2="${CFLAGS_gtk2} -DNEED_GTK2_MAIN" - CFLAGS_gtk2_main="${CFLAGS_gtk2_main} ${CFLAGS_gtk2}" - LDFLAGS_gtk2_main="${LDFLAGS_gtk2_main} ${LDFLAGS_gtk2}" + AX_ADD_PLUGINS([gtk2_main]) + AX_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN]) + AX_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2}]) + AX_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2}]) fi if test "${NEED_GNOME2_MAIN}" != "no" then - PLUGINS="${PLUGINS} gnome2_main" - CFLAGS_gnome2_main="${CFLAGS_gnome2_main} ${CFLAGS_gtk2} ${CFLAGS_gnome2}" - LDFLAGS_gnome2_main="${LDFLAGS_gnome2_main} ${LDFLAGS_gtk2} ${LDFLAGS_gnome2}" + AX_ADD_PLUGINS([gnome2_main]) + AX_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}]) + AX_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}]) fi dnl @@ -3080,12 +3025,10 @@ dnl qte_main plugin dnl if test "${NEED_QTE_MAIN}" != "no" then - PLUGINS="${PLUGINS} qte_main" - CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN" - CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN" - CFLAGS_vout_sdl="${CFLAGS_vout_sdl} -DNEED_QTE_MAIN" - CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}" - LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}" + AX_ADD_PLUGINS([qte_main]) + AX_ADD_CPPFLAGS([qte opie vout_sdl],[-DNEED_QTE_MAIN]) + AX_ADD_CXXFLAGS([qte_main],[${CPPFLAGS_qte} ${CXXFLAGS_qte}]) + AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte}]) fi @@ -3121,8 +3064,8 @@ then eval "${plugin}_p=yes" done else - BUILTINS="${BUILTINS} ${PLUGINS}" - PLUGINS= + AX_ADD_BUILTINS([${PLUGINS}]) + PLUGINS="" fi AM_CONDITIONAL(HAVE_PLUGINS, ${plugin_support}) @@ -3136,8 +3079,8 @@ then fi] AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) -dnl Import substitution variables generated by bootstrap -VLC_VARIABLES() +dnl Import conditional variables generated by bootstrap +AX_VLC_CONDITIONALS dnl dnl Stuff used by the program @@ -3157,24 +3100,21 @@ PLUGIN_PATH="${ac_tool_prefix}/lib/vlc" AC_SUBST(PLUGIN_PATH) dnl -dnl Restore *FLAGS +dnl Handle substvars that use $(top_srcdir) dnl -CPPFLAGS="${CPPFLAGS_save}" -CFLAGS="${CFLAGS_save}" -CXXFLAGS="${CXXFLAGS_save}" -OBJCFLAGS="${OBJCFLAGS_save}" -LDFLAGS="${LDFLAGS_save}" +VLC_CONFIG="\$(top_srcdir)/vlc-config" +AC_SUBST(VLC_CONFIG) +CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include" dnl -dnl Fool automake (see Makefile.am) +dnl Restore *FLAGS dnl -AUTOMAKE_SUCKS="\$(L_builtin) \$(LDFLAGS_builtin)" -AC_SUBST(AUTOMAKE_SUCKS) +AX_RESTORE_FLAGS dnl dnl Create the vlc-config script dnl -LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtins}" +LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtin}" for i in `echo "${BUILTINS}" | sed -e 's@[^ ]*/@@g'` ; do LDFLAGS_libvlc="${LDFLAGS_libvlc} ${libdir}/vlc/${i}.a `eval echo '$'{LDFLAGS_${i}}`" ; done dnl @@ -3182,8 +3122,6 @@ dnl Configuration is finished dnl AC_SUBST(SYS) AC_SUBST(ARCH) -AC_SUBST(PLUGINS) -AC_SUBST(BUILTINS) AC_SUBST(ALIASES) AC_SUBST(ASM) AC_SUBST(MOC) @@ -3193,27 +3131,15 @@ AC_SUBST(LIBEXT) AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) -AC_SUBST(CFLAGS_TUNING) -AC_SUBST(CFLAGS_OPTIM) -AC_SUBST(CFLAGS_OPTIM_NODEBUG) -AC_SUBST(CFLAGS_NOOPTIM) -AC_SUBST(LDFLAGS) - -AC_SUBST(CFLAGS_vlc) -AC_SUBST(CFLAGS_pics) -AC_SUBST(CXXFLAGS_pics) -AC_SUBST(CFLAGS_plugins) -AC_SUBST(CXXFLAGS_plugins) -AC_SUBST(CFLAGS_builtins) -AC_SUBST(CPPFLAGS_mozilla) - -AC_SUBST(LDFLAGS_vlc) -AC_SUBST(LDFLAGS_libvlc) -AC_SUBST(LDFLAGS_plugins) -AC_SUBST(LDFLAGS_builtins) -AC_SUBST(LDFLAGS_mozilla) +dnl Import substitutions generated by bootstrap +AX_VLC_SUBSTS + +dnl Create vlc-config.in +AX_OUTPUT_VLC_CONFIG_IN AC_OUTPUT([ + vlc-config + Makefile autotools/Makefile debian/Makefile @@ -3221,16 +3147,94 @@ AC_OUTPUT([ intl/Makefile ipkg/Makefile lib/Makefile - m4/Makefile modules/Makefile + m4/Makefile po/Makefile.in share/Makefile src/Makefile - vlc-config + + modules/access/Makefile + modules/access/dvd/Makefile + modules/access/dvdplay/Makefile + modules/access/dvdread/Makefile + modules/access/mms/Makefile + modules/access/pvr/Makefile + modules/access/satellite/Makefile + modules/access/v4l/Makefile + modules/access/vcd/Makefile + modules/access_output/Makefile + modules/audio_filter/Makefile + modules/audio_filter/channel_mixer/Makefile + modules/audio_filter/converter/Makefile + modules/audio_filter/resampler/Makefile + modules/audio_mixer/Makefile + modules/audio_output/Makefile + modules/codec/Makefile + modules/codec/a52old/Makefile + modules/codec/a52old/downmix/Makefile + modules/codec/a52old/imdct/Makefile + modules/codec/cinepak/Makefile + modules/codec/faad/Makefile + modules/codec/ffmpeg/Makefile + modules/codec/ffmpeg/postprocessing/Makefile + modules/codec/mpeg_audio/Makefile + modules/codec/mpeg_video/Makefile + modules/codec/mpeg_video/idct/Makefile + modules/codec/mpeg_video/motion/Makefile + modules/codec/spudec/Makefile + modules/control/Makefile + modules/control/lirc/Makefile + modules/control/rc/Makefile + modules/demux/Makefile + modules/demux/aac/Makefile + modules/demux/asf/Makefile + modules/demux/avi/Makefile + modules/demux/mp4/Makefile + modules/demux/mpeg/Makefile + modules/demux/util/Makefile + modules/demux/wav/Makefile + modules/encoder/Makefile + modules/encoder/ffmpeg/Makefile + modules/gui/Makefile + modules/gui/beos/Makefile + modules/gui/familiar/Makefile + modules/gui/gtk/Makefile + modules/gui/gtk2/Makefile + modules/gui/kde/Makefile + modules/gui/macosx/Makefile + modules/gui/ncurses/Makefile + modules/gui/qnx/Makefile + modules/gui/qt/Makefile + modules/gui/skins/Makefile + modules/gui/win32/Makefile + modules/gui/wxwindows/Makefile + modules/misc/Makefile + modules/misc/dummy/Makefile + modules/misc/logger/Makefile + modules/misc/memcpy/Makefile + modules/misc/network/Makefile + modules/misc/testsuite/Makefile + modules/mux/Makefile + modules/mux/mpeg/Makefile + modules/packetizer/Makefile + modules/stream_out/Makefile + modules/video_chroma/Makefile + modules/video_filter/Makefile + modules/video_filter/deinterlace/Makefile + modules/video_output/Makefile + modules/video_output/directx/Makefile + modules/video_output/mga/Makefile + modules/video_output/qte/Makefile + modules/video_output/x11/Makefile + modules/visualization/Makefile + modules/visualization/scope/Makefile + modules/visualization/xosd/Makefile ],[ - chmod a+x vlc-config + chmod 0755 vlc-config ]) +dnl Generate makefiles found by bootstrap + printf " vlc configuration -------------------- @@ -3238,14 +3242,15 @@ vlc version : ${VERSION} system : ${SYS} architecture : ${ARCH} build flavour : " -test "${DEBUG_TRUE}" = "" && printf "debug " -test "${CPROF_TRUE}" = "" && printf "cprof " -test "${GPROF_TRUE}" = "" && printf "gprof " -test "${OPTIM_TRUE}" = "" && printf "optim " -test "${RELEASE_TRUE}" = "" && printf "release " || printf "devel " +test "${enable_debug}" = "yes" && printf "debug " +test "${enable_cprof}" = "yes" && printf "cprof " +test "${enable_gprof}" = "yes" && printf "gprof " +test "${enable_optimizations}" = "yes" && printf "optim " +test "${enable_release}" = "yes" && printf "release " || printf "devel " echo " vlc aliases :${ALIASES} +You can tune the compiler flags in vlc-config. To build vlc and its plugins, type \`make'. " diff --git a/debian/rules b/debian/rules index bc69f01cd8..1ba72435ae 100755 --- a/debian/rules +++ b/debian/rules @@ -44,6 +44,7 @@ CONFIG_FLAGS += \ --enable-skins \ --disable-basic-skins \ --disable-freetype \ + --disable-mkv \ $(NULL) # These ones are currently shipped with VLC diff --git a/m4/.cvsignore b/m4/.cvsignore index cab3e8bf7f..e2414d79e4 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,3 +1,3 @@ Makefile Makefile.in -vlc.m4 +private.m4 diff --git a/modules/.cvsignore b/modules/.cvsignore index 282522db03..4717c0ca14 100644 --- a/modules/.cvsignore +++ b/modules/.cvsignore @@ -1,2 +1,3 @@ -Makefile +Makefile.am Makefile.in +Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am deleted file mode 100644 index 77f1b1e4ba..0000000000 --- a/modules/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -NULL = - -EXTRA_DIST = \ - LIST \ - access/Modules.am \ - access/dvd/Modules.am \ - access/dvdplay/Modules.am \ - access/dvdread/Modules.am \ - access/mms/Modules.am \ - access/pvr/Modules.am \ - access/satellite/Modules.am \ - access/v4l/Modules.am \ - access/vcd/Modules.am \ - access_output/Modules.am \ - audio_filter/channel_mixer/Modules.am \ - audio_filter/converter/Modules.am \ - audio_filter/resampler/Modules.am \ - audio_mixer/Modules.am \ - audio_output/Modules.am \ - codec/Modules.am \ - codec/a52old/Modules.am \ - codec/a52old/downmix/Modules.am \ - codec/a52old/imdct/Modules.am \ - codec/cinepak/Modules.am \ - codec/faad/Modules.am \ - codec/ffmpeg/Modules.am \ - codec/ffmpeg/postprocessing/Modules.am \ - codec/mpeg_video/Modules.am \ - codec/mpeg_video/idct/Modules.am \ - codec/mpeg_video/motion/Modules.am \ - codec/spudec/Modules.am \ - control/lirc/Modules.am \ - control/rc/Modules.am \ - control/Modules.am \ - demux/Modules.am \ - demux/aac/Modules.am \ - demux/avi/Modules.am \ - demux/asf/Modules.am \ - demux/mp4/Modules.am \ - demux/mpeg/Modules.am \ - demux/util/Modules.am \ - demux/wav/Modules.am \ - encoder/Modules.am \ - encoder/ffmpeg/Modules.am \ - gui/beos/Modules.am \ - gui/familiar/Modules.am \ - gui/gtk/Modules.am \ - gui/gtk2/Modules.am \ - gui/kde/Modules.am \ - gui/macosx/Modules.am \ - gui/ncurses/Modules.am \ - gui/qnx/Modules.am \ - gui/qt/Modules.am \ - gui/skins/Modules.am \ - gui/win32/Modules.am \ - gui/wxwindows/Modules.am \ - misc/Modules.am \ - misc/dummy/Modules.am \ - misc/logger/Modules.am \ - misc/memcpy/Modules.am \ - misc/network/Modules.am \ - misc/testsuite/Modules.am \ - mux/Modules.am \ - mux/mpeg/Modules.am \ - packetizer/Modules.am \ - stream_out/Modules.am \ - video_chroma/Modules.am \ - video_filter/Modules.am \ - video_filter/deinterlace/Modules.am \ - video_output/Modules.am \ - video_output/directx/Modules.am \ - video_output/mga/Modules.am \ - video_output/qte/Modules.am \ - video_output/x11/Modules.am \ - visualization/scope/Modules.am \ - visualization/xosd/Modules.am \ - $(NULL) - diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 9a0714c5d8..32f39d8574 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,12 +1,12 @@ -SOURCES_access_file = modules/access/file.c -SOURCES_access_directory = modules/access/directory.c -SOURCES_access_udp = modules/access/udp.c -SOURCES_access_http = modules/access/http.c -SOURCES_access_ftp = modules/access/ftp.c -SOURCES_slp = modules/access/slp.c +SOURCES_access_file = file.c +SOURCES_access_directory = directory.c +SOURCES_access_udp = udp.c +SOURCES_access_http = http.c +SOURCES_access_ftp = ftp.c +SOURCES_slp = slp.c SOURCES_cdda = \ - modules/access/cdda.c \ - modules/access/vcd/cdrom.c \ - modules/access/vcd/cdrom.h \ - modules/access/vcd/cdrom_internals.h \ + cdda.c \ + vcd/cdrom.c \ + vcd/cdrom.h \ + vcd/cdrom_internals.h \ $(NULL) diff --git a/modules/access/dvd/Modules.am b/modules/access/dvd/Modules.am index 0b67ada170..0ffdc0d532 100644 --- a/modules/access/dvd/Modules.am +++ b/modules/access/dvd/Modules.am @@ -1,18 +1,18 @@ SOURCES_dvd = \ - modules/access/dvd/dvd.c \ - modules/access/dvd/dvd.h \ - modules/access/dvd/access.c \ - modules/access/dvd/demux.c \ - modules/access/dvd/seek.c \ - modules/access/dvd/seek.h \ - modules/access/dvd/es.c \ - modules/access/dvd/es.h \ - modules/access/dvd/ifo.c \ - modules/access/dvd/ifo.h \ - modules/access/dvd/udf.c \ - modules/access/dvd/udf.h \ - modules/access/dvd/summary.c \ - modules/access/dvd/summary.h \ - modules/access/dvd/dvdcss.h \ + dvd.c \ + dvd.h \ + access.c \ + demux.c \ + seek.c \ + seek.h \ + es.c \ + es.h \ + ifo.c \ + ifo.h \ + udf.c \ + udf.h \ + summary.c \ + summary.h \ + dvdcss.h \ $(NULL) diff --git a/modules/access/dvdplay/Modules.am b/modules/access/dvdplay/Modules.am index 1c125dab2b..bca49faf5b 100644 --- a/modules/access/dvdplay/Modules.am +++ b/modules/access/dvdplay/Modules.am @@ -1,15 +1,15 @@ SOURCES_dvdplay = \ - modules/access/dvdplay/dvd.c \ - modules/access/dvdplay/dvd.h \ - modules/access/dvdplay/access.c \ - modules/access/dvdplay/access.h \ - modules/access/dvdplay/demux.c \ - modules/access/dvdplay/demux.h \ - modules/access/dvdplay/intf.c \ - modules/access/dvdplay/intf.h \ - modules/access/dvdplay/es.c \ - modules/access/dvdplay/es.h \ - modules/access/dvdplay/tools.c \ - modules/access/dvdplay/tools.h \ + dvd.c \ + dvd.h \ + access.c \ + access.h \ + demux.c \ + demux.h \ + intf.c \ + intf.h \ + es.c \ + es.h \ + tools.c \ + tools.h \ $(NULL) diff --git a/modules/access/dvdread/Modules.am b/modules/access/dvdread/Modules.am index 7d204f3bfb..b1f0612898 100644 --- a/modules/access/dvdread/Modules.am +++ b/modules/access/dvdread/Modules.am @@ -1,6 +1,6 @@ SOURCES_dvdread = \ - modules/access/dvdread/dvdread.c \ - modules/access/dvdread/input.c \ - modules/access/dvdread/input.h \ + dvdread.c \ + input.c \ + input.h \ $(NULL) diff --git a/modules/access/mms/Modules.am b/modules/access/mms/Modules.am index 062e4e2f16..fd6f046d0e 100644 --- a/modules/access/mms/Modules.am +++ b/modules/access/mms/Modules.am @@ -1,12 +1,12 @@ SOURCES_access_mms = \ - modules/access/mms/mms.c \ - modules/access/mms/mms.h \ - modules/access/mms/mmsh.c \ - modules/access/mms/mmsh.h \ - modules/access/mms/mmstu.c \ - modules/access/mms/mmstu.h \ - modules/access/mms/buffer.c \ - modules/access/mms/buffer.h \ - modules/access/mms/asf.h \ - modules/access/mms/asf.c \ + mms.c \ + mms.h \ + mmsh.c \ + mmsh.h \ + mmstu.c \ + mmstu.h \ + buffer.c \ + buffer.h \ + asf.h \ + asf.c \ $(NULL) diff --git a/modules/access/pvr/Modules.am b/modules/access/pvr/Modules.am index 9a1799a306..a9b15916eb 100644 --- a/modules/access/pvr/Modules.am +++ b/modules/access/pvr/Modules.am @@ -1,2 +1 @@ -SOURCES_pvr = modules/access/pvr/pvr.c \ - modules/access/pvr/videodev2.h +SOURCES_pvr = pvr.c videodev2.h diff --git a/modules/access/satellite/Modules.am b/modules/access/satellite/Modules.am index bab05cfcc3..5090e6633e 100644 --- a/modules/access/satellite/Modules.am +++ b/modules/access/satellite/Modules.am @@ -1,7 +1,7 @@ SOURCES_satellite = \ - modules/access/satellite/satellite.c \ - modules/access/satellite/access.c \ - modules/access/satellite/dvb.c \ - modules/access/satellite/dvb.h \ + satellite.c \ + access.c \ + dvb.c \ + dvb.h \ $(NULL) diff --git a/modules/access/v4l/Modules.am b/modules/access/v4l/Modules.am index 2a6a732624..bfdd8546a2 100644 --- a/modules/access/v4l/Modules.am +++ b/modules/access/v4l/Modules.am @@ -1,2 +1 @@ -SOURCES_v4l = modules/access/v4l/v4l.c \ - modules/access/v4l/videodev_mjpeg.h +SOURCES_v4l = v4l.c videodev_mjpeg.h diff --git a/modules/access/vcd/Modules.am b/modules/access/vcd/Modules.am index d33d2bfe1a..221906881e 100644 --- a/modules/access/vcd/Modules.am +++ b/modules/access/vcd/Modules.am @@ -1,6 +1,6 @@ SOURCES_vcd = \ - modules/access/vcd/vcd.c \ - modules/access/vcd/cdrom.c \ - modules/access/vcd/cdrom.h \ - modules/access/vcd/cdrom_internals.h \ + vcd.c \ + cdrom.c \ + cdrom.h \ + cdrom_internals.h \ $(NULL) diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am index 0e642847fd..35f9e66a5e 100644 --- a/modules/access_output/Modules.am +++ b/modules/access_output/Modules.am @@ -1,4 +1,4 @@ -SOURCES_access_output_dummy = modules/access_output/dummy.c -SOURCES_access_output_file = modules/access_output/file.c -SOURCES_access_output_udp = modules/access_output/udp.c -SOURCES_access_output_http = modules/access_output/http.c +SOURCES_access_output_dummy = dummy.c +SOURCES_access_output_file = file.c +SOURCES_access_output_udp = udp.c +SOURCES_access_output_http = http.c diff --git a/modules/audio_filter/.cvsignore b/modules/audio_filter/.cvsignore new file mode 100644 index 0000000000..c930ed7c2c --- /dev/null +++ b/modules/audio_filter/.cvsignore @@ -0,0 +1,11 @@ +.deps +.dirstamp +*.lo +*.la +*.dll +*.dylib +*.sl +*.so +Makefile.am +Makefile.in +Makefile diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/audio_filter/channel_mixer/Modules.am b/modules/audio_filter/channel_mixer/Modules.am index b68c7cda70..478d990d2a 100644 --- a/modules/audio_filter/channel_mixer/Modules.am +++ b/modules/audio_filter/channel_mixer/Modules.am @@ -1,2 +1,2 @@ -SOURCES_trivial_channel_mixer = modules/audio_filter/channel_mixer/trivial.c -SOURCES_headphone_channel_mixer = modules/audio_filter/channel_mixer/headphone.c +SOURCES_trivial_channel_mixer = trivial.c +SOURCES_headphone_channel_mixer = headphone.c diff --git a/modules/audio_filter/converter/Modules.am b/modules/audio_filter/converter/Modules.am index b8d2e8b126..b06811762f 100644 --- a/modules/audio_filter/converter/Modules.am +++ b/modules/audio_filter/converter/Modules.am @@ -1,16 +1,16 @@ -SOURCES_float32tos16 = modules/audio_filter/converter/float32tos16.c -SOURCES_float32tos8 = modules/audio_filter/converter/float32tos8.c -SOURCES_float32tou16 = modules/audio_filter/converter/float32tou16.c -SOURCES_float32tou8 = modules/audio_filter/converter/float32tou8.c -SOURCES_a52tospdif = modules/audio_filter/converter/a52tospdif.c -SOURCES_a52tofloat32 = modules/audio_filter/converter/a52tofloat32.c -SOURCES_dtstospdif = modules/audio_filter/converter/dtstospdif.c -SOURCES_fixed32tos16 = modules/audio_filter/converter/fixed32tos16.c -SOURCES_s16tofixed32 = modules/audio_filter/converter/s16tofixed32.c -SOURCES_fixed32tofloat32 = modules/audio_filter/converter/fixed32tofloat32.c -SOURCES_s16tofloat32 = modules/audio_filter/converter/s16tofloat32.c -SOURCES_s16tofloat32swab = modules/audio_filter/converter/s16tofloat32swab.c -SOURCES_s8tofloat32 = modules/audio_filter/converter/s8tofloat32.c -SOURCES_u8tofixed32 = modules/audio_filter/converter/u8tofixed32.c -SOURCES_u8tofloat32 = modules/audio_filter/converter/u8tofloat32.c -SOURCES_mpgatofixed32 = modules/audio_filter/converter/mpgatofixed32.c +SOURCES_float32tos16 = float32tos16.c +SOURCES_float32tos8 = float32tos8.c +SOURCES_float32tou16 = float32tou16.c +SOURCES_float32tou8 = float32tou8.c +SOURCES_a52tospdif = a52tospdif.c +SOURCES_a52tofloat32 = a52tofloat32.c +SOURCES_dtstospdif = dtstospdif.c +SOURCES_fixed32tos16 = fixed32tos16.c +SOURCES_s16tofixed32 = s16tofixed32.c +SOURCES_fixed32tofloat32 = fixed32tofloat32.c +SOURCES_s16tofloat32 = s16tofloat32.c +SOURCES_s16tofloat32swab = s16tofloat32swab.c +SOURCES_s8tofloat32 = s8tofloat32.c +SOURCES_u8tofixed32 = u8tofixed32.c +SOURCES_u8tofloat32 = u8tofloat32.c +SOURCES_mpgatofixed32 = mpgatofixed32.c diff --git a/modules/audio_filter/resampler/Modules.am b/modules/audio_filter/resampler/Modules.am index 01744c043e..d300a287df 100644 --- a/modules/audio_filter/resampler/Modules.am +++ b/modules/audio_filter/resampler/Modules.am @@ -1,6 +1,5 @@ -SOURCES_trivial_resampler = modules/audio_filter/resampler/trivial.c -SOURCES_ugly_resampler = modules/audio_filter/resampler/ugly.c -SOURCES_linear_resampler = modules/audio_filter/resampler/linear.c -SOURCES_bandlimited_resampler = modules/audio_filter/resampler/bandlimited.c \ - modules/audio_filter/resampler/bandlimited.h -SOURCES_coreaudio_resampler = modules/audio_filter/resampler/coreaudio.c +SOURCES_trivial_resampler = trivial.c +SOURCES_ugly_resampler = ugly.c +SOURCES_linear_resampler = linear.c +SOURCES_bandlimited_resampler = bandlimited.c bandlimited.h +SOURCES_coreaudio_resampler = coreaudio.c diff --git a/modules/audio_mixer/Modules.am b/modules/audio_mixer/Modules.am index d6c5b2df6d..3238bc4a65 100644 --- a/modules/audio_mixer/Modules.am +++ b/modules/audio_mixer/Modules.am @@ -1,3 +1,3 @@ -SOURCES_trivial_mixer = modules/audio_mixer/trivial.c -SOURCES_float32_mixer = modules/audio_mixer/float32.c -SOURCES_spdif_mixer = modules/audio_mixer/spdif.c +SOURCES_trivial_mixer = trivial.c +SOURCES_float32_mixer = float32.c +SOURCES_spdif_mixer = spdif.c diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am index 7239c0c4ac..8e1c3e268b 100644 --- a/modules/audio_output/Modules.am +++ b/modules/audio_output/Modules.am @@ -1,9 +1,9 @@ -SOURCES_alsa = modules/audio_output/alsa.c -SOURCES_arts = modules/audio_output/arts.c -SOURCES_coreaudio = modules/audio_output/coreaudio.c -SOURCES_aout_directx = modules/audio_output/directx.c -SOURCES_esd = modules/audio_output/esd.c -SOURCES_aout_file = modules/audio_output/file.c -SOURCES_oss = modules/audio_output/oss.c -SOURCES_aout_sdl = modules/audio_output/sdl.c -SOURCES_waveout = modules/audio_output/waveout.c +SOURCES_alsa = alsa.c +SOURCES_arts = arts.c +SOURCES_coreaudio = coreaudio.c +SOURCES_aout_directx = directx.c +SOURCES_esd = esd.c +SOURCES_aout_file = file.c +SOURCES_oss = oss.c +SOURCES_aout_sdl = sdl.c +SOURCES_waveout = waveout.c diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am index e63175555f..fc3f088a5a 100644 --- a/modules/codec/Modules.am +++ b/modules/codec/Modules.am @@ -1,16 +1,16 @@ -SOURCES_a52 = modules/codec/a52.c -SOURCES_dts = modules/codec/dts.c -SOURCES_flacdec = modules/codec/flacdec.c -SOURCES_lpcm = modules/codec/lpcm.c -SOURCES_araw = modules/codec/araw.c -SOURCES_vorbis = modules/codec/vorbis.c -SOURCES_tarkin = modules/codec/tarkin.c -SOURCES_theora = modules/codec/theora.c -SOURCES_tremor = modules/codec/vorbis.c -SOURCES_dv = modules/codec/dv.c -SOURCES_xvid = modules/codec/xvid.c -SOURCES_adpcm = modules/codec/adpcm.c -SOURCES_mpeg_audio = modules/codec/mpeg_audio.c -SOURCES_libmpeg2 = modules/codec/libmpeg2.c -SOURCES_rawvideo = modules/codec/rawvideo.c -SOURCES_quicktime = modules/codec/quicktime.c +SOURCES_a52 = a52.c +SOURCES_dts = dts.c +SOURCES_flacdec = flacdec.c +SOURCES_lpcm = lpcm.c +SOURCES_araw = araw.c +SOURCES_vorbis = vorbis.c +SOURCES_tarkin = tarkin.c +SOURCES_theora = theora.c +SOURCES_tremor = vorbis.c +SOURCES_dv = dv.c +SOURCES_xvid = xvid.c +SOURCES_adpcm = adpcm.c +SOURCES_mpeg_audio = mpeg_audio.c +SOURCES_libmpeg2 = libmpeg2.c +SOURCES_rawvideo = rawvideo.c +SOURCES_quicktime = quicktime.c diff --git a/modules/codec/a52old/Modules.am b/modules/codec/a52old/Modules.am index 27ffd84dbe..2c1fe6f663 100644 --- a/modules/codec/a52old/Modules.am +++ b/modules/codec/a52old/Modules.am @@ -1,18 +1,18 @@ SOURCES_a52old = \ - modules/codec/a52old/a52old.c \ - modules/codec/a52old/adec.h \ - modules/codec/a52old/internal.h \ - modules/codec/a52old/decoder.c \ - modules/codec/a52old/decoder.h \ - modules/codec/a52old/parse.c \ - modules/codec/a52old/exponent.c \ - modules/codec/a52old/exponent.h \ - modules/codec/a52old/bit_allocate.c \ - modules/codec/a52old/mantissa.c \ - modules/codec/a52old/mantissa.h \ - modules/codec/a52old/rematrix.c \ - modules/codec/a52old/imdct.c \ - modules/codec/a52old/imdct.h \ - modules/codec/a52old/downmix.h \ + a52old.c \ + adec.h \ + internal.h \ + decoder.c \ + decoder.h \ + parse.c \ + exponent.c \ + exponent.h \ + bit_allocate.c \ + mantissa.c \ + mantissa.h \ + rematrix.c \ + imdct.c \ + imdct.h \ + downmix.h \ $(NULL) diff --git a/modules/codec/a52old/downmix/Modules.am b/modules/codec/a52old/downmix/Modules.am index 2bbfe40bb4..d98f8f2cd5 100644 --- a/modules/codec/a52old/downmix/Modules.am +++ b/modules/codec/a52old/downmix/Modules.am @@ -1,18 +1,18 @@ SOURCES_downmix = \ - modules/codec/a52old/downmix/downmix.c \ - modules/codec/a52old/downmix/downmix_c.c \ - modules/codec/a52old/downmix/downmix_common.h \ + downmix.c \ + downmix_c.c \ + downmix_common.h \ $(NULL) SOURCES_downmixsse = \ - modules/codec/a52old/downmix/downmix.c \ - modules/codec/a52old/downmix/downmix_sse.c \ - modules/codec/a52old/downmix/downmix_common.h \ + downmix.c \ + downmix_sse.c \ + downmix_common.h \ $(NULL) SOURCES_downmix3dn = \ - modules/codec/a52old/downmix/downmix.c \ - modules/codec/a52old/downmix/downmix_3dn.c \ - modules/codec/a52old/downmix/downmix_common.h \ + downmix.c \ + downmix_3dn.c \ + downmix_common.h \ $(NULL) diff --git a/modules/codec/a52old/imdct/Modules.am b/modules/codec/a52old/imdct/Modules.am index 11ff3fe797..80c82cf552 100644 --- a/modules/codec/a52old/imdct/Modules.am +++ b/modules/codec/a52old/imdct/Modules.am @@ -1,24 +1,24 @@ COMMON_imdct = \ - modules/codec/a52old/imdct/imdct.c \ - modules/codec/a52old/imdct/imdct_common.c + imdct.c \ + imdct_common.c SOURCES_imdct = \ - modules/codec/a52old/imdct/imdct_c.c \ - modules/codec/a52old/imdct/srfft_c.c \ + imdct_c.c \ + srfft_c.c \ $(COMMON_imdct) SOURCES_imdctsse = \ - modules/codec/a52old/imdct/imdct_sse.c \ - modules/codec/a52old/imdct/srfft_sse.c \ + imdct_sse.c \ + srfft_sse.c \ $(COMMON_imdct) SOURCES_imdct3dn = \ - modules/codec/a52old/imdct/imdct_3dn.c \ - modules/codec/a52old/imdct/srfft_3dn.c \ + imdct_3dn.c \ + srfft_3dn.c \ $(COMMON_imdct) noinst_HEADERS += \ - modules/codec/a52old/imdct/imdct_common.h \ - modules/codec/a52old/imdct/retables.h \ - modules/codec/a52old/imdct/srfft.h + imdct_common.h \ + retables.h \ + srfft.h diff --git a/modules/codec/cinepak/Modules.am b/modules/codec/cinepak/Modules.am index 85d62396c4..c816746a6f 100644 --- a/modules/codec/cinepak/Modules.am +++ b/modules/codec/cinepak/Modules.am @@ -1,4 +1,4 @@ SOURCES_cinepak = \ - modules/codec/cinepak/cinepak.c \ - modules/codec/cinepak/cinepak.h \ + cinepak.c \ + cinepak.h \ $(NULL) diff --git a/modules/codec/faad/Modules.am b/modules/codec/faad/Modules.am index 4487515be7..e6d27523cc 100644 --- a/modules/codec/faad/Modules.am +++ b/modules/codec/faad/Modules.am @@ -1,4 +1,4 @@ SOURCES_faad = \ - modules/codec/faad/decoder.c \ - modules/codec/faad/decoder.h \ + decoder.c \ + decoder.h \ $(NULL) diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am index 7483e30c1e..2dbb03acc0 100644 --- a/modules/codec/ffmpeg/Modules.am +++ b/modules/codec/ffmpeg/Modules.am @@ -1,10 +1,10 @@ SOURCES_ffmpeg = \ - modules/codec/ffmpeg/ffmpeg.c \ - modules/codec/ffmpeg/ffmpeg.h \ - modules/codec/ffmpeg/video.c \ - modules/codec/ffmpeg/video.h \ - modules/codec/ffmpeg/audio.c \ - modules/codec/ffmpeg/audio.h \ - modules/codec/ffmpeg/chroma.c \ + ffmpeg.c \ + ffmpeg.h \ + video.c \ + video.h \ + audio.c \ + audio.h \ + chroma.c \ $(NULL) diff --git a/modules/codec/ffmpeg/postprocessing/Modules.am b/modules/codec/ffmpeg/postprocessing/Modules.am index 6109d18062..3b6a626503 100644 --- a/modules/codec/ffmpeg/postprocessing/Modules.am +++ b/modules/codec/ffmpeg/postprocessing/Modules.am @@ -1,20 +1,20 @@ SOURCES_postprocessing_c = \ - modules/codec/ffmpeg/postprocessing/postprocessing.c \ - modules/codec/ffmpeg/postprocessing/postprocessing_c.c \ + postprocessing.c \ + postprocessing_c.c \ $(NULL) SOURCES_postprocessing_mmx = \ - modules/codec/ffmpeg/postprocessing/postprocessing.c \ - modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c \ + postprocessing.c \ + postprocessing_mmx.c \ $(NULL) SOURCES_postprocessing_mmxext = \ - modules/codec/ffmpeg/postprocessing/postprocessing.c \ - modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c \ + postprocessing.c \ + postprocessing_mmxext.c \ $(NULL) noinst_HEADERS += \ - modules/codec/ffmpeg/postprocessing/postprocessing.h \ - modules/codec/ffmpeg/postprocessing/postprocessing_common.h \ + postprocessing.h \ + postprocessing_common.h \ $(NULL) diff --git a/modules/codec/mpeg_audio/Modules.am b/modules/codec/mpeg_audio/Modules.am index 8f204444be..922eb6b3b9 100644 --- a/modules/codec/mpeg_audio/Modules.am +++ b/modules/codec/mpeg_audio/Modules.am @@ -1,13 +1,13 @@ SOURCES_mpeg_audio = \ - modules/codec/mpeg_audio/decoder.c \ - modules/codec/mpeg_audio/decoder.h \ - modules/codec/mpeg_audio/layer1.c \ - modules/codec/mpeg_audio/layer1.h \ - modules/codec/mpeg_audio/layer2.c \ - modules/codec/mpeg_audio/layer2.h \ - modules/codec/mpeg_audio/math.c \ - modules/codec/mpeg_audio/math.h \ - modules/codec/mpeg_audio/generic.c \ - modules/codec/mpeg_audio/generic.h \ + decoder.c \ + decoder.h \ + layer1.c \ + layer1.h \ + layer2.c \ + layer2.h \ + math.c \ + math.h \ + generic.c \ + generic.h \ $(NULL) diff --git a/modules/codec/mpeg_video/Modules.am b/modules/codec/mpeg_video/Modules.am index 2be5927d1c..80c0ace962 100644 --- a/modules/codec/mpeg_video/Modules.am +++ b/modules/codec/mpeg_video/Modules.am @@ -1,14 +1,14 @@ SOURCES_mpeg_video_old = \ - modules/codec/mpeg_video/parser.c \ - modules/codec/mpeg_video/parser.h \ - modules/codec/mpeg_video/headers.c \ - modules/codec/mpeg_video/blocks.c \ - modules/codec/mpeg_video/blocks.h \ - modules/codec/mpeg_video/synchro.c \ - modules/codec/mpeg_video/pool.c \ - modules/codec/mpeg_video/pool.h \ - modules/codec/mpeg_video/decoder.c \ - modules/codec/mpeg_video/decoder.h \ - modules/codec/mpeg_video/plugins.h \ + parser.c \ + parser.h \ + headers.c \ + blocks.c \ + blocks.h \ + synchro.c \ + pool.c \ + pool.h \ + decoder.c \ + decoder.h \ + plugins.h \ $(NULL) diff --git a/modules/codec/mpeg_video/idct/Modules.am b/modules/codec/mpeg_video/idct/Modules.am index 6302a0c3c0..4396a251b9 100644 --- a/modules/codec/mpeg_video/idct/Modules.am +++ b/modules/codec/mpeg_video/idct/Modules.am @@ -1,37 +1,37 @@ SOURCES_idct = \ - modules/codec/mpeg_video/idct/idct.c \ - modules/codec/mpeg_video/idct/idct.h \ - modules/codec/mpeg_video/idct/idct_decl.h \ - modules/codec/mpeg_video/idct/idct_sparse.h \ - modules/codec/mpeg_video/idct/block_c.h \ + idct.c \ + idct.h \ + idct_decl.h \ + idct_sparse.h \ + block_c.h \ $(NULL) SOURCES_idctclassic = \ - modules/codec/mpeg_video/idct/idctclassic.c \ - modules/codec/mpeg_video/idct/idct.h \ - modules/codec/mpeg_video/idct/idct_decl.h \ - modules/codec/mpeg_video/idct/idct_sparse.h \ - modules/codec/mpeg_video/idct/block_c.h \ + idctclassic.c \ + idct.h \ + idct_decl.h \ + idct_sparse.h \ + block_c.h \ $(NULL) SOURCES_idctmmx = \ - modules/codec/mpeg_video/idct/idctmmx.c \ - modules/codec/mpeg_video/idct/idct.h \ - modules/codec/mpeg_video/idct/idct_decl.h \ - modules/codec/mpeg_video/idct/idct_sparse.h \ - modules/codec/mpeg_video/idct/block_mmx.h \ + idctmmx.c \ + idct.h \ + idct_decl.h \ + idct_sparse.h \ + block_mmx.h \ $(NULL) SOURCES_idctmmxext = \ - modules/codec/mpeg_video/idct/idctmmxext.c \ - modules/codec/mpeg_video/idct/idct.h \ - modules/codec/mpeg_video/idct/idct_decl.h \ - modules/codec/mpeg_video/idct/idct_sparse.h \ - modules/codec/mpeg_video/idct/block_mmx.h \ + idctmmxext.c \ + idct.h \ + idct_decl.h \ + idct_sparse.h \ + block_mmx.h \ $(NULL) SOURCES_idctaltivec = \ - modules/codec/mpeg_video/idct/idctaltivec.c \ - modules/codec/mpeg_video/idct/idct.h \ + idctaltivec.c \ + idct.h \ $(NULL) diff --git a/modules/codec/mpeg_video/motion/Modules.am b/modules/codec/mpeg_video/motion/Modules.am index 1a234920cf..8c9b2ffc07 100644 --- a/modules/codec/mpeg_video/motion/Modules.am +++ b/modules/codec/mpeg_video/motion/Modules.am @@ -1,5 +1,5 @@ -SOURCES_motion = modules/codec/mpeg_video/motion/motion.c -SOURCES_motionmmx = modules/codec/mpeg_video/motion/motionmmx.c -SOURCES_motionmmxext = modules/codec/mpeg_video/motion/motionmmxext.c -SOURCES_motion3dnow = modules/codec/mpeg_video/motion/motion3dnow.c -SOURCES_motionaltivec = modules/codec/mpeg_video/motion/motionaltivec.c +SOURCES_motion = motion.c +SOURCES_motionmmx = motionmmx.c +SOURCES_motionmmxext = motionmmxext.c +SOURCES_motion3dnow = motion3dnow.c +SOURCES_motionaltivec = motionaltivec.c diff --git a/modules/codec/spudec/Modules.am b/modules/codec/spudec/Modules.am index 856b349fae..de9f88f761 100644 --- a/modules/codec/spudec/Modules.am +++ b/modules/codec/spudec/Modules.am @@ -1,8 +1,8 @@ SOURCES_spudec = \ - modules/codec/spudec/spudec.c \ - modules/codec/spudec/parse.c \ - modules/codec/spudec/render.c \ - modules/codec/spudec/text.c \ - modules/codec/spudec/subtitler.c \ - modules/codec/spudec/spudec.h \ + spudec.c \ + parse.c \ + render.c \ + text.c \ + subtitler.c \ + spudec.h \ $(NULL) diff --git a/modules/control/Modules.am b/modules/control/Modules.am index 6fad06e8a8..a54a854508 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -1,2 +1,2 @@ -SOURCES_gestures = modules/control/gestures.c -SOURCES_http = modules/control/http.c +SOURCES_gestures = gestures.c +SOURCES_http = http.c diff --git a/modules/control/lirc/Modules.am b/modules/control/lirc/Modules.am index 725f9ded37..5296eee620 100644 --- a/modules/control/lirc/Modules.am +++ b/modules/control/lirc/Modules.am @@ -1 +1 @@ -SOURCES_lirc = modules/control/lirc/lirc.c +SOURCES_lirc = lirc.c diff --git a/modules/control/rc/Modules.am b/modules/control/rc/Modules.am index 18b5e9f7b4..fdb5e52500 100644 --- a/modules/control/rc/Modules.am +++ b/modules/control/rc/Modules.am @@ -1 +1 @@ -SOURCES_rc = modules/control/rc/rc.c +SOURCES_rc = rc.c diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index 35324a9c78..3aa44a3435 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,8 +1,8 @@ -SOURCES_a52sys = modules/demux/a52sys.c -SOURCES_flac = modules/demux/flac.c -SOURCES_ogg = modules/demux/ogg.c -SOURCES_m3u = modules/demux/m3u.c -SOURCES_demuxdump = modules/demux/demuxdump.c -SOURCES_rawdv = modules/demux/rawdv.c -SOURCES_au = modules/demux/au.c -SOURCES_mkv = modules/demux/mkv.cpp +SOURCES_a52sys = a52sys.c +SOURCES_flac = flac.c +SOURCES_ogg = ogg.c +SOURCES_m3u = m3u.c +SOURCES_demuxdump = demuxdump.c +SOURCES_rawdv = rawdv.c +SOURCES_au = au.c +SOURCES_mkv = mkv.cpp diff --git a/modules/demux/aac/Modules.am b/modules/demux/aac/Modules.am index 190b6d8200..0e84460085 100644 --- a/modules/demux/aac/Modules.am +++ b/modules/demux/aac/Modules.am @@ -1 +1 @@ -SOURCES_aac = modules/demux/aac/demux.c +SOURCES_aac = demux.c diff --git a/modules/demux/asf/Modules.am b/modules/demux/asf/Modules.am index c1f68f4a2d..812515a08b 100644 --- a/modules/demux/asf/Modules.am +++ b/modules/demux/asf/Modules.am @@ -1,6 +1,6 @@ SOURCES_asf = \ - modules/demux/asf/asf.c \ - modules/demux/asf/asf.h \ - modules/demux/asf/libasf.c \ - modules/demux/asf/libasf.h \ + asf.c \ + asf.h \ + libasf.c \ + libasf.h \ $(NULL) diff --git a/modules/demux/avi/Modules.am b/modules/demux/avi/Modules.am index 7c65467f2f..80960b392a 100644 --- a/modules/demux/avi/Modules.am +++ b/modules/demux/avi/Modules.am @@ -1,6 +1,6 @@ SOURCES_avi = \ - modules/demux/avi/avi.c \ - modules/demux/avi/avi.h \ - modules/demux/avi/libavi.c \ - modules/demux/avi/libavi.h \ + avi.c \ + avi.h \ + libavi.c \ + libavi.h \ $(NULL) diff --git a/modules/demux/mp4/Modules.am b/modules/demux/mp4/Modules.am index 512dfdec70..c88b1f3a81 100644 --- a/modules/demux/mp4/Modules.am +++ b/modules/demux/mp4/Modules.am @@ -1,6 +1,6 @@ SOURCES_mp4 = \ - modules/demux/mp4/mp4.c \ - modules/demux/mp4/mp4.h \ - modules/demux/mp4/libmp4.c \ - modules/demux/mp4/libmp4.h \ + mp4.c \ + mp4.h \ + libmp4.c \ + libmp4.h \ $(NULL) diff --git a/modules/demux/mpeg/Modules.am b/modules/demux/mpeg/Modules.am index 99c6422f0c..c88cee2813 100644 --- a/modules/demux/mpeg/Modules.am +++ b/modules/demux/mpeg/Modules.am @@ -1,30 +1,30 @@ SOURCES_mpeg_system = \ - modules/demux/mpeg/system.c \ - modules/demux/mpeg/system.h \ + system.c \ + system.h \ $(NULL) SOURCES_es = \ - modules/demux/mpeg/es.c \ + es.c \ $(NULL) SOURCES_m4v = \ - modules/demux/mpeg/m4v.c \ + m4v.c \ $(NULL) SOURCES_ps = \ - modules/demux/mpeg/ps.c \ + ps.c \ $(NULL) SOURCES_ts = \ - modules/demux/mpeg/ts.c \ + ts.c \ $(NULL) SOURCES_ts_dvbpsi = \ - modules/demux/mpeg/ts.c \ + ts.c \ $(NULL) SOURCES_audio = \ - modules/demux/mpeg/audio.c \ + audio.c \ $(NULL) diff --git a/modules/demux/util/Modules.am b/modules/demux/util/Modules.am index 8a1519757c..287afb8762 100644 --- a/modules/demux/util/Modules.am +++ b/modules/demux/util/Modules.am @@ -1,14 +1,14 @@ SOURCES_id3 = \ - modules/demux/util/id3.c \ + id3.c \ $(NULL) SOURCES_id3tag = \ - modules/demux/util/id3tag.c \ - modules/demux/util/id3genres.h \ + id3tag.c \ + id3genres.h \ $(NULL) SOURCES_demuxsub = \ - modules/demux/util/sub.c \ - modules/demux/util/sub.h \ + sub.c \ + sub.h \ $(NULL) diff --git a/modules/demux/wav/Modules.am b/modules/demux/wav/Modules.am index 923a5b0121..7f91c9b4c1 100644 --- a/modules/demux/wav/Modules.am +++ b/modules/demux/wav/Modules.am @@ -1,4 +1,4 @@ SOURCES_wav = \ - modules/demux/wav/wav.c \ - modules/demux/wav/wav.h \ + wav.c \ + wav.h \ $(NULL) diff --git a/modules/encoder/Modules.am b/modules/encoder/Modules.am index a20067390f..5188d7fbad 100644 --- a/modules/encoder/Modules.am +++ b/modules/encoder/Modules.am @@ -1 +1 @@ -SOURCES_encoder_xvid = modules/encoder/xvid.c +SOURCES_encoder_xvid = xvid.c diff --git a/modules/encoder/ffmpeg/Modules.am b/modules/encoder/ffmpeg/Modules.am index 06190c5c2d..61bd373d50 100644 --- a/modules/encoder/ffmpeg/Modules.am +++ b/modules/encoder/ffmpeg/Modules.am @@ -1,6 +1,6 @@ SOURCES_encoder_ffmpeg = \ - modules/encoder/ffmpeg/encoder.c \ - modules/encoder/ffmpeg/video.c \ - modules/encoder/ffmpeg/audio.c \ + encoder.c \ + video.c \ + audio.c \ $(NULL) diff --git a/modules/gui/.cvsignore b/modules/gui/.cvsignore new file mode 100644 index 0000000000..c930ed7c2c --- /dev/null +++ b/modules/gui/.cvsignore @@ -0,0 +1,11 @@ +.deps +.dirstamp +*.lo +*.la +*.dll +*.dylib +*.sl +*.so +Makefile.am +Makefile.in +Makefile diff --git a/modules/gui/Modules.am b/modules/gui/Modules.am new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/gui/beos/Modules.am b/modules/gui/beos/Modules.am index 72902af872..86b7d6fc53 100644 --- a/modules/gui/beos/Modules.am +++ b/modules/gui/beos/Modules.am @@ -1,28 +1,28 @@ SOURCES_beos = \ - modules/gui/beos/BeOS.cpp \ - modules/gui/beos/AudioOutput.cpp \ - modules/gui/beos/VideoOutput.cpp \ - modules/gui/beos/Interface.cpp \ - modules/gui/beos/InterfaceWindow.cpp \ - modules/gui/beos/InterfaceWindow.h \ - modules/gui/beos/ListViews.cpp \ - modules/gui/beos/ListViews.h \ - modules/gui/beos/DrawingTidbits.cpp \ - modules/gui/beos/DrawingTidbits.h \ - modules/gui/beos/TransportButton.cpp \ - modules/gui/beos/TransportButton.h \ - modules/gui/beos/PlayListWindow.cpp \ - modules/gui/beos/PlayListWindow.h \ - modules/gui/beos/PreferencesWindow.cpp \ - modules/gui/beos/PreferencesWindow.h \ - modules/gui/beos/MessagesWindow.cpp \ - modules/gui/beos/MessagesWindow.h \ - modules/gui/beos/MediaControlView.cpp \ - modules/gui/beos/MediaControlView.h \ - modules/gui/beos/VlcWrapper.cpp \ - modules/gui/beos/VlcWrapper.h \ - modules/gui/beos/Bitmaps.h \ - modules/gui/beos/MsgVals.h \ - modules/gui/beos/VideoWindow.h \ + BeOS.cpp \ + AudioOutput.cpp \ + VideoOutput.cpp \ + Interface.cpp \ + InterfaceWindow.cpp \ + InterfaceWindow.h \ + ListViews.cpp \ + ListViews.h \ + DrawingTidbits.cpp \ + DrawingTidbits.h \ + TransportButton.cpp \ + TransportButton.h \ + PlayListWindow.cpp \ + PlayListWindow.h \ + PreferencesWindow.cpp \ + PreferencesWindow.h \ + MessagesWindow.cpp \ + MessagesWindow.h \ + MediaControlView.cpp \ + MediaControlView.h \ + VlcWrapper.cpp \ + VlcWrapper.h \ + Bitmaps.h \ + MsgVals.h \ + VideoWindow.h \ $(NULL) diff --git a/modules/gui/familiar/Modules.am b/modules/gui/familiar/Modules.am index 8c87b764e1..325ab89549 100644 --- a/modules/gui/familiar/Modules.am +++ b/modules/gui/familiar/Modules.am @@ -1,16 +1,16 @@ SOURCES_familiar = \ - modules/gui/familiar/familiar.c \ - modules/gui/familiar/familiar.h \ - modules/gui/familiar/interface.c \ - modules/gui/familiar/interface.h \ - modules/gui/familiar/support.c \ - modules/gui/familiar/support.h \ - modules/gui/familiar/callbacks.c \ - modules/gui/familiar/callbacks.h \ - modules/gui/familiar/network.c \ - modules/gui/familiar/network.h \ - modules/gui/familiar/playlist.c \ - modules/gui/familiar/playlist.h \ + familiar.c \ + familiar.h \ + interface.c \ + interface.h \ + support.c \ + support.h \ + callbacks.c \ + callbacks.h \ + network.c \ + network.h \ + playlist.c \ + playlist.h \ $(NULL) -EXTRA_DIST += modules/gui/familiar/familiar.glade +EXTRA_DIST += familiar.glade diff --git a/modules/gui/gtk/Modules.am b/modules/gui/gtk/Modules.am index 58e9b1dfb3..e7cefbe800 100644 --- a/modules/gui/gtk/Modules.am +++ b/modules/gui/gtk/Modules.am @@ -1,46 +1,46 @@ COMMON_gtk = \ - modules/gui/gtk/display.c \ - modules/gui/gtk/open.c \ - modules/gui/gtk/sout.c \ - modules/gui/gtk/control.c \ - modules/gui/gtk/menu.c \ - modules/gui/gtk/playlist.c \ - modules/gui/gtk/modules.c \ - modules/gui/gtk/preferences.c \ - modules/gui/gtk/gtk_callbacks.c \ + display.c \ + open.c \ + sout.c \ + control.c \ + menu.c \ + playlist.c \ + modules.c \ + preferences.c \ + gtk_callbacks.c \ $(NULL) SOURCES_gtk = \ - modules/gui/gtk/gtk.c \ - modules/gui/gtk/gtk_interface.c \ - modules/gui/gtk/gtk_support.c \ + gtk.c \ + gtk_interface.c \ + gtk_support.c \ $(COMMON_gtk) SOURCES_gnome = \ - modules/gui/gtk/gnome.c \ - modules/gui/gtk/gnome_interface.c \ - modules/gui/gtk/gnome_support.c \ + gnome.c \ + gnome_interface.c \ + gnome_support.c \ $(COMMON_gtk) noinst_HEADERS += \ - modules/gui/gtk/common.h \ - modules/gui/gtk/control.h \ - modules/gui/gtk/gnome_callbacks.h \ - modules/gui/gtk/gnome_interface.h \ - modules/gui/gtk/gnome_support.h \ - modules/gui/gtk/gtk_callbacks.h \ - modules/gui/gtk/display.h \ - modules/gui/gtk/menu.h \ - modules/gui/gtk/modules.h \ - modules/gui/gtk/open.h \ - modules/gui/gtk/gtk_interface.h \ - modules/gui/gtk/playlist.h \ - modules/gui/gtk/preferences.h \ - modules/gui/gtk/gtk_support.h \ + common.h \ + control.h \ + gnome_callbacks.h \ + gnome_interface.h \ + gnome_support.h \ + gtk_callbacks.h \ + display.h \ + menu.h \ + modules.h \ + open.h \ + gtk_interface.h \ + playlist.h \ + preferences.h \ + gtk_support.h \ $(NULL) EXTRA_DIST += \ - modules/gui/gtk/gtk.glade \ - modules/gui/gtk/gnome.glade \ - modules/gui/gtk/gnome_callbacks.c \ + gtk.glade \ + gnome.glade \ + gnome_callbacks.c \ $(NULL) diff --git a/modules/gui/gtk2/Modules.am b/modules/gui/gtk2/Modules.am index f1de1eeb8e..3971ad602b 100644 --- a/modules/gui/gtk2/Modules.am +++ b/modules/gui/gtk2/Modules.am @@ -2,26 +2,26 @@ COMMON_gtk2 = \ $(NULL) SOURCES_gtk2 = \ - modules/gui/gtk2/gtk2.c \ - modules/gui/gtk2/gtk2_callbacks.c \ - modules/gui/gtk2/gtk2_callbacks.h \ - modules/gui/gtk2/gtk2_interface.c \ - modules/gui/gtk2/gtk2_interface.h \ - modules/gui/gtk2/gtk2_support.c \ - modules/gui/gtk2/gtk2_support.h \ + gtk2.c \ + gtk2_callbacks.c \ + gtk2_callbacks.h \ + gtk2_interface.c \ + gtk2_interface.h \ + gtk2_support.c \ + gtk2_support.h \ $(COMMON_gtk2) SOURCES_gnome2 = \ - modules/gui/gtk2/gnome2.c \ - modules/gui/gtk2/gnome2_callbacks.c \ - modules/gui/gtk2/gnome2_callbacks.h \ - modules/gui/gtk2/gnome2_interface.c \ - modules/gui/gtk2/gnome2_interface.h \ - modules/gui/gtk2/gnome2_support.c \ - modules/gui/gtk2/gnome2_support.h \ + gnome2.c \ + gnome2_callbacks.c \ + gnome2_callbacks.h \ + gnome2_interface.c \ + gnome2_interface.h \ + gnome2_support.c \ + gnome2_support.h \ $(COMMON_gtk2) EXTRA_DIST += \ - modules/gui/gtk2/gtk2.glade \ - modules/gui/gtk2/gnome2.glade \ + gtk2.glade \ + gnome2.glade \ $(NULL) diff --git a/modules/gui/kde/Modules.am b/modules/gui/kde/Modules.am index 553d6f7807..eafd1113b5 100644 --- a/modules/gui/kde/Modules.am +++ b/modules/gui/kde/Modules.am @@ -1,67 +1,70 @@ SOURCES_kde = \ - modules/gui/kde/kde.cpp \ - modules/gui/kde/interface.cpp \ - modules/gui/kde/slider.cpp \ - modules/gui/kde/disc.cpp \ - modules/gui/kde/net.cpp \ - modules/gui/kde/menu.cpp \ - modules/gui/kde/preferences.cpp \ - modules/gui/kde/pluginsbox.cpp \ - modules/gui/kde/QConfigItem.cpp \ - modules/gui/kde/messages.cpp \ - modules/gui/kde/info.cpp \ - modules/gui/kde/languagemenu.cpp + kde.cpp \ + interface.cpp \ + slider.cpp \ + disc.cpp \ + net.cpp \ + menu.cpp \ + preferences.cpp \ + pluginsbox.cpp \ + QConfigItem.cpp \ + messages.cpp \ + info.cpp \ + languagemenu.cpp \ + $(NULL) nodist_SOURCES_kde = \ - modules/gui/kde/interface.moc.cpp \ - modules/gui/kde/slider.moc.cpp \ - modules/gui/kde/disc.moc.cpp \ - modules/gui/kde/net.moc.cpp \ - modules/gui/kde/menu.moc.cpp \ - modules/gui/kde/preferences.moc.cpp \ - modules/gui/kde/pluginsbox.moc.cpp \ - modules/gui/kde/QConfigItem.moc.cpp \ - modules/gui/kde/messages.moc.cpp \ - modules/gui/kde/info.moc.cpp \ - modules/gui/kde/languagemenu.moc.cpp + interface.moc.cpp \ + slider.moc.cpp \ + disc.moc.cpp \ + net.moc.cpp \ + menu.moc.cpp \ + preferences.moc.cpp \ + pluginsbox.moc.cpp \ + QConfigItem.moc.cpp \ + messages.moc.cpp \ + info.moc.cpp \ + languagemenu.moc.cpp \ + $(NULL) noinst_HEADERS += \ - modules/gui/kde/common.h \ - modules/gui/kde/disc.h \ - modules/gui/kde/QConfigItem.h \ - modules/gui/kde/interface.h \ - modules/gui/kde/menu.h \ - modules/gui/kde/net.h \ - modules/gui/kde/pluginsbox.h \ - modules/gui/kde/preferences.h \ - modules/gui/kde/slider.h \ - modules/gui/kde/messages.h \ - modules/gui/kde/info.h \ - modules/gui/kde/languagemenu.h + common.h \ + disc.h \ + QConfigItem.h \ + interface.h \ + menu.h \ + net.h \ + pluginsbox.h \ + preferences.h \ + slider.h \ + messages.h \ + info.h \ + languagemenu.h \ + $(NULL) -modules/gui/kde/interface.moc.cpp: modules/gui/kde/interface.h +interface.moc.cpp: interface.h $(MOC) $< -o $@ -modules/gui/kde/slider.moc.cpp: modules/gui/kde/slider.h +slider.moc.cpp: slider.h $(MOC) $< -o $@ -modules/gui/kde/disc.moc.cpp: modules/gui/kde/disc.h +disc.moc.cpp: disc.h $(MOC) $< -o $@ -modules/gui/kde/net.moc.cpp: modules/gui/kde/net.h +net.moc.cpp: net.h $(MOC) $< -o $@ -modules/gui/kde/menu.moc.cpp: modules/gui/kde/menu.h +menu.moc.cpp: menu.h $(MOC) $< -o $@ -modules/gui/kde/preferences.moc.cpp: modules/gui/kde/preferences.h +preferences.moc.cpp: preferences.h $(MOC) $< -o $@ -modules/gui/kde/pluginsbox.moc.cpp: modules/gui/kde/pluginsbox.h +pluginsbox.moc.cpp: pluginsbox.h $(MOC) $< -o $@ -modules/gui/kde/QConfigItem.moc.cpp: modules/gui/kde/QConfigItem.h +QConfigItem.moc.cpp: QConfigItem.h $(MOC) $< -o $@ -modules/gui/kde/messages.moc.cpp: modules/gui/kde/messages.h +messages.moc.cpp: messages.h $(MOC) $< -o $@ -modules/gui/kde/info.moc.cpp: modules/gui/kde/info.h +info.moc.cpp: info.h $(MOC) $< -o $@ -modules/gui/kde/languagemenu.moc.cpp: modules/gui/kde/languagemenu.h +languagemenu.moc.cpp: languagemenu.h $(MOC) $< -o $@ kdedatadir = $(datadir)/vlc -dist_kdedata_DATA = modules/gui/kde/ui.rc \ No newline at end of file +dist_kdedata_DATA = ui.rc diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am index 44a0828d13..4fc84c2ac0 100644 --- a/modules/gui/macosx/Modules.am +++ b/modules/gui/macosx/Modules.am @@ -1,26 +1,26 @@ SOURCES_macosx = \ - modules/gui/macosx/about.h \ - modules/gui/macosx/about.m \ - modules/gui/macosx/applescript.h \ - modules/gui/macosx/applescript.m \ - modules/gui/macosx/controls.h \ - modules/gui/macosx/controls.m \ - modules/gui/macosx/intf.m \ - modules/gui/macosx/intf.h \ - modules/gui/macosx/info.h \ - modules/gui/macosx/info.m \ - modules/gui/macosx/macosx.m \ - modules/gui/macosx/misc.m \ - modules/gui/macosx/misc.h \ - modules/gui/macosx/open.m \ - modules/gui/macosx/open.h \ - modules/gui/macosx/playlist.m \ - modules/gui/macosx/playlist.h \ - modules/gui/macosx/prefs.m \ - modules/gui/macosx/prefs.h \ - modules/gui/macosx/output.h \ - modules/gui/macosx/output.m \ - modules/gui/macosx/vout.m \ - modules/gui/macosx/vout.h \ + about.h \ + about.m \ + applescript.h \ + applescript.m \ + controls.h \ + controls.m \ + intf.m \ + intf.h \ + info.h \ + info.m \ + macosx.m \ + misc.m \ + misc.h \ + open.m \ + open.h \ + playlist.m \ + playlist.h \ + prefs.m \ + prefs.h \ + output.h \ + output.m \ + vout.m \ + vout.h \ $(NULL) diff --git a/modules/gui/ncurses/Modules.am b/modules/gui/ncurses/Modules.am index ca6a252268..9520c3e0d9 100644 --- a/modules/gui/ncurses/Modules.am +++ b/modules/gui/ncurses/Modules.am @@ -1 +1 @@ -SOURCES_ncurses = modules/gui/ncurses/ncurses.c +SOURCES_ncurses = ncurses.c diff --git a/modules/gui/qnx/Modules.am b/modules/gui/qnx/Modules.am index 0f3386f89e..ef9dfc52a4 100644 --- a/modules/gui/qnx/Modules.am +++ b/modules/gui/qnx/Modules.am @@ -1,4 +1,4 @@ SOURCES_qnx = \ - modules/gui/qnx/qnx.c \ - modules/gui/qnx/aout.c \ - modules/gui/qnx/vout.c + qnx.c \ + aout.c \ + vout.c diff --git a/modules/gui/qt/Modules.am b/modules/gui/qt/Modules.am index 5102b3c114..1fa5d3af53 100644 --- a/modules/gui/qt/Modules.am +++ b/modules/gui/qt/Modules.am @@ -1,13 +1,13 @@ SOURCES_qt = \ - modules/gui/qt/qt.cpp \ - modules/gui/qt/intf.cpp + qt.cpp \ + intf.cpp nodist_SOURCES_qt = \ - modules/gui/qt/intf.moc.cpp + intf.moc.cpp noinst_HEADERS += \ - modules/gui/qt/intf.h + intf.h -modules/gui/qt/intf.moc.cpp: modules/gui/qt/intf.h +intf.moc.cpp: intf.h $(MOC) $< -o $@ diff --git a/modules/gui/skins/Modules.am b/modules/gui/skins/Modules.am index 8a80b0b201..3704a9ce6c 100644 --- a/modules/gui/skins/Modules.am +++ b/modules/gui/skins/Modules.am @@ -1,207 +1,207 @@ SOURCES_skins = \ - modules/gui/skins/os_api.h \ - modules/gui/skins/os_bitmap.h \ - modules/gui/skins/os_event.h \ - modules/gui/skins/os_font.h \ - modules/gui/skins/os_graphics.h \ - modules/gui/skins/os_theme.h \ - modules/gui/skins/os_window.h \ + os_api.h \ + os_bitmap.h \ + os_event.h \ + os_font.h \ + os_graphics.h \ + os_theme.h \ + os_window.h \ \ - modules/gui/skins/controls/controls.h \ - modules/gui/skins/controls/button.cpp \ - modules/gui/skins/controls/button.h \ - modules/gui/skins/controls/checkbox.cpp \ - modules/gui/skins/controls/checkbox.h \ - modules/gui/skins/controls/generic.cpp \ - modules/gui/skins/controls/generic.h \ - modules/gui/skins/controls/image.cpp \ - modules/gui/skins/controls/image.h \ - modules/gui/skins/controls/playlist.cpp \ - modules/gui/skins/controls/playlist.h \ - modules/gui/skins/controls/rectangle.cpp \ - modules/gui/skins/controls/rectangle.h \ - modules/gui/skins/controls/slider.cpp \ - modules/gui/skins/controls/slider.h \ - modules/gui/skins/controls/text.cpp \ - modules/gui/skins/controls/text.h \ + controls/controls.h \ + controls/button.cpp \ + controls/button.h \ + controls/checkbox.cpp \ + controls/checkbox.h \ + controls/generic.cpp \ + controls/generic.h \ + controls/image.cpp \ + controls/image.h \ + controls/playlist.cpp \ + controls/playlist.h \ + controls/rectangle.cpp \ + controls/rectangle.h \ + controls/slider.cpp \ + controls/slider.h \ + controls/text.cpp \ + controls/text.h \ \ - modules/gui/skins/parser/flex.c \ - modules/gui/skins/parser/skin.h \ - modules/gui/skins/parser/skin.c \ - modules/gui/skins/parser/wrappers.h \ - modules/gui/skins/parser/wrappers.cpp \ + parser/flex.c \ + parser/skin.h \ + parser/skin.c \ + parser/wrappers.h \ + parser/wrappers.cpp \ \ - modules/gui/skins/src/anchor.cpp \ - modules/gui/skins/src/anchor.h \ - modules/gui/skins/src/banks.cpp \ - modules/gui/skins/src/banks.h \ - modules/gui/skins/src/bezier.cpp \ - modules/gui/skins/src/bezier.h \ - modules/gui/skins/src/bitmap.cpp \ - modules/gui/skins/src/bitmap.h \ - modules/gui/skins/src/dialogs.cpp \ - modules/gui/skins/src/dialogs.h \ - modules/gui/skins/src/event.cpp \ - modules/gui/skins/src/event.h \ - modules/gui/skins/src/font.cpp \ - modules/gui/skins/src/font.h \ - modules/gui/skins/src/graphics.cpp \ - modules/gui/skins/src/graphics.h \ - modules/gui/skins/src/skin_main.cpp \ - modules/gui/skins/src/skin_common.h \ - modules/gui/skins/src/theme.cpp \ - modules/gui/skins/src/theme.h \ - modules/gui/skins/src/themeloader.cpp \ - modules/gui/skins/src/themeloader.h \ - modules/gui/skins/src/vlcproc.cpp \ - modules/gui/skins/src/vlcproc.h \ - modules/gui/skins/src/window.cpp \ - modules/gui/skins/src/window.h \ + src/anchor.cpp \ + src/anchor.h \ + src/banks.cpp \ + src/banks.h \ + src/bezier.cpp \ + src/bezier.h \ + src/bitmap.cpp \ + src/bitmap.h \ + src/dialogs.cpp \ + src/dialogs.h \ + src/event.cpp \ + src/event.h \ + src/font.cpp \ + src/font.h \ + src/graphics.cpp \ + src/graphics.h \ + src/skin_main.cpp \ + src/skin_common.h \ + src/theme.cpp \ + src/theme.h \ + src/themeloader.cpp \ + src/themeloader.h \ + src/vlcproc.cpp \ + src/vlcproc.h \ + src/window.cpp \ + src/window.h \ \ - modules/gui/skins/win32/win32_api.cpp \ - modules/gui/skins/win32/win32_bitmap.cpp \ - modules/gui/skins/win32/win32_bitmap.h \ - modules/gui/skins/win32/win32_dragdrop.cpp \ - modules/gui/skins/win32/win32_dragdrop.h \ - modules/gui/skins/win32/win32_event.cpp \ - modules/gui/skins/win32/win32_event.h \ - modules/gui/skins/win32/win32_font.cpp \ - modules/gui/skins/win32/win32_font.h \ - modules/gui/skins/win32/win32_graphics.cpp \ - modules/gui/skins/win32/win32_graphics.h \ - modules/gui/skins/win32/win32_run.cpp \ - modules/gui/skins/win32/win32_theme.cpp \ - modules/gui/skins/win32/win32_theme.h \ - modules/gui/skins/win32/win32_window.cpp \ - modules/gui/skins/win32/win32_window.h \ + win32/win32_api.cpp \ + win32/win32_bitmap.cpp \ + win32/win32_bitmap.h \ + win32/win32_dragdrop.cpp \ + win32/win32_dragdrop.h \ + win32/win32_event.cpp \ + win32/win32_event.h \ + win32/win32_font.cpp \ + win32/win32_font.h \ + win32/win32_graphics.cpp \ + win32/win32_graphics.h \ + win32/win32_run.cpp \ + win32/win32_theme.cpp \ + win32/win32_theme.h \ + win32/win32_window.cpp \ + win32/win32_window.h \ \ - modules/gui/skins/x11/x11_api.cpp \ - modules/gui/skins/x11/x11_bitmap.cpp \ - modules/gui/skins/x11/x11_bitmap.h \ - modules/gui/skins/x11/x11_dragdrop.cpp \ - modules/gui/skins/x11/x11_dragdrop.h \ - modules/gui/skins/x11/x11_event.cpp \ - modules/gui/skins/x11/x11_event.h \ - modules/gui/skins/x11/x11_font.cpp \ - modules/gui/skins/x11/x11_font.h \ - modules/gui/skins/x11/x11_graphics.cpp \ - modules/gui/skins/x11/x11_graphics.h \ - modules/gui/skins/x11/x11_run.cpp \ - modules/gui/skins/x11/x11_theme.cpp \ - modules/gui/skins/x11/x11_theme.h \ - modules/gui/skins/x11/x11_timer.cpp \ - modules/gui/skins/x11/x11_timer.h \ - modules/gui/skins/x11/x11_window.cpp \ - modules/gui/skins/x11/x11_window.h \ + x11/x11_api.cpp \ + x11/x11_bitmap.cpp \ + x11/x11_bitmap.h \ + x11/x11_dragdrop.cpp \ + x11/x11_dragdrop.h \ + x11/x11_event.cpp \ + x11/x11_event.h \ + x11/x11_font.cpp \ + x11/x11_font.h \ + x11/x11_graphics.cpp \ + x11/x11_graphics.h \ + x11/x11_run.cpp \ + x11/x11_theme.cpp \ + x11/x11_theme.h \ + x11/x11_timer.cpp \ + x11/x11_timer.h \ + x11/x11_window.cpp \ + x11/x11_window.h \ \ - modules/gui/wxwindows/wxwindows.h \ - modules/gui/wxwindows/fileinfo.cpp \ - modules/gui/wxwindows/messages.cpp \ - modules/gui/wxwindows/open.cpp \ - modules/gui/wxwindows/preferences.cpp \ - modules/gui/wxwindows/streamout.cpp \ - modules/gui/wxwindows/subtitles.cpp \ - modules/gui/wxwindows/menus.cpp \ + ../wxwindows/wxwindows.h \ + ../wxwindows/fileinfo.cpp \ + ../wxwindows/messages.cpp \ + ../wxwindows/open.cpp \ + ../wxwindows/preferences.cpp \ + ../wxwindows/streamout.cpp \ + ../wxwindows/subtitles.cpp \ + ../wxwindows/menus.cpp \ $(NULL) SOURCES_basic_skins = \ - modules/gui/skins/os_api.h \ - modules/gui/skins/os_bitmap.h \ - modules/gui/skins/os_event.h \ - modules/gui/skins/os_font.h \ - modules/gui/skins/os_graphics.h \ - modules/gui/skins/os_theme.h \ - modules/gui/skins/os_window.h \ + os_api.h \ + os_bitmap.h \ + os_event.h \ + os_font.h \ + os_graphics.h \ + os_theme.h \ + os_window.h \ \ - modules/gui/skins/controls/controls.h \ - modules/gui/skins/controls/button.cpp \ - modules/gui/skins/controls/button.h \ - modules/gui/skins/controls/checkbox.cpp \ - modules/gui/skins/controls/checkbox.h \ - modules/gui/skins/controls/generic.cpp \ - modules/gui/skins/controls/generic.h \ - modules/gui/skins/controls/image.cpp \ - modules/gui/skins/controls/image.h \ - modules/gui/skins/controls/playlist.cpp \ - modules/gui/skins/controls/playlist.h \ - modules/gui/skins/controls/rectangle.cpp \ - modules/gui/skins/controls/rectangle.h \ - modules/gui/skins/controls/slider.cpp \ - modules/gui/skins/controls/slider.h \ - modules/gui/skins/controls/text.cpp \ - modules/gui/skins/controls/text.h \ + controls/controls.h \ + controls/button.cpp \ + controls/button.h \ + controls/checkbox.cpp \ + controls/checkbox.h \ + controls/generic.cpp \ + controls/generic.h \ + controls/image.cpp \ + controls/image.h \ + controls/playlist.cpp \ + controls/playlist.h \ + controls/rectangle.cpp \ + controls/rectangle.h \ + controls/slider.cpp \ + controls/slider.h \ + controls/text.cpp \ + controls/text.h \ \ - modules/gui/skins/parser/flex.c \ - modules/gui/skins/parser/skin.h \ - modules/gui/skins/parser/skin.c \ - modules/gui/skins/parser/wrappers.h \ - modules/gui/skins/parser/wrappers.cpp \ + parser/flex.c \ + parser/skin.h \ + parser/skin.c \ + parser/wrappers.h \ + parser/wrappers.cpp \ \ - modules/gui/skins/src/anchor.cpp \ - modules/gui/skins/src/anchor.h \ - modules/gui/skins/src/banks.cpp \ - modules/gui/skins/src/banks.h \ - modules/gui/skins/src/bezier.cpp \ - modules/gui/skins/src/bezier.h \ - modules/gui/skins/src/bitmap.cpp \ - modules/gui/skins/src/bitmap.h \ - modules/gui/skins/src/dialogs.cpp \ - modules/gui/skins/src/dialogs.h \ - modules/gui/skins/src/event.cpp \ - modules/gui/skins/src/event.h \ - modules/gui/skins/src/font.cpp \ - modules/gui/skins/src/font.h \ - modules/gui/skins/src/graphics.cpp \ - modules/gui/skins/src/graphics.h \ - modules/gui/skins/src/skin_main.cpp \ - modules/gui/skins/src/skin_common.h \ - modules/gui/skins/src/theme.cpp \ - modules/gui/skins/src/theme.h \ - modules/gui/skins/src/themeloader.cpp \ - modules/gui/skins/src/themeloader.h \ - modules/gui/skins/src/vlcproc.cpp \ - modules/gui/skins/src/vlcproc.h \ - modules/gui/skins/src/window.cpp \ - modules/gui/skins/src/window.h \ + src/anchor.cpp \ + src/anchor.h \ + src/banks.cpp \ + src/banks.h \ + src/bezier.cpp \ + src/bezier.h \ + src/bitmap.cpp \ + src/bitmap.h \ + src/dialogs.cpp \ + src/dialogs.h \ + src/event.cpp \ + src/event.h \ + src/font.cpp \ + src/font.h \ + src/graphics.cpp \ + src/graphics.h \ + src/skin_main.cpp \ + src/skin_common.h \ + src/theme.cpp \ + src/theme.h \ + src/themeloader.cpp \ + src/themeloader.h \ + src/vlcproc.cpp \ + src/vlcproc.h \ + src/window.cpp \ + src/window.h \ \ - modules/gui/skins/win32/win32_api.cpp \ - modules/gui/skins/win32/win32_bitmap.cpp \ - modules/gui/skins/win32/win32_bitmap.h \ - modules/gui/skins/win32/win32_dragdrop.cpp \ - modules/gui/skins/win32/win32_dragdrop.h \ - modules/gui/skins/win32/win32_event.cpp \ - modules/gui/skins/win32/win32_event.h \ - modules/gui/skins/win32/win32_font.cpp \ - modules/gui/skins/win32/win32_font.h \ - modules/gui/skins/win32/win32_graphics.cpp \ - modules/gui/skins/win32/win32_graphics.h \ - modules/gui/skins/win32/win32_run.cpp \ - modules/gui/skins/win32/win32_theme.cpp \ - modules/gui/skins/win32/win32_theme.h \ - modules/gui/skins/win32/win32_window.cpp \ - modules/gui/skins/win32/win32_window.h \ + win32/win32_api.cpp \ + win32/win32_bitmap.cpp \ + win32/win32_bitmap.h \ + win32/win32_dragdrop.cpp \ + win32/win32_dragdrop.h \ + win32/win32_event.cpp \ + win32/win32_event.h \ + win32/win32_font.cpp \ + win32/win32_font.h \ + win32/win32_graphics.cpp \ + win32/win32_graphics.h \ + win32/win32_run.cpp \ + win32/win32_theme.cpp \ + win32/win32_theme.h \ + win32/win32_window.cpp \ + win32/win32_window.h \ \ - modules/gui/skins/x11/x11_api.cpp \ - modules/gui/skins/x11/x11_bitmap.cpp \ - modules/gui/skins/x11/x11_bitmap.h \ - modules/gui/skins/x11/x11_dragdrop.cpp \ - modules/gui/skins/x11/x11_dragdrop.h \ - modules/gui/skins/x11/x11_event.cpp \ - modules/gui/skins/x11/x11_event.h \ - modules/gui/skins/x11/x11_font.cpp \ - modules/gui/skins/x11/x11_font.h \ - modules/gui/skins/x11/x11_graphics.cpp \ - modules/gui/skins/x11/x11_graphics.h \ - modules/gui/skins/x11/x11_run.cpp \ - modules/gui/skins/x11/x11_theme.cpp \ - modules/gui/skins/x11/x11_theme.h \ - modules/gui/skins/x11/x11_timer.cpp \ - modules/gui/skins/x11/x11_timer.h \ - modules/gui/skins/x11/x11_window.cpp \ - modules/gui/skins/x11/x11_window.h \ + x11/x11_api.cpp \ + x11/x11_bitmap.cpp \ + x11/x11_bitmap.h \ + x11/x11_dragdrop.cpp \ + x11/x11_dragdrop.h \ + x11/x11_event.cpp \ + x11/x11_event.h \ + x11/x11_font.cpp \ + x11/x11_font.h \ + x11/x11_graphics.cpp \ + x11/x11_graphics.h \ + x11/x11_run.cpp \ + x11/x11_theme.cpp \ + x11/x11_theme.h \ + x11/x11_timer.cpp \ + x11/x11_timer.h \ + x11/x11_window.cpp \ + x11/x11_window.h \ $(NULL) EXTRA_DIST += \ - modules/gui/skins/parser/skin.dtd \ - modules/gui/skins/parser/skin.act + parser/skin.dtd \ + parser/skin.act diff --git a/modules/gui/win32/Modules.am b/modules/gui/win32/Modules.am index 8d1ed4449a..59e577caec 100644 --- a/modules/gui/win32/Modules.am +++ b/modules/gui/win32/Modules.am @@ -8,8 +8,8 @@ EXTRA_DIST += $(BORLAND_win32) # We have private rules! We do whatever we want! Don't mess with us! SOURCES_win32 = PRIVATE -modules/gui/win32/libwin32_plugin.dll: $(BORLAND_win32) - cd modules/gui/win32/ && \ +libwin32_plugin.dll: $(BORLAND_win32) + cd && \ rm -f win32.mak && \ $(BPR2MAK) win32.bpr -s | \ sed -e 's@^LIBPATH = .*@&;$$(RELEASELIBPATH)@' \ @@ -18,45 +18,45 @@ modules/gui/win32/libwin32_plugin.dll: $(BORLAND_win32) $(BCMAKE) -f win32.mak -b BORLAND_win32 = \ - modules/gui/win32/win32.bpr \ - modules/gui/win32/win32.bpf \ + win32.bpr \ + win32.bpf \ \ - modules/gui/win32/about.cpp \ - modules/gui/win32/disc.cpp \ - modules/gui/win32/dragdrop.cpp \ - modules/gui/win32/mainframe.cpp \ - modules/gui/win32/menu.cpp \ - modules/gui/win32/messages.cpp \ - modules/gui/win32/network.cpp \ - modules/gui/win32/playlist.cpp \ - modules/gui/win32/preferences.cpp \ - modules/gui/win32/win32.cpp \ - modules/gui/win32/misc.cpp \ - modules/gui/win32/sout.cpp \ - modules/gui/win32/subtitles.cpp \ + about.cpp \ + disc.cpp \ + dragdrop.cpp \ + mainframe.cpp \ + menu.cpp \ + messages.cpp \ + network.cpp \ + playlist.cpp \ + preferences.cpp \ + win32.cpp \ + misc.cpp \ + sout.cpp \ + subtitles.cpp \ \ - modules/gui/win32/about.dfm \ - modules/gui/win32/disc.dfm \ - modules/gui/win32/mainframe.dfm \ - modules/gui/win32/messages.dfm \ - modules/gui/win32/network.dfm \ - modules/gui/win32/playlist.dfm \ - modules/gui/win32/preferences.dfm \ - modules/gui/win32/sout.dfm \ - modules/gui/win32/subtitles.dfm \ + about.dfm \ + disc.dfm \ + mainframe.dfm \ + messages.dfm \ + network.dfm \ + playlist.dfm \ + preferences.dfm \ + sout.dfm \ + subtitles.dfm \ \ - modules/gui/win32/about.h \ - modules/gui/win32/disc.h \ - modules/gui/win32/dragdrop.h \ - modules/gui/win32/mainframe.h \ - modules/gui/win32/menu.h \ - modules/gui/win32/messages.h \ - modules/gui/win32/network.h \ - modules/gui/win32/playlist.h \ - modules/gui/win32/preferences.h \ - modules/gui/win32/win32_common.h \ - modules/gui/win32/misc.h \ - modules/gui/win32/sout.h \ - modules/gui/win32/subtitles.h \ + about.h \ + disc.h \ + dragdrop.h \ + mainframe.h \ + menu.h \ + messages.h \ + network.h \ + playlist.h \ + preferences.h \ + win32_common.h \ + misc.h \ + sout.h \ + subtitles.h \ $(NULL) diff --git a/modules/gui/wxwindows/Modules.am b/modules/gui/wxwindows/Modules.am index 31f242d819..4e9618eea9 100644 --- a/modules/gui/wxwindows/Modules.am +++ b/modules/gui/wxwindows/Modules.am @@ -1,27 +1,27 @@ SOURCES_wxwindows = \ - modules/gui/wxwindows/wxwindows.cpp \ - modules/gui/wxwindows/wxwindows.h \ - modules/gui/wxwindows/interface.cpp \ - modules/gui/wxwindows/open.cpp \ - modules/gui/wxwindows/streamout.cpp \ - modules/gui/wxwindows/messages.cpp \ - modules/gui/wxwindows/playlist.cpp \ - modules/gui/wxwindows/menus.cpp \ - modules/gui/wxwindows/preferences.cpp \ - modules/gui/wxwindows/timer.cpp \ - modules/gui/wxwindows/fileinfo.cpp \ - modules/gui/wxwindows/subtitles.cpp \ + wxwindows.cpp \ + wxwindows.h \ + interface.cpp \ + open.cpp \ + streamout.cpp \ + messages.cpp \ + playlist.cpp \ + menus.cpp \ + preferences.cpp \ + timer.cpp \ + fileinfo.cpp \ + subtitles.cpp \ $(NULL) EXTRA_DIST += \ - modules/gui/wxwindows/bitmaps/file.xpm \ - modules/gui/wxwindows/bitmaps/disc.xpm \ - modules/gui/wxwindows/bitmaps/net.xpm \ - modules/gui/wxwindows/bitmaps/stop.xpm \ - modules/gui/wxwindows/bitmaps/play.xpm \ - modules/gui/wxwindows/bitmaps/pause.xpm \ - modules/gui/wxwindows/bitmaps/playlist.xpm \ - modules/gui/wxwindows/bitmaps/previous.xpm \ - modules/gui/wxwindows/bitmaps/next.xpm \ - modules/gui/wxwindows/bitmaps/slow.xpm \ - modules/gui/wxwindows/bitmaps/fast.xpm + bitmaps/file.xpm \ + bitmaps/disc.xpm \ + bitmaps/net.xpm \ + bitmaps/stop.xpm \ + bitmaps/play.xpm \ + bitmaps/pause.xpm \ + bitmaps/playlist.xpm \ + bitmaps/previous.xpm \ + bitmaps/next.xpm \ + bitmaps/slow.xpm \ + bitmaps/fast.xpm diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index c71636f536..7251a177d9 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,8 +1,8 @@ -SOURCES_gtk_main = modules/misc/gtk_main.c -SOURCES_gnome_main = modules/misc/gtk_main.c -SOURCES_gtk2_main = modules/misc/gtk_main.c -SOURCES_gnome2_main = modules/misc/gtk_main.c -SOURCES_sap = modules/misc/sap.c -SOURCES_screensaver = modules/misc/screensaver.c -SOURCES_qte_main = modules/misc/qte_main.cpp -SOURCES_httpd = modules/misc/httpd.c +SOURCES_gtk_main = gtk_main.c +SOURCES_gnome_main = gtk_main.c +SOURCES_gtk2_main = gtk_main.c +SOURCES_gnome2_main = gtk_main.c +SOURCES_sap = sap.c +SOURCES_screensaver = screensaver.c +SOURCES_qte_main = qte_main.cpp +SOURCES_httpd = httpd.c diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am index e0fe6d8727..5a103c9b68 100644 --- a/modules/misc/dummy/Modules.am +++ b/modules/misc/dummy/Modules.am @@ -1,10 +1,10 @@ SOURCES_dummy = \ - modules/misc/dummy/dummy.c \ - modules/misc/dummy/dummy.h \ - modules/misc/dummy/aout.c \ - modules/misc/dummy/vout.c \ - modules/misc/dummy/interface.c \ - modules/misc/dummy/input.c \ - modules/misc/dummy/decoder.c \ + dummy.c \ + dummy.h \ + aout.c \ + vout.c \ + interface.c \ + input.c \ + decoder.c \ $(NULL) diff --git a/modules/misc/logger/Modules.am b/modules/misc/logger/Modules.am index f4830c0d55..f414909996 100644 --- a/modules/misc/logger/Modules.am +++ b/modules/misc/logger/Modules.am @@ -1 +1 @@ -SOURCES_logger = modules/misc/logger/logger.c +SOURCES_logger = logger.c diff --git a/modules/misc/memcpy/Modules.am b/modules/misc/memcpy/Modules.am index 236ac59b46..21029ddc2d 100644 --- a/modules/misc/memcpy/Modules.am +++ b/modules/misc/memcpy/Modules.am @@ -1,23 +1,23 @@ SOURCES_memcpy = \ - modules/misc/memcpy/memcpy.c \ + memcpy.c \ $(NULL) SOURCES_memcpymmx = \ - modules/misc/memcpy/memcpy.c \ - modules/misc/memcpy/fastmemcpy.h \ + memcpy.c \ + fastmemcpy.h \ $(NULL) SOURCES_memcpymmxext = \ - modules/misc/memcpy/memcpy.c \ - modules/misc/memcpy/fastmemcpy.h \ + memcpy.c \ + fastmemcpy.h \ $(NULL) SOURCES_memcpy3dn = \ - modules/misc/memcpy/memcpy.c \ - modules/misc/memcpy/fastmemcpy.h \ + memcpy.c \ + fastmemcpy.h \ $(NULL) SOURCES_memcpyaltivec = \ - modules/misc/memcpy/memcpyaltivec.c \ + memcpyaltivec.c \ $(NULL) diff --git a/modules/misc/network/Modules.am b/modules/misc/network/Modules.am index 6dafa00a47..4f54abf112 100644 --- a/modules/misc/network/Modules.am +++ b/modules/misc/network/Modules.am @@ -1,2 +1,2 @@ -SOURCES_ipv4 = modules/misc/network/ipv4.c -SOURCES_ipv6 = modules/misc/network/ipv6.c +SOURCES_ipv4 = ipv4.c +SOURCES_ipv6 = ipv6.c diff --git a/modules/misc/testsuite/Modules.am b/modules/misc/testsuite/Modules.am index c8f187d8ba..4f6e6000c8 100644 --- a/modules/misc/testsuite/Modules.am +++ b/modules/misc/testsuite/Modules.am @@ -1,4 +1,4 @@ -SOURCES_test1 = modules/misc/testsuite/test1.c -SOURCES_test2 = modules/misc/testsuite/test2.cpp -SOURCES_test3 = modules/misc/testsuite/test3.m -SOURCES_test4 = modules/misc/testsuite/test4.c +SOURCES_test1 = test1.c +SOURCES_test2 = test2.cpp +SOURCES_test3 = test3.m +SOURCES_test4 = test4.c diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am index 5439ee0cbc..5958c6540e 100644 --- a/modules/mux/Modules.am +++ b/modules/mux/Modules.am @@ -1,3 +1,3 @@ -SOURCES_mux_dummy = modules/mux/dummy.c -SOURCES_mux_avi = modules/mux/avi.c -SOURCES_mux_ogg = modules/mux/ogg.c +SOURCES_mux_dummy = dummy.c +SOURCES_mux_avi = avi.c +SOURCES_mux_ogg = ogg.c diff --git a/modules/mux/mpeg/Modules.am b/modules/mux/mpeg/Modules.am index d94ee7f50f..acd74102ff 100644 --- a/modules/mux/mpeg/Modules.am +++ b/modules/mux/mpeg/Modules.am @@ -1,17 +1,17 @@ -SOURCES_mux_ps = modules/mux/mpeg/ps.c \ - modules/mux/mpeg/pes.c \ - modules/mux/mpeg/pes.h \ - modules/mux/mpeg/bits.h \ +SOURCES_mux_ps = ps.c \ + pes.c \ + pes.h \ + bits.h \ $(NULL) -SOURCES_mux_ts = modules/mux/mpeg/ts.c \ - modules/mux/mpeg/pes.c \ - modules/mux/mpeg/pes.h \ - modules/mux/mpeg/bits.h \ +SOURCES_mux_ts = ts.c \ + pes.c \ + pes.h \ + bits.h \ $(NULL) -SOURCES_mux_ts_dvbpsi = modules/mux/mpeg/ts.c \ - modules/mux/mpeg/pes.c \ - modules/mux/mpeg/pes.h \ - modules/mux/mpeg/bits.h \ +SOURCES_mux_ts_dvbpsi = ts.c \ + pes.c \ + pes.h \ + bits.h \ $(NULL) diff --git a/modules/packetizer/Modules.am b/modules/packetizer/Modules.am index 21bb27f280..0f4275c55c 100644 --- a/modules/packetizer/Modules.am +++ b/modules/packetizer/Modules.am @@ -1,7 +1,7 @@ -SOURCES_packetizer_copy = modules/packetizer/copy.c -SOURCES_packetizer_a52 = modules/packetizer/a52.c -SOURCES_packetizer_mpegaudio = modules/packetizer/mpegaudio.c -SOURCES_packetizer_mpegvideo = modules/packetizer/mpegvideo.c -SOURCES_packetizer_mpeg4video = modules/packetizer/mpeg4video.c -SOURCES_packetizer_mpeg4audio = modules/packetizer/mpeg4audio.c -SOURCES_packetizer_vorbis = modules/packetizer/vorbis.c +SOURCES_packetizer_copy = copy.c +SOURCES_packetizer_a52 = a52.c +SOURCES_packetizer_mpegaudio = mpegaudio.c +SOURCES_packetizer_mpegvideo = mpegvideo.c +SOURCES_packetizer_mpeg4video = mpeg4video.c +SOURCES_packetizer_mpeg4audio = mpeg4audio.c +SOURCES_packetizer_vorbis = vorbis.c diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 8c0464f27b..4494407375 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -1,6 +1,6 @@ -SOURCES_stream_out_dummy = modules/stream_out/dummy.c -SOURCES_stream_out_standard = modules/stream_out/standard.c -SOURCES_stream_out_transcode = modules/stream_out/transcode.c -SOURCES_stream_out_duplicate = modules/stream_out/duplicate.c -SOURCES_stream_out_es = modules/stream_out/es.c -SOURCES_stream_out_display = modules/stream_out/display.c +SOURCES_stream_out_dummy = dummy.c +SOURCES_stream_out_standard = standard.c +SOURCES_stream_out_transcode = transcode.c +SOURCES_stream_out_duplicate = duplicate.c +SOURCES_stream_out_es = es.c +SOURCES_stream_out_display = display.c diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am index 23bf554a66..16f7c15719 100644 --- a/modules/video_chroma/Modules.am +++ b/modules/video_chroma/Modules.am @@ -1,43 +1,43 @@ SOURCES_i420_rgb = \ - modules/video_chroma/i420_rgb.c \ - modules/video_chroma/i420_rgb.h \ - modules/video_chroma/i420_rgb8.c \ - modules/video_chroma/i420_rgb16.c \ - modules/video_chroma/i420_rgb_c.h \ + i420_rgb.c \ + i420_rgb.h \ + i420_rgb8.c \ + i420_rgb16.c \ + i420_rgb_c.h \ $(NULL) SOURCES_i420_rgb_mmx = \ - modules/video_chroma/i420_rgb.c \ - modules/video_chroma/i420_rgb.h \ - modules/video_chroma/i420_rgb16.c \ - modules/video_chroma/i420_rgb_mmx.h \ + i420_rgb.c \ + i420_rgb.h \ + i420_rgb16.c \ + i420_rgb_mmx.h \ $(NULL) SOURCES_i420_yuy2 = \ - modules/video_chroma/i420_yuy2.c \ - modules/video_chroma/i420_yuy2.h \ + i420_yuy2.c \ + i420_yuy2.h \ $(NULL) SOURCES_i420_yuy2_mmx = \ - modules/video_chroma/i420_yuy2.c \ - modules/video_chroma/i420_yuy2.h \ + i420_yuy2.c \ + i420_yuy2.h \ $(NULL) SOURCES_i422_yuy2 = \ - modules/video_chroma/i422_yuy2.c \ - modules/video_chroma/i422_yuy2.h \ + i422_yuy2.c \ + i422_yuy2.h \ $(NULL) SOURCES_i422_yuy2_mmx = \ - modules/video_chroma/i422_yuy2.c \ - modules/video_chroma/i422_yuy2.h \ + i422_yuy2.c \ + i422_yuy2.h \ $(NULL) SOURCES_i420_ymga = \ - modules/video_chroma/i420_ymga.c + i420_ymga.c \ $(NULL) SOURCES_i420_ymga_mmx = \ - modules/video_chroma/i420_ymga.c + i420_ymga.c \ $(NULL) diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 9b1fd62599..d1be0ccff0 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -1,10 +1,10 @@ -SOURCES_transform = modules/video_filter/transform.c -SOURCES_invert = modules/video_filter/invert.c -SOURCES_adjust = modules/video_filter/adjust.c -SOURCES_distort = modules/video_filter/distort.c -SOURCES_wall = modules/video_filter/wall.c -SOURCES_clone = modules/video_filter/clone.c -SOURCES_crop = modules/video_filter/crop.c -SOURCES_motionblur = modules/video_filter/motionblur.c -SOURCES_osdtext = modules/video_filter/osd_text.c -noinst_HEADERS += modules/video_filter/filter_common.h +SOURCES_transform = transform.c +SOURCES_invert = invert.c +SOURCES_adjust = adjust.c +SOURCES_distort = distort.c +SOURCES_wall = wall.c +SOURCES_clone = clone.c +SOURCES_crop = crop.c +SOURCES_motionblur = motionblur.c +SOURCES_osdtext = osd_text.c +noinst_HEADERS += filter_common.h diff --git a/modules/video_filter/deinterlace/Modules.am b/modules/video_filter/deinterlace/Modules.am index a0cea98119..61b9fd0db7 100644 --- a/modules/video_filter/deinterlace/Modules.am +++ b/modules/video_filter/deinterlace/Modules.am @@ -1 +1 @@ -SOURCES_deinterlace = modules/video_filter/deinterlace/deinterlace.c +SOURCES_deinterlace = deinterlace.c diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am index 600420b5f5..f08613c66f 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -1,8 +1,8 @@ -SOURCES_aa = modules/video_output/aa.c -SOURCES_fb = modules/video_output/fb.c -SOURCES_ggi = modules/video_output/ggi.c -SOURCES_glide = modules/video_output/glide.c -SOURCES_vout_sdl = modules/video_output/sdl.c -SOURCES_svgalib = modules/video_output/svgalib.c -SOURCES_wingdi = modules/video_output/wingdi.c -SOURCES_vout_encoder = modules/video_output/encoder.c +SOURCES_aa = aa.c +SOURCES_fb = fb.c +SOURCES_ggi = ggi.c +SOURCES_glide = glide.c +SOURCES_vout_sdl = sdl.c +SOURCES_svgalib = svgalib.c +SOURCES_wingdi = wingdi.c +SOURCES_vout_encoder = encoder.c diff --git a/modules/video_output/directx/Modules.am b/modules/video_output/directx/Modules.am index f0807beb0b..1107cec41d 100644 --- a/modules/video_output/directx/Modules.am +++ b/modules/video_output/directx/Modules.am @@ -1,6 +1,6 @@ SOURCES_vout_directx = \ - modules/video_output/directx/directx.c \ - modules/video_output/directx/vout.h \ - modules/video_output/directx/events.c \ + directx.c \ + vout.h \ + events.c \ $(NULL) diff --git a/modules/video_output/mga/Modules.am b/modules/video_output/mga/Modules.am index 04b12d1b67..df7741055e 100644 --- a/modules/video_output/mga/Modules.am +++ b/modules/video_output/mga/Modules.am @@ -1,2 +1,2 @@ -SOURCES_mga = modules/video_output/mga/mga.c -SOURCES_xmga = modules/video_output/mga/xmga.c +SOURCES_mga = mga.c +SOURCES_xmga = xmga.c diff --git a/modules/video_output/qte/Modules.am b/modules/video_output/qte/Modules.am index 3d0f69ff85..7ca5aa931d 100644 --- a/modules/video_output/qte/Modules.am +++ b/modules/video_output/qte/Modules.am @@ -1,4 +1,4 @@ SOURCES_qte = \ - modules/video_output/qte/qte.cpp \ - modules/video_output/qte/qte.h \ + qte.cpp \ + qte.h \ $(NULL) diff --git a/modules/video_output/x11/Modules.am b/modules/video_output/x11/Modules.am index f8100aad98..fc189dd886 100644 --- a/modules/video_output/x11/Modules.am +++ b/modules/video_output/x11/Modules.am @@ -1,12 +1,12 @@ SOURCES_x11 = \ - modules/video_output/x11/x11.c \ - modules/video_output/x11/xcommon.c \ - modules/video_output/x11/xcommon.h \ + x11.c \ + xcommon.c \ + xcommon.h \ $(NULL) SOURCES_xvideo = \ - modules/video_output/x11/xvideo.c \ - modules/video_output/x11/xcommon.c \ - modules/video_output/x11/xcommon.h \ + xvideo.c \ + xcommon.c \ + xcommon.h \ $(NULL) diff --git a/modules/visualization/.cvsignore b/modules/visualization/.cvsignore new file mode 100644 index 0000000000..c930ed7c2c --- /dev/null +++ b/modules/visualization/.cvsignore @@ -0,0 +1,11 @@ +.deps +.dirstamp +*.lo +*.la +*.dll +*.dylib +*.sl +*.so +Makefile.am +Makefile.in +Makefile diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/visualization/scope/Modules.am b/modules/visualization/scope/Modules.am index 6e2ae76b83..378ae304b9 100644 --- a/modules/visualization/scope/Modules.am +++ b/modules/visualization/scope/Modules.am @@ -1 +1 @@ -SOURCES_scope = modules/visualization/scope/scope.c +SOURCES_scope = scope.c diff --git a/modules/visualization/xosd/Modules.am b/modules/visualization/xosd/Modules.am index 8dd86f2075..67bf672390 100644 --- a/modules/visualization/xosd/Modules.am +++ b/modules/visualization/xosd/Modules.am @@ -1 +1 @@ -SOURCES_xosd = modules/visualization/xosd/xosd.c +SOURCES_xosd = xosd.c diff --git a/po/POTFILES.in b/po/POTFILES.in index 9219c689e3..1e6d0f3467 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -14,7 +14,6 @@ include/httpd.h include/input_ext-dec.h include/input_ext-intf.h include/input_ext-plugins.h -include/interface.h include/intf_eject.h include/iso_lang.h include/main.h @@ -23,29 +22,30 @@ include/modules.h include/modules_inner.h include/mtime.h include/network.h -include/osd.h include/os_specific.h +include/osd.h include/stream_control.h include/stream_output.h include/variables.h -include/video.h include/video_output.h include/vlc/aout.h -include/vlc_common.h -include/vlc_config.h -include/vlc_cpu.h include/vlc/decoder.h include/vlc/input.h include/vlc/intf.h +include/vlc/sout.h +include/vlc/vlc.h +include/vlc/vout.h +include/vlc_common.h +include/vlc_config.h +include/vlc_cpu.h +include/vlc_interface.h include/vlc_messages.h include/vlc_objects.h include/vlc_playlist.h -include/vlc/sout.h include/vlc_symbols.h -include/vlc_threads_funcs.h include/vlc_threads.h -include/vlc/vlc.h -include/vlc/vout.h +include/vlc_threads_funcs.h +include/vlc_video.h include/vout_synchro.h include/win32_specific.h src/audio_output/common.c @@ -57,9 +57,9 @@ src/audio_output/mixer.c src/audio_output/output.c src/extras/dirent.c src/extras/dirent.h -src/extras/getopt1.c src/extras/getopt.c src/extras/getopt.h +src/extras/getopt1.c src/extras/libc.c src/input/input.c src/input/input_clock.c @@ -81,8 +81,8 @@ src/misc/error.c src/misc/iso-639_def.h src/misc/iso_lang.c src/misc/messages.c -src/misc/modules_builtin.h src/misc/modules.c +src/misc/modules_builtin.h src/misc/modules_plugin.h src/misc/mtime.c src/misc/objects.c @@ -107,12 +107,18 @@ modules/access/directory.c modules/access/dvd/access.c modules/access/dvd/demux.c modules/access/dvd/dvd.c -modules/access/dvd/dvdcss.h modules/access/dvd/dvd.h +modules/access/dvd/dvdcss.h modules/access/dvd/es.c modules/access/dvd/es.h modules/access/dvd/ifo.c modules/access/dvd/ifo.h +modules/access/dvd/seek.c +modules/access/dvd/seek.h +modules/access/dvd/summary.c +modules/access/dvd/summary.h +modules/access/dvd/udf.c +modules/access/dvd/udf.h modules/access/dvdplay/access.c modules/access/dvdplay/access.h modules/access/dvdplay/demux.c @@ -128,12 +134,6 @@ modules/access/dvdplay/tools.h modules/access/dvdread/dvdread.c modules/access/dvdread/input.c modules/access/dvdread/input.h -modules/access/dvd/seek.c -modules/access/dvd/seek.h -modules/access/dvd/summary.c -modules/access/dvd/summary.h -modules/access/dvd/udf.c -modules/access/dvd/udf.h modules/access/file.c modules/access/ftp.c modules/access/http.c @@ -147,10 +147,6 @@ modules/access/mms/mmsh.c modules/access/mms/mmsh.h modules/access/mms/mmstu.c modules/access/mms/mmstu.h -modules/access_output/dummy.c -modules/access_output/file.c -modules/access_output/http.c -modules/access_output/udp.c modules/access/pvr/pvr.c modules/access/pvr/videodev2.h modules/access/satellite/access.c @@ -165,6 +161,11 @@ modules/access/vcd/cdrom.c modules/access/vcd/cdrom.h modules/access/vcd/cdrom_internals.h modules/access/vcd/vcd.c +modules/access/vlcs.c +modules/access_output/dummy.c +modules/access_output/file.c +modules/access_output/http.c +modules/access_output/udp.c modules/audio_filter/channel_mixer/headphone.c modules/audio_filter/channel_mixer/trivial.c modules/audio_filter/converter/a52tofloat32.c @@ -207,26 +208,26 @@ modules/codec/a52old/adec.h modules/codec/a52old/bit_allocate.c modules/codec/a52old/decoder.c modules/codec/a52old/decoder.h -modules/codec/a52old/downmix/downmix_3dn.c +modules/codec/a52old/downmix.h modules/codec/a52old/downmix/downmix.c +modules/codec/a52old/downmix/downmix_3dn.c modules/codec/a52old/downmix/downmix_c.c modules/codec/a52old/downmix/downmix_common.h modules/codec/a52old/downmix/downmix_sse.c -modules/codec/a52old/downmix.h modules/codec/a52old/exponent.c modules/codec/a52old/exponent.h modules/codec/a52old/imdct.c modules/codec/a52old/imdct.h -modules/codec/a52old/imdct/imdct_3dn.c modules/codec/a52old/imdct/imdct.c +modules/codec/a52old/imdct/imdct_3dn.c modules/codec/a52old/imdct/imdct_c.c modules/codec/a52old/imdct/imdct_common.c modules/codec/a52old/imdct/imdct_common.h modules/codec/a52old/imdct/imdct_sse.c modules/codec/a52old/imdct/retables.h +modules/codec/a52old/imdct/srfft.h modules/codec/a52old/imdct/srfft_3dn.c modules/codec/a52old/imdct/srfft_c.c -modules/codec/a52old/imdct/srfft.h modules/codec/a52old/imdct/srfft_sse.c modules/codec/a52old/internal.h modules/codec/a52old/mantissa.c @@ -247,9 +248,9 @@ modules/codec/ffmpeg/chroma.c modules/codec/ffmpeg/ffmpeg.c modules/codec/ffmpeg/ffmpeg.h modules/codec/ffmpeg/postprocessing/postprocessing.c +modules/codec/ffmpeg/postprocessing/postprocessing.h modules/codec/ffmpeg/postprocessing/postprocessing_c.c modules/codec/ffmpeg/postprocessing/postprocessing_common.h -modules/codec/ffmpeg/postprocessing/postprocessing.h modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c modules/codec/ffmpeg/video.c @@ -276,17 +277,17 @@ modules/codec/mpeg_video/decoder.h modules/codec/mpeg_video/headers.c modules/codec/mpeg_video/idct/block_c.h modules/codec/mpeg_video/idct/block_mmx.h -modules/codec/mpeg_video/idct/idctaltivec.c modules/codec/mpeg_video/idct/idct.c -modules/codec/mpeg_video/idct/idctclassic.c -modules/codec/mpeg_video/idct/idct_decl.h modules/codec/mpeg_video/idct/idct.h +modules/codec/mpeg_video/idct/idct_decl.h +modules/codec/mpeg_video/idct/idct_sparse.h +modules/codec/mpeg_video/idct/idctaltivec.c +modules/codec/mpeg_video/idct/idctclassic.c modules/codec/mpeg_video/idct/idctmmx.c modules/codec/mpeg_video/idct/idctmmxext.c -modules/codec/mpeg_video/idct/idct_sparse.h +modules/codec/mpeg_video/motion/motion.c modules/codec/mpeg_video/motion/motion3dnow.c modules/codec/mpeg_video/motion/motionaltivec.c -modules/codec/mpeg_video/motion/motion.c modules/codec/mpeg_video/motion/motionmmx.c modules/codec/mpeg_video/motion/motionmmxext.c modules/codec/mpeg_video/parser.c @@ -387,20 +388,6 @@ modules/gui/familiar/playlist.c modules/gui/familiar/playlist.h modules/gui/familiar/support.c modules/gui/familiar/support.h -modules/gui/gtk2/gnome2.c -modules/gui/gtk2/gnome2_callbacks.c -modules/gui/gtk2/gnome2_callbacks.h -modules/gui/gtk2/gnome2_interface.c -modules/gui/gtk2/gnome2_interface.h -modules/gui/gtk2/gnome2_support.c -modules/gui/gtk2/gnome2_support.h -modules/gui/gtk2/gtk2.c -modules/gui/gtk2/gtk2_callbacks.c -modules/gui/gtk2/gtk2_callbacks.h -modules/gui/gtk2/gtk2_interface.c -modules/gui/gtk2/gtk2_interface.h -modules/gui/gtk2/gtk2_support.c -modules/gui/gtk2/gtk2_support.h modules/gui/gtk/common.h modules/gui/gtk/control.c modules/gui/gtk/control.h @@ -431,30 +418,55 @@ modules/gui/gtk/playlist.h modules/gui/gtk/preferences.c modules/gui/gtk/preferences.h modules/gui/gtk/sout.c +modules/gui/gtk2/gnome2.c +modules/gui/gtk2/gnome2_callbacks.c +modules/gui/gtk2/gnome2_callbacks.h +modules/gui/gtk2/gnome2_interface.c +modules/gui/gtk2/gnome2_interface.h +modules/gui/gtk2/gnome2_support.c +modules/gui/gtk2/gnome2_support.h +modules/gui/gtk2/gtk2.c +modules/gui/gtk2/gtk2_callbacks.c +modules/gui/gtk2/gtk2_callbacks.h +modules/gui/gtk2/gtk2_interface.c +modules/gui/gtk2/gtk2_interface.h +modules/gui/gtk2/gtk2_support.c +modules/gui/gtk2/gtk2_support.h +modules/gui/kde/QConfigItem.cpp +modules/gui/kde/QConfigItem.h +modules/gui/kde/QConfigItem.moc.cpp modules/gui/kde/common.h modules/gui/kde/disc.cpp modules/gui/kde/disc.h +modules/gui/kde/disc.moc.cpp modules/gui/kde/info.cpp modules/gui/kde/info.h +modules/gui/kde/info.moc.cpp modules/gui/kde/interface.cpp modules/gui/kde/interface.h +modules/gui/kde/interface.moc.cpp modules/gui/kde/kde.cpp modules/gui/kde/languagemenu.cpp modules/gui/kde/languagemenu.h +modules/gui/kde/languagemenu.moc.cpp modules/gui/kde/menu.cpp modules/gui/kde/menu.h +modules/gui/kde/menu.moc.cpp modules/gui/kde/messages.cpp modules/gui/kde/messages.h +modules/gui/kde/messages.moc.cpp modules/gui/kde/net.cpp modules/gui/kde/net.h +modules/gui/kde/net.moc.cpp modules/gui/kde/pluginsbox.cpp modules/gui/kde/pluginsbox.h +modules/gui/kde/pluginsbox.moc.cpp modules/gui/kde/preferences.cpp modules/gui/kde/preferences.h -modules/gui/kde/QConfigItem.cpp -modules/gui/kde/QConfigItem.h +modules/gui/kde/preferences.moc.cpp modules/gui/kde/slider.cpp modules/gui/kde/slider.h +modules/gui/kde/slider.moc.cpp modules/gui/macosx/about.h modules/gui/macosx/about.m modules/gui/macosx/applescript.h @@ -484,6 +496,7 @@ modules/gui/qnx/qnx.c modules/gui/qnx/vout.c modules/gui/qt/intf.cpp modules/gui/qt/intf.h +modules/gui/qt/intf.moc.cpp modules/gui/qt/qt.cpp modules/gui/skins/controls/button.cpp modules/gui/skins/controls/button.h @@ -597,8 +610,8 @@ modules/misc/gtk_main.c modules/misc/httpd.c modules/misc/logger/logger.c modules/misc/memcpy/fastmemcpy.h -modules/misc/memcpy/memcpyaltivec.c modules/misc/memcpy/memcpy.c +modules/misc/memcpy/memcpyaltivec.c modules/misc/network/ipv4.c modules/misc/network/ipv6.c modules/misc/qte_main.cpp @@ -623,17 +636,18 @@ modules/packetizer/mpeg4audio.c modules/packetizer/mpeg4video.c modules/packetizer/mpegaudio.c modules/packetizer/mpegvideo.c +modules/packetizer/vorbis.c modules/stream_out/display.c modules/stream_out/dummy.c modules/stream_out/duplicate.c modules/stream_out/es.c modules/stream_out/standard.c modules/stream_out/transcode.c +modules/video_chroma/i420_rgb.c +modules/video_chroma/i420_rgb.h modules/video_chroma/i420_rgb16.c modules/video_chroma/i420_rgb8.c -modules/video_chroma/i420_rgb.c modules/video_chroma/i420_rgb_c.h -modules/video_chroma/i420_rgb.h modules/video_chroma/i420_rgb_mmx.h modules/video_chroma/i420_ymga.c modules/video_chroma/i420_yuy2.c diff --git a/po/de.po b/po/de.po index 0d1243803e..14e794850e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc 0.73.3\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2002-04-18 23:38+0100\n" "Last-Translator: Felix Kühne \n" "Language-Team: \n" @@ -15,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 #, fuzzy msgid "" "\n" @@ -125,7 +126,7 @@ msgid "Program" msgstr "Programm" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1085,19 +1086,20 @@ msgstr "Oberfl #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "Ton" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Bild" @@ -1363,39 +1365,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "Microsoft Media Server (MMS) Input" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "Dummy-Streamausgabe" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "Datei-Streamausgabe" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "HTTP-Streamausgabe" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "zwischenspeichern des Werts in ms" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" -"Erlaubt Ihnen den Standard-Zwischenspeicher-Wert für UDP streams zu ändern. " -"Dieser Wert sollte in Millisekunden sein." - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "UDP-Streamausgabe" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Stream-Ausgabe benutzen" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "Hauppauge PVR-Karten Input" @@ -1444,6 +1413,18 @@ msgstr "SLP Input" msgid "slp" msgstr "slp" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "zwischenspeichern des Werts in ms" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" +"Erlaubt Ihnen den Standard-Zwischenspeicher-Wert für UDP streams zu ändern. " +"Dieser Wert sollte in Millisekunden sein." + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "UDP/RTP Input" @@ -1476,6 +1457,35 @@ msgstr "Video4Linux Demuxer" msgid "VCD input" msgstr "VCD Input" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "SAP" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "SAP Oberflächen Modul" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "Dummy-Streamausgabe" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "Datei-Streamausgabe" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "HTTP-Streamausgabe" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "UDP-Streamausgabe" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Stream-Ausgabe benutzen" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "Charakteristische Dimension" @@ -1675,7 +1685,7 @@ msgstr "5.1" msgid "2 Front 2 Rear" msgstr "2 Vorder- und 2 Rückseiten" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "EsounD Tonausgabe" @@ -1927,14 +1937,14 @@ msgstr "MPEG audio layer I/II/III parser" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "MPEG I/II layer 1/2 - Tondekoder" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "AltiVec IDCT" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "IDCT" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "AltiVec IDCT" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "klassisches IDCT" @@ -1947,6 +1957,10 @@ msgstr "MMX IDCT" msgid "MMX EXT IDCT" msgstr "MMX EXT IDCT" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "Bewegungsausgleich" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "3D Now! Bewegungsausgleich" @@ -1955,10 +1969,6 @@ msgstr "3D Now! Bewegungsausgleich" msgid "AltiVec motion compensation" msgstr "AltiVec Bewegungsausgleich" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "Bewegungsausgleich" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "MMX Bewegungsausgleich" @@ -2202,17 +2212,17 @@ msgid "Layer" msgstr "Layer" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Kanäle" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "Daten-/Symbolrate" @@ -2220,24 +2230,27 @@ msgstr "Daten-/Symbolrate" msgid "ASF v1.0 demuxer (file only)" msgstr "ASF v1.0 Muxer (nur für Dateien)" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "Anzahl der Streams" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "Typ" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "Codec" @@ -2245,7 +2258,8 @@ msgstr "Codec" msgid "Avg. byterate" msgstr "durchschnittliche Byte-Rate" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "Bits pro Sekunde" @@ -2253,7 +2267,8 @@ msgstr "Bits pro Sekunde" msgid "Size" msgstr "Größe" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "Auflösung" @@ -2261,7 +2276,7 @@ msgstr "Aufl msgid "Planes" msgstr "Ebenen" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "Bits pro Pixel" @@ -2326,24 +2341,24 @@ msgstr "Index-Erzeugung erzwingen" msgid "AVI demuxer" msgstr "AVI Muxer" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "Avi" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "Anzahl der Streams" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "Markierungen" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "Frame-Rate" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "Unbekannt" @@ -2368,20 +2383,59 @@ msgstr "flac Bild/Ton-Trenner" msgid "playlist metademux" msgstr "Abspiellisten Meta-Bild/Ton-Trenner" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 #, fuzzy msgid "mkv-demuxer" msgstr "avi-Muxer" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "AAC Stream Bild/Ton-Trennung" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Dauer" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Dateiname" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Über dieses Programm" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Startposition" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Auflösung" + +#: modules/demux/mkv.cpp:2323 +#, fuzzy +msgid "Frame Per Second" +msgstr "Bilder pro Sekunde" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "Untertitel" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "MP4 Bild/Ton-Trenner" @@ -2457,40 +2511,40 @@ msgstr "ISO 13818-1 MPEG Transport Stream Eingabe" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "ISO 13818-1 MPEG Transport Stream Eingabe (libdvbpsi)" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "ogg-Stream Bild/Ton-Trennung" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "Vorbis" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "Bit-Rate" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "Theora" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "tarkin" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "Bit-Menge" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "Breite" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "Höhe" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "Bits pro Beispiel" @@ -2897,8 +2951,8 @@ msgstr "Datei" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Datei öffnen" @@ -3278,10 +3332,10 @@ msgstr "" "Der VideoLAN Client ist ein MPEG 1, MPEG 2, MP3 und DivX Player der sowohl " "lokale Dateien als auch Netzwerk-Quellen unterstützt." -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Konnte pixmap-Datei %s nicht finden" @@ -3291,64 +3345,6 @@ msgstr "Konnte pixmap-Datei %s nicht finden" msgid "Error loading pixmap file: %s" msgstr "Fehler beim Laden der pixmap Datei %s" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "Gtk2 Oberfläche" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "_Neu" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "gnome2" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "button4" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "button3" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "Datei sichern" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "Fenster 1" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Datei" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "_Bearbeiten" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Ansicht" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "_Hilfe" - -#: modules/gui/gtk2/gtk2_interface.c:146 -msgid "_About" -msgstr "_Über..." - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "button1" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "button2" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "Hilfetexte anzeigen" @@ -3819,10 +3815,6 @@ msgstr "Horizontal" msgid "Satellite" msgstr "Satellit" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "Untertitel" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3883,11 +3875,6 @@ msgstr "L msgid "Selection" msgstr "Auswahl" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Dauer" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "Spring zu:" @@ -3959,6 +3946,11 @@ msgstr "Gtk+" msgid "Gtk+ interface" msgstr "Gtk+ Oberfläche" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Datei" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "_Schließen" @@ -3975,6 +3967,10 @@ msgstr "B_eenden" msgid "Exit the program" msgstr "Programm beenden" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Ansicht" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Hauptfenster ausblenden" @@ -3995,6 +3991,10 @@ msgstr "_Einstellungen..." msgid "Configure the application" msgstr "Programm einstellen" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "_Hilfe" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_Über..." @@ -4099,6 +4099,51 @@ msgstr "Einstellen" msgid "Selected:" msgstr "Ausgewählt:" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "Gtk2 Oberfläche" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "_Neu" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "gnome2" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "button4" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "button3" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "Datei sichern" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "Fenster 1" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: modules/gui/gtk2/gtk2_interface.c:146 +msgid "_About" +msgstr "_Über..." + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "button1" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "button2" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "Sprachen" @@ -4525,27 +4570,27 @@ msgstr "QT Oberfl msgid "Open a skin file" msgstr "Eine Skin-Datei öffnen" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "Zuletzt benutzter Skin" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "Konfiguration des letzten Skins" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "Programm im System-Tray anzeigen" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "Programm in der Taskleiste anzeigen" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 msgid "Skinnable Interface" msgstr "mit Skins anpassbare Oberfläche" @@ -5025,10 +5070,6 @@ msgstr "Interface-Aktionen in Datei mitschreiben" msgid "Using the logger interface plugin..." msgstr "Das Benutzeroberflächen-Aufzeichnungs-PlugIn benutzen..." -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "AltiVec memcpy" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "libc memcpy" @@ -5045,6 +5086,10 @@ msgstr "MMX memcpy" msgid "MMX EXT memcpy" msgstr "MMX EXT memcpy" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "AltiVec memcpy" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "IPv4 Netzwerk Abstraktions-Layer" @@ -5069,11 +5114,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "Integrierte QT Hilfe" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "SAP" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 msgid "SAP interface" msgstr "SAP Benutzeroberfläche" @@ -5113,7 +5154,7 @@ msgstr "TS Muxer" msgid "TS muxer (libdvbpsi)" msgstr "TS Muxer (libdvbpsi)" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "Ogg/ogm Muxer" @@ -5141,6 +5182,11 @@ msgstr "MPEG I/II - Ton-Packetizer" msgid "MPEG-I/II video packetizer" msgstr "MPEG I/II Video Packetizer" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "A/52 Ton-Packetizer" + #: modules/stream_out/display.c:50 msgid "Display stream" msgstr "Stream anzeigen" @@ -5157,7 +5203,7 @@ msgstr "Stream duplizieren" msgid "ES stream" msgstr "ES Stream" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 msgid "Standard stream" msgstr "Standard Stream" @@ -5720,9 +5766,6 @@ msgstr "xosd Oberfl #~ msgid "Video Track" #~ msgstr "Bildspur" -#~ msgid "SAP interface module" -#~ msgstr "SAP Oberflächen Modul" - #~ msgid "mpga" #~ msgstr "mpga" @@ -5781,9 +5824,6 @@ msgstr "xosd Oberfl #~ msgid "&Menus" #~ msgstr "&Menüs" -#~ msgid "Starting position" -#~ msgstr "Startposition" - #~ msgid "&Title:" #~ msgstr "&Titel:" diff --git a/po/en_GB.po b/po/en_GB.po index 554eaa973a..64c25535ce 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -17,7 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2002-04-22 09:56+0200\n" "Last-Translator: Samuel Hocevar \n" "Language-Team: \n" @@ -25,7 +26,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -130,7 +131,7 @@ msgid "Program" msgstr "Programme" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -959,19 +960,20 @@ msgstr "" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "" @@ -1211,36 +1213,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "" - -#: modules/access_output/udp.c:81 -msgid "udp stream output" -msgstr "" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1289,6 +1261,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "" @@ -1319,6 +1301,34 @@ msgstr "" msgid "VCD input" msgstr "" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "" + +#: modules/access_output/udp.c:81 +msgid "udp stream output" +msgstr "" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "" @@ -1509,7 +1519,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "" @@ -1744,14 +1754,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1764,6 +1774,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -1772,10 +1786,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -2006,17 +2016,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -2024,24 +2034,27 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "" @@ -2049,7 +2062,8 @@ msgstr "" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2057,7 +2071,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "" @@ -2065,7 +2080,7 @@ msgstr "" msgid "Planes" msgstr "" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2130,24 +2145,24 @@ msgstr "" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2171,18 +2186,52 @@ msgstr "" msgid "playlist metademux" msgstr "" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 msgid "mka/mkv stream demuxer" msgstr "" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +msgid "Segment Filename" +msgstr "" + +#: modules/demux/mkv.cpp:2277 +msgid "Muxing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2281 +msgid "Writing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2319 +msgid "Display Resolution" +msgstr "" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2253,40 +2302,40 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2693,8 +2742,8 @@ msgstr "" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "" @@ -3070,10 +3119,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3083,64 +3132,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:146 -msgid "_About" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "" @@ -3607,10 +3598,6 @@ msgstr "" msgid "Satellite" msgstr "" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3669,11 +3656,6 @@ msgstr "" msgid "Selection" msgstr "" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "" @@ -3745,6 +3727,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -3761,6 +3748,10 @@ msgstr "" msgid "Exit the program" msgstr "" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "" @@ -3781,6 +3772,10 @@ msgstr "" msgid "Configure the application" msgstr "" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "" @@ -3885,6 +3880,51 @@ msgstr "" msgid "Selected:" msgstr "" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:146 +msgid "_About" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "" @@ -4299,27 +4339,27 @@ msgstr "" msgid "Open a skin file" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 msgid "Skinnable Interface" msgstr "" @@ -4774,10 +4814,6 @@ msgstr "" msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -4794,6 +4830,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -4816,11 +4856,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 msgid "SAP interface" msgstr "" @@ -4860,7 +4896,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -4888,6 +4924,11 @@ msgstr "MPEG-I/II audio packetiser" msgid "MPEG-I/II video packetizer" msgstr "MPEG-I/II video packetiser" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "A/52 audio packetiser" + #: modules/stream_out/display.c:50 msgid "Display stream" msgstr "" @@ -4904,7 +4945,7 @@ msgstr "" msgid "ES stream" msgstr "" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 msgid "Standard stream" msgstr "" diff --git a/po/fr.po b/po/fr.po index 3e0459e3e6..7a4470933d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2001-12-10 13:32+0100\n" "Last-Translator: Jean-Pierre Kuypers \n" "Language-Team: \n" @@ -14,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 #, fuzzy msgid "" "\n" @@ -124,7 +125,7 @@ msgid "Program" msgstr "Programme" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1088,19 +1089,20 @@ msgstr "Interface" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "Audio" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Vidéo" @@ -1353,39 +1355,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "Lecture Microsoft Media Server (MMS)" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "Flux de sortie muet" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "Sortie vers un fichier" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "Flux de sortie HTTP" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "Taille de la cache en ms" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" -"Cette option permet de modifier la taille de la cache pour les flux UDP. " -"Cette valeur est en millisecondes" - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "Flux de sortie UDP" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Activer le flux de sortie" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1434,6 +1403,18 @@ msgstr "Entr msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "Taille de la cache en ms" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" +"Cette option permet de modifier la taille de la cache pour les flux UDP. " +"Cette valeur est en millisecondes" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "Lecture UDP/RTP" @@ -1466,6 +1447,35 @@ msgstr "Lecture Video4Linux" msgid "VCD input" msgstr "Lecture VCD" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "Module d'interface SAP" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "Flux de sortie muet" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "Sortie vers un fichier" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "Flux de sortie HTTP" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "Flux de sortie UDP" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Activer le flux de sortie" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "Dimension caractéristique" @@ -1663,7 +1673,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "Sortie audio EsounD" @@ -1917,14 +1927,14 @@ msgstr "Parseur MPEG audio couches I/II/III" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "Décodeur vidéo MPEG I/II" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "IDCT optimisé AltiVec" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "IDCT optimisé AltiVec" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "IDCT classique" @@ -1937,6 +1947,10 @@ msgstr "IDCT optimis msgid "MMX EXT IDCT" msgstr "IDCT optimisé MMX EXT" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "Compensation de mouvement" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "Compensation de mouvement optimisé 3D Now!" @@ -1945,10 +1959,6 @@ msgstr "Compensation de mouvement optimis msgid "AltiVec motion compensation" msgstr "Compensation de mouvement optimisé AltiVec" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "Compensation de mouvement" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "Compensation de mouvement optimisé MMX" @@ -2184,17 +2194,17 @@ msgid "Layer" msgstr "Couche" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Canaux" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "Débit" @@ -2202,24 +2212,27 @@ msgstr "D msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "Nombre de flux" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "" @@ -2227,7 +2240,8 @@ msgstr "" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2235,7 +2249,8 @@ msgstr "" msgid "Size" msgstr "Taille" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "Résolution" @@ -2243,7 +2258,7 @@ msgstr "R msgid "Planes" msgstr "" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2308,24 +2323,24 @@ msgstr "Forcer la cr msgid "AVI demuxer" msgstr "Démultiplexeur AVI" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "Nombre de flux" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "Fréquence d'affichage" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2349,20 +2364,59 @@ msgstr "D msgid "playlist metademux" msgstr "Liste de lecture (meta-demultiplexeur)" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 #, fuzzy msgid "mkv-demuxer" msgstr "Démultiplexeur WAV" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "Démultiplexeur de flux AAC" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Durée" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Nom de fichier" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "À propos de cette application" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Position de départ" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Résolution" + +#: modules/demux/mkv.cpp:2323 +#, fuzzy +msgid "Frame Per Second" +msgstr "Images par seconde" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "Sous-titre" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "MP4 démultiplexeur" @@ -2433,40 +2487,40 @@ msgstr "Entr msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "Entrée ISO 13818-1 MPEG Transport Stream (libdvbpsi)" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "Démultiplexeur de flux Ogg" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "Débit" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "Largeur" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "Hauteur" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2880,8 +2934,8 @@ msgstr "Fichier" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Ouvrir un fichier" @@ -3261,10 +3315,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3274,68 +3328,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "Interface Gtk+" - -#: modules/gui/gtk2/gnome2_interface.c:31 -#, fuzzy -msgid "_New" -msgstr "_Vue" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "Enregistrer le fichier" - -#: modules/gui/gtk2/gtk2_interface.c:67 -#, fuzzy -msgid "window1" -msgstr "Fenêtre" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Fichier" - -#: modules/gui/gtk2/gtk2_interface.c:109 -#, fuzzy -msgid "_Edit" -msgstr "Édition" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Vue" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "Aide" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "À propos" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "Afficher les bulles d'aide" @@ -3808,10 +3800,6 @@ msgstr "Horizontale" msgid "Satellite" msgstr "Satellite" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "Sous-titre" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3872,11 +3860,6 @@ msgstr "Supprimer" msgid "Selection" msgstr "Sélection" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Durée" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "Aller à: " @@ -3948,6 +3931,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "Interface Gtk+" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Fichier" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "Fermer" @@ -3964,6 +3952,10 @@ msgstr "Quitter" msgid "Exit the program" msgstr "Quitter le programme" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Vue" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Masquer la fenêtre d'interface" @@ -3984,6 +3976,10 @@ msgstr "_Pr msgid "Configure the application" msgstr "Configurer l'application" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "Aide" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_A propos..." @@ -4088,6 +4084,55 @@ msgstr "Configurer" msgid "Selected:" msgstr "Sélectionné :" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "Interface Gtk+" + +#: modules/gui/gtk2/gnome2_interface.c:31 +#, fuzzy +msgid "_New" +msgstr "_Vue" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "Enregistrer le fichier" + +#: modules/gui/gtk2/gtk2_interface.c:67 +#, fuzzy +msgid "window1" +msgstr "Fenêtre" + +#: modules/gui/gtk2/gtk2_interface.c:109 +#, fuzzy +msgid "_Edit" +msgstr "Édition" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "À propos" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "Langues" @@ -4515,27 +4560,27 @@ msgstr "Interface Qt" msgid "Open a skin file" msgstr "Ouvre un fichier" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "Dernière skin utilisée" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "Masquer/afficher l'interface" @@ -5025,11 +5070,6 @@ msgstr "Module d'interface fichier journal" msgid "Using the logger interface plugin..." msgstr "Utiliser le module d'interface fichier journal..." -#: modules/misc/memcpy/memcpyaltivec.c:52 -#, fuzzy -msgid "AltiVec memcpy" -msgstr "Module de memcpy optimisé AltiVec" - #: modules/misc/memcpy/memcpy.c:81 #, fuzzy msgid "libc memcpy" @@ -5050,6 +5090,11 @@ msgstr "Module de memcpy optimis msgid "MMX EXT memcpy" msgstr "Module de memcpy optimisé MMMEXT" +#: modules/misc/memcpy/memcpyaltivec.c:52 +#, fuzzy +msgid "AltiVec memcpy" +msgstr "Module de memcpy optimisé AltiVec" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "Couche d'abstraction de réseau IPv4" @@ -5073,11 +5118,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "Module vidéo Qt Embedded" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "&Ajouter une interface" @@ -5120,7 +5161,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5150,6 +5191,11 @@ msgstr "D msgid "MPEG-I/II video packetizer" msgstr "Module décodeur vidéo MPEG I/II" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "Décodeur audio Vorbis" + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5170,7 +5216,7 @@ msgstr "Jouer le flux" msgid "ES stream" msgstr "Arrêter le flux" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "Arrêter le flux" @@ -5690,9 +5736,6 @@ msgstr "Module d'interface xosd" #~ msgid "Video Track" #~ msgstr "Vidéo" -#~ msgid "SAP interface module" -#~ msgstr "Module d'interface SAP" - #, fuzzy #~ msgid "Auto" #~ msgstr "Auteurs" @@ -5731,9 +5774,6 @@ msgstr "Module d'interface xosd" #~ msgid "Device &name:" #~ msgstr "&Nom du périphérique" -#~ msgid "Starting position" -#~ msgstr "Position de départ" - #~ msgid "&Title:" #~ msgstr "&Titre :" diff --git a/po/it.po b/po/it.po index 1be0e1e23a..8ed8b1fa7f 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2003-06-14 15:00+0100\n" "Last-Translator: Vella Bruno\n" "Language-Team: Italian \n" @@ -14,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -119,7 +120,7 @@ msgid "Program" msgstr "Programma" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1056,19 +1057,20 @@ msgstr "Interfaccia" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "Audio" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Video" @@ -1317,39 +1319,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "uscita sorgente dummy" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "uscita sorgente file" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "uscita sorgente HTTP" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "valore caching in ms" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" -"Ti permette di modificare il valore di caching preimpostato per le sorgenti " -"udp. Questo valore deve essere impostato in millisecondi." - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "uscita sorgente UDP" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Usa uscita sorgente" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1398,6 +1367,18 @@ msgstr "ingresso SLP" msgid "slp" msgstr "slp" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "valore caching in ms" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" +"Ti permette di modificare il valore di caching preimpostato per le sorgenti " +"udp. Questo valore deve essere impostato in millisecondi." + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "ingresso UDP/RTP" @@ -1430,6 +1411,35 @@ msgstr "" msgid "VCD input" msgstr "ingresso VCD" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "SAP" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "modulo interfaccia SAP" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "uscita sorgente dummy" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "uscita sorgente file" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "uscita sorgente HTTP" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "uscita sorgente UDP" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Usa uscita sorgente" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "Dimensione caratteristica" @@ -1622,7 +1632,7 @@ msgstr "5.1" msgid "2 Front 2 Rear" msgstr "2 Anteriori 2 Posteriori" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "uscita audio EsounD" @@ -1857,14 +1867,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "Decodifica audio MPEG I/II layer 1/2" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1877,6 +1887,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -1885,10 +1899,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -2116,17 +2126,17 @@ msgid "Layer" msgstr "Livello" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Canali" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -2134,24 +2144,27 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "Numero di sorgenti" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "Tipo" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "Codifica" @@ -2159,7 +2172,8 @@ msgstr "Codifica" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2167,7 +2181,8 @@ msgstr "" msgid "Size" msgstr "Dimensione" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "Risoluzione" @@ -2175,7 +2190,7 @@ msgstr "Risoluzione" msgid "Planes" msgstr "Piani" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2240,24 +2255,24 @@ msgstr "forza creazione indice" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "Numero di Sorgenti" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "Sconosciuto" @@ -2281,18 +2296,57 @@ msgstr "" msgid "playlist metademux" msgstr "" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 msgid "mka/mkv stream demuxer" msgstr "" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Durata" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Nome file" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Info su questa applicazione" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Posizione iniziale" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Risoluzione" + +#: modules/demux/mkv.cpp:2323 +#, fuzzy +msgid "Frame Per Second" +msgstr "Fotogrammi al secondo" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "Sottotitolo" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2363,40 +2417,40 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "tarkin" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "Ampiezza" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "Altezza" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2803,8 +2857,8 @@ msgstr "Archivio" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Apri File" @@ -3183,10 +3237,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Non riesco a trovare il file pixmap: %s" @@ -3196,64 +3250,6 @@ msgstr "Non riesco a trovare il file pixmap: %s" msgid "Error loading pixmap file: %s" msgstr "Errore caricamento file pixmap: %s" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "Interfaccia Gtk2" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "_Nuovo" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "Registra File" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "Archivio" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "Composizione" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Vista" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "Aiuto" - -#: modules/gui/gtk2/gtk2_interface.c:146 -msgid "_About" -msgstr "Info su" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "Mostra suggerimenti" @@ -3720,10 +3716,6 @@ msgstr "Orizzontale" msgid "Satellite" msgstr "Satellite" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "Sottotitolo" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3782,11 +3774,6 @@ msgstr "Elimina" msgid "Selection" msgstr "Selezione" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Durata" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "Salta a: " @@ -3858,6 +3845,11 @@ msgstr "Gtk+" msgid "Gtk+ interface" msgstr "interfaccia Gtk+" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "Archivio" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "_Chiudi" @@ -3874,6 +3866,10 @@ msgstr "Esci" msgid "Exit the program" msgstr "Esci dal programma" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Vista" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Nascondi la finestra dell'interfaccia principale" @@ -3894,6 +3890,10 @@ msgstr "_Preferenze..." msgid "Configure the application" msgstr "Configura l'applicazione" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "Aiuto" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "Info su..." @@ -3998,6 +3998,51 @@ msgstr "Configura" msgid "Selected:" msgstr "Selezionato:" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "Interfaccia Gtk2" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "_Nuovo" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "Registra File" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "Composizione" + +#: modules/gui/gtk2/gtk2_interface.c:146 +msgid "_About" +msgstr "Info su" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "Lingue" @@ -4416,27 +4461,27 @@ msgstr "interfaccia Qt" msgid "Open a skin file" msgstr "Apri un file skin" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 msgid "Skinnable Interface" msgstr "" @@ -4894,10 +4939,6 @@ msgstr "interfaccia file resoconti" msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -4914,6 +4955,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -4936,11 +4981,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "SAP" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 msgid "SAP interface" msgstr "interfaccia SAP" @@ -4980,7 +5021,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5008,6 +5049,11 @@ msgstr "" msgid "MPEG-I/II video packetizer" msgstr "" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "decodifica audio Vorbis" + #: modules/stream_out/display.c:50 msgid "Display stream" msgstr "Mostra sorgente" @@ -5024,7 +5070,7 @@ msgstr "Duplica sorgente" msgid "ES stream" msgstr "Sorgente ES" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 msgid "Standard stream" msgstr "Sorgente standard" @@ -5498,9 +5544,6 @@ msgstr "interfaccia xosd" #~ msgid "Video Track" #~ msgstr "Traccia Video" -#~ msgid "SAP interface module" -#~ msgstr "modulo interfaccia SAP" - #~ msgid "mpga" #~ msgstr "mpga" @@ -5547,9 +5590,6 @@ msgstr "interfaccia xosd" #~ msgid "&Menus" #~ msgstr "&Menu" -#~ msgid "Starting position" -#~ msgstr "Posizione iniziale" - #~ msgid "&Title:" #~ msgstr "&Titolo:" diff --git a/po/ja.po b/po/ja.po index 6f72b38d23..588fe63b80 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2003-01-09 02:37+0900\n" "Last-Translator: Fumio Nakayama \n" "Language-Team: Japanese \n" @@ -12,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 #, fuzzy msgid "" "\n" @@ -124,7 +125,7 @@ msgid "Program" msgstr "¥×¥í¥°¥é¥à" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1128,19 +1129,20 @@ msgstr " #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "¥ª¡¼¥Ç¥£¥ª" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "¥Ó¥Ç¥ª" @@ -1420,43 +1422,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -#, fuzzy -msgid "Dummy stream ouput" -msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" - -#: modules/access_output/file.c:66 -#, fuzzy -msgid "File stream ouput" -msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" - -#: modules/access_output/http.c:54 -#, fuzzy -msgid "HTTP stream ouput" -msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" -"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ" -"Äꤷ¤Þ¤¹¡£" - -#: modules/access_output/udp.c:80 -#, fuzzy -msgid "UDP stream ouput" -msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1514,6 +1479,18 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" +"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ" +"Äꤷ¤Þ¤¹¡£" + #: modules/access/udp.c:78 #, fuzzy msgid "UDP/RTP input" @@ -1549,6 +1526,40 @@ msgstr "Video4Linux msgid "VCD input" msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +#, fuzzy +msgid "SAP interface module" +msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë" + +#: modules/access_output/dummy.c:56 +#, fuzzy +msgid "Dummy stream ouput" +msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" + +#: modules/access_output/file.c:66 +#, fuzzy +msgid "File stream ouput" +msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" + +#: modules/access_output/http.c:54 +#, fuzzy +msgid "HTTP stream ouput" +msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" + +#: modules/access_output/udp.c:80 +#, fuzzy +msgid "UDP stream ouput" +msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò" + #: modules/audio_filter/channel_mixer/headphone.c:48 #, fuzzy msgid "Characteristic dimension" @@ -1766,7 +1777,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 #, fuzzy msgid "EsounD audio output" msgstr "EsounD¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë" @@ -2027,15 +2038,15 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë" +#: modules/codec/mpeg_video/idct/idct.c:41 +msgid "IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctaltivec.c:45 #, fuzzy msgid "AltiVec IDCT" msgstr "Altivec IDCT¥â¥¸¥å¡¼¥ë" -#: modules/codec/mpeg_video/idct/idct.c:41 -msgid "IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idctclassic.c:41 #, fuzzy msgid "classic IDCT" @@ -2051,6 +2062,11 @@ msgstr "MMX IDCT msgid "MMX EXT IDCT" msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥óIDCT¥â¥¸¥å¡¼¥ë" +#: modules/codec/mpeg_video/motion/motion.c:42 +#, fuzzy +msgid "motion compensation" +msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 #, fuzzy msgid "3D Now! motion compensation" @@ -2061,11 +2077,6 @@ msgstr "3D Now! msgid "AltiVec motion compensation" msgstr "AltiVec¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë" -#: modules/codec/mpeg_video/motion/motion.c:42 -#, fuzzy -msgid "motion compensation" -msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 #, fuzzy msgid "MMX motion compensation" @@ -2327,17 +2338,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "¥Á¥ã¥ó¥Í¥ë" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 #, fuzzy msgid "Sample Rate" msgstr "¥·¥ó¥Ü¥ë¡¦¥ì¡¼¥È" @@ -2346,25 +2357,28 @@ msgstr " msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 #, fuzzy msgid "Number of streams" msgstr "¹Ô¿ô" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "¥¿¥¤¥×" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 #, fuzzy msgid "Codec" msgstr "ÊĤ¸¤ë" @@ -2373,7 +2387,8 @@ msgstr " msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2381,7 +2396,8 @@ msgstr "" msgid "Size" msgstr "¥µ¥¤¥º" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 #, fuzzy msgid "Resolution" msgstr "ÁªÂò" @@ -2391,7 +2407,7 @@ msgstr " msgid "Planes" msgstr "ºÆÀ¸" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2464,26 +2480,26 @@ msgstr " msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 #, fuzzy msgid "Number of Streams" msgstr "¹Ô¿ô" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 #, fuzzy msgid "Flags" msgstr "ÁáÁ÷¤ê" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2509,19 +2525,58 @@ msgstr "" msgid "playlist metademux" msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "»ý³´ü´Ö" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "¿âľÊý¸þ°ÌÃÖ" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "ÁªÂò" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +#, fuzzy +msgid "Subtitle" +msgstr "»úËë(_S)" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2599,42 +2654,42 @@ msgstr "ISO 13818-1 MPEGž msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "ISO 13818-1 MPEGžÁ÷¥¹¥È¥ê¡¼¥àÆþÎÏ(libdvdpsi)" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 #, fuzzy msgid "ogg stream demuxer" msgstr "MPEG 1/2¥ì¥¤¥ä1/2¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 #, fuzzy msgid "tarkin" msgstr "ʸ»úÎó" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -3069,8 +3124,8 @@ msgstr " #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯" @@ -3475,10 +3530,10 @@ msgstr "" "VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î" "¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" @@ -3488,69 +3543,6 @@ msgstr " msgid "Error loading pixmap file: %s" msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -#, fuzzy -msgid "Gtk2 interface" -msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë" - -#: modules/gui/gtk2/gnome2_interface.c:31 -#, fuzzy -msgid "_New" -msgstr "ɽ¼¨(_V)" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ" - -#: modules/gui/gtk2/gtk2_interface.c:67 -#, fuzzy -msgid "window1" -msgstr "¥¦¥£¥ó¥É¥¦" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "¥Õ¥¡¥¤¥ë(_F)" - -#: modules/gui/gtk2/gtk2_interface.c:109 -#, fuzzy -msgid "_Edit" -msgstr "ÊÔ½¸" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "ɽ¼¨(_V)" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "¥Ø¥ë¥×(_H)" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 #, fuzzy msgid "Show tooltips" @@ -4033,11 +4025,6 @@ msgstr " msgid "Satellite" msgstr "±ÒÀ±" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -#, fuzzy -msgid "Subtitle" -msgstr "»úËë(_S)" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 #, fuzzy @@ -4100,11 +4087,6 @@ msgstr " msgid "Selection" msgstr "ÁªÂò" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "»ý³´ü´Ö" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "»ØÄê»þ´Ö¤Ø¥¸¥ã¥ó¥×: " @@ -4181,6 +4163,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "¥Õ¥¡¥¤¥ë(_F)" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "ÊĤ¸¤ë(_C)" @@ -4197,6 +4184,10 @@ msgstr " msgid "Exit the program" msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "ɽ¼¨(_V)" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥¦¥£¥ó¥É¥¦¤ò±£¤¹" @@ -4217,6 +4208,10 @@ msgstr " msgid "Configure the application" msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÀßÄê" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "¥Ø¥ë¥×(_H)" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..." @@ -4325,6 +4320,56 @@ msgstr " msgid "Selected:" msgstr "ÁªÂòºÑ¤ß:" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +#, fuzzy +msgid "Gtk2 interface" +msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë" + +#: modules/gui/gtk2/gnome2_interface.c:31 +#, fuzzy +msgid "_New" +msgstr "ɽ¼¨(_V)" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ" + +#: modules/gui/gtk2/gtk2_interface.c:67 +#, fuzzy +msgid "window1" +msgstr "¥¦¥£¥ó¥É¥¦" + +#: modules/gui/gtk2/gtk2_interface.c:109 +#, fuzzy +msgid "_Edit" +msgstr "ÊÔ½¸" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "¸À¸ì" @@ -4773,27 +4818,27 @@ msgstr "Qt msgid "Open a skin file" msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)" @@ -5327,11 +5372,6 @@ msgstr " msgid "Using the logger interface plugin..." msgstr "¥í¥®¥ó¥°¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£" -#: modules/misc/memcpy/memcpyaltivec.c:52 -#, fuzzy -msgid "AltiVec memcpy" -msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë" - #: modules/misc/memcpy/memcpy.c:81 #, fuzzy msgid "libc memcpy" @@ -5352,6 +5392,11 @@ msgstr "MMX memcpy msgid "MMX EXT memcpy" msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ómemcpy¥â¥¸¥å¡¼¥ë" +#: modules/misc/memcpy/memcpyaltivec.c:52 +#, fuzzy +msgid "AltiVec memcpy" +msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "IPv4¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä" @@ -5375,11 +5420,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "QTËä¤á¹þ¤ß¥â¥¸¥å¡¼¥ë" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹" @@ -5421,7 +5462,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5451,6 +5492,11 @@ msgstr "MPEG 1/2 msgid "MPEG-I/II video packetizer" msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë" + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5471,7 +5517,7 @@ msgstr " msgid "ES stream" msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß" @@ -6019,10 +6065,6 @@ msgstr "xosd #~ msgid "Video Track" #~ msgstr "¥Ó¥Ç¥ª" -#, fuzzy -#~ msgid "SAP interface module" -#~ msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë" - #, fuzzy #~ msgid "Auto" #~ msgstr "ºîÀ®¼Ô" @@ -6059,10 +6101,6 @@ msgstr "xosd #~ msgid "Device &name:" #~ msgstr "¥Ç¥Ð¥¤¥¹Ì¾" -#, fuzzy -#~ msgid "Starting position" -#~ msgstr "¿âľÊý¸þ°ÌÃÖ" - #, fuzzy #~ msgid "&Title:" #~ msgstr "¥¿¥¤¥È¥ë:" diff --git a/po/nl.po b/po/nl.po index 27a23487b3..07a2e8f276 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2002-04-20 16:58GMT\n" "Last-Translator: Derk-Jan Hartman \n" "Language-Team: Nederlands \n" @@ -15,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 0.8\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 #, fuzzy msgid "" "\n" @@ -125,7 +126,7 @@ msgid "Program" msgstr "Programma" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1089,19 +1090,20 @@ msgstr "Interface" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "Audio" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Video" @@ -1368,39 +1370,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "Microsoft Media Server (MMS) invoer" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "Dummy stream uitvoer" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "Voer uit naar stream" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "HTTP stream uitvoer" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "buffer grootte in ms" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" -"Wijzig de standaard buffer grootte voor udp stromen. Deze waarde wordt in " -"miliseconden opgegeven." - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "UDP stream uitvoer" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Voer uit naar stream" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1449,6 +1418,18 @@ msgstr "SLP invoer" msgid "slp" msgstr "slp" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "buffer grootte in ms" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" +"Wijzig de standaard buffer grootte voor udp stromen. Deze waarde wordt in " +"miliseconden opgegeven." + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "UDP/RTP invoer" @@ -1481,6 +1462,35 @@ msgstr "Video4Linux demuxer" msgid "VCD input" msgstr "VCD input" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "SAP" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "SAP interface module" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "Dummy stream uitvoer" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "Voer uit naar stream" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "HTTP stream uitvoer" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "UDP stream uitvoer" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Voer uit naar stream" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "Karakteristieke dimensie" @@ -1677,7 +1687,7 @@ msgstr "5.1" msgid "2 Front 2 Rear" msgstr "2 Voor 2 Achter" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "EsounD audio uitvoer" @@ -1935,14 +1945,14 @@ msgstr "MPEG layer I/II/III audio parser" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "MPEG I/II layer 1/2 audio decoder" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "AltiVec IDCT" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "IDCT" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "AltiVec IDCT" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "classic IDCT" @@ -1955,6 +1965,10 @@ msgstr "MMX IDCT" msgid "MMX EXT IDCT" msgstr "MMX EXT IDCT" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "compensatie van beweging" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "3D Now! compensatie van beweging" @@ -1963,10 +1977,6 @@ msgstr "3D Now! compensatie van beweging" msgid "AltiVec motion compensation" msgstr "AltiVec compensatie van beweging" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "compensatie van beweging" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "MMX compensatie van beweging" @@ -2209,17 +2219,17 @@ msgid "Layer" msgstr "Laag" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Kanalen" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "Sample Rate" @@ -2227,24 +2237,27 @@ msgstr "Sample Rate" msgid "ASF v1.0 demuxer (file only)" msgstr "ASF v1.0 demuxer (enkel bestanden)" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "Aantal streams" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "Type" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "Codec" @@ -2252,7 +2265,8 @@ msgstr "Codec" msgid "Avg. byterate" msgstr "Gemiddelde byterate" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "Bits per Sample" @@ -2260,7 +2274,8 @@ msgstr "Bits per Sample" msgid "Size" msgstr "Grootte" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "Resolutie" @@ -2268,7 +2283,7 @@ msgstr "Resolutie" msgid "Planes" msgstr "Niveaus" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "Bits per Pixel" @@ -2333,24 +2348,24 @@ msgstr "forceer de creatie van een index" msgid "AVI demuxer" msgstr "AVI demuxer" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "Avi" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "Aantal Streams" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "Opties" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "Frame rate" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "Onbekend" @@ -2374,20 +2389,59 @@ msgstr "flac demuxer" msgid "playlist metademux" msgstr "afspeellijst metademux" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 #, fuzzy msgid "mkv-demuxer" msgstr "avi-demuxer" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "AAC stream demuxer" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Duur" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Bestandsnaam" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Over dit programma" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Begin positie" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Resolutie" + +#: modules/demux/mkv.cpp:2323 +#, fuzzy +msgid "Frame Per Second" +msgstr "Beelden per seconde" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "Ondertiteling" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "MP4 demuxer" @@ -2463,40 +2517,40 @@ msgstr "ISO 13818-1 MPEG Transport Stream input" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "ogg stream demuxer" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "Vorbis" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "Bit Rate" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "Theora" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "tarkin" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "Aantal Bits" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "Breedte" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "Hoogte" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "Aantal bits per sample" @@ -2903,8 +2957,8 @@ msgstr "Bestand" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Open Bestand" @@ -3285,10 +3339,10 @@ msgstr "" "De VideoLAN Client is een MPEG 1, MPEG 2, MP3, DivX multimedia speler, die " "invoer zowel van schijf als van netwerk kan afspelen." -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Pixmap bestand niet gevonden: %s" @@ -3298,64 +3352,6 @@ msgstr "Pixmap bestand niet gevonden: %s" msgid "Error loading pixmap file: %s" msgstr "Fout tijdens laden van pixmap bestand: %s" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "Gtk2 interface" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "_Nieuw" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "gnome2" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "knop4" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "knop3" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "Bewaar Bestand" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "venster1" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Bestand" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "_Bewerk" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Toon" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "_Help" - -#: modules/gui/gtk2/gtk2_interface.c:146 -msgid "_About" -msgstr "_Over" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "knop1" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "knop2" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "Toon tooltips" @@ -3826,10 +3822,6 @@ msgstr "Horizontaal" msgid "Satellite" msgstr "Satelliet" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "Ondertiteling" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3889,11 +3881,6 @@ msgstr "Verwijder" msgid "Selection" msgstr "Selectie" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Duur" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "Spring naar: " @@ -3965,6 +3952,11 @@ msgstr "Gtk+" msgid "Gtk+ interface" msgstr "Gtk+ interface" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Bestand" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "_Sluit" @@ -3981,6 +3973,10 @@ msgstr "Af_sluiten" msgid "Exit the program" msgstr "Sluit programma af" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Toon" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Verberg het hoofdscherm" @@ -4001,6 +3997,10 @@ msgstr "_Voorkeuren..." msgid "Configure the application" msgstr "Stel applicatie voorkeuren in" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "_Help" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_Over..." @@ -4105,6 +4105,51 @@ msgstr "Configureer" msgid "Selected:" msgstr "Geselecteerd:" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "Gtk2 interface" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "_Nieuw" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "gnome2" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "knop4" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "knop3" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "Bewaar Bestand" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "venster1" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "_Bewerk" + +#: modules/gui/gtk2/gtk2_interface.c:146 +msgid "_About" +msgstr "_Over" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "knop1" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "knop2" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "Talen" @@ -4531,27 +4576,27 @@ msgstr "Qt interface" msgid "Open a skin file" msgstr "Open een skin bestand" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "Laast gebruikte skin" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "Configuratie van laatst gebruikte skin" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "Toon programma in system tray" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "Toon programma in taakbalk" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 msgid "Skinnable Interface" msgstr "Interface met Skins" @@ -5027,10 +5072,6 @@ msgstr "bestands logging interface" msgid "Using the logger interface plugin..." msgstr "De logger interface plugin module wordt gebruikt..." -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "AltiVec memcpy" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "libc memcpy" @@ -5047,6 +5088,10 @@ msgstr "MMX memcpy" msgid "MMX EXT memcpy" msgstr "MMX EXT memcpy" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "AltiVec memcpy" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "IPv4 network abstractie laag" @@ -5069,11 +5114,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "Qt Embedded GUI helper" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "SAP" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 msgid "SAP interface" msgstr "SAP interface" @@ -5113,7 +5154,7 @@ msgstr "TS muxer" msgid "TS muxer (libdvbpsi)" msgstr "TS muxer (libdvbpsi)" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "Ogg/ogm muxer" @@ -5141,6 +5182,11 @@ msgstr "MPEG I/II audio packetizer" msgid "MPEG-I/II video packetizer" msgstr "MPEG I/II video packetizer" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "A/52 audio packetizer" + #: modules/stream_out/display.c:50 msgid "Display stream" msgstr "Toon stream" @@ -5157,7 +5203,7 @@ msgstr "Dupliceer stream" msgid "ES stream" msgstr "ES stream" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 msgid "Standard stream" msgstr "Standaard stream" @@ -5670,9 +5716,6 @@ msgstr "xosd interface" #~ msgid "Video Track" #~ msgstr "Video Spoor" -#~ msgid "SAP interface module" -#~ msgstr "SAP interface module" - #~ msgid "Bitrate (bps)" #~ msgstr "Bitrate (bps)" @@ -5733,9 +5776,6 @@ msgstr "xosd interface" #~ msgid "&Menus" #~ msgstr "&Menus" -#~ msgid "Starting position" -#~ msgstr "Begin positie" - #~ msgid "&Title:" #~ msgstr "&Titel:" diff --git a/po/no.po b/po/no.po index 9e66361da1..d86b7c9d7d 100644 --- a/po/no.po +++ b/po/no.po @@ -4,7 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2003-04-06 12:32+0200\n" "Last-Translator: Haakon Meland Eriksen \n" "Language-Team: vlc <>\n" @@ -12,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 #, fuzzy msgid "" "\n" @@ -125,7 +126,7 @@ msgid "Program" msgstr "Avslutt programmet" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1155,19 +1156,20 @@ msgstr "Grensesnitt" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "Lyd" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Video" @@ -1415,41 +1417,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -#, fuzzy -msgid "Dummy stream ouput" -msgstr "Standard output:" - -#: modules/access_output/file.c:66 -#, fuzzy -msgid "File stream ouput" -msgstr "Standard output:" - -#: modules/access_output/http.c:54 -#, fuzzy -msgid "HTTP stream ouput" -msgstr "Standard output:" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -#, fuzzy -msgid "UDP stream ouput" -msgstr "Standard output:" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Standard output:" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1499,6 +1466,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "" @@ -1531,6 +1508,40 @@ msgstr "Standard grensesnitt: " msgid "VCD input" msgstr "" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +#, fuzzy +msgid "SAP interface module" +msgstr "Standard grensesnitt: " + +#: modules/access_output/dummy.c:56 +#, fuzzy +msgid "Dummy stream ouput" +msgstr "Standard output:" + +#: modules/access_output/file.c:66 +#, fuzzy +msgid "File stream ouput" +msgstr "Standard output:" + +#: modules/access_output/http.c:54 +#, fuzzy +msgid "HTTP stream ouput" +msgstr "Standard output:" + +#: modules/access_output/udp.c:80 +#, fuzzy +msgid "UDP stream ouput" +msgstr "Standard output:" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Standard output:" + #: modules/audio_filter/channel_mixer/headphone.c:48 #, fuzzy msgid "Characteristic dimension" @@ -1729,7 +1740,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "2 Front 2 Bak" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 #, fuzzy msgid "EsounD audio output" msgstr "Lydeksport volum" @@ -1976,14 +1987,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "Standard grensesnitt: " -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1996,6 +2007,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -2004,10 +2019,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -2248,17 +2259,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Kanaler" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -2266,25 +2277,28 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 #, fuzzy msgid "Number of streams" msgstr "Stopp strøm" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "" @@ -2292,7 +2306,8 @@ msgstr "" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2300,7 +2315,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "Oppløsning" @@ -2309,7 +2325,7 @@ msgstr "Oppl msgid "Planes" msgstr "Spill" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2381,26 +2397,26 @@ msgstr "" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 #, fuzzy msgid "Number of Streams" msgstr "Pause strøm" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 #, fuzzy msgid "Flags" msgstr "Fort" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "Ukjent" @@ -2426,19 +2442,58 @@ msgstr "" msgid "playlist metademux" msgstr "Åpne spilleliste-vinduet" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "Standard grensesnitt: " +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Varighet" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Fil" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Om dette programmet" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Startposisjon" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Oppløsning" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +#, fuzzy +msgid "Subtitle" +msgstr "_Teksting" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2511,41 +2566,41 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 #, fuzzy msgid "tarkin" msgstr "tegn" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2972,8 +3027,8 @@ msgstr "Fil" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Åpne fil" @@ -3384,10 +3439,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3397,69 +3452,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -#, fuzzy -msgid "Gtk2 interface" -msgstr "Standard grensesnitt: " - -#: modules/gui/gtk2/gnome2_interface.c:31 -#, fuzzy -msgid "_New" -msgstr "_Vis" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -#, fuzzy -msgid "Save File" -msgstr "Velg fil" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Fil" - -#: modules/gui/gtk2/gtk2_interface.c:109 -#, fuzzy -msgid "_Edit" -msgstr "_Avslutt" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Vis" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "_Hjelp" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "Om" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "" @@ -3946,11 +3938,6 @@ msgstr "" msgid "Satellite" msgstr "Åpne spilleliste-vinduet" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -#, fuzzy -msgid "Subtitle" -msgstr "_Teksting" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 #, fuzzy @@ -4013,11 +4000,6 @@ msgstr "Slett" msgid "Selection" msgstr "Valg" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Varighet" - #: modules/gui/gtk/gnome_interface.c:2588 #, fuzzy msgid "Jump to: " @@ -4095,6 +4077,11 @@ msgstr "Gtk+" msgid "Gtk+ interface" msgstr "Standard grensesnitt: " +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Fil" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -4112,6 +4099,10 @@ msgstr "_Avslutt" msgid "Exit the program" msgstr "Avslutt programmet" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Vis" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Skjul grensesnittvinduet" @@ -4132,6 +4123,10 @@ msgstr "_Preferanser..." msgid "Configure the application" msgstr "Konfigurer programmet" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "_Hjelp" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_Om..." @@ -4242,6 +4237,56 @@ msgstr "" msgid "Selected:" msgstr "Valgte" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +#, fuzzy +msgid "Gtk2 interface" +msgstr "Standard grensesnitt: " + +#: modules/gui/gtk2/gnome2_interface.c:31 +#, fuzzy +msgid "_New" +msgstr "_Vis" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +#, fuzzy +msgid "Save File" +msgstr "Velg fil" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:109 +#, fuzzy +msgid "_Edit" +msgstr "_Avslutt" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "Om" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "" @@ -4695,27 +4740,27 @@ msgstr "Standard grensesnitt: " msgid "Open a skin file" msgstr "Åpne en fil" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "Grensesnitt" @@ -5240,10 +5285,6 @@ msgstr "Standard grensesnitt: " msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -5260,6 +5301,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -5283,11 +5328,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "Standard grensesnitt: " -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "_Gjem grensesnitt" @@ -5329,7 +5370,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5357,6 +5398,11 @@ msgstr "" msgid "MPEG-I/II video packetizer" msgstr "" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "Standard grensesnitt: " + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5377,7 +5423,7 @@ msgstr "Spill str msgid "ES stream" msgstr "Stopp strøm" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "Stopp strøm" @@ -5885,10 +5931,6 @@ msgstr "xosd modulgrensesnitt" #~ msgid "Video Track" #~ msgstr "Video" -#, fuzzy -#~ msgid "SAP interface module" -#~ msgstr "Standard grensesnitt: " - #, fuzzy #~ msgid "mpga" #~ msgstr "mpeg" @@ -5927,10 +5969,6 @@ msgstr "xosd modulgrensesnitt" #~ msgid "Device &name:" #~ msgstr "Enhets navn:" -#, fuzzy -#~ msgid "Starting position" -#~ msgstr "Startposisjon" - #, fuzzy #~ msgid "&Title:" #~ msgstr "Tittel:" diff --git a/po/pl.po b/po/pl.po index ed8e923c72..324eedd686 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2002-07-12 11:49+0100\n" "Last-Translator: Arkadiusz Lipiec \n" "Language-Team: polish \n" @@ -13,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -121,7 +122,7 @@ msgid "Program" msgstr "Program" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -1097,19 +1098,20 @@ msgstr "Interfejs" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "D¼wiêk" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "Obraz" @@ -1364,41 +1366,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -#, fuzzy -msgid "Dummy stream ouput" -msgstr "wyj¶cie obrazu w skali szaro¶ci" - -#: modules/access_output/file.c:66 -#, fuzzy -msgid "File stream ouput" -msgstr "wyj¶cie obrazu w skali szaro¶ci" - -#: modules/access_output/http.c:54 -#, fuzzy -msgid "HTTP stream ouput" -msgstr "wyj¶cie obrazu w skali szaro¶ci" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -#, fuzzy -msgid "UDP stream ouput" -msgstr "wyj¶cie obrazu w skali szaro¶ci" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "wyj¶cie obrazu w skali szaro¶ci" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1456,6 +1423,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 #, fuzzy msgid "UDP/RTP input" @@ -1490,6 +1467,40 @@ msgstr "modu msgid "VCD input" msgstr "modu³ wej¶cia VCD" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +#, fuzzy +msgid "SAP interface module" +msgstr "modu³ interfejsu" + +#: modules/access_output/dummy.c:56 +#, fuzzy +msgid "Dummy stream ouput" +msgstr "wyj¶cie obrazu w skali szaro¶ci" + +#: modules/access_output/file.c:66 +#, fuzzy +msgid "File stream ouput" +msgstr "wyj¶cie obrazu w skali szaro¶ci" + +#: modules/access_output/http.c:54 +#, fuzzy +msgid "HTTP stream ouput" +msgstr "wyj¶cie obrazu w skali szaro¶ci" + +#: modules/access_output/udp.c:80 +#, fuzzy +msgid "UDP stream ouput" +msgstr "wyj¶cie obrazu w skali szaro¶ci" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "wyj¶cie obrazu w skali szaro¶ci" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "" @@ -1696,7 +1707,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 #, fuzzy msgid "EsounD audio output" msgstr "modu³ d¼wiêku EsounD" @@ -1958,15 +1969,15 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "modu³ dekodera obrazu MPEG I/II" +#: modules/codec/mpeg_video/idct/idct.c:41 +msgid "IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctaltivec.c:45 #, fuzzy msgid "AltiVec IDCT" msgstr "modu³ AltiVec IDCT" -#: modules/codec/mpeg_video/idct/idct.c:41 -msgid "IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idctclassic.c:41 #, fuzzy msgid "classic IDCT" @@ -1982,6 +1993,11 @@ msgstr "modu msgid "MMX EXT IDCT" msgstr "modu³ MMX EXT IDCT" +#: modules/codec/mpeg_video/motion/motion.c:42 +#, fuzzy +msgid "motion compensation" +msgstr "modu³ kompensacji ruchu" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 #, fuzzy msgid "3D Now! motion compensation" @@ -1992,11 +2008,6 @@ msgstr "modu msgid "AltiVec motion compensation" msgstr "modu³ kompensacji ruchu AltiVec" -#: modules/codec/mpeg_video/motion/motion.c:42 -#, fuzzy -msgid "motion compensation" -msgstr "modu³ kompensacji ruchu" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 #, fuzzy msgid "MMX motion compensation" @@ -2257,17 +2268,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "Kana³y" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 #, fuzzy msgid "Sample Rate" msgstr "Szybko¶æ symboliczna" @@ -2276,25 +2287,28 @@ msgstr "Szybko msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 #, fuzzy msgid "Number of streams" msgstr "Liczba wierszy" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 #, fuzzy msgid "Codec" msgstr "Nic" @@ -2303,7 +2317,8 @@ msgstr "Nic" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2311,7 +2326,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 #, fuzzy msgid "Resolution" msgstr "Wybór" @@ -2321,7 +2337,7 @@ msgstr "Wyb msgid "Planes" msgstr "Odtwórz" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2393,26 +2409,26 @@ msgstr "wymuszenie d msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 #, fuzzy msgid "Number of Streams" msgstr "Liczba wierszy" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 #, fuzzy msgid "Flags" msgstr "Przyspiesz" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2438,19 +2454,58 @@ msgstr "" msgid "playlist metademux" msgstr "Otwiera okno listy odtwarzania" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 #, fuzzy msgid "mka/mkv stream demuxer" msgstr "dekoder d¼wiêku MPEG warstwa I/II" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "Czas trwania" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "nazwa pliku dziennika" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Informacje dotycz±ce tej aplikacji" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Pozycja pocz±tkowa" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Wybór" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +#, fuzzy +msgid "Subtitle" +msgstr "_Podtytu³y" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2525,42 +2580,42 @@ msgstr "Wej msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "Wej¶cie transportu strumienia ISO 13818-1 MPEG (libdvbpsi)" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 #, fuzzy msgid "ogg stream demuxer" msgstr "dekoder d¼wiêku MPEG warstwa I/II" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 #, fuzzy msgid "tarkin" msgstr "napis" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2993,8 +3048,8 @@ msgstr "Plik" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Otwórz plik" @@ -3412,10 +3467,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3425,70 +3480,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -#, fuzzy -msgid "Gtk2 interface" -msgstr "Modu³ interfejsu Gtk+" - -#: modules/gui/gtk2/gnome2_interface.c:31 -#, fuzzy -msgid "_New" -msgstr "_Widok" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -#, fuzzy -msgid "Save File" -msgstr "Wybierz plik" - -#: modules/gui/gtk2/gtk2_interface.c:67 -#, fuzzy -msgid "window1" -msgstr "Aktywne okna" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Plik" - -#: modules/gui/gtk2/gtk2_interface.c:109 -#, fuzzy -msgid "_Edit" -msgstr "W_yjd¼" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "_Widok" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "_Pomoc" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "Informacje o..." - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 #, fuzzy msgid "Show tooltips" @@ -3972,11 +3963,6 @@ msgstr "Pozioma" msgid "Satellite" msgstr "Otwórz kartê satelitarn±" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -#, fuzzy -msgid "Subtitle" -msgstr "_Podtytu³y" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 #, fuzzy @@ -4039,11 +4025,6 @@ msgstr "Usu msgid "Selection" msgstr "Wybór" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "Czas trwania" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "Skocz do:" @@ -4119,6 +4100,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "Modu³ interfejsu Gtk+" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Plik" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -4136,6 +4122,10 @@ msgstr "W_yjd msgid "Exit the program" msgstr "Wychodzi z programu" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "_Widok" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "Ukrywa g³ówne okno interfejsu" @@ -4156,6 +4146,10 @@ msgstr "_Preferencje..." msgid "Configure the application" msgstr "Konfiguruje t± aplikacjê" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "_Pomoc" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_Informacje o..." @@ -4264,6 +4258,57 @@ msgstr "Skonfiguruj" msgid "Selected:" msgstr "Wybrano:" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +#, fuzzy +msgid "Gtk2 interface" +msgstr "Modu³ interfejsu Gtk+" + +#: modules/gui/gtk2/gnome2_interface.c:31 +#, fuzzy +msgid "_New" +msgstr "_Widok" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +#, fuzzy +msgid "Save File" +msgstr "Wybierz plik" + +#: modules/gui/gtk2/gtk2_interface.c:67 +#, fuzzy +msgid "window1" +msgstr "Aktywne okna" + +#: modules/gui/gtk2/gtk2_interface.c:109 +#, fuzzy +msgid "_Edit" +msgstr "W_yjd¼" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "Informacje o..." + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "" @@ -4720,27 +4765,27 @@ msgstr "modu msgid "Open a skin file" msgstr "Otwiera plik" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "Prze³±cz _Interfejs" @@ -5282,11 +5327,6 @@ msgstr "" "\n" "U¿ywanie wtyczku interfejsu zapisu do dziennika..." -#: modules/misc/memcpy/memcpyaltivec.c:52 -#, fuzzy -msgid "AltiVec memcpy" -msgstr "modu³ AltiVec memcpy" - #: modules/misc/memcpy/memcpy.c:81 #, fuzzy msgid "libc memcpy" @@ -5307,6 +5347,11 @@ msgstr "modu msgid "MMX EXT memcpy" msgstr "modu³ MMX EXT memcpy" +#: modules/misc/memcpy/memcpyaltivec.c:52 +#, fuzzy +msgid "AltiVec memcpy" +msgstr "modu³ AltiVec memcpy" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "sieciowa warstwa abstrakcji IPv4" @@ -5330,11 +5375,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "modu³ demux" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "interfejs sieciowy" @@ -5378,7 +5419,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5408,6 +5449,11 @@ msgstr "dekoder d msgid "MPEG-I/II video packetizer" msgstr "modu³ dekodera obrazu MPEG I/II" +#: modules/packetizer/vorbis.c:89 +#, fuzzy +msgid "Vorbis audio packetizer" +msgstr "modu³ dekodera podtytu³ów DVD" + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5428,7 +5474,7 @@ msgstr "Odtwarza strumie msgid "ES stream" msgstr "Zatrzymuje strumieñ" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "Zatrzymuje strumieñ" @@ -5972,10 +6018,6 @@ msgstr "modu #~ msgid "Video Track" #~ msgstr "Obraz" -#, fuzzy -#~ msgid "SAP interface module" -#~ msgstr "modu³ interfejsu" - #, fuzzy #~ msgid "Auto" #~ msgstr "Autorzy" @@ -6008,10 +6050,6 @@ msgstr "modu #~ msgid "Device &name:" #~ msgstr "Nazwa urz±dzenia:" -#, fuzzy -#~ msgid "Starting position" -#~ msgstr "Pozycja pocz±tkowa" - #, fuzzy #~ msgid "&Title:" #~ msgstr "Tytu³:" diff --git a/po/ru.po b/po/ru.po index a62ca2b5b3..73ed6cea25 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2001-02-19 19:58+03:00\n" "Last-Translator: Valek Filippov \n" "Language-Team: Russian \n" @@ -13,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -120,7 +121,7 @@ msgid "Program" msgstr "" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -958,19 +959,20 @@ msgstr "" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "" @@ -1212,41 +1214,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -#, fuzzy -msgid "Dummy stream ouput" -msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" - -#: modules/access_output/file.c:66 -#, fuzzy -msgid "File stream ouput" -msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" - -#: modules/access_output/http.c:54 -#, fuzzy -msgid "HTTP stream ouput" -msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -#, fuzzy -msgid "UDP stream ouput" -msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1296,6 +1263,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "" @@ -1326,6 +1303,40 @@ msgstr "" msgid "VCD input" msgstr "" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +#, fuzzy +msgid "SAP interface module" +msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" + +#: modules/access_output/dummy.c:56 +#, fuzzy +msgid "Dummy stream ouput" +msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" + +#: modules/access_output/file.c:66 +#, fuzzy +msgid "File stream ouput" +msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" + +#: modules/access_output/http.c:54 +#, fuzzy +msgid "HTTP stream ouput" +msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" + +#: modules/access_output/udp.c:80 +#, fuzzy +msgid "UDP stream ouput" +msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "" @@ -1516,7 +1527,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "" @@ -1755,14 +1766,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1775,6 +1786,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -1783,10 +1798,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -2015,17 +2026,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -2033,25 +2044,28 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 #, fuzzy msgid "Number of streams" msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "" @@ -2059,7 +2073,8 @@ msgstr "" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2067,7 +2082,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 #, fuzzy msgid "Resolution" msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ" @@ -2077,7 +2093,7 @@ msgstr " msgid "Planes" msgstr "÷ÏÓÐÒ." -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2142,26 +2158,26 @@ msgstr "" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 #, fuzzy msgid "Number of Streams" msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 #, fuzzy msgid "Flags" msgstr "âÙÓÔÒÏ" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2187,18 +2203,54 @@ msgstr "" msgid "playlist metademux" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 msgid "mka/mkv stream demuxer" msgstr "" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ" + +#: modules/demux/mkv.cpp:2277 +msgid "Muxing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2281 +msgid "Writing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2270,40 +2322,40 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2720,8 +2772,8 @@ msgstr " #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "ïÔËÒÙÔØ ÆÁÊÌ" @@ -3118,10 +3170,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3131,67 +3183,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -#, fuzzy -msgid "Gtk2 interface" -msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -#, fuzzy -msgid "Save File" -msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "íÏÄÕÌÉ..." - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "" @@ -3675,10 +3666,6 @@ msgstr "" msgid "Satellite" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 #, fuzzy @@ -3740,11 +3727,6 @@ msgstr "" msgid "Selection" msgstr "" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "" @@ -3819,6 +3801,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -3836,6 +3823,10 @@ msgstr "" msgid "Exit the program" msgstr "" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:294 #, fuzzy msgid "Hide the main interface window" @@ -3857,6 +3848,10 @@ msgstr "" msgid "Configure the application" msgstr "" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 #, fuzzy msgid "_About..." @@ -3967,6 +3962,54 @@ msgstr "" msgid "Selected:" msgstr "" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +#, fuzzy +msgid "Gtk2 interface" +msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +#, fuzzy +msgid "Save File" +msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "íÏÄÕÌÉ..." + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "" @@ -4408,27 +4451,27 @@ msgstr " msgid "Open a skin file" msgstr "ïÔËÒÙÔØ ÆÁÊÌ" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" @@ -4927,10 +4970,6 @@ msgstr " msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -4947,6 +4986,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -4969,11 +5012,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" @@ -5014,7 +5053,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5042,6 +5081,10 @@ msgstr "" msgid "MPEG-I/II video packetizer" msgstr "" +#: modules/packetizer/vorbis.c:89 +msgid "Vorbis audio packetizer" +msgstr "" + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5062,7 +5105,7 @@ msgstr " msgid "ES stream" msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË" @@ -5535,10 +5578,6 @@ msgstr "" msgid "xosd interface" msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" -#, fuzzy -#~ msgid "SAP interface module" -#~ msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ" - #, fuzzy #~ msgid "Auto" #~ msgstr "íÏÄÕÌÉ..." diff --git a/po/sv.po b/po/sv.po index 126968ec78..2e932352f8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: vlc\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: 2002-07-23 23:00+0200\n" "Last-Translator: Joel Arvidsson \n" "Language-Team: \n" @@ -14,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -122,7 +123,7 @@ msgid "Program" msgstr "" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -958,19 +959,20 @@ msgstr "" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "" @@ -1213,41 +1215,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -#, fuzzy -msgid "Dummy stream ouput" -msgstr "Paus" - -#: modules/access_output/file.c:66 -#, fuzzy -msgid "File stream ouput" -msgstr "Paus" - -#: modules/access_output/http.c:54 -#, fuzzy -msgid "HTTP stream ouput" -msgstr "Paus" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -#, fuzzy -msgid "UDP stream ouput" -msgstr "Paus" - -#: modules/access_output/udp.c:81 -#, fuzzy -msgid "udp stream output" -msgstr "Paus" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1296,6 +1263,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "" @@ -1326,6 +1303,40 @@ msgstr "" msgid "VCD input" msgstr "" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +#, fuzzy +msgid "SAP interface module" +msgstr "Göm andra" + +#: modules/access_output/dummy.c:56 +#, fuzzy +msgid "Dummy stream ouput" +msgstr "Paus" + +#: modules/access_output/file.c:66 +#, fuzzy +msgid "File stream ouput" +msgstr "Paus" + +#: modules/access_output/http.c:54 +#, fuzzy +msgid "HTTP stream ouput" +msgstr "Paus" + +#: modules/access_output/udp.c:80 +#, fuzzy +msgid "UDP stream ouput" +msgstr "Paus" + +#: modules/access_output/udp.c:81 +#, fuzzy +msgid "udp stream output" +msgstr "Paus" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "" @@ -1516,7 +1527,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "" @@ -1755,14 +1766,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1775,6 +1786,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -1783,10 +1798,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -2018,18 +2029,18 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 #, fuzzy msgid "Channels" msgstr "Kanal:" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -2037,25 +2048,28 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 #, fuzzy msgid "Number of streams" msgstr "Paus" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 #, fuzzy msgid "Codec" msgstr "Radera" @@ -2064,7 +2078,8 @@ msgstr "Radera" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2072,7 +2087,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 #, fuzzy msgid "Resolution" msgstr "Markera allt" @@ -2082,7 +2098,7 @@ msgstr "Markera allt" msgid "Planes" msgstr "Spela upp" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2149,26 +2165,26 @@ msgstr "" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 #, fuzzy msgid "Number of Streams" msgstr "Paus" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 #, fuzzy msgid "Flags" msgstr "Spola framåt" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2194,18 +2210,57 @@ msgstr "" msgid "playlist metademux" msgstr "Föregående fil" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 msgid "mka/mkv stream demuxer" msgstr "" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +#, fuzzy +msgid "Segment Filename" +msgstr "Arkiv" + +#: modules/demux/mkv.cpp:2277 +#, fuzzy +msgid "Muxing Application" +msgstr "Om VLC" + +#: modules/demux/mkv.cpp:2281 +#, fuzzy +msgid "Writing Application" +msgstr "Om VLC" + +#: modules/demux/mkv.cpp:2319 +#, fuzzy +msgid "Display Resolution" +msgstr "Markera allt" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +#, fuzzy +msgid "Subtitle" +msgstr "Undertext" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2276,40 +2331,40 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2732,8 +2787,8 @@ msgstr "Arkiv" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "Öppna fil" @@ -3132,10 +3187,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3145,69 +3200,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -#, fuzzy -msgid "Gtk2 interface" -msgstr "Göm andra" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -#, fuzzy -msgid "Save File" -msgstr "Nästa file" - -#: modules/gui/gtk2/gtk2_interface.c:67 -#, fuzzy -msgid "window1" -msgstr "Fönster" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "_Fil" - -#: modules/gui/gtk2/gtk2_interface.c:109 -#, fuzzy -msgid "_Edit" -msgstr "Redigera" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:146 -#, fuzzy -msgid "_About" -msgstr "Om VLC" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "" @@ -3679,11 +3671,6 @@ msgstr "" msgid "Satellite" msgstr "" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -#, fuzzy -msgid "Subtitle" -msgstr "Undertext" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 #, fuzzy @@ -3743,11 +3730,6 @@ msgstr "" msgid "Selection" msgstr "" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "" @@ -3822,6 +3804,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "Göm andra" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "_Fil" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -3838,6 +3825,10 @@ msgstr "_Avsluta" msgid "Exit the program" msgstr "Avsluta VLC" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "" @@ -3858,6 +3849,10 @@ msgstr "" msgid "Configure the application" msgstr "" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "_Om VLC..." @@ -3965,6 +3960,56 @@ msgstr "" msgid "Selected:" msgstr "" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +#, fuzzy +msgid "Gtk2 interface" +msgstr "Göm andra" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +#, fuzzy +msgid "Save File" +msgstr "Nästa file" + +#: modules/gui/gtk2/gtk2_interface.c:67 +#, fuzzy +msgid "window1" +msgstr "Fönster" + +#: modules/gui/gtk2/gtk2_interface.c:109 +#, fuzzy +msgid "_Edit" +msgstr "Redigera" + +#: modules/gui/gtk2/gtk2_interface.c:146 +#, fuzzy +msgid "_About" +msgstr "Om VLC" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 #, fuzzy msgid "Languages" @@ -4408,27 +4453,27 @@ msgstr "G msgid "Open a skin file" msgstr "Öppna fil" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 #, fuzzy msgid "Skinnable Interface" msgstr "Göm andra" @@ -4927,10 +4972,6 @@ msgstr "G msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -4947,6 +4988,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -4969,11 +5014,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 #, fuzzy msgid "SAP interface" msgstr "Göm andra" @@ -5014,7 +5055,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -5042,6 +5083,10 @@ msgstr "" msgid "MPEG-I/II video packetizer" msgstr "" +#: modules/packetizer/vorbis.c:89 +msgid "Vorbis audio packetizer" +msgstr "" + #: modules/stream_out/display.c:50 #, fuzzy msgid "Display stream" @@ -5062,7 +5107,7 @@ msgstr "Spela upp" msgid "ES stream" msgstr "Stopp" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 #, fuzzy msgid "Standard stream" msgstr "Stopp" @@ -5535,10 +5580,6 @@ msgstr "" msgid "xosd interface" msgstr "Göm andra" -#, fuzzy -#~ msgid "SAP interface module" -#~ msgstr "Göm andra" - #, fuzzy #~ msgid "Auto" #~ msgstr "Om VLC" diff --git a/po/vlc.pot b/po/vlc.pot index d590d570ef..d006bf09a7 100644 --- a/po/vlc.pot +++ b/po/vlc.pot @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-06-22 18:09+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-06-26 15:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: include/interface.h:72 +#: include/vlc_interface.h:72 msgid "" "\n" "Warning: if you can't access the GUI anymore, open a dos command box, go to " @@ -120,7 +121,7 @@ msgid "Program" msgstr "" #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696 -#: modules/gui/beos/MediaControlView.cpp:1258 +#: modules/demux/mkv.cpp:2265 modules/gui/beos/MediaControlView.cpp:1258 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373 @@ -934,19 +935,20 @@ msgstr "" #: src/libvlc.h:458 modules/audio_output/coreaudio.c:227 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228 -#: modules/demux/ogg.c:555 modules/demux/ogg.c:825 modules/demux/ogg.c:998 -#: modules/gui/beos/InterfaceWindow.cpp:259 +#: modules/demux/mkv.cpp:2295 modules/demux/ogg.c:557 modules/demux/ogg.c:829 +#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219 #: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155 msgid "Audio" msgstr "" -#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:905 modules/gui/gtk/gnome_interface.c:1099 -#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:389 -#: modules/gui/macosx/macosx.m:68 modules/gui/macosx/output.m:144 -#: modules/misc/dummy/dummy.c:81 modules/video_output/directx/directx.c:112 +#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208 +#: modules/demux/mkv.cpp:2311 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:909 +#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296 +#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68 +#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81 +#: modules/video_output/directx/directx.c:112 msgid "Video" msgstr "" @@ -1185,36 +1187,6 @@ msgstr "" msgid "Microsoft Media Server (MMS) input" msgstr "" -#: modules/access_output/dummy.c:56 -msgid "Dummy stream ouput" -msgstr "" - -#: modules/access_output/file.c:66 -msgid "File stream ouput" -msgstr "" - -#: modules/access_output/http.c:54 -msgid "HTTP stream ouput" -msgstr "" - -#: modules/access_output/udp.c:74 modules/access/udp.c:72 -msgid "caching value in ms" -msgstr "" - -#: modules/access_output/udp.c:76 modules/access/udp.c:74 -msgid "" -"Allows you to modify the default caching value for udp streams. This value " -"should be set in miliseconds units." -msgstr "" - -#: modules/access_output/udp.c:80 -msgid "UDP stream ouput" -msgstr "" - -#: modules/access_output/udp.c:81 -msgid "udp stream output" -msgstr "" - #: modules/access/pvr/pvr.c:74 msgid "Hauppauge PVR cards input" msgstr "" @@ -1263,6 +1235,16 @@ msgstr "" msgid "slp" msgstr "" +#: modules/access/udp.c:72 modules/access_output/udp.c:74 +msgid "caching value in ms" +msgstr "" + +#: modules/access/udp.c:74 modules/access_output/udp.c:76 +msgid "" +"Allows you to modify the default caching value for udp streams. This value " +"should be set in miliseconds units." +msgstr "" + #: modules/access/udp.c:78 msgid "UDP/RTP input" msgstr "" @@ -1293,6 +1275,34 @@ msgstr "" msgid "VCD input" msgstr "" +#: modules/access/vlcs.c:131 modules/misc/sap.c:142 +msgid "SAP" +msgstr "" + +#: modules/access/vlcs.c:134 +msgid "SAP interface module" +msgstr "" + +#: modules/access_output/dummy.c:56 +msgid "Dummy stream ouput" +msgstr "" + +#: modules/access_output/file.c:66 +msgid "File stream ouput" +msgstr "" + +#: modules/access_output/http.c:54 +msgid "HTTP stream ouput" +msgstr "" + +#: modules/access_output/udp.c:80 +msgid "UDP stream ouput" +msgstr "" + +#: modules/access_output/udp.c:81 +msgid "udp stream output" +msgstr "" + #: modules/audio_filter/channel_mixer/headphone.c:48 msgid "Characteristic dimension" msgstr "" @@ -1483,7 +1493,7 @@ msgstr "" msgid "2 Front 2 Rear" msgstr "" -#: modules/audio_output/esd.c:64 +#: modules/audio_output/esd.c:66 msgid "EsounD audio output" msgstr "" @@ -1718,14 +1728,14 @@ msgstr "" msgid "MPEG I/II layer 1/2 audio decoder" msgstr "" -#: modules/codec/mpeg_video/idct/idctaltivec.c:45 -msgid "AltiVec IDCT" -msgstr "" - #: modules/codec/mpeg_video/idct/idct.c:41 msgid "IDCT" msgstr "" +#: modules/codec/mpeg_video/idct/idctaltivec.c:45 +msgid "AltiVec IDCT" +msgstr "" + #: modules/codec/mpeg_video/idct/idctclassic.c:41 msgid "classic IDCT" msgstr "" @@ -1738,6 +1748,10 @@ msgstr "" msgid "MMX EXT IDCT" msgstr "" +#: modules/codec/mpeg_video/motion/motion.c:42 +msgid "motion compensation" +msgstr "" + #: modules/codec/mpeg_video/motion/motion3dnow.c:44 msgid "3D Now! motion compensation" msgstr "" @@ -1746,10 +1760,6 @@ msgstr "" msgid "AltiVec motion compensation" msgstr "" -#: modules/codec/mpeg_video/motion/motion.c:42 -msgid "motion compensation" -msgstr "" - #: modules/codec/mpeg_video/motion/motionmmx.c:45 msgid "MMX motion compensation" msgstr "" @@ -1975,17 +1985,17 @@ msgid "Layer" msgstr "" #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275 -#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:833 -#: modules/demux/ogg.c:1006 modules/gui/gtk/gnome_interface.c:148 -#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481 -#: modules/gui/gtk/gtk_interface.c:1282 +#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2299 +#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010 +#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931 +#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282 msgid "Channels" msgstr "" #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277 -#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632 -#: modules/demux/ogg.c:557 modules/demux/ogg.c:667 modules/demux/ogg.c:828 -#: modules/demux/ogg.c:1001 +#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2303 +#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559 +#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005 msgid "Sample Rate" msgstr "" @@ -1993,24 +2003,27 @@ msgstr "" msgid "ASF v1.0 demuxer (file only)" msgstr "" -#: modules/demux/asf/asf.c:165 +#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2283 msgid "Number of streams" msgstr "" #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302 -#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203 -#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:555 -#: modules/demux/ogg.c:625 modules/demux/ogg.c:665 modules/demux/ogg.c:730 -#: modules/demux/ogg.c:825 modules/demux/ogg.c:905 modules/demux/ogg.c:998 -#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134 +#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208 +#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2295 +#: modules/demux/mkv.cpp:2311 modules/demux/mkv.cpp:2327 +#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669 +#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909 +#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370 +#: modules/gui/macosx/output.m:134 msgid "Type" msgstr "" #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318 -#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204 -#: modules/demux/ogg.c:556 modules/demux/ogg.c:626 modules/demux/ogg.c:666 -#: modules/demux/ogg.c:731 modules/demux/ogg.c:826 modules/demux/ogg.c:906 -#: modules/demux/ogg.c:999 +#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209 +#: modules/demux/mkv.cpp:2296 modules/demux/mkv.cpp:2312 +#: modules/demux/mkv.cpp:2328 modules/demux/ogg.c:558 modules/demux/ogg.c:630 +#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830 +#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003 msgid "Codec" msgstr "" @@ -2018,7 +2031,8 @@ msgstr "" msgid "Avg. byterate" msgstr "" -#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175 +#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180 +#: modules/demux/mkv.cpp:2307 msgid "Bits Per Sample" msgstr "" @@ -2026,7 +2040,8 @@ msgstr "" msgid "Size" msgstr "" -#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206 +#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211 +#: modules/demux/mkv.cpp:2315 msgid "Resolution" msgstr "" @@ -2034,7 +2049,7 @@ msgstr "" msgid "Planes" msgstr "" -#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212 +#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217 msgid "Bits Per Pixel" msgstr "" @@ -2099,24 +2114,24 @@ msgstr "" msgid "AVI demuxer" msgstr "" -#: modules/demux/avi/avi.c:1096 +#: modules/demux/avi/avi.c:1101 msgid "Avi" msgstr "" -#: modules/demux/avi/avi.c:1097 +#: modules/demux/avi/avi.c:1102 msgid "Number of Streams" msgstr "" -#: modules/demux/avi/avi.c:1098 +#: modules/demux/avi/avi.c:1103 msgid "Flags" msgstr "" -#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:627 -#: modules/demux/ogg.c:733 modules/demux/ogg.c:908 +#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631 +#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 msgid "Frame Rate" msgstr "" -#: modules/demux/avi/avi.c:1234 +#: modules/demux/avi/avi.c:1239 msgid "Unknown" msgstr "" @@ -2140,18 +2155,52 @@ msgstr "" msgid "playlist metademux" msgstr "" -#: modules/demux/mkv.cpp:83 +#: modules/demux/mkv.cpp:91 msgid "mkv-demuxer" msgstr "" -#: modules/demux/mkv.cpp:85 modules/demux/mkv.cpp:86 -msgid "Create index if no cues found" +#: modules/demux/mkv.cpp:93 modules/demux/mkv.cpp:94 +msgid "Seek based on percent not time" msgstr "" -#: modules/demux/mkv.cpp:87 +#: modules/demux/mkv.cpp:96 msgid "mka/mkv stream demuxer" msgstr "" +#: modules/demux/mkv.cpp:2260 modules/gui/gtk/gnome_interface.c:2436 +#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148 +msgid "Duration" +msgstr "" + +#: modules/demux/mkv.cpp:2269 +msgid "Date UTC" +msgstr "" + +#: modules/demux/mkv.cpp:2273 +msgid "Segment Filename" +msgstr "" + +#: modules/demux/mkv.cpp:2277 +msgid "Muxing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2281 +msgid "Writing Application" +msgstr "" + +#: modules/demux/mkv.cpp:2319 +msgid "Display Resolution" +msgstr "" + +#: modules/demux/mkv.cpp:2323 +msgid "Frame Per Second" +msgstr "" + +#: modules/demux/mkv.cpp:2327 modules/gui/gtk/gnome_interface.c:1963 +#: modules/gui/gtk/gtk_interface.c:2278 +msgid "Subtitle" +msgstr "" + #: modules/demux/mp4/mp4.c:59 msgid "MP4 demuxer" msgstr "" @@ -2222,40 +2271,40 @@ msgstr "" msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)" msgstr "" -#: modules/demux/ogg.c:187 +#: modules/demux/ogg.c:188 msgid "ogg stream demuxer" msgstr "" -#: modules/demux/ogg.c:556 +#: modules/demux/ogg.c:558 msgid "Vorbis" msgstr "" -#: modules/demux/ogg.c:559 modules/demux/ogg.c:629 modules/demux/ogg.c:669 -#: modules/demux/ogg.c:830 modules/demux/ogg.c:1003 +#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673 +#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007 msgid "Bit Rate" msgstr "" -#: modules/demux/ogg.c:626 +#: modules/demux/ogg.c:630 msgid "Theora" msgstr "" -#: modules/demux/ogg.c:666 +#: modules/demux/ogg.c:670 msgid "tarkin" msgstr "" -#: modules/demux/ogg.c:735 modules/demux/ogg.c:910 +#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 msgid "Bit Count" msgstr "" -#: modules/demux/ogg.c:737 modules/demux/ogg.c:912 +#: modules/demux/ogg.c:741 modules/demux/ogg.c:916 msgid "Width" msgstr "" -#: modules/demux/ogg.c:739 modules/demux/ogg.c:914 +#: modules/demux/ogg.c:743 modules/demux/ogg.c:918 msgid "Height" msgstr "" -#: modules/demux/ogg.c:835 modules/demux/ogg.c:1008 +#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012 msgid "Bits per Sample" msgstr "" @@ -2662,8 +2711,8 @@ msgstr "" #: modules/gui/beos/InterfaceWindow.cpp:240 #: modules/gui/beos/PlayListWindow.cpp:84 -#: modules/gui/gtk2/gnome2_interface.c:113 -#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332 +#: modules/gui/gtk/gnome_interface.c:2179 +#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677 msgid "Open File" msgstr "" @@ -3039,10 +3088,10 @@ msgid "" "from local or network sources." msgstr "" -#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60 -#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90 -#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100 +#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121 +#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85 +#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" @@ -3052,64 +3101,6 @@ msgstr "" msgid "Error loading pixmap file: %s" msgstr "" -#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 -msgid "Gtk2 interface" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:31 -msgid "_New" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:87 -msgid "gnome2" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:112 -msgid "button4" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:122 -#: modules/gui/gtk2/gtk2_interface.c:183 -msgid "button3" -msgstr "" - -#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 -msgid "Save File" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:67 -msgid "window1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147 -#: modules/gui/gtk/gtk_interface.c:1373 -msgid "_File" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:109 -msgid "_Edit" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268 -msgid "_View" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569 -msgid "_Help" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:146 -msgid "_About" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:163 -msgid "button1" -msgstr "" - -#: modules/gui/gtk2/gtk2_interface.c:173 -msgid "button2" -msgstr "" - #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57 msgid "Show tooltips" msgstr "" @@ -3576,10 +3567,6 @@ msgstr "" msgid "Satellite" msgstr "" -#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278 -msgid "Subtitle" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322 #: modules/gui/macosx/open.m:175 msgid "delay" @@ -3638,11 +3625,6 @@ msgstr "" msgid "Selection" msgstr "" -#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857 -#: modules/gui/wxwindows/playlist.cpp:148 -msgid "Duration" -msgstr "" - #: modules/gui/gtk/gnome_interface.c:2588 msgid "Jump to: " msgstr "" @@ -3714,6 +3696,11 @@ msgstr "" msgid "Gtk+ interface" msgstr "" +#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373 +#: modules/gui/gtk2/gtk2_interface.c:77 +msgid "_File" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:238 msgid "_Close" msgstr "" @@ -3730,6 +3717,10 @@ msgstr "" msgid "Exit the program" msgstr "" +#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132 +msgid "_View" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:294 msgid "Hide the main interface window" msgstr "" @@ -3750,6 +3741,10 @@ msgstr "" msgid "Configure the application" msgstr "" +#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139 +msgid "_Help" +msgstr "" + #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435 msgid "_About..." msgstr "" @@ -3854,6 +3849,51 @@ msgstr "" msgid "Selected:" msgstr "" +#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55 +msgid "Gtk2 interface" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:31 +msgid "_New" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:87 +msgid "gnome2" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:112 +msgid "button4" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:122 +#: modules/gui/gtk2/gtk2_interface.c:183 +msgid "button3" +msgstr "" + +#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337 +msgid "Save File" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:67 +msgid "window1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:109 +msgid "_Edit" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:146 +msgid "_About" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:163 +msgid "button1" +msgstr "" + +#: modules/gui/gtk2/gtk2_interface.c:173 +msgid "button2" +msgstr "" + #: modules/gui/kde/interface.cpp:88 msgid "Languages" msgstr "" @@ -4268,27 +4308,27 @@ msgstr "" msgid "Open a skin file" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:349 #: modules/gui/skins/src/skin_main.cpp:350 -#: modules/gui/skins/src/skin_main.cpp:351 msgid "Last skin actually used" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:351 #: modules/gui/skins/src/skin_main.cpp:352 -#: modules/gui/skins/src/skin_main.cpp:353 msgid "Config of last used skin" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:353 #: modules/gui/skins/src/skin_main.cpp:354 -#: modules/gui/skins/src/skin_main.cpp:355 msgid "Show application in system tray" msgstr "" +#: modules/gui/skins/src/skin_main.cpp:355 #: modules/gui/skins/src/skin_main.cpp:356 -#: modules/gui/skins/src/skin_main.cpp:357 msgid "Show application in taskbar" msgstr "" -#: modules/gui/skins/src/skin_main.cpp:368 +#: modules/gui/skins/src/skin_main.cpp:367 msgid "Skinnable Interface" msgstr "" @@ -4741,10 +4781,6 @@ msgstr "" msgid "Using the logger interface plugin..." msgstr "" -#: modules/misc/memcpy/memcpyaltivec.c:52 -msgid "AltiVec memcpy" -msgstr "" - #: modules/misc/memcpy/memcpy.c:81 msgid "libc memcpy" msgstr "" @@ -4761,6 +4797,10 @@ msgstr "" msgid "MMX EXT memcpy" msgstr "" +#: modules/misc/memcpy/memcpyaltivec.c:52 +msgid "AltiVec memcpy" +msgstr "" + #: modules/misc/network/ipv4.c:85 msgid "IPv4 network abstraction layer" msgstr "" @@ -4783,11 +4823,7 @@ msgstr "" msgid "Qt Embedded GUI helper" msgstr "" -#: modules/misc/sap.c:140 -msgid "SAP" -msgstr "" - -#: modules/misc/sap.c:159 +#: modules/misc/sap.c:161 msgid "SAP interface" msgstr "" @@ -4827,7 +4863,7 @@ msgstr "" msgid "TS muxer (libdvbpsi)" msgstr "" -#: modules/mux/ogg.c:54 +#: modules/mux/ogg.c:55 msgid "Ogg/ogm muxer" msgstr "" @@ -4855,6 +4891,10 @@ msgstr "" msgid "MPEG-I/II video packetizer" msgstr "" +#: modules/packetizer/vorbis.c:89 +msgid "Vorbis audio packetizer" +msgstr "" + #: modules/stream_out/display.c:50 msgid "Display stream" msgstr "" @@ -4871,7 +4911,7 @@ msgstr "" msgid "ES stream" msgstr "" -#: modules/stream_out/standard.c:49 +#: modules/stream_out/standard.c:51 msgid "Standard stream" msgstr "" diff --git a/toolbox b/toolbox index e14ba73bc5..44b4c4c3db 100755 --- a/toolbox +++ b/toolbox @@ -1,7 +1,7 @@ #! /bin/sh ## toolbox for the VLC media player -## $Id: toolbox,v 1.27 2003/06/25 03:08:57 sam Exp $ +## $Id: toolbox,v 1.28 2003/06/27 13:50:07 sam Exp $ ## ## Authors: Samuel Hocevar @@ -20,14 +20,14 @@ help() { cat << EOF recognized flags are: - --update-changelog update the CVS changelog - --update-vc update Microsoft Visual Studio files - --update-po update translation files - --update-includes [BUILTINS] generate various include files - --update-glade generate and fix Glade code - --update-glade2 generate and fix Glade 2 code - --update-flexml generate and fix flexml and flex code - --distclean "make distclean" + --update-changelog update the CVS changelog + --update-vc update Microsoft Visual Studio files + --update-po update translation files + --update-includes generate various include files + --update-glade generate and fix Glade code + --update-glade2 generate and fix Glade 2 code + --update-flexml generate and fix flexml and flex code + --distclean "make distclean" EOF exit 1 } @@ -333,10 +333,10 @@ then echo "# automatically created by toolbox --update-po" > po/POTFILES.in echo "" >> po/POTFILES.in echo "# main sources" >> po/POTFILES.in - find include src -name '*.[chm]' -o -name '*.[hc]pp' | sort >> po/POTFILES.in + find include src -name '*.[chm]' -o -name '*.[ch]pp' | sort >> po/POTFILES.in echo "" >> po/POTFILES.in echo "# modules" >> po/POTFILES.in - find modules -name '*.[chm]' -o -name '*.[hc]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in + find modules -name '*.[chm]' -o -name '*.[ch]pp' | grep -v 'gui/win32/' | sort >> po/POTFILES.in # clean old potfiles cd po rm -f vlc.pot @@ -356,7 +356,7 @@ then #set -x LIBVLC_HEADERS=`getfiles HEADERS_include` - BUILTINS=`while test $# -gt 0; do echo $1; shift; done` + BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config` file=include/vlc_symbols.h @@ -372,6 +372,7 @@ then then rm -f ${file}.in else + echo "creating new ${file}" mv -f ${file}.in ${file} fi @@ -386,6 +387,7 @@ then then rm -f ${file}.tmp else + echo "creating new ${file}" mv -f ${file}.tmp ${file} fi @@ -416,6 +418,7 @@ then then rm -f ${file}.tmp else + echo "creating new ${file}" mv -f ${file}.tmp ${file} fi diff --git a/vlc-config.in b/vlc-config.in deleted file mode 100644 index 687d924eef..0000000000 --- a/vlc-config.in +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -usage() -{ - cat <&2 -fi - -lib_vlc=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @VERSION@ - exit 0 - ;; - --cflags) - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi -if test "$echo_cflags" = "yes"; then - echo -I@INCLUDE@ $includes -fi -if test "$echo_libs" = "yes"; then - echo "-L@libdir@ -lvlc @LDFLAGS_libvlc@" -fi diff --git a/vlc-config.in.in b/vlc-config.in.in new file mode 100644 index 0000000000..358e037989 --- /dev/null +++ b/vlc-config.in.in @@ -0,0 +1,287 @@ +#!/bin/sh + +prefix="@prefix@" +exec_prefix="@exec_prefix@" +exec_prefix_set=no + +release="@release@" +debug="@debug@" +gprof="@gprof@" +cprof="@cprof@" +optim="@optim@" + +plugins="@PLUGINS@" +builtins="@BUILTINS@" + +cflags_tuning="@CFLAGS_TUNING@" +cflags_optim="@CFLAGS_OPTIM@" +cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@" +cflags_nooptim="@CFLAGS_NOOPTIM@" + +# +# Do not touch below this place unless you really know what you are doing +# +usage() +{ + cat << BLAH +Usage: vlc-config OPTIONS MODULES +Options: + [--prefix[=DIR]] set prefix + [--exec-prefix[=DIR]] set exec prefix + [--version] print version and exit + [--linkage] print linkage mode (c, c++, objc) + [--target] print targets and exit + [--libs] output linking flags + [--cflags] output C compilation flags + [--cxxflags] output C++ compilation flags + [--objcflags] output Objective C compilation flags +Modules: + vlc the main VLC object + plugin flags for plugin modules + builtin flags for built-in modules + pic flags for PIC code + MODULE any available module (dummy, gtk, avi, etc.) +BLAH + exit $1 +} + +register_flags() +{ + case "$1" in + #@1@# + *) + ;; + esac +} + +register_targets() +{ + case "$1" in + #@2@# + *) + ;; + esac +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +# +# No need to include the default @*FLAGS@ values here because they are +# automatically added when using $(COMPILE), $(CXXCOMPILE) or $(OBJCCOMPILE) +# +if test "@includedir@" != /usr/include ; then + includes="-I@includedir@" +fi +cppflags="${includes}" +libs="-L@libdir@" +module="" +linkage="c" + +# +# On Linux and Solaris, activate 64-bit off_t (by default under BSD) +# +cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_GNU_SOURCE" + +# +# Gettext, data and plugin location +# +cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\"" +cppflags="${cppflags} -DDATA_PATH=\"${prefix}/share/vlc\"" +cppflags="${cppflags} -DPLUGIN_PATH=\"${prefix}/lib/vlc\"" + +# +# Various additional defines +# +if [ "${debug}" = yes ]; then + cppflags="${cppflags} -DDEBUG" + cflags="${cflags} -g" + cxxflags="${cxxflags} -g" + objcflags="${objcflags} -g" + ldflags="${objcflags} -g" +fi +if [ "${cprof}" = yes ]; then + cppflags="${cppflags} -DCPROF" + cflags="${cflags} -finstrument-functions" + cxxflags="${cxxflags} -finstrument-functions" + objcflags="${objcflags} -finstrument-functions" +fi +if [ "${gprof}" = yes ]; then + cppflags="${cppflags} -DGPROF" + cflags="${cflags} -pg" + cxxflags="${cxxflags} -pg" + objcflags="${objcflags} -pg" + ldflags="${ldflags} -pg" +fi +if [ "${release}" = yes ]; then + cppflags="${cppflags} -DHAVE_RELEASE" +fi +if [ "${optim}" = yes ]; then + cppflags="${cppflags} ${cflags_optim} ${cflags_tuning}" + if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then + cppflags="${cppflags} ${cflags_optim_nodebug}" + fi +else + cppflags="${cppflags} ${cflags_nooptim}" +fi + +# +# The main argument loop +# +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/-_a-zA-Z0-9*=//'` ;; + *) optarg= ;; + esac + + case "$1" in + --prefix=*) + prefix="${optarg}" + if test "${exec_prefix_set}" = no ; then + exec_prefix="${optarg}" + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix="${optarg}" + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo "@VERSION@" + exit 0 + ;; + --linkage) + echo_linkage=yes + ;; + --target) + echo_target=yes + ;; + --cflags) + echo_cflags=yes + ;; + --cxxflags) + echo_cxxflags=yes + ;; + --objcflags) + echo_objcflags=yes + ;; + --libs) + echo_libs=yes + ;; + -*) + usage 1 1>&1 + ;; + vlc) + cppflags="${cppflags} -D__VLC__" + ;; + plugin) + echo_plugin=yes + cppflags="${cppflags} -D__VLC__ -D__PLUGIN__" + ;; + pic) + echo_pic=yes + ;; + builtin) + echo_builtin=yes + cppflags="${cppflags} -D__VLC__ -D__BUILTIN__" + ;; + mozilla) + ;; + *) + module="$1" + ;; + esac + + # Register per-module *FLAGS + register_flags "$1" + + # Register module targets + register_targets "$1" + + shift +done + +# +# If a module was requested, use its name +# +if test "${module}" != ""; then + cppflags="${cppflags} -DMODULE_NAME=${module} -DMODULE_NAME_IS_${module}" +fi + +# +# Output what we were asked +# +if test "${echo_linkage}" = yes; then + if test "${echo_plugin}"; then + for module in `echo "${plugins}"`; do + register_flags "${module}" + done + fi + if test "${echo_builtin}"; then + for module in `echo "${builtins}"`; do + register_flags "${module}" + done + fi + echo "${linkage}" + exit 0 +fi + +if test "${echo_target}" = yes; then + if test "${echo_plugin}"; then + for module in `echo "${plugins}"`; do + register_targets "${module}" + done + echo "${list}" | sed -e 's/[^ ][^ ]*/&_plugin/g' + fi + if test "${echo_builtin}"; then + for module in `echo "${builtins}"`; do + register_targets "${module}" + done + if test "${echo_pic}"; then + echo "${list}" | sed -e 's/[^ ][^ ]*/&_pic.a/g' + else + echo "${list}" | sed -e 's/[^ ][^ ]*/&.a/g' + fi + fi + exit 0 +fi + +if test "${echo_prefix}" = yes; then + echo "${prefix}" +fi +if test "${echo_exec_prefix}" = yes; then + echo "${exec_prefix}" +fi +if test "${echo_cppflags}" = yes; then + echo "${cppflags}" +fi +if test "${echo_cflags}" = yes; then + echo "${cppflags} ${cflags}" +fi +if test "${echo_cxxflags}" = yes; then + echo "${cppflags} ${cxxflags}" +fi +if test "${echo_objcflags}" = yes; then + echo "${cppflags} ${objcflags}" +fi +if test "${echo_libs}" = yes; then + if test "${echo_builtin}"; then + for module in `echo "${builtins}"`; do + register_targets "${module}" + register_flags "${module}" + done + if test "${echo_pic}"; then + libs="`echo "${list}" | sed -e 's/[^ ][^ ]*/&_pic.a/g'` ${libs}" + else + libs="`echo "${list}" | sed -e 's/[^ ][^ ]*/&.a/g'` ${libs}" + fi + fi + echo "${libs} ${ldflags}" +fi +