HEAD
+ * ./src/interface/main.c: tidied the help output code.
+ * ALL: removed underscores from option names and made a few options more
+ self-explanatory, for instance --input_channel becomes --audio-channel;
+ run vlc -H to see what has changed.
+ * ALL: replaced many occurences of "plugin" with the word "module".
+ * ./src/interface/main.c: moved all satellite-specific configuration options
+ to the satellite plugin.
+ * ./po/*: updated translations.
* ./plugins/chroma/i420_yuy2.h: optimized the 420 planar-to-packed chroma
transformations. They're now PIC-friendly as well.
* ./plugins/macosx/intf_open.c: added Open disc and network panels.
enableval="$enable_satellite"
if test x$enable_satellite = xyes
then
- BUILTINS="${BUILTINS} satellite"
- cat >> confdefs.h <<\EOF
-#define HAVE_SATELLITE 1
-EOF
-
+ PLUGINS="${PLUGINS} satellite"
fi
fi
echo $ac_n "checking for inet_pton""... $ac_c" 1>&6
-echo "configure:6022: checking for inet_pton" >&5
+echo "configure:6018: checking for inet_pton" >&5
if eval "test \"`echo '$''{'ac_cv_func_inet_pton'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6027 "configure"
+#line 6023 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char inet_pton(); below. */
; return 0; }
EOF
-if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_inet_pton=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6106: checking for $ac_hdr" >&5
+echo "configure:6102: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6111 "configure"
+#line 6107 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
done
echo $ac_n "checking for mad_bit_init in -lmad""... $ac_c" 1>&6
-echo "configure:6146: checking for mad_bit_init in -lmad" >&5
+echo "configure:6142: checking for mad_bit_init in -lmad" >&5
ac_lib_var=`echo mad'_'mad_bit_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lmad $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6154 "configure"
+#line 6150 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
mad_bit_init()
; return 0; }
EOF
-if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6216: checking for $ac_hdr" >&5
+echo "configure:6212: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6221 "configure"
+#line 6217 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6269: checking for $ac_hdr" >&5
+echo "configure:6265: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6274 "configure"
+#line 6270 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
#define $ac_tr_hdr 1
EOF
- PLUGINS="${PLUGINS} vorbis"
+ #PLUGINS="${PLUGINS} vorbis"
vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6337: checking for $ac_hdr" >&5
+echo "configure:6333: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6342 "configure"
+#line 6338 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6400: checking for $ac_hdr" >&5
+echo "configure:6396: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6405 "configure"
+#line 6401 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
echo $ac_n "checking for XvSetPortAttribute in -lXv_pic""... $ac_c" 1>&6
-echo "configure:6434: checking for XvSetPortAttribute in -lXv_pic" >&5
+echo "configure:6430: checking for XvSetPortAttribute in -lXv_pic" >&5
ac_lib_var=`echo Xv_pic'_'XvSetPortAttribute | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lXv_pic $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6442 "configure"
+#line 6438 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
XvSetPortAttribute()
; return 0; }
EOF
-if { (eval echo configure:6453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# Extract the first word of "sdl12-config", so it can be a program name with args.
set dummy sdl12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6511: checking for $ac_word" >&5
+echo "configure:6507: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl11-config", so it can be a program name with args.
set dummy sdl11-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6551: checking for $ac_word" >&5
+echo "configure:6547: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6592: checking for $ac_word" >&5
+echo "configure:6588: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SDL_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6637: checking for $ac_hdr" >&5
+echo "configure:6633: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6642 "configure"
+#line 6638 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6717: checking for $ac_hdr" >&5
+echo "configure:6713: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6722 "configure"
+#line 6718 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
else
echo $ac_n "checking for directX headers in ${withval}""... $ac_c" 1>&6
-echo "configure:6756: checking for directX headers in ${withval}" >&5
+echo "configure:6752: checking for directX headers in ${withval}" >&5
if test -f ${withval}/ddraw.h
then
PLUGINS="${PLUGINS} directx"
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6783: checking for $ac_hdr" >&5
+echo "configure:6779: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6788 "configure"
+#line 6784 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
then
ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for aalib.h""... $ac_c" 1>&6
-echo "configure:6888: checking for aalib.h" >&5
+echo "configure:6884: checking for aalib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6893 "configure"
+#line 6889 "configure"
#include "confdefs.h"
#include <aalib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6949: checking for $ac_hdr" >&5
+echo "configure:6945: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6954 "configure"
+#line 6950 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
PLUGINS="${PLUGINS} dsp"
echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-echo "configure:6982: checking for main in -lossaudio" >&5
+echo "configure:6978: checking for main in -lossaudio" >&5
ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lossaudio $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6990 "configure"
+#line 6986 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:6997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7033: checking for $ac_word" >&5
+echo "configure:7029: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ESD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "artsc-config", so it can be a program name with args.
set dummy artsc-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7084: checking for $ac_word" >&5
+echo "configure:7080: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_ARTS_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
then
ac_safe=`echo "alsa/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for alsa/asoundlib.h""... $ac_c" 1>&6
-echo "configure:7134: checking for alsa/asoundlib.h" >&5
+echo "configure:7130: checking for alsa/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7139 "configure"
+#line 7135 "configure"
#include "confdefs.h"
#include <alsa/asoundlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:7161: checking for main in -lasound" >&5
+echo "configure:7157: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7169 "configure"
+#line 7165 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# Extract the first word of "gtk12-config", so it can be a program name with args.
set dummy gtk12-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7253: checking for $ac_word" >&5
+echo "configure:7249: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7292: checking for $ac_word" >&5
+echo "configure:7288: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7341: checking for $ac_hdr" >&5
+echo "configure:7337: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7346 "configure"
+#line 7342 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
# Extract the first word of "gnome-config", so it can be a program name with args.
set dummy gnome-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7397: checking for $ac_word" >&5
+echo "configure:7393: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7441: checking for $ac_hdr" >&5
+echo "configure:7437: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7446 "configure"
+#line 7442 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7540: checking for $ac_hdr" >&5
+echo "configure:7536: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7545 "configure"
+#line 7541 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7595: checking for $ac_hdr" >&5
+echo "configure:7591: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
+#line 7596 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
then
ac_safe=`echo "lirc/lirc_client.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lirc/lirc_client.h""... $ac_c" 1>&6
-echo "configure:7676: checking for lirc/lirc_client.h" >&5
+echo "configure:7672: checking for lirc/lirc_client.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7681 "configure"
+#line 7677 "configure"
#include "confdefs.h"
#include <lirc/lirc_client.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for lirc_init in -llirc_client""... $ac_c" 1>&6
-echo "configure:7703: checking for lirc_init in -llirc_client" >&5
+echo "configure:7699: checking for lirc_init in -llirc_client" >&5
ac_lib_var=`echo lirc_client'_'lirc_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-llirc_client $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7711 "configure"
+#line 7707 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
lirc_init()
; return 0; }
EOF
-if { (eval echo configure:7722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
;;
*)
echo $ac_n "checking whether the byte order is big-endian""... $ac_c" 1>&6
-echo "configure:7777: checking whether the byte order is big-endian" >&5
+echo "configure:7773: checking whether the byte order is big-endian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
enableval="$enable_pth"
if test x$enableval = xyes; then
echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6
-echo "configure:7851: checking for pth_init in -lpth" >&5
+echo "configure:7847: checking for pth_init in -lpth" >&5
ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lpth $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7859 "configure"
+#line 7855 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pth_init()
; return 0; }
EOF
-if { (eval echo configure:7870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
cat > conftest.$ac_ext <<EOF
-#line 7898 "configure"
+#line 7894 "configure"
#include "confdefs.h"
#include <pth.h>
EOF
enableval="$enable_st"
if test x$enableval = xyes; then
echo $ac_n "checking for st_init in -lst""... $ac_c" 1>&6
-echo "configure:7924: checking for st_init in -lst" >&5
+echo "configure:7920: checking for st_init in -lst" >&5
ac_lib_var=`echo st'_'st_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lst $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7932 "configure"
+#line 7928 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
st_init()
; return 0; }
EOF
-if { (eval echo configure:7943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
cat > conftest.$ac_ext <<EOF
-#line 7971 "configure"
+#line 7967 "configure"
#include "confdefs.h"
#include <st.h>
EOF
[ --enable-satellite satellite card support (default disabled)],
[ if test x$enable_satellite = xyes
then
- BUILTINS="${BUILTINS} satellite"
- AC_DEFINE(HAVE_SATELLITE, 1, define if compiling with satellite card support)
+ PLUGINS="${PLUGINS} satellite"
fi])
dnl
if test "x$enableval" != "xno"
then
AC_CHECK_HEADERS(ogg/ogg.h, [
- PLUGINS="${PLUGINS} vorbis"
+ dnl disabled for the moment
+ #PLUGINS="${PLUGINS} vorbis"
vorbis_LDFLAGS="${vorbis_LDFLAGS} -lvorbis"
],[])
fi
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: configuration.h,v 1.7 2002/04/21 18:32:12 sam Exp $
+ * $Id: configuration.h,v 1.8 2002/04/23 14:16:19 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
/* Configuration item types */
#define MODULE_CONFIG_ITEM_STRING 0x0010 /* String option */
#define MODULE_CONFIG_ITEM_FILE 0x0020 /* File option */
-#define MODULE_CONFIG_ITEM_PLUGIN 0x0030 /* Plugin option */
+#define MODULE_CONFIG_ITEM_MODULE 0x0030 /* Module option */
#define MODULE_CONFIG_ITEM_INTEGER 0x0040 /* Integer option */
#define MODULE_CONFIG_ITEM_BOOL 0x0050 /* Bool option */
#define MODULE_CONFIG_ITEM_FLOAT 0x0060 /* Float option */
#define ADD_FILE( name, psz_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \
p_callback, NULL, 0 },
-#define ADD_PLUGIN( name, i_capability, psz_value, p_callback, text, longtext)\
- { MODULE_CONFIG_ITEM_PLUGIN, name, '\0', text, longtext, psz_value, \
+#define ADD_MODULE( name, i_capability, psz_value, p_callback, text, longtext)\
+ { MODULE_CONFIG_ITEM_MODULE, name, '\0', text, longtext, psz_value, \
i_capability, 0, p_callback, NULL, 0 },
#define ADD_INTEGER( name, i_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, \
#define ADD_FILE_WITH_SHORT( name, ch, psz_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FILE, name, ch, text, longtext, psz_value, 0, 0, \
p_callback, NULL, 0 },
-#define ADD_PLUGIN_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
+#define ADD_MODULE_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
text, longtext) \
- { MODULE_CONFIG_ITEM_PLUGIN, name, ch, text, longtext, psz_value, \
+ { MODULE_CONFIG_ITEM_MODULE, name, ch, text, longtext, psz_value, \
i_capability, 0, p_callback, NULL, 0 },
#define ADD_INTEGER_WITH_SHORT( name, ch, i_value, p_callback, text, \
longtext ) \
/* Define if your compiler groks C altivec extensions. */
#undef CAN_COMPILE_C_ALTIVEC
-/* define if compiling with satellite card support */
-#undef HAVE_SATELLITE
-
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#undef SDL_INCLUDE_FILE
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.63 2002/03/21 02:27:04 jobi Exp $
+ * $Id: input_ext-intf.h,v 1.64 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* fast forward and slow motion ? */
u8 i_cat; /* stream category: video, audio,
* spu, other */
-#ifdef HAVE_SATELLITE
- int i_dmx_fd; /* used to store demux device
+ int i_demux_fd; /* used to store demux device
file handle */
-#endif
char psz_desc[20]; /* description of ES: audio language
* for instance ; NULL if not
* available */
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.14 2002/04/19 13:56:10 sam Exp $
+ * $Id: modules_inner.h,v 1.15 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
int i_shortcut = 0; \
struct module_config_s* p_item; \
p_module->psz_name = MODULE_STRING; \
- p_module->psz_longname = _( MODULE_STRING ); \
+ p_module->psz_longname = MODULE_STRING; \
p_module->psz_program = NULL; \
p_module->i_capabilities = 0; \
p_module->i_cpu_capabilities = 0;
* ac3_adec.c: ac3 decoder module main file
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: ac3_adec.c,v 1.26 2002/04/21 10:32:20 sam Exp $
+ * $Id: ac3_adec.c,v 1.27 2002/04/23 14:16:20 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
*
* Build configuration tree.
*****************************************************************************/
/* Variable containing the AC3 downmix method */
-#define DOWNMIX_METHOD_VAR "ac3_downmix"
+#define DOWNMIX_METHOD_VAR "ac3-downmix"
/* Variable containing the AC3 IMDCT method */
-#define IMDCT_METHOD_VAR "ac3_imdct"
+#define IMDCT_METHOD_VAR "ac3-imdct"
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)
-ADD_PLUGIN ( DOWNMIX_METHOD_VAR, MODULE_CAPABILITY_DOWNMIX, NULL, NULL,
+ADD_MODULE ( DOWNMIX_METHOD_VAR, MODULE_CAPABILITY_DOWNMIX, NULL, NULL,
N_("AC3 downmix module"), NULL )
-ADD_PLUGIN ( IMDCT_METHOD_VAR, MODULE_CAPABILITY_IMDCT, NULL, NULL,
+ADD_MODULE ( IMDCT_METHOD_VAR, MODULE_CAPABILITY_IMDCT, NULL, NULL,
N_("AC3 IMDCT module"), NULL )
MODULE_CONFIG_STOP
* ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: ac3_spdif.c,v 1.22 2002/04/19 13:56:10 sam Exp $
+ * $Id: ac3_spdif.c,v 1.23 2002/04/23 14:16:20 sam Exp $
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
}
/* The audio output need to be ready for an ac3 stream */
- p_spdif->i_previous_format = config_GetIntVariable( "aout_format" );
- config_PutIntVariable( "aout_format", 8 );
+ p_spdif->i_previous_format = config_GetIntVariable( "audio-format" );
+ config_PutIntVariable( "audio-format", 8 );
/* Creating the audio output fifo */
p_spdif->p_aout_fifo = aout_CreateFifo( AOUT_FIFO_SPDIF, 1,
}
/* restore previous setting for output format */
- config_PutIntVariable( "aout_format", p_spdif->i_previous_format );
+ config_PutIntVariable( "audio-format", p_spdif->i_previous_format );
/* Destroy descriptor */
free( p_spdif );
* aout_dsp.c : dsp functions library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: aout_dsp.c,v 1.26 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: aout_dsp.c,v 1.27 2002/04/23 14:16:20 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
}
/* Initialize some variables */
- if( !(p_aout->p_sys->psz_device = config_GetPszVariable( "dsp_dev" )) )
+ if( !(p_aout->p_sys->psz_device = config_GetPszVariable( "dspdev" )) )
{
intf_ErrMsg( "aout error: don't know which audio device to open" );
free( p_aout->p_sys );
* dsp.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: dsp.c,v 1.15 2002/04/19 13:56:10 sam Exp $
+ * $Id: dsp.c,v 1.16 2002/04/23 14:16:20 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*****************************************************************************/
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_FILE ( "dsp_dev", "/dev/dsp", NULL, N_("OSS dsp device"), NULL )
+ADD_FILE ( "dspdev", "/dev/dsp", NULL, N_("OSS dsp device"), NULL )
MODULE_CONFIG_STOP
MODULE_INIT_START
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_access.c,v 1.13 2002/04/03 06:23:08 sam Exp $
+ * $Id: dvd_access.c,v 1.14 2002/04/23 14:16:20 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
/* no device and no access specified: we probably don't want DVD */
return NULL;
}
- psz_device = config_GetPszVariable( "dvd_device" );
+ psz_device = config_GetPszVariable( "dvd" );
}
#ifndef WIN32
/* dvd_es.c: functions to find and select ES
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: dvd_es.c,v 1.6 2002/04/03 06:23:08 sam Exp $
+ * $Id: dvd_es.c,v 1.7 2002/04/23 14:16:20 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
if( p_main->b_audio && p_dvd->i_audio_nb > 0 )
{
/* For audio: first one if none or a not existing one specified */
- i_audio = config_GetIntVariable( "input_channel" );
+ i_audio = config_GetIntVariable( "audio-channel" );
if( i_audio <= 0 || i_audio > p_dvd->i_audio_nb )
{
- config_PutIntVariable( "input_channel", 1 );
+ config_PutIntVariable( "audio-channel", 1 );
i_audio = 1;
}
- if( ( config_GetIntVariable( "input_audio" ) == REQUESTED_AC3 ) )
+ if( ( config_GetIntVariable( "audio-type" ) == REQUESTED_AC3 ) )
{
int i_ac3 = i_audio;
while( ( p_input->stream.pp_es[i_ac3]->i_type !=
if( p_main->b_video && p_dvd->i_spu_nb > 0 )
{
/* for spu, default is none */
- i_spu = config_GetIntVariable( "input_subtitle" );
+ i_spu = config_GetIntVariable( "spu-channel" );
if( i_spu < 0 || i_spu > p_dvd->i_spu_nb )
{
- config_PutIntVariable( "input_subtitle", 0 );
+ config_PutIntVariable( "spu-channel", 0 );
i_spu = 0;
}
if( i_spu > 0 )
* It depends on: libdvdread for ifo files and block reading.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.35 2002/04/03 16:22:23 sam Exp $
+ * $Id: input_dvdread.c,v 1.36 2002/04/23 14:16:20 sam Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
free( psz_orig );
return -1;
}
- psz_source = config_GetPszVariable( "dvd_device" );
+ psz_source = config_GetPszVariable( "dvd" );
}
if( stat( psz_source, &stat_info ) == -1 )
if( p_main->b_audio )
{
/* For audio: first one if none or a not existing one specified */
- int i_audio = config_GetIntVariable( "input_channel" );
+ int i_audio = config_GetIntVariable( "audio-channel" );
if( i_audio < 0 /*|| i_audio > i_audio_nb*/ )
{
- config_PutIntVariable( "input_channel", 1 );
+ config_PutIntVariable( "audio-channel", 1 );
i_audio = 1;
}
if( i_audio > 0/* && i_audio_nb > 0*/ )
{
- if( config_GetIntVariable( "input_audio" ) == REQUESTED_AC3 )
+ if( config_GetIntVariable( "audio-type" ) == REQUESTED_AC3 )
{
int i_ac3 = i_audio;
while( ( p_input->stream.pp_es[i_ac3]->i_type !=
if( p_main->b_video )
{
/* for spu, default is none */
- int i_spu = config_GetIntVariable( "input_subtitle" );
+ int i_spu = config_GetIntVariable( "spu-channel" );
if( i_spu < 0 /*|| i_spu > i_spu_nb*/ )
{
- config_PutIntVariable( "input_subtitle", 0 );
+ config_PutIntVariable( "spu-channel", 0 );
i_spu = 0;
}
if( i_spu > 0 /*&& i_spu_nb > 0*/ )
* fb.c : framebuffer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: fb.c,v 1.17 2002/04/19 13:56:11 sam Exp $
+ * $Id: fb.c,v 1.18 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Building configuration tree
*****************************************************************************/
-#define FB_DEV_VAR "fb_dev"
+#define FB_DEV_VAR "fbdev"
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
#include <videolan/vlc.h>
EOF
tail +8 $file \
- | sed 's#_("/dev/dvd")#config_GetPszVariable( "dvd_device" )#' \
+ | sed 's#_("/dev/dvd")#config_GetPszVariable( "dvd" )#' \
>> /tmp/$$.$file.bak
mv -f /tmp/$$.$file.bak $file
fi
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
- * $Id: gnome.c,v 1.17 2002/04/19 13:56:11 sam Exp $
+ * $Id: gnome.c,v 1.18 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
- ADD_BOOL ( "gnome_hide_tooltips", NULL, TOOLTIPS_TEXT,
+ ADD_BOOL ( "gnome-notooltips", NULL, TOOLTIPS_TEXT,
TOOLTIPS_LONGTEXT )
- ADD_INTEGER ( "gnome_prefs_maxh", 480, NULL, PREFS_MAXH_TEXT,
+ ADD_INTEGER ( "gnome-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
PREFS_MAXH_LONGTEXT )
MODULE_CONFIG_STOP
p_intf->p_sys->p_tooltips = gtk_tooltips_new();
/* Hide tooltips if the option is set */
- if( config_GetIntVariable( "gnome_hide_tooltips" ) )
+ if( config_GetIntVariable( "gnome-notooltips" ) )
gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
/* Store p_intf to keep an eye on it */
<class>GtkPixmapMenuItem</class>
<name>menubar_modules</name>
<sensitive>False</sensitive>
- <tooltip>Open the plugin manager</tooltip>
+ <tooltip>Open the module manager</tooltip>
<signal>
<name>activate</name>
<handler>GnomeMenubarModulesActivate</handler>
<child_name>Toolbar:button</child_name>
<name>toolbar_back</name>
<sensitive>False</sensitive>
- <tooltip>Go Backwards</tooltip>
+ <tooltip>Go Backward</tooltip>
<signal>
<name>button_press_event</name>
<handler>GtkControlBack</handler>
},
{
GNOME_APP_UI_ITEM, N_("_Modules..."),
- N_("Open the plugin manager"),
+ N_("Open the module manager"),
(gpointer) GnomeMenubarModulesActivate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ATTACH,
0, (GdkModifierType) 0, NULL
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
_("Back"),
- _("Go Backwards"), NULL,
+ _("Go Backward"), NULL,
tmp_toolbar_icon, NULL, NULL);
gtk_widget_ref (toolbar_back);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_back", toolbar_back,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_name);
gtk_box_pack_start (GTK_BOX (hbox1), disc_name, TRUE, TRUE, 0);
- gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd_device" ));
+ gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd" ));
dialog_action_area4 = GNOME_DIALOG (intf_disc)->action_area;
gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_action_area4", dialog_action_area4);
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (entry1);
gtk_box_pack_start (GTK_BOX (hbox6), entry1, TRUE, TRUE, 0);
- gtk_entry_set_text (GTK_ENTRY (entry1), config_GetPszVariable( "dvd_device" ));
+ gtk_entry_set_text (GTK_ENTRY (entry1), config_GetPszVariable( "dvd" ));
tab_disc = gtk_label_new (_("Disc"));
gtk_widget_ref (tab_disc);
* gtk.c : Gtk+ plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: gtk.c,v 1.19 2002/04/19 13:56:11 sam Exp $
+ * $Id: gtk.c,v 1.20 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
- ADD_BOOL ( "gtk_hide_tooltips", NULL, TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT )
- ADD_INTEGER ( "gtk_prefs_maxh", 480, NULL, PREFS_MAXH_TEXT,
+ ADD_BOOL ( "gtk-notooltips", NULL, TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT )
+ ADD_INTEGER ( "gtk-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
PREFS_MAXH_LONGTEXT )
MODULE_CONFIG_STOP
p_intf->p_sys->p_jump = NULL;
/* Hide tooltips if the option is set */
- if( config_GetIntVariable( "gtk_hide_tooltips" ) )
+ if( config_GetIntVariable( "gtk-notooltips" ) )
gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
/* Store p_intf to keep an eye on it */
<class>GtkMenuItem</class>
<name>menubar_modules</name>
<sensitive>False</sensitive>
- <tooltip>Open the plugin manager</tooltip>
+ <tooltip>Open the module manager</tooltip>
<signal>
<name>activate</name>
<handler>GtkModulesActivate</handler>
<child_name>Toolbar:button</child_name>
<name>toolbar_back</name>
<sensitive>False</sensitive>
- <tooltip>Go Backwards</tooltip>
+ <tooltip>Go Backward</tooltip>
<signal>
<name>button_press_event</name>
<handler>GtkControlBack</handler>
* gtk_callbacks.c : Callbacks for the Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.37 2002/04/06 04:22:27 sam Exp $
+ * $Id: gtk_callbacks.c,v 1.38 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
{
case '\0':
case '@':
- psz_device = config_GetPszVariable( "dvd_device" );
+ psz_device = config_GetPszVariable( "dvd" );
break;
default:
/* Omit the first 4 characters */
{
case '\0':
case '@':
- psz_device = config_GetPszVariable( "vcd_device" );
+ psz_device = config_GetPszVariable( "vcd" );
break;
default:
/* Omit the first 4 characters */
* gtk_display.c: Gtk+ tools for main interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: gtk_display.c,v 1.19 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: gtk_display.c,v 1.20 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
p_input_bank->pp_input[0]->psz_source );
p_channel = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_window ), "network_channel_box" ) );
- if( config_GetIntVariable( "network_channel" ) )
+ if( config_GetIntVariable( "network-channel" ) )
{
gtk_widget_show( GTK_WIDGET( p_channel ) );
}
}
else
{
- if( config_GetIntVariable( "network_channel" ) )
+ if( config_GetIntVariable( "network-channel" ) )
{
gtk_widget_show( GTK_WIDGET( p_network_box ) );
gtk_widget_show (menubar_modules);
gtk_container_add (GTK_CONTAINER (menubar_view_menu), menubar_modules);
gtk_widget_set_sensitive (menubar_modules, FALSE);
- gtk_tooltips_set_tip (tooltips, menubar_modules, _("Open the plugin manager"), NULL);
+ gtk_tooltips_set_tip (tooltips, menubar_modules, _("Open the module manager"), NULL);
menubar_messages = gtk_menu_item_new_with_label (_("Messages..."));
gtk_widget_ref (menubar_messages);
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
_("Back"),
- _("Go Backwards"), NULL,
+ _("Go Backward"), NULL,
NULL, NULL, NULL);
gtk_widget_ref (toolbar_back);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_back", toolbar_back,
channel_label = gtk_label_new (_("Channel:"));
gtk_widget_ref (channel_label);
- gtk_object_set_data_full (GTK_OBJECT (intf_window), "channel_label", channel_label,
+ gtk_object_set_data_full (GTK_OBJECT (intf_window), "channel-label", channel_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (channel_label);
gtk_box_pack_start (GTK_BOX (network_channel_box), channel_label, FALSE, FALSE, 5);
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_name);
gtk_box_pack_start (GTK_BOX (hbox2), disc_name, TRUE, TRUE, 0);
- gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd_device" ));
+ gtk_entry_set_text (GTK_ENTRY (disc_name), config_GetPszVariable( "dvd" ));
dialog_action_area1 = GTK_DIALOG (intf_disc)->action_area;
gtk_object_set_data (GTK_OBJECT (intf_disc), "dialog_action_area1", dialog_action_area1);
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_open.c,v 1.22 2002/04/15 04:36:45 jobi Exp $
+ * $Id: gtk_open.c,v 1.23 2002/04/23 14:16:20 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stéphane Borel <stef@via.ecp.fr>
gtk_object_set_data( GTK_OBJECT( p_intf->p_sys->p_fileopen ),
"p_intf", p_intf );
- if( (psz_path = config_GetPszVariable( "search_path" )) )
+ if( (psz_path = config_GetPszVariable( "search-path" )) )
gtk_file_selection_set_filename( GTK_FILE_SELECTION(
p_intf->p_sys->p_fileopen ), psz_path );
if( psz_path ) free( psz_path );
{
char *psz_dvd_device;
- if( (psz_dvd_device = config_GetPszVariable( "dvd_device" )) )
+ if( (psz_dvd_device = config_GetPszVariable( "dvd" )) )
gtk_entry_set_text(
GTK_ENTRY( lookup_widget( GTK_WIDGET(togglebutton),
"disc_name" ) ), psz_dvd_device );
{
char *psz_vcd_device;
- if( (psz_vcd_device = config_GetPszVariable( "vcd_device" )) )
+ if( (psz_vcd_device = config_GetPszVariable( "vcd" )) )
gtk_entry_set_text(
GTK_ENTRY( lookup_widget( GTK_WIDGET(togglebutton),
"disc_name" ) ), psz_vcd_device );
gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_network ), "network_port" ) ),
- config_GetIntVariable( "server_port" ) );
+ config_GetIntVariable( "server-port" ) );
- psz_channel_server = config_GetPszVariable( "channel_server" );
+ psz_channel_server = config_GetPszVariable( "channel-server" );
if( psz_channel_server )
gtk_entry_set_text( GTK_ENTRY( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_network ), "network_channel" ) ),
gtk_spin_button_set_value( GTK_SPIN_BUTTON( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_network ), "network_channel_port" ) ),
- config_GetIntVariable( "channel_port" ) );
+ config_GetIntVariable( "channel-port" ) );
gtk_toggle_button_set_active( gtk_object_get_data( GTK_OBJECT(
p_intf->p_sys->p_network ), "network_channel_check" ),
- config_GetIntVariable( "network_channel" ) );
+ config_GetIntVariable( "network-channel" ) );
}
gtk_widget_show( p_intf->p_sys->p_network );
/* Manage channel server */
b_channel = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(
lookup_widget( GTK_WIDGET(button), "network_channel_check" ) ) );
- config_PutIntVariable( "network_channel", b_channel );
+ config_PutIntVariable( "network-channel", b_channel );
if( b_channel )
{
char * psz_channel;
i_channel_port = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(
lookup_widget( GTK_WIDGET(button), "network_channel_port" ) ) );
- config_PutPszVariable( "channel_server", psz_channel );
+ config_PutPszVariable( "channel-server", psz_channel );
if( i_channel_port < 65536 )
{
- config_PutIntVariable( "channel_port", i_channel_port );
+ config_PutIntVariable( "channel-port", i_channel_port );
}
p_intf->p_sys->b_playing = 1;
* gtk_preferences.c: functions to handle the preferences dialog box.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.25 2002/04/21 11:23:03 gbazin Exp $
+ * $Id: gtk_preferences.c,v 1.26 2002/04/23 14:16:20 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Loïc Minier <lool@via.ecp.fr>
static void GtkFreeHashValue ( gpointer, gpointer, gpointer );
static void GtkSaveHashValue ( gpointer, gpointer, gpointer );
-static void GtkPluginConfigure ( GtkButton *, gpointer );
-static void GtkPluginSelected ( GtkButton *, gpointer );
-static void GtkPluginHighlighted ( GtkCList *, int, int, GdkEventButton *,
+static void GtkModuleConfigure ( GtkButton *, gpointer );
+static void GtkModuleSelected ( GtkButton *, gpointer );
+static void GtkModuleHighlighted ( GtkCList *, int, int, GdkEventButton *,
gpointer );
/****************************************************************************
GtkWidget *float_spinbutton;
GtkObject *item_adj;
GtkWidget *bool_checkbutton;
- GtkWidget *plugin_clist;
- GtkWidget *plugin_config_button;
- GtkWidget *plugin_select_button;
+ GtkWidget *module_clist;
+ GtkWidget *module_config_button;
+ GtkWidget *module_select_button;
gint category_max_height;
#ifdef MODULE_NAME_IS_gnome
config_dialog = gnome_dialog_new( p_module->psz_longname, NULL );
config_dialog_vbox = GNOME_DIALOG(config_dialog)->vbox;
- category_max_height = config_GetIntVariable( "gnome_prefs_maxh" );
#else
config_dialog = gtk_dialog_new();
gtk_window_set_title( GTK_WINDOW(config_dialog), p_module->psz_longname );
config_dialog_vbox = GTK_DIALOG(config_dialog)->vbox;
- category_max_height = config_GetIntVariable( "gtk_prefs_maxh" );
#endif
+ category_max_height = config_GetIntVariable( MODULE_STRING "-prefs-maxh" );
+
gtk_window_set_policy( GTK_WINDOW(config_dialog), TRUE, TRUE, FALSE );
gtk_container_set_border_width( GTK_CONTAINER(config_dialog_vbox), 0 );
break;
- case MODULE_CONFIG_ITEM_PLUGIN:
+ case MODULE_CONFIG_ITEM_MODULE:
item_frame = gtk_frame_new( p_item->psz_text );
{
gchar * titles[] = { _("Name"), _("Description") };
- plugin_clist =
+ module_clist =
gtk_clist_new_with_titles( 2, titles );
}
- gtk_clist_column_titles_passive( GTK_CLIST(plugin_clist) );
- gtk_clist_set_selection_mode( GTK_CLIST(plugin_clist),
+ gtk_clist_column_titles_passive( GTK_CLIST(module_clist) );
+ gtk_clist_set_selection_mode( GTK_CLIST(module_clist),
GTK_SELECTION_SINGLE);
- gtk_container_add( GTK_CONTAINER(item_vbox), plugin_clist );
+ gtk_container_add( GTK_CONTAINER(item_vbox), module_clist );
- /* build a list of available plugins */
+ /* build a list of available modules */
{
gchar * entry[2];
{
entry[0] = p_module_bis->psz_name;
entry[1] = p_module_bis->psz_longname;
- gtk_clist_append( GTK_CLIST(plugin_clist), entry );
+ gtk_clist_append( GTK_CLIST(module_clist), entry );
}
}
}
- gtk_clist_set_column_auto_resize( GTK_CLIST(plugin_clist),
+ gtk_clist_set_column_auto_resize( GTK_CLIST(module_clist),
0, TRUE );
- gtk_clist_set_column_auto_resize( GTK_CLIST(plugin_clist),
+ gtk_clist_set_column_auto_resize( GTK_CLIST(module_clist),
1, TRUE );
- /* connect signals to the plugins list */
- gtk_signal_connect( GTK_OBJECT(plugin_clist), "select_row",
- GTK_SIGNAL_FUNC(GtkPluginHighlighted),
+ /* connect signals to the modules list */
+ gtk_signal_connect( GTK_OBJECT(module_clist), "select_row",
+ GTK_SIGNAL_FUNC(GtkModuleHighlighted),
NULL );
/* hbox holding the "select" and "configure" buttons */
gtk_container_add( GTK_CONTAINER(item_vbox), item_hbox);
/* add configure button */
- plugin_config_button =
+ module_config_button =
gtk_button_new_with_label( _("Configure") );
- gtk_widget_set_sensitive( plugin_config_button, FALSE );
+ gtk_widget_set_sensitive( module_config_button, FALSE );
gtk_container_add( GTK_CONTAINER(item_hbox),
- plugin_config_button );
- gtk_object_set_data( GTK_OBJECT(plugin_config_button),
+ module_config_button );
+ gtk_object_set_data( GTK_OBJECT(module_config_button),
"p_intf", p_intf );
- gtk_object_set_data( GTK_OBJECT(plugin_clist),
- "config_button", plugin_config_button );
+ gtk_object_set_data( GTK_OBJECT(module_clist),
+ "config_button", module_config_button );
/* add select button */
- plugin_select_button =
+ module_select_button =
gtk_button_new_with_label( _("Select") );
gtk_container_add( GTK_CONTAINER(item_hbox),
- plugin_select_button );
+ module_select_button );
/* add a tooltip on mouseover */
gtk_tooltips_set_tip( p_intf->p_sys->p_tooltips,
- plugin_select_button,
+ module_select_button,
p_item->psz_longtext, "" );
/* hbox holding the "selected" label and text input */
/* add input box with default value */
string_entry = gtk_entry_new();
- gtk_object_set_data( GTK_OBJECT(plugin_clist),
- "plugin_entry", string_entry );
+ gtk_object_set_data( GTK_OBJECT(module_clist),
+ "module_entry", string_entry );
gtk_container_add( GTK_CONTAINER(item_hbox), string_entry );
vlc_mutex_lock( p_item->p_lock );
gtk_entry_set_text( GTK_ENTRY(string_entry),
string_entry, p_item->psz_longtext, "" );
/* connect signals to the buttons */
- gtk_signal_connect( GTK_OBJECT(plugin_config_button), "clicked",
- GTK_SIGNAL_FUNC(GtkPluginConfigure),
- (gpointer)plugin_clist );
- gtk_signal_connect( GTK_OBJECT(plugin_select_button), "clicked",
- GTK_SIGNAL_FUNC(GtkPluginSelected),
- (gpointer)plugin_clist );
+ gtk_signal_connect( GTK_OBJECT(module_config_button), "clicked",
+ GTK_SIGNAL_FUNC(GtkModuleConfigure),
+ (gpointer)module_clist );
+ gtk_signal_connect( GTK_OBJECT(module_select_button), "clicked",
+ GTK_SIGNAL_FUNC(GtkModuleSelected),
+ (gpointer)module_clist );
/* connect signal to track changes in the text box */
gtk_object_set_data( GTK_OBJECT(string_entry), "config_option",
}
/****************************************************************************
- * GtkPluginHighlighted: display plugin description when an entry is selected
+ * GtkModuleHighlighted: display module description when an entry is selected
* in the clist, and activate the configure button if necessary.
****************************************************************************/
-void GtkPluginHighlighted( GtkCList *plugin_clist, int row, int column,
+void GtkModuleHighlighted( GtkCList *module_clist, int row, int column,
GdkEventButton *event, gpointer user_data )
{
GtkWidget *config_button;
module_t *p_module;
char *psz_name;
- if( gtk_clist_get_text( GTK_CLIST(plugin_clist), row, 0, &psz_name ) )
+ if( gtk_clist_get_text( GTK_CLIST(module_clist), row, 0, &psz_name ) )
{
- /* look for plugin 'psz_name' */
+ /* look for module 'psz_name' */
for( p_module = p_module_bank->first ;
p_module != NULL ;
p_module = p_module->next )
{
if( !strcmp( p_module->psz_name, psz_name ) )
{
- gtk_object_set_data( GTK_OBJECT(plugin_clist),
- "plugin_highlighted", p_module );
- config_button = gtk_object_get_data( GTK_OBJECT(plugin_clist),
+ gtk_object_set_data( GTK_OBJECT(module_clist),
+ "module_highlighted", p_module );
+ config_button = gtk_object_get_data( GTK_OBJECT(module_clist),
"config_button" );
if( p_module->i_config_items )
gtk_widget_set_sensitive( config_button, TRUE );
}
/****************************************************************************
- * GtkPluginConfigure: display plugin configuration dialog box.
+ * GtkModuleConfigure: display module configuration dialog box.
****************************************************************************/
-void GtkPluginConfigure( GtkButton *button, gpointer user_data )
+void GtkModuleConfigure( GtkButton *button, gpointer user_data )
{
module_t *p_module;
intf_thread_t *p_intf;
p_module = (module_t *)gtk_object_get_data( GTK_OBJECT(user_data),
- "plugin_highlighted" );
+ "module_highlighted" );
if( !p_module ) return;
p_intf = (intf_thread_t *)gtk_object_get_data( GTK_OBJECT(button),
}
/****************************************************************************
- * GtkPluginSelected: select plugin.
+ * GtkModuleSelected: select module.
****************************************************************************/
-void GtkPluginSelected( GtkButton *button, gpointer user_data )
+void GtkModuleSelected( GtkButton *button, gpointer user_data )
{
module_t *p_module;
GtkWidget *widget;
p_module = (module_t *)gtk_object_get_data( GTK_OBJECT(user_data),
- "plugin_highlighted" );
+ "module_highlighted" );
widget = (GtkWidget *)gtk_object_get_data( GTK_OBJECT(user_data),
- "plugin_entry" );
+ "module_entry" );
if( !p_module ) return;
gtk_entry_set_text( GTK_ENTRY(widget), p_module->psz_name );
case MODULE_CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_PLUGIN:
+ case MODULE_CONFIG_ITEM_MODULE:
config_PutPszVariable( p_config->psz_name,
*p_config->psz_value? p_config->psz_value : NULL );
break;
* mpeg_ps.c : Program Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ps.c,v 1.12 2002/04/19 13:56:11 sam Exp $
+ * $Id: mpeg_ps.c,v 1.13 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
case MPEG1_AUDIO_ES:
case MPEG2_AUDIO_ES:
- if( config_GetIntVariable( "input_channel" )
+ if( config_GetIntVariable( "audio-channel" )
== (p_es->i_id & 0x1F) ||
- ( config_GetIntVariable( "input_channel" ) < 0
+ ( config_GetIntVariable( "audio-channel" ) < 0
&& !(p_es->i_id & 0x1F) ) )
- switch( config_GetIntVariable( "input_audio" ) )
+ switch( config_GetIntVariable( "audio-type" ) )
{
case -1:
case REQUESTED_MPEG:
break;
case AC3_AUDIO_ES:
- if( config_GetIntVariable( "input_channel" )
+ if( config_GetIntVariable( "audio-channel" )
== ((p_es->i_id & 0xF00) >> 8) ||
- ( config_GetIntVariable( "input_channel" ) < 0
+ ( config_GetIntVariable( "audio-channel" ) < 0
&& !((p_es->i_id & 0xF00) >> 8) ) )
- switch( config_GetIntVariable( "input_audio" ) )
+ switch( config_GetIntVariable( "audio-type" ) )
{
case -1:
case REQUESTED_AC3:
break;
case DVD_SPU_ES:
- if( config_GetIntVariable( "input_subtitle" )
+ if( config_GetIntVariable( "spu-channel" )
== ((p_es->i_id & 0x1F00) >> 8) )
{
input_SelectES( p_input, p_es );
break;
case LPCM_AUDIO_ES:
- if( config_GetIntVariable( "input_channel" )
+ if( config_GetIntVariable( "audio-channel" )
== ((p_es->i_id & 0x1F00) >> 8) ||
- ( config_GetIntVariable( "input_channel" ) < 0
+ ( config_GetIntVariable( "audio-channel" ) < 0
&& !((p_es->i_id & 0x1F00) >> 8) ) )
- switch( config_GetIntVariable( "input_audio" ) )
+ switch( config_GetIntVariable( "audio-type" ) )
{
case -1:
case REQUESTED_LPCM:
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video_parser.c,v 1.17 2002/04/21 10:32:20 sam Exp $
+ * $Id: video_parser.c,v 1.18 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
* Build configuration tree.
*****************************************************************************/
/* Variable containing the motion compensation method */
-#define MOTION_METHOD_VAR "mpeg_vdec_motion"
+#define MOTION_METHOD_VAR "mpeg-motion"
/* Variable containing the IDCT method */
-#define IDCT_METHOD_VAR "mpeg_vdec_idct"
+#define IDCT_METHOD_VAR "mpeg-idct"
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)
-ADD_PLUGIN( IDCT_METHOD_VAR, MODULE_CAPABILITY_IDCT, NULL, NULL,
+ADD_MODULE( IDCT_METHOD_VAR, MODULE_CAPABILITY_IDCT, NULL, NULL,
N_("IDCT module"), NULL )
-ADD_PLUGIN( MOTION_METHOD_VAR, MODULE_CAPABILITY_MOTION, NULL, NULL,
+ADD_MODULE( MOTION_METHOD_VAR, MODULE_CAPABILITY_MOTION, NULL, NULL,
N_("motion compensation module"), NULL )
MODULE_CONFIG_STOP
* vpar_synchro.c : frame dropping routines
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: vpar_synchro.c,v 1.8 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: vpar_synchro.c,v 1.9 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
static int SynchroType( void )
{
char psz_synchro_tmp[5];
- char * psz_synchro = config_GetPszVariable( "vpar_synchro" );
+ char * psz_synchro = config_GetPszVariable( "vpar-synchro" );
if( psz_synchro == NULL )
{
* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: ipv4.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: ipv4.c,v 1.11 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com>
if( i_bind_port == 0 )
{
- i_bind_port = config_GetIntVariable( "server_port" );
+ i_bind_port = config_GetIntVariable( "server-port" );
}
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0)
* ipv6.c: IPv6 network abstraction layer
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.5 2002/04/19 13:56:11 sam Exp $
+ * $Id: ipv6.c,v 1.6 2002/04/23 14:16:20 sam Exp $
*
* Authors: Alexis Guillard <alexis.guillard@bt.com>
* Christophe Massiot <massiot@via.ecp.fr>
if( i_bind_port == 0 )
{
- i_bind_port = config_GetIntVariable( "server_port" );
+ i_bind_port = config_GetIntVariable( "server-port" );
}
/* Open a SOCK_DGRAM (UDP) socket, in the AF_INET6 domain, automatic (0)
--- /dev/null
+*.bak
+.dep
+*.lo
+*.o.*
+*.lo.*
{
intf_WarnMsg( 1, "input: satellite: invalid frequency, using"\
"default one" );
- i_srate = config_GetIntVariable( "sat_frequency" );
+ i_srate = config_GetIntVariable( "frequency" );
}
if( i_srate > 30000 || i_srate < 1000 )
{
intf_WarnMsg( 1, "input: satellite: invalid symbol rate, using"\
"default one" );
- i_srate = config_GetIntVariable( "sat_symbol_rate" );
+ i_srate = config_GetIntVariable( "symbol-rate" );
}
if( !b_pol && b_pol != 1 )
{
intf_WarnMsg( 1, "input: satellite: invalid polarization, using"\
"default one" );
- b_pol = config_GetIntVariable( "sat_polarization" );
+ b_pol = config_GetIntVariable( "polarization" );
}
if( i_fec > 7 || i_fec < 1 )
{
intf_WarnMsg( 1, "input: satellite: invalid FEC, using default one" );
- i_fec = config_GetIntVariable( "sat_fec" );
+ i_fec = config_GetIntVariable( "fec" );
}
switch( i_fec )
/* Get antenna configuration options */
- b_diseqc = config_GetIntVariable( "sat_diseqc" );
- i_lnb_lof1 = config_GetIntVariable( "sat_lnb_lof1" );
- i_lnb_lof2 = config_GetIntVariable( "sat_lnb_lof2" );
- i_lnb_slof = config_GetIntVariable( "sat_lnb_slof" );
+ b_diseqc = config_GetIntVariable( "diseqc" );
+ i_lnb_lof1 = config_GetIntVariable( "lnb-lof1" );
+ i_lnb_lof2 = config_GetIntVariable( "lnb-lof2" );
+ i_lnb_slof = config_GetIntVariable( "lnb-slof" );
/* Initialize the Satellite Card */
#define p_es p_input->stream.p_selected_program->pp_es[i_es_index]
if ( p_es->p_decoder_fifo )
{
- ioctl_UnsetDMXFilter( p_es->i_dmx_fd );
+ ioctl_UnsetDMXFilter( p_es->i_demux_fd );
}
#undef p_es
}
{
input_UnselectES( p_input , p_es );
}
- if ( p_es->i_dmx_fd )
+ if ( p_es->i_demux_fd )
{
- ioctl_UnsetDMXFilter( p_es->i_dmx_fd );
- p_es->i_dmx_fd = 0;
+ ioctl_UnsetDMXFilter( p_es->i_demux_fd );
+ p_es->i_demux_fd = 0;
}
#undef p_es
}
case MPEG2_VIDEO_ES:
if ( p_main->b_video )
{
- ioctl_SetDMXFilter( p_es->i_id, &p_es->i_dmx_fd, 1);
+ ioctl_SetDMXFilter( p_es->i_id, &p_es->i_demux_fd, 1);
input_SelectES( p_input , p_es );
}
break;
case MPEG2_AUDIO_ES:
if ( p_main->b_audio )
{
- ioctl_SetDMXFilter( p_es->i_id, &p_es->i_dmx_fd, 2);
+ ioctl_SetDMXFilter( p_es->i_id, &p_es->i_demux_fd, 2);
input_SelectES( p_input , p_es );
}
break;
default:
- ioctl_SetDMXFilter( p_es->i_id, &p_es->i_dmx_fd, 3);
+ ioctl_SetDMXFilter( p_es->i_id, &p_es->i_demux_fd, 3);
input_SelectES( p_input , p_es );
break;
#undef p_es
for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
{
- if ( p_input->stream.pp_programs[i]->pp_es[0]->i_dmx_fd == 0 )
+ if ( p_input->stream.pp_programs[i]->pp_es[0]->i_demux_fd == 0 )
{
intf_WarnMsg( 2, "input: satellite: setting filter on pmt pid %d",
p_input->stream.pp_programs[i]->pp_es[0]->i_id);
ioctl_SetDMXFilter( p_input->stream.pp_programs[i]->pp_es[0]->i_id,
- &p_input->stream.pp_programs[i]->pp_es[0]->i_dmx_fd,
+ &p_input->stream.pp_programs[i]->pp_es[0]->i_demux_fd,
3 );
}
}
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
void _M( access_getfunctions )( function_list_t * p_function_list );
void _M( demux_getfunctions )( function_list_t * p_function_list );
-/*****************************************************************************
- * Local prototypes.
- *****************************************************************************/
-
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+
+#define FREQ_TEXT N_("satellite transponder frequency")
+#define FREQ_LONGTEXT ""
+
+#define POL_TEXT N_("satellite transponder polarization")
+#define POL_LONGTEXT ""
+
+#define FEC_TEXT N_("satellite transponder FEC")
+#define FEC_LONGTEXT ""
+
+#define SRATE_TEXT N_("satellite transponder symbol rate")
+#define SRATE_LONGTEXT ""
+
+#define DISEQC_TEXT N_("use diseqc with antenna")
+#define DISEQC_LONGTEXT ""
+
+#define LNB_LOF1_TEXT N_("antenna lnb_lof1 (kHz)")
+#define LNB_LOF1_LONGTEXT ""
+
+#define LNB_LOF2_TEXT N_("antenna lnb_lof2 (kHz)")
+#define LNB_LOF2_LONGTEXT ""
+
+#define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
+#define LNB_SLOF_LONGTEXT ""
+
MODULE_CONFIG_START
+ ADD_CATEGORY_HINT( N_("Input"), NULL )
+ ADD_INTEGER ( "frequency", 11954, NULL, FREQ_TEXT, FREQ_LONGTEXT )
+ ADD_INTEGER ( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT )
+ ADD_INTEGER ( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT )
+ ADD_INTEGER ( "symbol-rate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT )
+ ADD_BOOL ( "diseqc", 0, DISEQC_TEXT, DISEQC_LONGTEXT )
+ ADD_INTEGER ( "lnb-lof1", 10000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT )
+ ADD_INTEGER ( "lnb-lof2", 10000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT )
+ ADD_INTEGER ( "lnb-slof", 11700, NULL, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
free( psz_orig );
return -1;
}
- psz_source = config_GetPszVariable( "vcd_device" );
+ psz_source = config_GetPszVariable( "vcd" );
}
/* test the type of file given */
\r
if( RadioGroupType->ItemIndex == 0 )\r
{\r
- psz_device = config_GetPszVariable( "dvd_device" );\r
+ psz_device = config_GetPszVariable( "dvd" );\r
}\r
else\r
{\r
- psz_device = config_GetPszVariable( "vcd_device" );\r
+ psz_device = config_GetPszVariable( "vcd" );\r
}\r
\r
if( psz_device )\r
GroupBoxNetwork->Visible = true;\r
ActiveGB = GroupBoxNetwork;\r
LabelServer->Caption = p_input_bank->pp_input[0]->psz_source;\r
- if( config_GetIntVariable( "network_channel" ) )\r
+ if( config_GetIntVariable( "network-channel" ) )\r
{\r
LabelChannel->Visible = true;\r
}\r
{\r
i_Height = StatusBar->Height + ToolBar->Height + 47;\r
\r
- if( config_GetIntVariable( "network_channel" ) )\r
+ if( config_GetIntVariable( "network-channel" ) )\r
{\r
GroupBoxNetwork->Visible = true;\r
LabelChannel->Visible = true;\r
char *psz_channel_server;\r
\r
/* server port */\r
- UpDownPort->Position = config_GetIntVariable( "server_port" );\r
+ UpDownPort->Position = config_GetIntVariable( "server-port" );\r
\r
/* channel server */\r
- if( config_GetIntVariable( "network_channel" ) )\r
+ if( config_GetIntVariable( "network-channel" ) )\r
{\r
CheckBoxChannel->Checked = true;\r
}\r
\r
- psz_channel_server = config_GetPszVariable( "channel_server" );\r
+ psz_channel_server = config_GetPszVariable( "channel-server" );\r
if( psz_channel_server )\r
{\r
ComboBoxChannel->Text = psz_channel_server;\r
free( psz_channel_server );\r
}\r
\r
- UpDownPortCS->Position = config_GetIntVariable( "channel_port" );\r
+ UpDownPortCS->Position = config_GetIntVariable( "channel-port" );\r
}\r
//---------------------------------------------------------------------------\r
void __fastcall TNetworkDlg::FormShow( TObject *Sender )\r
\r
/* Manage channel server */\r
b_channel = CheckBoxChannel->Checked ? TRUE : FALSE;\r
- config_PutIntVariable( "network_channel", b_channel );\r
+ config_PutIntVariable( "network-channel", b_channel );\r
if( b_channel )\r
{\r
AnsiString Channel = ComboBoxChannel->Text;\r
network_ChannelCreate();\r
}\r
\r
- config_PutPszVariable( "channel_server", Channel.c_str() );\r
+ config_PutPszVariable( "channel-server", Channel.c_str() );\r
if( i_channel_port < 65536 )\r
{\r
- config_PutIntVariable( "channel_port", i_channel_port );\r
+ config_PutIntVariable( "channel-port", i_channel_port );\r
}\r
\r
p_intfGlobal->p_sys->b_playing = 1;\r
\r
\r
/****************************************************************************\r
- * GroupBox for plugin management\r
+ * GroupBox for module management\r
****************************************************************************/\r
__fastcall TGroupBoxPlugin::TGroupBoxPlugin( TComponent* Owner,\r
module_config_t *p_config ) : TGroupBoxPref( Owner, p_config )\r
Name = Item->Caption;\r
if( Name != "" )\r
{\r
- /* look for plugin 'Name' */\r
+ /* look for module 'Name' */\r
for( p_module = p_module_bank->first ;\r
p_module != NULL ;\r
p_module = p_module->next )\r
\r
break;\r
\r
- case MODULE_CONFIG_ITEM_PLUGIN:\r
+ case MODULE_CONFIG_ITEM_MODULE:\r
\r
/* add new groupbox for the config option */\r
GroupBoxPlugin = new TGroupBoxPlugin( this, &p_module->p_config[i] );\r
{\r
case MODULE_CONFIG_ITEM_STRING:\r
case MODULE_CONFIG_ITEM_FILE:\r
- case MODULE_CONFIG_ITEM_PLUGIN:\r
+ case MODULE_CONFIG_ITEM_MODULE:\r
config_PutPszVariable( p_config->psz_name,\r
*p_config->psz_value ? p_config->psz_value : NULL );\r
break;\r
* x11.c : X11 plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: x11.c,v 1.15 2002/04/19 13:56:11 sam Exp $
+ * $Id: x11.c,v 1.16 2002/04/23 14:16:20 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "x11_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
-ADD_BOOL ( "x11_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
+ADD_STRING ( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
+ADD_BOOL ( "x11-altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.27 2002/04/04 05:08:05 sam Exp $
+ * $Id: xcommon.c,v 1.28 2002/04/23 14:16:20 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* Open display, unsing the "display" config variable or the DISPLAY
* environment variable */
-#ifdef MODULE_NAME_IS_xvideo
- psz_display = config_GetPszVariable( "xvideo_display" );
-#else
- psz_display = config_GetPszVariable( "x11_display" );
-#endif
+ psz_display = config_GetPszVariable( MODULE_STRING "-display" );
p_vout->p_sys->p_display = XOpenDisplay( psz_display );
* because to go back to window mode we need to know in which
* fullscreen mode we where */
p_vout->p_sys->b_altfullscreen =
-#ifdef MODULE_NAME_IS_xvideo
- config_GetIntVariable( "xvideo_altfullscreen" );
-#else
- config_GetIntVariable( "x11_altfullscreen" );
-#endif
+ config_GetIntVariable( MODULE_STRING "-altfullscreen" );
/* Save current window coordinates so they can be restored when
* we exit from fullscreen mode. This is the tricky part because
}
i_selected_port = -1;
- i_requested_adaptor = config_GetIntVariable( "xvideo_adaptor" );
+ i_requested_adaptor = config_GetIntVariable( "xvideo-adaptor" );
for( i_adaptor = 0; i_adaptor < i_num_adaptors; ++i_adaptor )
{
* xvideo.c : Xvideo plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xvideo.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: xvideo.c,v 1.11 2002/04/23 14:16:20 sam Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "xvideo_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
-ADD_INTEGER ( "xvideo_adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT )
-ADD_BOOL ( "xvideo_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
+ADD_STRING ( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
+ADD_INTEGER ( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT )
+ADD_BOOL ( "xvideo-altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
msgid ""
msgstr ""
"Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2002-04-18 23:38+0100\n"
"Last-Translator: Thomas Graf <tgr@reeler.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr "VCD Gerät"
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr "Satellit Transponder Frequenz"
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr "Satellit Transponder Polarisation"
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr "Satellit Transponder FEC"
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr "Satellit Transponder Symbol Rate"
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr "Verwende diseqc mit Antenne"
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr "Antenne lnb_lof1 (kHz)"
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr "Antenne lnb_lof2 (kHz)"
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr "Antenne lnb_slof (kHz)"
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr "IPv6 forcieren"
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr "IPv4 forcieren"
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr "MPEG Audio Dekoder wählen"
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr "AC3 Audio Dekoder wählen"
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr "Benutz zusätzliche Prozessoren"
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr "Synchro Algorithmus focieren {I|I+|IP|IP+|IPB}"
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr "MMX Unterstützung deaktivieren"
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr "3D Now! Unterstützung deaktivieren"
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr "MMX EXT Unterstützung deaktivieren."
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr "SSE Unterstüzung deaktivieren"
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr "AltiVec Unterstützung deaktiveren"
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr "Abspielliste aufrufen beim Starten"
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr "Standardmässig in die Abspielliste einreihen"
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr "Abspielliste endlos abspielen"
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr "Speicherkopier Modul"
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr "Oberfläche"
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr ""
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr ""
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr "Eingabe"
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr "Dekoder"
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr "Prozessor"
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "Abspielliste"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr "Sonstiges"
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
msgstr "Hauptprogramm"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr "Hilfetext anzeigen"
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr "Detailierter Hilfetext anzeigen"
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
-msgstr "Liste aller verfügbaren Plugins ausgeben"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
+msgstr "Liste allen verfügbaren Plugins ausgeben"
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
-msgstr "Hilfe über Plugin <text> ausgeben"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
+msgstr "Hilfe über Modul <text> ausgeben"
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr "Versionsinformationen ausgeben."
+#: src/interface/main.c:560
+msgid "help module"
+msgstr "Hilfe Modul"
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr "%s Modul Optionen:\n"
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
-msgstr "<text>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
+msgstr "text"
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
-msgstr " <zahl>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
+msgstr "zahl"
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
-msgstr ""
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
+msgstr "gleitpunktzahl"
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
"pausieren\n"
" vlc:quit \tVLC beenden"
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
"\n"
"Drück die Eingabetaste um weiterzufahren..."
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
-msgstr "[Plugin] [Beschreibung]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
+msgstr "[Modul] [Beschreibung]"
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
msgstr ""
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr "<boolesch>"
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr "<zahl>"
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr "# %s <gleitpunktzahl>\n"
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
-msgstr "# %s <text>\n"
+msgid "boolean"
+msgstr "boolesch"
#: plugins/a52/a52.c:76
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr "Zurück"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+msgid "Go Backward"
msgstr "Zurück gehen"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
#: plugins/idct/idctaltivec.c:49
msgid "Altivec IDCT module"
-msgstr "ALtiVec IDCT Modul"
+msgstr "AltiVec IDCT Modul"
#: plugins/idct/idctclassic.c:47
msgid "classic IDCT module"
#: plugins/imdct/imdct3dn.c:47
msgid "3D Now! AC3 IMDCT module"
-msgstr "3D Now! AC3 IMDCT MOdul"
+msgstr "3D Now! AC3 IMDCT Modul"
#: plugins/imdct/imdctsse.c:47
msgid "SSE AC3 IMDCT module"
msgid "Qt interface module"
msgstr "Qt Oberfläche Modul"
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr "Satellit Transponder Frequenz"
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr "Satellit Transponder Polarisation"
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr "Satellit Transponder FEC"
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr "Satellit Transponder Symbol Rate"
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr "Verwende diseqc mit Antenne"
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "Antenne lnb_lof1 (kHz)"
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "Antenne lnb_lof2 (kHz)"
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr "Antenne lnb_slof (kHz)"
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr "Satellit Eingabe Modul"
msgid "XVideo extension module"
msgstr "XVideo Erweiterung Modul"
-#~ msgid "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"
-#~ msgstr "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - das VideoLAN Team"
+#~ msgid "<integer>"
+#~ msgstr "<zahl>"
+
+#~ msgid "<float>"
+#~ msgstr "<gleitpunktzahl>"
+
+#~ msgid "<string>"
+#~ msgstr "<text>"
#~ msgid "Select audio language"
#~ msgstr "Sprache festlegen"
#~ msgid "Transponder Settings"
#~ msgstr "Transponder Einstellungen"
-
-#~ msgid " --%s <string>%s %s"
-#~ msgstr " --%s <text>%s %s"
-
-#~ msgid " --%s <integer>%s %s"
-#~ msgstr " --%s <zahl>%s %s"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ascii\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/interface/main.c:97
#: src/interface/main.c:190
msgid "grayscale video output"
-msgstr ""
+msgstr "greyscale video output"
#: src/interface/main.c:192
msgid ""
#: src/interface/main.c:226
msgid "choose program (SID)"
-msgstr ""
+msgstr "choose programme (SID)"
#: src/interface/main.c:228
msgid "Choose the program to select by giving its Service ID."
-msgstr ""
+msgstr "Choose the programme to select by giving its Service ID."
#: src/interface/main.c:230
msgid "choose audio"
msgstr ""
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr ""
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr ""
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr ""
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr ""
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr ""
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr ""
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr ""
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr ""
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr ""
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr ""
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr ""
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr ""
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr ""
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr ""
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr ""
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr ""
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr ""
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr ""
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr ""
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr ""
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr ""
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr ""
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr ""
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr ""
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr ""
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr ""
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
-msgstr ""
+msgstr "main programme"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr ""
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr ""
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
msgstr ""
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
msgstr ""
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr ""
+#: src/interface/main.c:560
+msgid "help module"
+msgstr ""
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr ""
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:quit quit VLC"
msgstr ""
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
msgstr ""
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
msgstr ""
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"see the file named COPYING for details.\n"
"Written by the VideoLAN team at Ecole Centrale, Paris."
msgstr ""
+"This programme comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute it under the terms of the GNU General Public License;\n"
+"see the file named COPYING for details.\n"
+"Written by the VideoLAN team at École Centrale, Paris."
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/gtk/gtk_interface.c:234
msgid "Exit the program"
-msgstr ""
+msgstr "Exit the programme"
#: plugins/gtk/gtk_interface.c:241
msgid "_View"
#: plugins/gtk/gnome_interface.c:71 plugins/gtk/gtk_interface.c:299
msgid "Choose the program"
-msgstr ""
+msgstr "Choose the programme"
#: plugins/gtk/gnome_interface.c:77 plugins/gtk/gtk_interface.c:303
msgid "_Title"
msgstr ""
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
-msgstr ""
+msgid "Go Backward"
+msgstr "Go Backwards"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
#: plugins/gtk/gtk_interface.c:540 plugins/gtk/gtk_interface.c:998
#: plugins/gtk/gnome_interface.c:908 plugins/gtk/gtk_interface.c:1092
msgid "Program"
-msgstr ""
+msgstr "Programme"
#: plugins/gtk/gnome_interface.c:915 plugins/gtk/gtk_interface.c:1102
msgid "_Navigation"
#: plugins/gtk/gnome_interface.c:909
msgid "Switch program"
-msgstr ""
+msgstr "Switch programme"
#: plugins/gtk/gnome_interface.c:916
msgid "Navigate through titles and chapters"
msgid "Qt interface module"
msgstr ""
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr ""
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr ""
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr ""
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr ""
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#: src/interface/main.c:97
msgid "interface module"
-msgstr "module d'interface Qt"
+msgstr "module d'interface"
#: src/interface/main.c:99
msgid ""
msgstr "périphérique VCD"
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr "fréquence du transpondeur satellite"
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr "polarisation du transpondeur satellite"
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr "FEC du transpondeur satellite"
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr "débit symbole du transpondeur satellite"
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr "utiliser diseqc pour l'antenne"
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr "lnb_lof1 de l'antenne (kHz)"
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr "lnb_lof2 de l'antenne (kHz)"
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr "lnb_slof de l'antenne (kHz)"
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr "forcer l'utilisation d'IPv6"
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr "forcer l'utilisation d'IPv4"
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr "choisir le décodeur MPEG audio"
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr "choisir le décodeur AC3 audio"
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr "utiliser des processeurs supplémentaires"
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr "forcer l'algorithme de synchro {I|I+|IP|IP+|IPB}"
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr "désactiver le support MMX du processeur"
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr "désactiver le support 3D Now! du processeur"
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr "désactiver le support MMX EXT du processeur"
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr "désactiver le support SSE du processeur"
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr "désactiver le support AltiVec du processeur"
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr "lancer la playlist au démarrage"
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr "ajouter les fichiers en fin de playlist"
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr "boucler en fin de playlist"
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr "module de copie mémoire"
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr "implémentation pthread rapide pour NT/2K/XP (développeurs uniquement)"
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
"avec laquelle vous pouvez rencontrer des problèmes."
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr "Interface"
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr "Audio"
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr "Vidéo"
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr "Entrée"
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr "Décodeurs"
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr "Processeur"
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "Playlist"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr "Divers"
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
msgstr "programme principal"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr "afficher l'aide"
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr "afficher l'aide détaillée"
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
-msgstr "afficher la liste des plugins disponibles"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
+msgstr "afficher la liste des modules disponibles"
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
-msgstr "afficher l'aide du plugin <chaîne>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
+msgstr "afficher l'aide du module <chaîne>"
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr "afficher le nom et la version du logiciel"
+#: src/interface/main.c:560
+msgid "help module"
+msgstr "module d'aide"
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Utilisation: %s [options] [paramètres] [fichier]...\n"
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr "options du module %s :\n"
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
-msgstr " <chaîne>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
+msgstr "chaîne"
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
-msgstr " <entier>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
+msgstr "entier"
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
-msgstr ""
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
+msgstr "flottant"
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:pause fait une pause dans la playlist\n"
" vlc:quit quitter VLC"
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
"\n"
"Appuyez sur ENTRÉE pour continuer..."
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
-msgstr "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
+msgstr "[module] [description]"
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"Écrit par l'équipe VideoLAN à l'École Centrale, Paris."
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr "<booléen>"
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr "<entier>"
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr "# %s <flottant>\n"
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
-msgstr "# %s <chaîne>\n"
+msgid "boolean"
+msgstr "booléen"
#: plugins/a52/a52.c:76
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
"Specify the X11 hardware display you want to use.\n"
"By default vlc will use the value of the DISPLAY environment variable."
msgstr ""
+"Spécifier le display X11 que vous désirez utiliser.\n"
+"Par défaut vlc utilisera la valeur de la variable d'environnement DISPLAY."
#: plugins/glide/glide.c:72
msgid "3dfx Glide module"
#: plugins/gtk/gnome_interface.c:403 plugins/gtk/gtk_interface.c:516
msgid "Open a Satellite Card"
-msgstr ""
+msgstr "Ouvrir une carte satellite"
#: plugins/gtk/gnome_interface.c:416 plugins/gtk/gnome_interface.c:850
#: plugins/gtk/gtk_interface.c:528 plugins/gtk/gtk_interface.c:1005
msgstr "Retour"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+msgid "Go Backward"
msgstr "Retour arrière"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr "module d'interface Qt"
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr "fréquence du transpondeur satellite"
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr "polarisation du transpondeur satellite"
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr "FEC du transpondeur satellite"
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr "débit symbole du transpondeur satellite"
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr "utiliser diseqc pour l'antenne"
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "lnb_lof1 de l'antenne (kHz)"
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "lnb_lof2 de l'antenne (kHz)"
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr "lnb_slof de l'antenne (kHz)"
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr "module d'entrée satellite"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2002-04-02 03:22+0900\n"
"Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr ""
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr ""
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr ""
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr ""
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr ""
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr ""
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr ""
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr ""
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr ""
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr ""
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr ""
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr ""
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr ""
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr ""
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr ""
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr ""
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr ""
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr ""
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr ""
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr ""
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr ""
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
#, fuzzy
msgid "Interface"
msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Îɽ¼¨ÀÚÂؤ¨(_I)"
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
#, fuzzy
msgid "Audio"
msgstr "½ÐÎϲ»À¼(_A)"
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
#, fuzzy
msgid "Video"
msgstr "ɽ¼¨(_V)"
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "¥ê¥¹¥È"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr ""
-#: src/interface/main.c:434
+#: src/interface/main.c:395
#, fuzzy
msgid "main program"
msgstr "¥×¥í¥°¥é¥à¤ÎÀÚÂؤ¨"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr ""
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr ""
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
msgstr ""
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
msgstr ""
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr ""
+#: src/interface/main.c:560
+msgid "help module"
+msgstr ""
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr ""
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:quit quit VLC"
msgstr ""
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
msgstr ""
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
msgstr ""
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
msgstr ""
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
msgstr "µÕž"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+#, fuzzy
+msgid "Go Backward"
msgstr "µÕžºÆÀ¸"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr ""
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr ""
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr ""
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr ""
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr ""
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2002-04-20 16:58GMT\n"
"Last-Translator: Jean-Paul Saman <jpsaman@wxs.nl>\n"
"Language-Team: Nederlands <nl@li.org>\n"
msgstr "VCD apparaat"
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr "sateliet transponder frequentie"
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr "sateliet transponder polarisatie"
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr "sateliet transponder FEC"
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr "sateliet transponder symbool snelheid"
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr "gebruik disecq met antenne"
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr "antenne lnb_lof1 (kHz)"
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr "antenne lnb_lof2 (kHz)"
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr "antenne lnb_slof (kHz)"
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr "forceer IPv6"
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr "forceer IPv4"
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr "selecteer MPEG audio decoder"
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr "selecteer AC3 audio decoder"
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr "gebruik extra processors"
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr "forceer synchronisatie algorithme {I|I+|IP|IP+|IPB}"
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr "schakel CPU's MMU support uit"
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr "schakel CPU's 3D Now! support uit"
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr "schakel CPU's MMX EXT support uit"
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr "schakel CPU's SSE support uit"
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr "schakel CPU's AltiVec support uit"
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr "lanceer speellijst bij opstarten"
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr "standaard in wachtrij plaatsen"
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr "begin voor aan na einde speellijst"
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr "geheugen kopieer module"
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr "snelle pthread op NT/2K/XP (alleen ontwikkelaars)"
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
"optreden met deze snellere implementatie."
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr ""
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr ""
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr ""
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "Speellijst"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr "Overige"
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
msgstr "hoofd programma"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr "print help"
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr "print gedetailleerde help"
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
-msgstr "print een lijst van beschikbare plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
+msgstr "print een lijst van beschikbare modules"
-#: src/interface/main.c:454
-#, fuzzy
-msgid "print help on plugin <string>"
-msgstr "print help over plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
+msgstr "print help over module <string>"
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr "print versie informatie"
+#: src/interface/main.c:560
+msgid "help module"
+msgstr "help module"
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr "%s module opties:\n"
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:pause \tpauzeer speellijst items\n"
" vlc:quit \tstop VLC"
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
"\n"
"Druk op RETURN om verder te gaan..."
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
-msgstr "[plugin] [beschrijving]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
+msgstr "[module] [beschrijving]"
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"Geschreven door het VideoLAN team at Ecole Centrale, Paris."
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
msgstr "Terug"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+msgid "Go Backward"
msgstr "Ga Terug"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr ""
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr "sateliet transponder frequentie"
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr "sateliet transponder polarisatie"
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr "sateliet transponder FEC"
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr "sateliet transponder symbool snelheid"
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr "gebruik disecq met antenne"
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr "antenne lnb_lof1 (kHz)"
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr "antenne lnb_lof2 (kHz)"
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr "antenne lnb_slof (kHz)"
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr "sateliet input module"
msgid ""
msgstr ""
"Project-Id-Version: vlc-cvs\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2002-28-02 23.35+0100\n"
"Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr ""
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr ""
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr ""
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr ""
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr ""
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr ""
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr ""
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr ""
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr ""
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr ""
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr ""
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr ""
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr ""
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr ""
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr ""
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr ""
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr ""
-#: src/interface/main.c:302
+#: src/interface/main.c:278
#, fuzzy
msgid "launch playlist on startup"
msgstr "Kjør ved oppstart"
-#: src/interface/main.c:305
+#: src/interface/main.c:281
#, fuzzy
msgid "enqueue playlist as default"
msgstr "Legg til i kø som standard"
-#: src/interface/main.c:308
+#: src/interface/main.c:284
#, fuzzy
msgid "loop playlist on end"
msgstr "Gå tilbake til start ved slutten av Spillelisten"
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr ""
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr "Grensesnitt"
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr "Lyd"
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr "Video"
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "Spilleliste"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr ""
-#: src/interface/main.c:434
+#: src/interface/main.c:395
#, fuzzy
msgid "main program"
msgstr "Avslutt programmet"
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr ""
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr ""
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
msgstr ""
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
msgstr ""
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr ""
+#: src/interface/main.c:560
+#, fuzzy
+msgid "help module"
+msgstr "Standard grensesnitt: "
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr ""
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:quit quit VLC"
msgstr ""
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
msgstr ""
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
msgstr ""
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
msgstr ""
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
msgstr "Tilbake"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+#, fuzzy
+msgid "Go Backward"
msgstr "Gå tilbake"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr "Standard grensesnitt: "
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr ""
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr ""
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr ""
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr ""
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: gnome-vlc\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: 2001-02-19 19:58+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
msgstr ""
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr ""
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr ""
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr ""
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr ""
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr ""
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr ""
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr ""
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr ""
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr ""
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr ""
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr ""
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr ""
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr ""
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr ""
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr ""
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr ""
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr ""
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr ""
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr ""
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr ""
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr ""
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr ""
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr ""
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr ""
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr ""
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
msgstr ""
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr ""
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr ""
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
msgstr ""
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
msgstr ""
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr ""
+#: src/interface/main.c:560
+msgid "help module"
+msgstr ""
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr ""
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:quit quit VLC"
msgstr ""
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
msgstr ""
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
msgstr ""
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
msgstr ""
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
msgstr "îÁÚÁÄ"
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+#, fuzzy
+msgid "Go Backward"
msgstr "÷ÅÒÎÕÔØÓÑ ÎÁÚÁÄ"
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr ""
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr ""
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr ""
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr ""
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr ""
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-22 09:46+0200\n"
+"POT-Creation-Date: 2002-04-22 16:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#: src/interface/main.c:245
-msgid "satellite transponder frequency"
-msgstr ""
-
-#: src/interface/main.c:248
-msgid "satellite transponder polarization"
-msgstr ""
-
-#: src/interface/main.c:251
-msgid "satellite transponder FEC"
-msgstr ""
-
-#: src/interface/main.c:254
-msgid "satellite transponder symbol rate"
-msgstr ""
-
-#: src/interface/main.c:257
-msgid "use diseqc with antenna"
-msgstr ""
-
-#: src/interface/main.c:260
-msgid "antenna lnb_lof1 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:263
-msgid "antenna lnb_lof2 (kHz)"
-msgstr ""
-
-#: src/interface/main.c:266
-msgid "antenna lnb_slof (kHz)"
-msgstr ""
-
-#: src/interface/main.c:269
msgid "force IPv6"
msgstr ""
-#: src/interface/main.c:272
+#: src/interface/main.c:248
msgid "force IPv4"
msgstr ""
-#: src/interface/main.c:275
+#: src/interface/main.c:251
msgid "choose MPEG audio decoder"
msgstr ""
-#: src/interface/main.c:278
+#: src/interface/main.c:254
msgid "choose AC3 audio decoder"
msgstr ""
-#: src/interface/main.c:281
+#: src/interface/main.c:257
msgid "use additional processors"
msgstr ""
-#: src/interface/main.c:284
+#: src/interface/main.c:260
msgid "force synchro algorithm {I|I+|IP|IP+|IPB}"
msgstr ""
-#: src/interface/main.c:287
+#: src/interface/main.c:263
msgid "disable CPU's MMX support"
msgstr ""
-#: src/interface/main.c:290
+#: src/interface/main.c:266
msgid "disable CPU's 3D Now! support"
msgstr ""
-#: src/interface/main.c:293
+#: src/interface/main.c:269
msgid "disable CPU's MMX EXT support"
msgstr ""
-#: src/interface/main.c:296
+#: src/interface/main.c:272
msgid "disable CPU's SSE support"
msgstr ""
-#: src/interface/main.c:299
+#: src/interface/main.c:275
msgid "disable CPU's AltiVec support"
msgstr ""
-#: src/interface/main.c:302
+#: src/interface/main.c:278
msgid "launch playlist on startup"
msgstr ""
-#: src/interface/main.c:305
+#: src/interface/main.c:281
msgid "enqueue playlist as default"
msgstr ""
-#: src/interface/main.c:308
+#: src/interface/main.c:284
msgid "loop playlist on end"
msgstr ""
-#: src/interface/main.c:311
+#: src/interface/main.c:287
msgid "memory copy module"
msgstr ""
-#: src/interface/main.c:314
+#: src/interface/main.c:290
msgid "fast pthread on NT/2K/XP (developpers only)"
msgstr ""
-#: src/interface/main.c:316
+#: src/interface/main.c:292
msgid ""
"On Windows NT/2K/XP we use a slow but correct pthread implementation, you "
"can also use this faster implementation but you might experience problems "
msgstr ""
#. Interface options
-#: src/interface/main.c:338
+#: src/interface/main.c:314
msgid "Interface"
msgstr ""
#. Audio options
-#: src/interface/main.c:345
+#: src/interface/main.c:321
msgid "Audio"
msgstr ""
#. Video options
-#: src/interface/main.c:356
+#: src/interface/main.c:332
msgid "Video"
msgstr ""
#. Input options
-#: src/interface/main.c:369
+#: src/interface/main.c:345
msgid "Input"
msgstr ""
#. Decoder options
-#: src/interface/main.c:403
+#: src/interface/main.c:364
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/interface/main.c:410
+#: src/interface/main.c:371
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1806
#: plugins/gtk/gnome_interface.c:1830 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:418
+#: plugins/gtk/gtk_interface.c:2084 src/interface/main.c:379
msgid "Playlist"
msgstr ""
#: plugins/ac3_adec/ac3_adec.c:77 plugins/dsp/dsp.c:42 plugins/fb/fb.c:72
#: plugins/ggi/ggi.c:68 plugins/gtk/gnome.c:73 plugins/gtk/gtk.c:74
#: plugins/mga/xmga.c:111 plugins/mpeg_vdec/video_parser.c:80
-#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:424
+#: plugins/x11/x11.c:55 plugins/x11/xvideo.c:60 src/interface/main.c:385
msgid "Miscellaneous"
msgstr ""
-#: src/interface/main.c:434
+#: src/interface/main.c:395
msgid "main program"
msgstr ""
-#: src/interface/main.c:448
+#: src/interface/main.c:409
msgid "print help"
msgstr ""
-#: src/interface/main.c:450
+#: src/interface/main.c:411
msgid "print detailed help"
msgstr ""
-#: src/interface/main.c:452
-msgid "print a list of available plugins"
+#: src/interface/main.c:413
+msgid "print a list of available modules"
msgstr ""
-#: src/interface/main.c:454
-msgid "print help on plugin <string>"
+#: src/interface/main.c:415
+msgid "print help on module <string>"
msgstr ""
-#: src/interface/main.c:457
+#: src/interface/main.c:418
msgid "print version information"
msgstr ""
+#: src/interface/main.c:560
+msgid "help module"
+msgstr ""
+
#. Usage
-#: src/interface/main.c:622 src/interface/main.c:1071
+#: src/interface/main.c:584 src/interface/main.c:1045
#, c-format
msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. print module name
-#: src/interface/main.c:948
+#: src/interface/main.c:924
#, c-format
msgid "%s module options:\n"
msgstr ""
-#: src/interface/main.c:981 src/interface/main.c:985
-msgid " <string>"
+#. We could also have "=<" here
+#: src/interface/main.c:956 src/misc/configuration.c:696
+msgid "string"
msgstr ""
-#: src/interface/main.c:992 src/interface/main.c:996
-msgid " <integer>"
+#: src/interface/main.c:961 src/misc/configuration.c:680
+msgid "integer"
msgstr ""
-#: src/interface/main.c:1003 src/interface/main.c:1007
-msgid " <float>"
+#: src/interface/main.c:966 src/misc/configuration.c:688
+msgid "float"
msgstr ""
-#: src/interface/main.c:1028
+#: src/interface/main.c:1002
msgid ""
"\n"
"Playlist items:\n"
" vlc:quit quit VLC"
msgstr ""
-#: src/interface/main.c:1048 src/interface/main.c:1097
-#: src/interface/main.c:1121
+#: src/interface/main.c:1022 src/interface/main.c:1071
+#: src/interface/main.c:1095
msgid ""
"\n"
"Press the RETURN key to continue..."
msgstr ""
-#: src/interface/main.c:1074
-msgid "[plugin] [description]"
+#: src/interface/main.c:1048
+msgid "[module] [description]"
msgstr ""
-#: src/interface/main.c:1115
+#: src/interface/main.c:1089
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
msgstr ""
#: src/misc/configuration.c:680
-msgid "<boolean>"
-msgstr ""
-
-#: src/misc/configuration.c:680
-msgid "<integer>"
-msgstr ""
-
-#: src/misc/configuration.c:687
-#, c-format
-msgid "# %s <float>\n"
-msgstr ""
-
-#: src/misc/configuration.c:694
-#, c-format
-msgid "# %s <string>\n"
+msgid "boolean"
msgstr ""
#: plugins/a52/a52.c:76
msgstr ""
#: plugins/gtk/gnome_interface.c:417 plugins/gtk/gtk_interface.c:529
-msgid "Go Backwards"
+msgid "Go Backward"
msgstr ""
#: plugins/gtk/gnome_interface.c:429 plugins/gtk/gnome_interface.c:843
msgid "Qt interface module"
msgstr ""
-#: plugins/satellite/satellite.c:48
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/satellite/satellite.c:41
+msgid "satellite transponder frequency"
+msgstr ""
+
+#: plugins/satellite/satellite.c:44
+msgid "satellite transponder polarization"
+msgstr ""
+
+#: plugins/satellite/satellite.c:47
+msgid "satellite transponder FEC"
+msgstr ""
+
+#: plugins/satellite/satellite.c:50
+msgid "satellite transponder symbol rate"
+msgstr ""
+
+#: plugins/satellite/satellite.c:53
+msgid "use diseqc with antenna"
+msgstr ""
+
+#: plugins/satellite/satellite.c:56
+msgid "antenna lnb_lof1 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:59
+msgid "antenna lnb_lof2 (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:62
+msgid "antenna lnb_slof (kHz)"
+msgstr ""
+
+#: plugins/satellite/satellite.c:77
msgid "satellite input module"
msgstr ""
* audio_output.c : audio output thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: audio_output.c,v 1.83 2002/03/12 18:37:46 stef Exp $
+ * $Id: audio_output.c,v 1.84 2002/04/23 14:16:20 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr>
p_aout->i_rate = config_GetIntVariable( "rate" );
p_aout->i_channels = config_GetIntVariable( "mono" ) ? 1 : 2;
- i_format = config_GetIntVariable( "aout_format" );
+ i_format = config_GetIntVariable( "audio-format" );
if( ( !i_format ) || ( i_format > 8 ) )
{
p_aout->i_format = AOUT_FMT_S16_NE;
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input.c,v 1.193 2002/04/08 14:53:05 jobi Exp $
+ * $Id: input.c,v 1.194 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
p_input->stream.control.i_rate = DEFAULT_RATE;
p_input->stream.control.b_mute = 0;
p_input->stream.control.b_grayscale = config_GetIntVariable( "grayscale" );
- p_input->stream.control.i_smp = config_GetIntVariable( "vdec_smp" );
+ p_input->stream.control.i_smp = config_GetIntVariable( "vdec-smp" );
intf_WarnMsg( 1, "input: playlist item `%s'", p_input->psz_source );
* input_dec.c: Functions for the management of decoders
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: input_dec.c,v 1.31 2002/03/14 01:35:28 stef Exp $
+ * $Id: input_dec.c,v 1.32 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
if( p_es->i_type == MPEG1_AUDIO_ES || p_es->i_type == MPEG2_AUDIO_ES )
{
- psz_plugin = config_GetPszVariable( "mpeg_adec" );
+ psz_plugin = config_GetPszVariable( "mpeg-adec" );
}
if( p_es->i_type == AC3_AUDIO_ES )
{
- psz_plugin = config_GetPszVariable( "ac3_adec" );
+ psz_plugin = config_GetPszVariable( "ac3-adec" );
}
/* Get a suitable module */
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: input_programs.c,v 1.80 2002/04/17 17:00:58 jobi Exp $
+ * $Id: input_programs.c,v 1.81 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
if( p_main->b_audio )
{
/* Default is the first one */
- i_required_audio_es = config_GetIntVariable( "input_channel" );
+ i_required_audio_es = config_GetIntVariable( "audio-channel" );
if( i_required_audio_es < 0 )
{
i_required_audio_es = 1;
if( p_main->b_video )
{
/* for spu, default is none */
- i_required_spu_es = config_GetIntVariable( "input_subtitle" );
+ i_required_spu_es = config_GetIntVariable( "spu-channel" );
if( i_required_spu_es < 0 )
{
i_required_spu_es = 0;
p_es->p_decoder_fifo = NULL;
p_es->b_audio = 0;
p_es->i_cat = UNKNOWN_ES;
-#ifdef HAVE_SATELLITE
- p_es->i_dmx_fd = 0;
-#endif
+ p_es->i_demux_fd = 0;
if( i_data_len )
{
* mpeg_system.c: TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: mpeg_system.c,v 1.90 2002/04/17 17:00:58 jobi Exp $
+ * $Id: mpeg_system.c,v 1.91 2002/04/23 14:16:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
p_es->i_cat = AUDIO_ES;
#ifdef AUTO_SPAWN
if( !p_input->stream.b_seekable )
- if( config_GetIntVariable( "input_channel" )
+ if( config_GetIntVariable( "audio-channel" )
== (p_es->i_id & 0x1F) ||
- ( config_GetIntVariable( "input_channel" ) < 0
+ ( config_GetIntVariable( "audio-channel" ) < 0
&& !(p_es->i_id & 0x1F) ) )
- switch( config_GetIntVariable( "input_audio" ) )
+ switch( config_GetIntVariable( "audio-type" ) )
{
case -1:
case REQUESTED_MPEG:
p_es->i_cat = AUDIO_ES;
#ifdef AUTO_SPAWN
if( !p_input->stream.b_seekable )
- if( config_GetIntVariable( "input_channel" )
+ if( config_GetIntVariable( "audio-channel" )
== ((p_es->i_id & 0xF00) >> 8) ||
- ( config_GetIntVariable( "input_channel" ) < 0
+ ( config_GetIntVariable( "audio-channel" ) < 0
&& !((p_es->i_id & 0xF00) >> 8)) )
- switch( config_GetIntVariable( "input_audio" ) )
+ switch( config_GetIntVariable( "audio-type" ) )
{
case -1:
case REQUESTED_AC3:
p_es->i_type = DVD_SPU_ES;
p_es->i_cat = SPU_ES;
#ifdef AUTO_SPAWN
- if( config_GetIntVariable( "input_subtitle" )
+ if( config_GetIntVariable( "spu-channel" )
== ((p_es->i_id & 0x1F00) >> 8) )
{
if( !p_input->stream.b_seekable )
if( !p_input->stream.p_selected_program )
{
pgrm_descriptor_t * p_pgrm_to_select;
- u16 i_id = (u16)config_GetIntVariable( "input_program" );
+ u16 i_id = (u16)config_GetIntVariable( "program" );
if( i_id != 0 ) /* if user specified a program */
{
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: interface.c,v 1.92 2002/03/11 07:23:10 gbazin Exp $
+ * $Id: interface.c,v 1.93 2002/04/23 14:16:21 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
p_main->p_playlist->b_stopped = 0;
p_main->p_playlist->i_mode = PLAYLIST_FORWARD +
- config_GetIntVariable( "playlist_loop" );
+ config_GetIntVariable( "loop-playlist" );
intf_WarnMsg( 3, "intf: creating new input thread" );
p_input = input_CreateThread( &p_main->p_playlist->current,
NULL );
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.185 2002/04/22 08:20:26 sam Exp $
+ * $Id: main.c,v 1.186 2002/04/23 14:16:21 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#endif
#ifdef HAVE_LOCALE_H
-# include <locale.h>
+# include <locale.h>
#endif
#include <errno.h> /* ENOMEM */
#include "debug.h"
/*****************************************************************************
- * Configuration options for the main program. Each plugin will also separatly
+ * Configuration options for the main program. Each module will also separatly
* define its own configuration options.
* Look into configuration.h if you need to know more about the following
* macros.
#define VCD_DEV_TEXT N_("VCD device")
#define VCD_DEV_LONGTEXT ""
-#define SAT_FREQ_TEXT N_("satellite transponder frequency")
-#define SAT_FREQ_LONGTEXT ""
-
-#define SAT_POL_TEXT N_("satellite transponder polarization")
-#define SAT_POL_LONGTEXT ""
-
-#define SAT_FEC_TEXT N_("satellite transponder FEC")
-#define SAT_FEC_LONGTEXT ""
-
-#define SAT_SRATE_TEXT N_("satellite transponder symbol rate")
-#define SAT_SRATE_LONGTEXT ""
-
-#define SAT_DISEQC_TEXT N_("use diseqc with antenna")
-#define SAT_DISEQC_LONGTEXT ""
-
-#define SAT_LNB_LOF1_TEXT N_("antenna lnb_lof1 (kHz)")
-#define SAT_LNB_LOF1_LONGTEXT ""
-
-#define SAT_LNB_LOF2_TEXT N_("antenna lnb_lof2 (kHz)")
-#define SAT_LNB_LOF2_LONGTEXT ""
-
-#define SAT_LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
-#define SAT_LNB_SLOF_LONGTEXT ""
-
#define IPV6_TEXT N_("force IPv6")
#define IPV6_LONGTEXT ""
* ADD_SUBCATEGORY_HINT( N_(text), longtext )
* ADD_STRING( option_name, value, p_callback, N_(text), N_(longtext) )
* ADD_FILE( option_name, psz_value, p_callback, N_(text), N_(longtext) )
- * ADD_PLUGIN( option_name, psz_value, i_capability, p_callback,
+ * ADD_MODULE( option_name, psz_value, i_capability, p_callback,
* N_(text), N_(longtext) )
* ADD_INTEGER( option_name, i_value, p_callback, N_(text), N_(longtext) )
* ADD_BOOL( option_name, p_callback, N_(text), N_(longtext) )
/* Interface options */
ADD_CATEGORY_HINT( N_("Interface"), NULL)
-ADD_PLUGIN_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
ADD_INTEGER ( "warning", 0, NULL, WARNING_TEXT, WARNING_LONGTEXT )
ADD_BOOL ( "stats", NULL, STATS_TEXT, STATS_LONGTEXT )
-ADD_STRING ( "search_path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
+ADD_STRING ( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
/* Audio options */
ADD_CATEGORY_HINT( N_("Audio"), NULL)
-ADD_PLUGIN_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
ADD_BOOL ( "noaudio", NULL, NOAUDIO_TEXT, NOAUDIO_LONGTEXT )
ADD_BOOL ( "mono", NULL, MONO_TEXT, MONO_LONGTEXT )
ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT )
ADD_INTEGER ( "rate", 44100, NULL, RATE_TEXT, RATE_LONGTEXT )
ADD_INTEGER ( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT )
-ADD_INTEGER ( "aout_format", 0, NULL, FORMAT_TEXT,
+ADD_INTEGER ( "audio-format", 0, NULL, FORMAT_TEXT,
FORMAT_LONGTEXT )
/* Video options */
ADD_CATEGORY_HINT( N_("Video"), NULL )
-ADD_PLUGIN_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
ADD_BOOL ( "novideo", NULL, NOVIDEO_TEXT, NOVIDEO_LONGTEXT )
ADD_INTEGER ( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT )
ADD_INTEGER ( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT )
ADD_BOOL ( "fullscreen", NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT )
ADD_BOOL ( "nooverlay", NULL, NOOVERLAY_TEXT, NOOVERLAY_LONGTEXT )
ADD_INTEGER ( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT )
-ADD_PLUGIN ( "filter", MODULE_CAPABILITY_VOUT, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT )
+ADD_MODULE ( "filter", MODULE_CAPABILITY_VOUT, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT )
/* Input options */
ADD_CATEGORY_HINT( N_("Input"), NULL )
-ADD_INTEGER ( "server_port", 1234, NULL, SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT )
-ADD_BOOL ( "network_channel", NULL, NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT )
-ADD_STRING ( "channel_server", "localhost", NULL, CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT )
-ADD_INTEGER ( "channel_port", 6010, NULL, CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT )
+ADD_INTEGER ( "server-port", 1234, NULL, SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT )
+ADD_BOOL ( "network-channel", NULL, NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT )
+ADD_STRING ( "channel-server", "localhost", NULL, CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT )
+ADD_INTEGER ( "channel-port", 6010, NULL, CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT )
ADD_STRING ( "iface", "eth0", NULL, IFACE_TEXT, IFACE_LONGTEXT )
-ADD_INTEGER ( "input_program", 0, NULL, INPUT_PROGRAM_TEXT,
- INPUT_PROGRAM_LONGTEXT )
-ADD_INTEGER ( "input_audio", -1, NULL, INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT )
-ADD_INTEGER ( "input_channel", -1, NULL, INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT )
-ADD_INTEGER ( "input_subtitle", -1, NULL, INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT )
-
-ADD_STRING ( "dvd_device", "/dev/dvd", NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT )
-ADD_STRING ( "vcd_device", "/dev/cdrom", NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT )
-#ifdef HAVE_SATELLITE
-ADD_INTEGER ( "sat_frequency", 11954, NULL, SAT_FREQ_TEXT, SAT_FREQ_LONGTEXT )
-ADD_INTEGER ( "sat_polarization", 0, NULL, SAT_POL_TEXT, SAT_POL_LONGTEXT )
-ADD_INTEGER ( "sat_fec", 3, NULL, SAT_FEC_TEXT, SAT_FEC_LONGTEXT )
-ADD_INTEGER ( "sat_symbol_rate", 27500, NULL, SAT_SRATE_TEXT,
- SAT_SRATE_LONGTEXT )
-ADD_BOOL ( "sat_diseqc", 0, SAT_DISEQC_TEXT, SAT_DISEQC_LONGTEXT )
-ADD_INTEGER ( "sat_lnb_lof1", 10000, NULL, SAT_LNB_LOF1_TEXT,
- SAT_LNB_LOF1_LONGTEXT )
-ADD_INTEGER ( "sat_lnb_lof2", 10000, NULL, SAT_LNB_LOF2_TEXT,
- SAT_LNB_LOF2_LONGTEXT )
-ADD_INTEGER ( "sat_lnb_slof", 11700, NULL, SAT_LNB_SLOF_TEXT,
- SAT_LNB_SLOF_LONGTEXT )
-#endif
+ADD_INTEGER ( "program", 0, NULL, INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT )
+ADD_INTEGER ( "audio-type", -1, NULL, INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT )
+ADD_INTEGER ( "audio-channel", -1, NULL, INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT )
+ADD_INTEGER ( "spu-channel", -1, NULL, INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT )
+
+ADD_STRING ( "dvd", "/dev/dvd", NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT )
+ADD_STRING ( "vcd", "/dev/cdrom", NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "ipv6", '6', NULL, IPV6_TEXT, IPV6_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "ipv4", '4', NULL, IPV4_TEXT, IPV4_LONGTEXT )
/* Decoder options */
ADD_CATEGORY_HINT( N_("Decoders"), NULL )
-ADD_PLUGIN ( "mpeg_adec", MODULE_CAPABILITY_DECODER, NULL, NULL, ADEC_MPEG_TEXT, ADEC_MPEG_LONGTEXT )
-ADD_PLUGIN ( "ac3_adec", MODULE_CAPABILITY_DECODER, NULL, NULL, ADEC_AC3_TEXT, ADEC_AC3_LONGTEXT )
-ADD_INTEGER ( "vdec_smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT )
-ADD_STRING ( "vpar_synchro", NULL, NULL, VPAR_SYNCHRO_TEXT, VPAR_SYNCHRO_LONGTEXT )
+ADD_MODULE ( "mpeg-adec", MODULE_CAPABILITY_DECODER, NULL, NULL, ADEC_MPEG_TEXT, ADEC_MPEG_LONGTEXT )
+ADD_MODULE ( "ac3-adec", MODULE_CAPABILITY_DECODER, NULL, NULL, ADEC_AC3_TEXT, ADEC_AC3_LONGTEXT )
+ADD_INTEGER ( "vdec-smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT )
+ADD_STRING ( "vpar-synchro", NULL, NULL, VPAR_SYNCHRO_TEXT, VPAR_SYNCHRO_LONGTEXT )
/* CPU options */
ADD_CATEGORY_HINT( N_("CPU"), NULL )
/* Playlist options */
ADD_CATEGORY_HINT( N_("Playlist"), NULL )
-ADD_BOOL ( "playlist_launch", NULL, PLAYLIST_LAUNCH_TEXT, PLAYLIST_LAUNCH_LONGTEXT )
-ADD_BOOL ( "playlist_enqueue", NULL, PLAYLIST_ENQUEUE_TEXT, PLAYLIST_ENQUEUE_LONGTEXT )
-ADD_BOOL ( "playlist_loop", NULL, PLAYLIST_LOOP_TEXT, PLAYLIST_LOOP_LONGTEXT )
+ADD_BOOL ( "launch-playlist", NULL, PLAYLIST_LAUNCH_TEXT, PLAYLIST_LAUNCH_LONGTEXT )
+ADD_BOOL ( "enqueue-playlist", NULL, PLAYLIST_ENQUEUE_TEXT, PLAYLIST_ENQUEUE_LONGTEXT )
+ADD_BOOL ( "loop-playlist", NULL, PLAYLIST_LOOP_TEXT, PLAYLIST_LOOP_LONGTEXT )
/* Misc options */
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_PLUGIN ( "memcpy", MODULE_CAPABILITY_MEMCPY, NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT )
+ADD_MODULE ( "memcpy", MODULE_CAPABILITY_MEMCPY, NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT )
+ADD_MODULE ( "access", MODULE_CAPABILITY_ACCESS, NULL, NULL, "access module", "This is a legacy entry to let you configure access modules" )
+ADD_MODULE ( "demux", MODULE_CAPABILITY_DEMUX, NULL, NULL, "demux module", "This is a legacy entry to let you configure demux modules" )
#if defined(WIN32)
ADD_BOOL ( "fast_pthread", NULL, FAST_PTHREAD_TEXT, FAST_PTHREAD_LONGTEXT )
{ MODULE_CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help"),
NULL, NULL, 0, 0, NULL, NULL, 0 },
{ MODULE_CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available "
- "plugins"), NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_STRING, "plugin", 'p', N_("print help on plugin "
+ "modules"), NULL, NULL, 0, 0, NULL, NULL, 0 },
+ { MODULE_CONFIG_ITEM_STRING, "module", 'p', N_("print help on module "
"<string>"), NULL, NULL, 0, 0, NULL, &help_module.config_lock, 0 },
{ MODULE_CONFIG_ITEM_BOOL, "version", '\0',
N_("print version information"), NULL, NULL, 0, 0, NULL, NULL, 0 },
input_bank_t input_bank;
aout_bank_t aout_bank;
vout_bank_t vout_bank;
- char *psz_plugin;
+ char *psz_module;
char *p_tmp;
struct module_config_s *p_item;
/* Hack: insert the help module here */
help_module.psz_name = "help";
+ help_module.psz_longname = _( "help module" );
help_module.i_config_items =
sizeof(p_help_config) / sizeof(module_config_t) - 1;
vlc_mutex_init( &help_module.config_lock );
/*
* Load the builtins and plugins into the module_bank.
* We have to do it before config_Load*() because this also gets the
- * list of configuration options exported by each plugin and loads their
+ * list of configuration options exported by each module and loads their
* default values.
*/
module_LoadBuiltins();
p_module_bank->first = &help_module;
/* end hack */
- /* Check for help on plugins */
- if( (p_tmp = config_GetPszVariable( "plugin" )) )
+ /* Check for help on modules */
+ if( (p_tmp = config_GetPszVariable( "module" )) )
{
Usage( p_tmp );
free( p_tmp );
return( -1 );
}
- /* Check for plugin list option */
+ /* Check for module list option */
if( config_GetIntVariable( "list" ) )
{
ListModules();
/*
* Choose the best memcpy module
*/
- psz_plugin = config_GetPszVariable( "memcpy" );
+ psz_module = config_GetPszVariable( "memcpy" );
p_main->p_memcpy_module = module_Need( MODULE_CAPABILITY_MEMCPY,
- psz_plugin, NULL );
- if( psz_plugin ) free( psz_plugin );
+ psz_module, NULL );
+ if( psz_module ) free( psz_module );
if( p_main->p_memcpy_module == NULL )
{
intf_ErrMsg( "intf error: no suitable memcpy module, "
/*
* Initialize shared resources and libraries
*/
- if( config_GetIntVariable( "network_channel" ) &&
+ if( config_GetIntVariable( "network-channel" ) &&
network_ChannelCreate() )
{
/* On error during Channels initialization, switch off channels */
intf_ErrMsg( "intf error: channels initialization failed, "
"deactivating channels" );
- config_PutIntVariable( "network_channel", 0 );
+ config_PutIntVariable( "network-channel", 0 );
}
/*
/*
* Go back into channel 0 which is the network
*/
- if( config_GetIntVariable( "network_channel" ) && p_main->p_channel )
+ if( config_GetIntVariable( "network-channel" ) && p_main->p_channel )
{
network_ChannelJoin( COMMON_CHANNEL );
}
*****************************************************************************/
static void Usage( const char *psz_module_name )
{
+#define FORMAT_STRING " --%s%s%s%s%s %s"
+ /* option name ---------------' | | | | |
+ * <bra ------------------------' | | | |
+ * option type or "" -------------' | | |
+ * ket> ----------------------------' | |
+ * padding spaces --------------------' |
+ * comment ------------------------------'
+ *
+ * The purpose of having bra and ket is that we might i18n them as well.
+ */
+#define LINE_START 8
+#define PADDING_SPACES 25
module_t *p_module;
module_config_t *p_item;
- char psz_spaces[30];
- char psz_format[sizeof(" --%s%s%s %s")];
+ char psz_spaces[PADDING_SPACES+LINE_START+1];
+ char psz_format[sizeof(FORMAT_STRING)];
+
+ memset( psz_spaces, ' ', PADDING_SPACES+LINE_START );
+ psz_spaces[PADDING_SPACES+LINE_START] = '\0';
- memset( psz_spaces, ' ', 30 );
- memcpy( psz_format, " --%s%s%s %s", sizeof(psz_format) );
+ strcpy( psz_format, FORMAT_STRING );
#ifdef WIN32
ShowConsole();
if( psz_module_name && strcmp( psz_module_name, p_module->psz_name ) )
continue;
- /* ignore plugins without config options */
+ /* ignore modules without config options */
if( !p_module->i_config_items ) continue;
/* print module name */
p_item->i_type != MODULE_CONFIG_HINT_END;
p_item++ )
{
+ char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
int i;
if( p_item->i_short )
case MODULE_CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_PLUGIN:
- /* Nasty hack, but right now I'm too tired to think about
- * a nice solution */
- i = 25 - strlen( p_item->psz_name )
- - strlen(_(" <string>")) - 1;
- if( i < 0 ) i = 0; psz_spaces[i] = 0;
-
- intf_Msg( psz_format, p_item->psz_name,
- _(" <string>"), psz_spaces, p_item->psz_text );
- psz_spaces[i] = ' ';
+ case MODULE_CONFIG_ITEM_MODULE: /* We could also have "=<" here */
+ psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
break;
case MODULE_CONFIG_ITEM_INTEGER:
- /* Nasty hack, but right now I'm too tired to think about
- * a nice solution */
- i = 25 - strlen( p_item->psz_name )
- - strlen(_(" <integer>")) - 1;
- if( i < 0 ) i = 0; psz_spaces[i] = 0;
-
- intf_Msg( psz_format, p_item->psz_name,
- _(" <integer>"), psz_spaces, p_item->psz_text );
- psz_spaces[i] = ' ';
+ psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
break;
case MODULE_CONFIG_ITEM_FLOAT:
- /* Nasty hack, but right now I'm too tired to think about
- * a nice solution */
- i = 25 - strlen( p_item->psz_name )
- - strlen(_(" <float>")) - 1;
- if( i < 0 ) i = 0; psz_spaces[i] = 0;
-
- intf_Msg( psz_format, p_item->psz_name,
- _(" <float>"), psz_spaces, p_item->psz_text );
- psz_spaces[i] = ' ';
+ psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break;
case MODULE_CONFIG_ITEM_BOOL:
- /* Nasty hack, but right now I'm too tired to think about
- * a nice solution */
- i = 25 - strlen( p_item->psz_name ) - 1;
- if( i < 0 ) i = 0; psz_spaces[i] = 0;
+ psz_bra = ""; psz_type = ""; psz_ket = "";
+ break;
+ }
- intf_Msg( psz_format,
- p_item->psz_name, "", psz_spaces, p_item->psz_text );
+ if( psz_type )
+ {
+ i = PADDING_SPACES - strlen( p_item->psz_name )
+ - strlen( psz_bra ) - strlen( psz_type )
+ - strlen( psz_ket ) - 1;
+ if( i < 0 )
+ {
+ i = 0;
+ psz_spaces[i] = '\n';
+ }
+ else
+ {
+ psz_spaces[i] = '\0';
+ }
+
+ intf_Msg( psz_format, p_item->psz_name, psz_bra, psz_type,
+ psz_ket, psz_spaces, p_item->psz_text );
psz_spaces[i] = ' ';
- break;
}
}
static void ListModules( void )
{
module_t *p_module;
- char psz_spaces[20];
+ char psz_spaces[22];
- memset( psz_spaces, 32, 20 );
+ memset( psz_spaces, ' ', 22 );
#ifdef WIN32
ShowConsole();
intf_Msg( _("Usage: %s [options] [parameters] [file]...\n"),
p_main->psz_arg0 );
- intf_Msg( _("[plugin] [description]") );
+ intf_Msg( _("[module] [description]") );
/* Enumerate each module */
for( p_module = p_module_bank->first ;
/* Nasty hack, but right now I'm too tired to think about a nice
* solution */
- i = 20 - strlen( p_module->psz_name ) - 1;
+ i = 22 - strlen( p_module->psz_name ) - 1;
if( i < 0 ) i = 0;
psz_spaces[i] = 0;
intf_Msg( " %s%s %s", p_module->psz_name, psz_spaces,
p_module->psz_longname );
- psz_spaces[i] = 32;
+ psz_spaces[i] = ' ';
}
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.18 2002/04/21 21:29:20 gbazin Exp $
+ * $Id: configuration.c,v 1.19 2002/04/23 14:16:21 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*****************************************************************************
* This function is used to get the value of variables which are internally
* represented by a string (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE,
- * and MODULE_CONFIG_ITEM_PLUGIN).
+ * and MODULE_CONFIG_ITEM_MODULE).
*
* Important note: remember to free() the returned char* because it a duplicate
* of the actual value. It isn't safe to return a pointer to the actual value
}
if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) &&
(p_config->i_type!=MODULE_CONFIG_ITEM_FILE) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_PLUGIN) )
+ (p_config->i_type!=MODULE_CONFIG_ITEM_MODULE) )
{
intf_ErrMsg( "config error: option %s doesn't refer to a string",
psz_name );
*****************************************************************************
* This function is used to set the value of variables which are internally
* represented by a string (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE,
- * and MODULE_CONFIG_ITEM_PLUGIN).
+ * and MODULE_CONFIG_ITEM_MODULE).
*****************************************************************************/
void config_PutPszVariable( const char *psz_name, char *psz_value )
{
}
if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) &&
(p_config->i_type!=MODULE_CONFIG_ITEM_FILE) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_PLUGIN) )
+ (p_config->i_type!=MODULE_CONFIG_ITEM_MODULE) )
{
intf_ErrMsg( "config error: option %s doesn't refer to a string",
psz_name );
* It's no use to save the config options that kept their default values, so
* we'll try to be a bit clever here.
*
- * When we save we mustn't delete the config options of the plugins that
+ * When we save we mustn't delete the config options of the modules that
* haven't been loaded. So we cannot just create a new config file with the
* config structures we've got in memory.
* I don't really know how to deal with this nicely, so I will use a completly
case MODULE_CONFIG_ITEM_BOOL:
case MODULE_CONFIG_ITEM_INTEGER:
if( p_item->psz_text )
- fprintf( file, "# %s %s\n", p_item->psz_text,
+ fprintf( file, "# %s (%s)\n", p_item->psz_text,
(p_item->i_type == MODULE_CONFIG_ITEM_BOOL) ?
- _("<boolean>") : _("<integer>") );
+ _("boolean") : _("integer") );
fprintf( file, "%s=%i\n", p_item->psz_name,
p_item->i_value );
break;
case MODULE_CONFIG_ITEM_FLOAT:
if( p_item->psz_text )
- fprintf( file, _("# %s <float>\n"), p_item->psz_text );
+ fprintf( file, "# %s (%s)\n", p_item->psz_text,
+ _("float") );
fprintf( file, "%s=%f\n", p_item->psz_name,
(double)p_item->f_value );
break;
default:
if( p_item->psz_text )
- fprintf( file, _("# %s <string>\n"), p_item->psz_text );
+ fprintf( file, "# %s (%s)\n", p_item->psz_text,
+ _("string") );
fprintf( file, "%s=%s\n", p_item->psz_name,
p_item->psz_value ? p_item->psz_value : "" );
}
{
case MODULE_CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_PLUGIN:
+ case MODULE_CONFIG_ITEM_MODULE:
config_PutPszVariable( p_longopts[i_index].name, optarg );
break;
case MODULE_CONFIG_ITEM_INTEGER:
{
case MODULE_CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_PLUGIN:
+ case MODULE_CONFIG_ITEM_MODULE:
config_PutPszVariable( pp_shortopts[i_cmd]->psz_name, optarg );
break;
case MODULE_CONFIG_ITEM_INTEGER:
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.61 2002/03/19 00:30:44 sam Exp $
+ * $Id: netutils.c,v 1.62 2002/04/23 14:16:21 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
struct timeval delay;
fd_set fds;
- if( !config_GetIntVariable( "network_channel" ) )
+ if( !config_GetIntVariable( "network-channel" ) )
{
intf_ErrMsg( "network: channels disabled, to enable them, use the"
"--channels option" );
}
/* Getting information about the channel server */
- if( !(psz_vlcs = config_GetPszVariable( "channel_server" )) )
+ if( !(psz_vlcs = config_GetPszVariable( "channel-server" )) )
{
intf_ErrMsg( "network: configuration variable channel_server empty" );
return -1;
}
- i_port = config_GetIntVariable( "channel_port" );
+ i_port = config_GetIntVariable( "channel-port" );
intf_WarnMsg( 5, "channel: connecting to %s:%d",
psz_vlcs, i_port );
projects / vlc / commitdiff