Skip to content

V
vlc-2-2
Commit 7291e0a7 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

(new in MAIN) 

  * ./src/interface/interface.c: interfaces are no longer attached only to
    p_vlc.
  * ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
    ./src/input/input.c: improvements in the playlist handling (not quite that
    yet though).
(ported from v0_4_1_branch)
  * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
  * ./src/misc/configuration.c: fixed the --nofoo option handling.
  * ./src/interface/main.c: fixed two compilation warnings under Solaris.
parent c4c5b603
Hide whitespace changes
Inline Side-by-side
Showing with 1092 additions and 1054 deletions
ChangeLog
View file @ 7291e0a7
......@@ -4,6 +4,11 @@
HEAD
* ./src/interface/interface.c: interfaces are no longer attached only to
p_vlc.
* ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
./src/input/input.c: improvements in the playlist handling (not quite that
yet though).
* ./plugins/spudec/spu_decoder.c: we now use FIND_ANYWHERE to find a vout.
* ./plugins/dvd/dvd_es.c, ./plugins/satellite/input_satellite.c,
./plugins/dvdread/input_dvdread.c: updated outdated variable names.
......@@ -35,8 +40,21 @@ HEAD
* ALL: the first libvlc commit.
0.4.1
Not released yet
Mon, 3 Jun 2002 23:43:35 +0200
* ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
* ./src/misc/configuration.c: fixed the --nofoo option handling.
* ./src/interface/main.c: fixed two compilation warnings under Solaris.
* ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be
selected only once.
* ./plugins/win32/waveout.c: waveOutUnprepareHeader() was never being
called. This should fix the memory leak some people reported when using
the waveout plugin.
* ./src/misc/netutils.c: factored code common to the interfaces into the
network_ChannelJoin function.
* ./plugins/mga/xmga.c, ./plugins/x11/xcommon.c, ./plugins/sdl/vout_sdl.c,
./plugins/directx/vout_events.c: we can now use keys F1 to F12 to switch
channels from the video output window.
* ./plugins/motion/motionmmx.c: MMX motion optimizations courtesy of
Vladimir Chernyshov <greengrass@writeme.com>.
* ./plugins/dvdread/dvdread.c: disabled the dvdread plugin because it
......
Makefile.opts.in
View file @ 7291e0a7
......@@ -58,20 +58,21 @@ builtins_CFLAGS := @builtins_CFLAGS@
a52_CFLAGS = @a52_CFLAGS@
arts_CFLAGS = @arts_CFLAGS@
chroma_i420_yuy2_mmx_CFLAGS = @chroma_i420_yuy2_mmx_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
dvd_CFLAGS = @dvd_CFLAGS@
dvdread_CFLAGS = @dvdread_CFLAGS@
mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
esd_CFLAGS = @esd_CFLAGS@
ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
glide_CFLAGS = @glide_CFLAGS@
gnome_CFLAGS = @gnome_CFLAGS@
gtk_CFLAGS = @gtk_CFLAGS@
kde_CFLAGS = @kde_CFLAGS@
idctaltivec_CFLAGS = @idctaltivec_CFLAGS@
kde_CFLAGS = @kde_CFLAGS@
mad_CFLAGS = @mad_CFLAGS@
memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
mpeg_ts_dvbpsi_CFLAGS = @mpeg_ts_dvbpsi_CFLAGS@
qt_CFLAGS = @qt_CFLAGS@
sdl_CFLAGS = @sdl_CFLAGS@
x11_CFLAGS = @x11_CFLAGS@
......@@ -94,7 +95,6 @@ directx_LDFLAGS = @directx_LDFLAGS@
dsp_LDFLAGS = @dsp_LDFLAGS@
dvd_LDFLAGS = @dvd_LDFLAGS@
dvdread_LDFLAGS = @dvdread_LDFLAGS@
mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
esd_LDFLAGS = @esd_LDFLAGS@
filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
......@@ -115,6 +115,7 @@ macosx_LDFLAGS = @macosx_LDFLAGS@
mad_LDFLAGS = @mad_LDFLAGS@
memcpyaltivec_LDFLAGS = @memcpyaltivec_LDFLAGS@
motionaltivec_LDFLAGS = @motionaltivec_LDFLAGS@
mpeg_ts_dvbpsi_LDFLAGS = @mpeg_ts_dvbpsi_LDFLAGS@
ncurses_LDFLAGS = @ncurses_LDFLAGS@
qnx_LDFLAGS = @qnx_LDFLAGS@
qt_LDFLAGS = @qt_LDFLAGS@
......
TODO
View file @ 7291e0a7
......@@ -47,7 +47,7 @@ Urgency: Wishlist
Description: Share stream information between vlc and vls
vls should send misc TS packets to let us know what the stream PID
contain, such as the language, or the subtitle palette.
Status: Todo
Status: Done (collective work)
Task: 0x59
Difficulty: Hard
......@@ -137,7 +137,7 @@ Description: Fix all known DVD playback issues
A few DVDs are still reported not to work at all. Try to find what is
causing this, have a more robust DVD input, and list all discs reported
to work flawlessly to prevent bug regression.
Status: Todo
Status: Done (collective work)
Task: 0x4e
Difficulty: Hard
......@@ -169,7 +169,7 @@ Urgency: Normal
Description: Write AVI input plugin
.avi files can use MPEG codec, if this is the case it shouldn't be
hard to read those files -> Meuuh
Status: Todo
Status: Done 23 Apr 2002 (fenrir)
Task: 0x4a
Difficulty: Medium
......@@ -459,7 +459,7 @@ Difficulty: Hard
Urgency: Wishlist
Description: MP3 support
The vlc cannot play MPEG1/2 layer 3 yet. It might be nice to fix that.
Status: Todo
Status: Done 10 May 2002 (fenrir)
Task: 0x25
Difficulty: Hard
......
configure
View file @ 7291e0a7
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ 7291e0a7
......@@ -3,16 +3,22 @@ AC_INIT(include/main.h)
AC_CONFIG_HEADER(include/defs.h)
AC_CANONICAL_SYSTEM
CONFIGURE_LINE="$0 $*"
PACKAGE="vlc"
VERSION="0.4.0"
CODENAME=Ourumov
VERSION="0.5.0-cvs"
CODENAME="Natalya"
dnl Save CFLAGS and LDFLAGS
save_CFLAGS="${CFLAGS}"
dnl
dnl Save *FLAGS
dnl
save_CPPFLAGS="${CPPFLAGS}"
save_CFLAGS="${CFLAGS}"
save_LDFLAGS="${LDFLAGS}"
dnl
dnl Check for tools
dnl
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CPP
......@@ -21,7 +27,9 @@ dnl Find the right ranlib, even when cross-compiling
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(STRIP, strip, :)
dnl
dnl Check for GNU make
dnl
AC_PATH_PROG(GMAKE, gmake, no)
if test "x$GMAKE" = "xno"; then
AC_CACHE_CHECK([whether GNU make is installed],
......@@ -48,6 +56,11 @@ AM_GNU_GETTEXT
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
dnl
dnl Set default LDFLAGS
dnl
vlc_LDFLAGS="${LDFLAGS}"
dnl
dnl Check the operating system
dnl
......@@ -120,6 +133,10 @@ AC_CHECK_FUNC(connect,,[
ipv4_LDFLAGS="${ipv4_LDFLAGS} -lsocket"
vlc_LDFLAGS="${vlc_LDFLAGS} -lsocket"
)])
AC_CHECK_FUNC(send,,[
AC_CHECK_LIB(socket,send,
http_LDFLAGS="${http_LDFLAGS} -lsocket"
)])
AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lnsl")
])
......@@ -137,7 +154,7 @@ AC_CHECK_FUNC(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,ipv4_LDFLAGS="${ipv4_LDFLAGS} -lresolv")
])
AC_CHECK_FUNC(textdomain,,[
AC_CHECK_LIB(intl,textdomain,save_LDFLAGS="${save_LDFLAGS} -lintl")
AC_CHECK_LIB(intl,textdomain,vlc_LDFLAGS="${vlc_LDFLAGS} -lintl")
])
dnl Check for getopt
......@@ -154,6 +171,7 @@ AC_CHECK_LIB(m,cos,
imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
filter_distort_LDFLAGS="${filter_distort_LDFLAGS} -lm")
AC_CHECK_LIB(m,pow,
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} -lm"
imdct_LDFLAGS="${imdct_LDFLAGS} -lm"
imdct3dn_LDFLAGS="${imdct3dn_LDFLAGS} -lm"
imdctsse_LDFLAGS="${imdctsse_LDFLAGS} -lm"
......@@ -183,12 +201,15 @@ dnl Check for misc headers
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_cond_t.)])
AC_EGREP_HEADER(pthread_once,pthread.h,[
AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1,
Define if <pthread.h> defines pthread_once.)])
AC_EGREP_HEADER(strncasecmp,strings.h,[
AC_DEFINE(STRNCASECMP_IN_STRINGS_H, 1,
Define if <strings.h> defines strncasecmp.)])
dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h)
AC_CHECK_HEADERS(stdint.h getopt.h strings.h inttypes.h sys/int_types.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h)
AC_CHECK_HEADERS(dlfcn.h image.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
......@@ -254,17 +275,17 @@ fi
dnl Check for -W or -w flags
AC_CACHE_CHECK([if \$CC accepts -Wall -Winline],
[ac_cv_c_Wall_Winline],
[CFLAGS="${save_CFLAGS} -Wall -Winline"
[CFLAGS="-Wall -Winline ${save_CFLAGS}"
AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)])
if test x"$ac_cv_c_Wall_Winline" != x"no"; then
save_CFLAGS="${save_CFLAGS} -Wall -Winline"
save_CFLAGS="-Wall -Winline ${save_CFLAGS}"
else
AC_CACHE_CHECK([if \$CC accepts -wall -winline],
[ac_cv_c_wall_winline],
[CFLAGS="${save_CFLAGS} -wall -winline"
[CFLAGS="-wall -winline ${save_CFLAGS}"
AC_TRY_COMPILE([],,ac_cv_c_wall_winline=yes, ac_cv_c_wall_winline=no)])
if test x"$ac_cv_c_wall_winline" != x"no"; then
save_CFLAGS="${save_CFLAGS} -wall -winline"
save_CFLAGS="-wall -winline ${save_CFLAGS}"
fi
fi
......@@ -327,6 +348,8 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer],
AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test x"$ac_cv_c_omit_frame_pointer" != x"no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
# this plugin does not compile without -fomit-frame-pointer, damn gcc!
chroma_i420_yuy2_mmx_CFLAGS="${chroma_i420_yuy2_mmx_CFLAGS} -fomit-frame-pointer"
fi
dnl Check for Darwin plugin linking flags
......@@ -376,36 +399,6 @@ if test x"$ac_cv_c_attribute_aligned" != x"0"; then
[$ac_cv_c_attribute_aligned],[Maximum supported data alignment])
fi
dnl End of the bizarre compilation tests
CFLAGS="${save_CFLAGS}"
CPPFLAGS="${save_CPPFLAGS}"
LDFLAGS="${save_LDFLAGS}"
dnl Check for boolean_t
AC_CACHE_CHECK([for boolean_t in sys/types.h],
[ac_cv_c_boolean_t_sys_types_h],
[AC_TRY_COMPILE([#include <sys/types.h>], [boolean_t foo;],
ac_cv_c_boolean_t_sys_types_h=yes, ac_cv_c_boolean_t_sys_types_h=no)])
if test x"$ac_cv_c_boolean_t_sys_types_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_SYS_TYPES_H, 1, Define if <sys/types.h> defines boolean_t.)
fi
AC_CACHE_CHECK([for boolean_t in pthread.h],
[ac_cv_c_boolean_t_pthread_h],
[AC_TRY_COMPILE([#include <pthread.h>], [boolean_t foo;],
ac_cv_c_boolean_t_pthread_h=yes, ac_cv_c_boolean_t_pthread_h=no)])
if test x"$ac_cv_c_boolean_t_pthread_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_PTHREAD_H, 1, Define if <pthread.h> defines boolean_t.)
fi
AC_CACHE_CHECK([for boolean_t in cthreads.h],
[ac_cv_c_boolean_t_cthreads_h],
[AC_TRY_COMPILE([#include <cthreads.h>], [boolean_t foo;],
ac_cv_c_boolean_t_cthreads_h=yes, ac_cv_c_boolean_t_cthreads_h=no)])
if test x"$ac_cv_c_boolean_t_cthreads_h" != x"no"; then
AC_DEFINE(BOOLEAN_T_IN_CTHREADS_H, 1, Define if <cthreads.h> defines boolean_t.)
fi
dnl
dnl Check the CPU
dnl
......@@ -421,8 +414,8 @@ esac
dnl
dnl default modules
dnl
BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_ps mpeg_ts mpeg_audio file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone fx_scope"
BUILTINS="${BUILTINS} idct idctclassic motion imdct downmix mpeg_adec ac3_adec mpeg_vdec"
PLUGINS="${PLUGINS} dummy null rc logger mpeg_es mpeg_audio mpeg_ps mpeg_ts file udp http ipv4 memcpy lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort filter_clone filter_crop fx_scope chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga"
dnl
dnl Accelerated modules
......@@ -435,7 +428,8 @@ ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
[CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));],
ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
if test x"$ac_cv_mmx_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
......@@ -443,7 +437,8 @@ fi
AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly],
[ac_cv_mmxext_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
[CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));],
ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
if test x"$ac_cv_mmxext_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
......@@ -451,7 +446,8 @@ fi
AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly],
[ac_cv_3dnow_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
[CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));],
ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)])
if test x"$ac_cv_3dnow_inline" != x"no"; then
AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.)
......@@ -460,29 +456,29 @@ fi
AC_CACHE_CHECK([if \$CC groks SSE inline assembly],
[ac_cv_sse_inline],
[AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
[CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));],
ac_cv_sse_inline=yes, ac_cv_sse_inline=no)])
if test x"$ac_cv_sse_inline" != x"no" -a x$SYS != xmingw32; then
AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.)
ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}"
fi
# don't try to grok altivec with native mingw32 it doesn't work right now
# don't try to grok AltiVec with native mingw32 it doesn't work right now
# we should be able to remove this test with future versions of mingw32
if test x$SYS != xmingw32; then
AC_CACHE_CHECK([if \$CC groks Altivec inline assembly],
AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly],
[ac_cv_altivec_inline],
[AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
[CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
ac_cv_altivec_inline=yes,
[save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Wa,-m7400"
[CFLAGS="$save_CFLAGS -Wa,-m7400"
AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");],
[ac_cv_altivec_inline="-Wa,-m7400"],
ac_cv_altivec_inline=no)
CFLAGS=$save_CFLAGS
])])
if test x"$ac_cv_altivec_inline" != x"no"; then
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks ALTIVEC inline assembly.)
AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.)
if test x"$ac_cv_altivec_inline" != x"yes"; then
idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_altivec_inline"
motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_altivec_inline"
......@@ -492,10 +488,9 @@ if test x"$ac_cv_altivec_inline" != x"no"; then
ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
fi
AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
AC_CACHE_CHECK([if \$CC groks AltiVec C extensions],
[ac_cv_c_altivec],
[save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -faltivec"
[CFLAGS="$save_CFLAGS -faltivec"
# Darwin test
AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
ac_cv_c_altivec=-faltivec, [
......@@ -504,10 +499,9 @@ AC_CACHE_CHECK([if \$CC groks Altivec C extensions],
AC_TRY_COMPILE(,[vec_mtvscr((vector unsigned int)(0));],
[ac_cv_c_altivec="-fvec"], ac_cv_c_altivec=no)
])
CFLAGS=$save_CFLAGS
])
if test x"$ac_cv_c_altivec" != x"no"; then
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C altivec extensions.)
AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
idctaltivec_CFLAGS="$idctaltivec_CFLAGS $ac_cv_c_altivec"
motionaltivec_CFLAGS="$motionaltivec_CFLAGS $ac_cv_c_altivec"
memcpyaltivec_CFLAGS="$memcpyaltivec_CFLAGS $ac_cv_c_altivec"
......@@ -517,10 +511,8 @@ fi
AC_CACHE_CHECK([if linker needs -framework vecLib],
[ac_cv_ld_altivec],
[save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -framework vecLib"
[LDFLAGS="$vlc_LDFLAGS -framework vecLib"
AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no)
LDFLAGS=$save_LDFLAGS
])
if test x"$ac_cv_ld_altivec" != x"no"; then
idctaltivec_LDFLAGS="${idctaltivec_LDFLAGS} -framework vecLib"
......@@ -555,7 +547,7 @@ dnl
if test x${target_cpu} = xi686 -o x${target_cpu} = xi586 -o x${target_cpu} = xx86 -o x${target_cpu} = xi386
then
ARCH="${ARCH} mmx"
BUILTINS="${BUILTINS} ${ACCEL_MODULES}"
PLUGINS="${PLUGINS} ${ACCEL_MODULES}"
fi
dnl
......@@ -570,7 +562,7 @@ dnl
dnl AltiVec acceleration
dnl
AC_ARG_ENABLE(altivec,
[ --disable-altivec disable altivec optimizations (default enabled on PPC)],
[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)],
[ if test x$enable_altivec = xyes; then ARCH="${ARCH} altivec";
BUILTINS="${BUILTINS} ${ACCEL_MODULES}"; fi ],
[ if test x${target_cpu} = xpowerpc; then ARCH="${ARCH} altivec";
......@@ -685,6 +677,7 @@ then
fi
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
CFLAGS="${save_CFLAGS}"
AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
[void foo() { int i=DVD_VIDEO_LB_LEN; }],[
PLUGINS="${PLUGINS} dvdread"
......@@ -725,8 +718,8 @@ then
x|xyes)
if test "x$with_dvbpsi_tree" = x
then
AC_CHECK_HEADERS(src/descriptors/dr.h,
[ PLUGINS="${PLUGINS} dvbpsi"
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [],
[ AC_MSG_ERROR([cannot find libdvbpsi headers]) ])
else
......@@ -825,6 +818,7 @@ dnl ipv6 plugin - not for QNX yet
dnl
if test x$SYS != xnto && test "x$SYS" != "xmingw32"
then
CFLAGS="$save_CFLAGS"
AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"])
fi
if test "x$SYS" = "xmingw32"
......@@ -896,18 +890,14 @@ then
AC_MSG_ERROR([the specified tree doesn't have mad.h])
fi
else
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $mad_CFLAGS"
LDFLAGS="$LDFLAGS $mad_LDFLAGS"
CFLAGS="$vlc_CFLAGS $mad_CFLAGS"
LDFLAGS="$vlc_LDFLAGS $mad_LDFLAGS"
AC_CHECK_HEADERS(mad.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libmad...]) ])
AC_CHECK_LIB(mad, mad_bit_init, [
PLUGINS="${PLUGINS} mad"
mad_LDFLAGS="${mad_LDFLAGS} -lmad" ],
[ AC_MSG_ERROR([Cannot find libmad library...]) ])
CFLAGS=$save_CFLAGS
LDFLAGS=$save_LDFLAGS
fi
fi
......@@ -1083,11 +1073,9 @@ if test x$enable_xvideo != xno &&
if test x$x_libraries = xNONE; then
x_libraries=/usr/X11R6/lib
fi
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$save_CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -L$x_libraries -lX11 -lXext"
CFLAGS="$save_CFLAGS -L$x_libraries -lX11 -lXext"
AC_CHECK_LIB(Xv_pic,XvSetPortAttribute,
# We have Xv_pic, that's good, we can build an xvideo.so plugin !
PLUGINS="${PLUGINS} xvideo"
......@@ -1097,7 +1085,6 @@ if test x$enable_xvideo != xno &&
BUILTINS="${BUILTINS} xvideo"
xvideo_LDFLAGS="${xvideo_LDFLAGS} -L$x_libraries -lX11 -lXext -lXv"
xvideo_CFLAGS="${xvideo_CFLAGS} -I$x_includes")
CFLAGS="$save_CFLAGS"
]
CPPFLAGS="$save_CPPFLAGS")
fi
......@@ -1588,18 +1575,26 @@ fi
dnl
dnl Profiling
dnl
PROFILING=0
GPROF=0
AC_ARG_ENABLE(gprof,
[ --enable-gprof gprof profiling (default disabled)],
[ if test "x$enable_gprof" = "xyes"; then GPROF=1; fi ])
[ if test "x$enable_gprof" = "xyes"
then
GPROF=1
PROFILING="gprof"
fi
])
CPROF=0
AC_ARG_ENABLE(cprof,
[ --enable-cprof cprof profiling (default disabled)],
[ if test "x$enable_cprof" = "xyes";
[ if test "x$enable_cprof" = "xyes"
then
LDFLAGS="${LDFLAGS} -lcprof"
CPROF=1
PROFILING="cprof"
fi
])
......@@ -1631,7 +1626,8 @@ AC_ARG_ENABLE(st,
fi])
])
LDFLAGS="${LDFLAGS} ${THREAD_LIB}"
vlc_LDFLAGS="${vlc_LDFLAGS} ${THREAD_LIB}"
plugins_LDFLAGS="${plugins_LDFLAGS} ${THREAD_LIB}"
dnl
dnl Plug-ins - this must be AT THE END
......@@ -1659,6 +1655,7 @@ dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "vlc $VERSION $CODENAME Copyright 1996-2002 VideoLAN", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version $VERSION $CODENAME - (c) 1996-2002 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "$CONFIGURE_LINE", [The ./configure command line])
VLC_SYMBOL="`echo ${VERSION} | tr .- __`"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__MODULE_$VLC_SYMBOL", [String suffix for module functions])
......@@ -1669,6 +1666,13 @@ AC_SUBST(DATA_PATH)
PLUGIN_PATH="${ac_tool_prefix}/share/videolan"
AC_SUBST(PLUGIN_PATH)
dnl
dnl Restore *FLAGS
dnl
CPPFLAGS="${save_CPPFLAGS}"
CFLAGS="${save_CFLAGS}"
LDFLAGS="${save_LDFLAGS}"
dnl
dnl Configuration is finished
dnl
......@@ -1701,6 +1705,7 @@ AC_SUBST(builtins_CFLAGS)
AC_SUBST(a52_CFLAGS)
AC_SUBST(arts_CFLAGS)
AC_SUBST(chroma_i420_yuy2_mmx_CFLAGS)
AC_SUBST(dvd_CFLAGS)
AC_SUBST(dvdread_CFLAGS)
AC_SUBST(mpeg_ts_dvbpsi_CFLAGS)
......@@ -1779,7 +1784,7 @@ optimizations : ${OPTIMS}
tuning : ${TUNING}
debug mode : ${DEBUG}
release : ${RELEASE}
cprof/gprof support : ${CPROF}/${GPROF}
profiling : ${PROFILING}
need builtin getopt : ${NEED_GETOPT}
built-in modules :${BUILTINS}
plug-in modules :${PLUGINS}
......
debian/control
View file @ 7291e0a7
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, a52dec-dev, aalib1-dev
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, a52dec-dev, aalib1-dev, libdvbpsi1-dev
Standards-Version: 3.5.6
Package: vlc
......
debian/rules
View file @ 7291e0a7
......@@ -9,7 +9,7 @@
export DH_COMPAT=3
# Compilation options
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa"
export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi"
# Remove --without-dvdcss here in non-totalitarian countries
export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"
......
include/defs.h.in
View file @ 7291e0a7
......@@ -190,6 +190,9 @@
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have the <dvbpsi/dr.h> header file. */
#undef HAVE_DVBPSI_DR_H
/* Define if you have the <dvdcss/dvdcss.h> header file. */
#undef HAVE_DVDCSS_DVDCSS_H
......
include/modules.h
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.53 2002/06/01 18:04:48 sam Exp $
* $Id: modules.h,v 1.54 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -122,9 +122,8 @@ struct module_s
* Variables set by the module to store its config options
*/
module_config_t *p_config; /* Module configuration structure */
vlc_mutex_t config_lock; /* lock used to modify the config */
unsigned int i_config_items; /* number of configuration items */
unsigned int i_bool_items; /* number of bool config items */
unsigned int i_config_items; /* number of configuration items */
unsigned int i_bool_items; /* number of bool config items */
/*
* Variables used internally by the module manager
......
include/playlist.h
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* vlc_playlist.h : Playlist functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: playlist.h,v 1.4 2002/06/01 18:04:48 sam Exp $
* $Id: playlist.h,v 1.5 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -26,9 +26,9 @@
*****************************************************************************/
struct playlist_item_s
{
char* psz_name;
int i_type; /* unused yet */
int i_status; /* unused yet */
char * psz_name;
int i_type; /* unused yet */
int i_status; /* unused yet */
};
/*****************************************************************************
......@@ -91,7 +91,6 @@ void playlist_Destroy ( playlist_t * );
#define playlist_Goto(p,i) playlist_Command(p,PLAYLIST_GOTO,i)
VLC_EXPORT( void, playlist_Command, ( playlist_t *, int, int ) );
#define playlist_Add(a,b,c) __playlist_Add(CAST_TO_VLC_OBJECT(a),b,c)
VLC_EXPORT( int, __playlist_Add, ( vlc_object_t *, int, const char * ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
VLC_EXPORT( int, playlist_Add, ( playlist_t *, int, const char * ) );
VLC_EXPORT( int, playlist_Delete, ( playlist_t *, int ) );
include/vlc_common.h
View file @ 7291e0a7
......@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc_common.h,v 1.5 2002/06/02 15:51:30 gbazin Exp $
* $Id: vlc_common.h,v 1.6 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -221,8 +221,10 @@ VLC_DECLARE_STRUCT(iso639_lang)
/* Thread properties, if any */ \
vlc_bool_t b_thread; \
vlc_thread_t thread_id; \
vlc_mutex_t thread_lock; \
vlc_cond_t thread_wait; \
\
/* Object access lock */ \
vlc_mutex_t object_lock; \
vlc_cond_t object_wait; \
\
volatile vlc_bool_t b_error; /* set by the object */ \
volatile vlc_bool_t b_die; /* set by the outside */ \
......
include/vlc_symbols.h
View file @ 7291e0a7
......@@ -92,17 +92,8 @@ struct module_symbols_s
int (* __network_ChannelJoin_inner) ( vlc_object_t *, int ) ;
int (* __network_ChannelCreate_inner) ( vlc_object_t * ) ;
void (* playlist_Command_inner) ( playlist_t *, int, int ) ;
int (* __playlist_Add_inner) ( vlc_object_t *, int, const char * ) ;
int (* playlist_Add_inner) ( playlist_t *, int, const char * ) ;
int (* playlist_Delete_inner) ( playlist_t *, int ) ;
int (* __vlc_threads_init_inner) ( vlc_object_t * ) ;
int (* vlc_threads_end_inner) ( void ) ;
int (* __vlc_mutex_init_inner) ( vlc_object_t *, vlc_mutex_t * ) ;
int (* __vlc_mutex_destroy_inner) ( char *, int, vlc_mutex_t * ) ;
int (* vlc_cond_init_inner) ( vlc_cond_t * ) ;
int (* __vlc_cond_destroy_inner) ( char *, int, vlc_cond_t * ) ;
int (* __vlc_thread_create_inner) ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), vlc_bool_t ) ;
void (* __vlc_thread_ready_inner) ( vlc_object_t * ) ;
void (* __vlc_thread_join_inner) ( vlc_object_t *, char *, int ) ;
vout_thread_t * (* __vout_CreateThread_inner) ( vlc_object_t *, int, int, u32, int ) ;
void (* vout_DestroyThread_inner) ( vout_thread_t * ) ;
int (* vout_ChromaCmp_inner) ( u32, u32 ) ;
......@@ -133,6 +124,15 @@ struct module_symbols_s
void (* __vlc_object_detach_all_inner) ( vlc_object_t * ) ;
void (* __vlc_object_attach_inner) ( vlc_object_t *, vlc_object_t * ) ;
void (* __vlc_dumpstructure_inner) ( vlc_object_t * ) ;
int (* __vlc_threads_init_inner) ( vlc_object_t * ) ;
int (* vlc_threads_end_inner) ( void ) ;
int (* __vlc_mutex_init_inner) ( vlc_object_t *, vlc_mutex_t * ) ;
int (* __vlc_mutex_destroy_inner) ( char *, int, vlc_mutex_t * ) ;
int (* vlc_cond_init_inner) ( vlc_cond_t * ) ;
int (* __vlc_cond_destroy_inner) ( char *, int, vlc_cond_t * ) ;
int (* __vlc_thread_create_inner) ( vlc_object_t *, char *, int, char *, void * ( * ) ( void * ), vlc_bool_t ) ;
void (* __vlc_thread_ready_inner) ( vlc_object_t * ) ;
void (* __vlc_thread_join_inner) ( vlc_object_t *, char *, int ) ;
};
#ifdef __PLUGIN__
......@@ -226,17 +226,8 @@ struct module_symbols_s
# define __network_ChannelJoin p_symbols->__network_ChannelJoin_inner
# define __network_ChannelCreate p_symbols->__network_ChannelCreate_inner
# define playlist_Command p_symbols->playlist_Command_inner
# define __playlist_Add p_symbols->__playlist_Add_inner
# define playlist_Add p_symbols->playlist_Add_inner
# define playlist_Delete p_symbols->playlist_Delete_inner
# define __vlc_threads_init p_symbols->__vlc_threads_init_inner
# define vlc_threads_end p_symbols->vlc_threads_end_inner
# define __vlc_mutex_init p_symbols->__vlc_mutex_init_inner
# define __vlc_mutex_destroy p_symbols->__vlc_mutex_destroy_inner
# define vlc_cond_init p_symbols->vlc_cond_init_inner
# define __vlc_cond_destroy p_symbols->__vlc_cond_destroy_inner
# define __vlc_thread_create p_symbols->__vlc_thread_create_inner
# define __vlc_thread_ready p_symbols->__vlc_thread_ready_inner
# define __vlc_thread_join p_symbols->__vlc_thread_join_inner
# define __vout_CreateThread p_symbols->__vout_CreateThread_inner
# define vout_DestroyThread p_symbols->vout_DestroyThread_inner
# define vout_ChromaCmp p_symbols->vout_ChromaCmp_inner
......@@ -267,5 +258,14 @@ struct module_symbols_s
# define __vlc_object_detach_all p_symbols->__vlc_object_detach_all_inner
# define __vlc_object_attach p_symbols->__vlc_object_attach_inner
# define __vlc_dumpstructure p_symbols->__vlc_dumpstructure_inner
# define __vlc_threads_init p_symbols->__vlc_threads_init_inner
# define vlc_threads_end p_symbols->vlc_threads_end_inner
# define __vlc_mutex_init p_symbols->__vlc_mutex_init_inner
# define __vlc_mutex_destroy p_symbols->__vlc_mutex_destroy_inner
# define vlc_cond_init p_symbols->vlc_cond_init_inner
# define __vlc_cond_destroy p_symbols->__vlc_cond_destroy_inner
# define __vlc_thread_create p_symbols->__vlc_thread_create_inner
# define __vlc_thread_ready p_symbols->__vlc_thread_ready_inner
# define __vlc_thread_join p_symbols->__vlc_thread_join_inner
#endif /* __PLUGIN__ */
plugins/directx/vout_events.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* vout_events.c: Windows DirectX video output events handler
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vout_events.c,v 1.22 2002/06/02 09:03:54 sam Exp $
* $Id: vout_events.c,v 1.23 2002/06/04 00:11:12 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -141,10 +141,22 @@ void DirectXEventThread( event_thread_t *p_event )
switch( msg.wParam )
{
case VK_ESCAPE:
case VK_F12:
/* exit application */
p_event->p_vlc->b_die = 1;
break;
case VK_F1: network_ChannelJoin( p_event, 1 ); break;
case VK_F2: network_ChannelJoin( p_event, 2 ); break;
case VK_F3: network_ChannelJoin( p_event, 3 ); break;
case VK_F4: network_ChannelJoin( p_event, 4 ); break;
case VK_F5: network_ChannelJoin( p_event, 5 ); break;
case VK_F6: network_ChannelJoin( p_event, 6 ); break;
case VK_F7: network_ChannelJoin( p_event, 7 ); break;
case VK_F8: network_ChannelJoin( p_event, 8 ); break;
case VK_F9: network_ChannelJoin( p_event, 9 ); break;
case VK_F10: network_ChannelJoin( p_event, 10 ); break;
case VK_F11: network_ChannelJoin( p_event, 11 ); break;
case VK_F12: network_ChannelJoin( p_event, 12 ); break;
}
TranslateMessage(&msg);
break;
......@@ -186,17 +198,6 @@ void DirectXEventThread( event_thread_t *p_event )
p_event->p_vout->p_sys->i_changes |= VOUT_INTF_CHANGE;
break;
case '0': network_ChannelJoin( p_event, 0 ); break;
case '1': network_ChannelJoin( p_event, 1 ); break;
case '2': network_ChannelJoin( p_event, 2 ); break;
case '3': network_ChannelJoin( p_event, 3 ); break;
case '4': network_ChannelJoin( p_event, 4 ); break;
case '5': network_ChannelJoin( p_event, 5 ); break;
case '6': network_ChannelJoin( p_event, 6 ); break;
case '7': network_ChannelJoin( p_event, 7 ); break;
case '8': network_ChannelJoin( p_event, 8 ); break;
case '9': network_ChannelJoin( p_event, 9 ); break;
default:
break;
}
......
plugins/gtk/gtk_callbacks.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* gtk_callbacks.c : Callbacks for the Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: gtk_callbacks.c,v 1.41 2002/06/01 18:04:48 sam Exp $
* $Id: gtk_callbacks.c,v 1.42 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -303,29 +303,7 @@ void GtkChannelGo( GtkButton * button, gpointer user_data )
msg_Dbg( p_intf, "joining channel %d", i_channel );
vlc_mutex_lock( &p_intf->change_lock );
if( p_intf->p_sys->p_input != NULL )
{
/* end playing item */
p_intf->p_sys->p_input->b_eof = 1;
#if 0 /* PLAYLIST TARASS */
/* update playlist */
vlc_mutex_lock( &p_intf->p_vlc->p_playlist->change_lock );
p_intf->p_vlc->p_playlist->i_index--;
p_intf->p_vlc->p_playlist->b_stopped = 1;
vlc_mutex_unlock( &p_intf->p_vlc->p_playlist->change_lock );
#endif
}
network_ChannelJoin( p_intf, i_channel );
/* FIXME 2 */
#if 0 /* PLAYLIST TARASS */
p_intf->p_vlc->p_playlist->b_stopped = 0;
#endif
vlc_mutex_unlock( &p_intf->change_lock );
// input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
......
plugins/mga/xmga.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xmga.c,v 1.16 2002/06/01 12:32:00 sam Exp $
* $Id: xmga.c,v 1.17 2002/06/04 00:11:12 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -494,6 +494,19 @@ static int vout_Manage( vout_thread_t *p_vout )
INPUT_STATUS_PAUSE );
break;
case XK_F1: network_ChannelJoin( p_vout, 1 ); break;
case XK_F2: network_ChannelJoin( p_vout, 2 ); break;
case XK_F3: network_ChannelJoin( p_vout, 3 ); break;
case XK_F4: network_ChannelJoin( p_vout, 4 ); break;
case XK_F5: network_ChannelJoin( p_vout, 5 ); break;
case XK_F6: network_ChannelJoin( p_vout, 6 ); break;
case XK_F7: network_ChannelJoin( p_vout, 7 ); break;
case XK_F8: network_ChannelJoin( p_vout, 8 ); break;
case XK_F9: network_ChannelJoin( p_vout, 9 ); break;
case XK_F10: network_ChannelJoin( p_vout, 10 ); break;
case XK_F11: network_ChannelJoin( p_vout, 11 ); break;
case XK_F12: network_ChannelJoin( p_vout, 12 ); break;
default:
/* "Normal Keys"
* The reason why I use this instead of XK_0 is that
......@@ -514,17 +527,6 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
break;
case '0': network_ChannelJoin( 0 ); break;
case '1': network_ChannelJoin( 1 ); break;
case '2': network_ChannelJoin( 2 ); break;
case '3': network_ChannelJoin( 3 ); break;
case '4': network_ChannelJoin( 4 ); break;
case '5': network_ChannelJoin( 5 ); break;
case '6': network_ChannelJoin( 6 ); break;
case '7': network_ChannelJoin( 7 ); break;
case '8': network_ChannelJoin( 8 ); break;
case '9': network_ChannelJoin( 9 ); break;
default:
break;
}
......
plugins/mpeg_system/mpeg_ts.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: mpeg_ts.c,v 1.14 2002/06/01 12:32:00 sam Exp $
* $Id: mpeg_ts.c,v 1.15 2002/06/04 00:11:12 sam Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
......@@ -35,12 +35,21 @@
#include "iso_lang.h"
#if defined MODULE_NAME_IS_mpeg_ts_dvbpsi
#include <dvbpsi/dvbpsi.h>
#include <dvbpsi/descriptor.h>
#include <dvbpsi/pat.h>
#include <dvbpsi/pmt.h>
#include <dvbpsi/dr.h>
# ifdef HAVE_DVBPSI_DR_H
# include <dvbpsi/dvbpsi.h>
# include <dvbpsi/descriptor.h>
# include <dvbpsi/pat.h>
# include <dvbpsi/pmt.h>
# include <dvbpsi/dr.h>
# else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pat.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# endif
#endif
/*****************************************************************************
* Constants
*****************************************************************************/
......
plugins/sdl/vout_sdl.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* vout_sdl.c: SDL video output display method
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: vout_sdl.c,v 1.94 2002/06/02 09:03:54 sam Exp $
* $Id: vout_sdl.c,v 1.95 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org>
......@@ -451,16 +451,18 @@ static int vout_Manage( vout_thread_t *p_vout )
input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case SDLK_F10: network_ChannelJoin( p_vout, 0 ); break;
case SDLK_F1: network_ChannelJoin( p_vout, 1 ); break;
case SDLK_F2: network_ChannelJoin( p_vout, 2 ); break;
case SDLK_F3: network_ChannelJoin( p_vout, 3 ); break;
case SDLK_F4: network_ChannelJoin( p_vout, 4 ); break;
case SDLK_F5: network_ChannelJoin( p_vout, 5 ); break;
case SDLK_F6: network_ChannelJoin( p_vout, 6 ); break;
case SDLK_F7: network_ChannelJoin( p_vout, 7 ); break;
case SDLK_F8: network_ChannelJoin( p_vout, 8 ); break;
case SDLK_F9: network_ChannelJoin( p_vout, 9 ); break;
case SDLK_F1: network_ChannelJoin( p_vout, 1 ); break;
case SDLK_F2: network_ChannelJoin( p_vout, 2 ); break;
case SDLK_F3: network_ChannelJoin( p_vout, 3 ); break;
case SDLK_F4: network_ChannelJoin( p_vout, 4 ); break;
case SDLK_F5: network_ChannelJoin( p_vout, 5 ); break;
case SDLK_F6: network_ChannelJoin( p_vout, 6 ); break;
case SDLK_F7: network_ChannelJoin( p_vout, 7 ); break;
case SDLK_F8: network_ChannelJoin( p_vout, 8 ); break;
case SDLK_F9: network_ChannelJoin( p_vout, 9 ); break;
case SDLK_F10: network_ChannelJoin( p_vout, 10 ); break;
case SDLK_F11: network_ChannelJoin( p_vout, 11 ); break;
case SDLK_F12: network_ChannelJoin( p_vout, 12 ); break;
default:
break;
......
plugins/win32/mainframe.cpp
View file @ 7291e0a7
......@@ -538,29 +538,7 @@ void __fastcall TMainFrameDlg::ButtonGoClick( TObject *Sender )
msg_Dbg( p_intf, "joining channel %d", i_channel );
vlc_mutex_lock( &p_intf->change_lock );
if( p_input_bank->pp_input[0] != NULL )
{
/* end playing item */
p_input_bank->pp_input[0]->b_eof = 1;
/* update playlist */
vlc_mutex_lock( &p_intf->p_vlc->p_playlist->change_lock );
p_intf->p_vlc->p_playlist->i_index--;
p_intf->p_vlc->p_playlist->b_stopped = 1;
vlc_mutex_unlock( &p_intf->p_vlc->p_playlist->change_lock );
/* FIXME: ugly hack to close input and outputs */
p_intf->pf_manage( p_intf );
}
network_ChannelJoin( p_intf, i_channel );
/* FIXME 2 */
p_intf->p_vlc->p_playlist->b_stopped = 0;
p_intf->pf_manage( p_intf );
vlc_mutex_unlock( &p_intf->change_lock );
// input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PLAY );
......
plugins/x11/xcommon.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.38 2002/06/02 09:03:54 sam Exp $
* $Id: xcommon.c,v 1.39 2002/06/04 00:11:12 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -678,6 +678,19 @@ static int vout_Manage( vout_thread_t *p_vout )
input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
break;
case XK_F1: network_ChannelJoin( p_vout, 1 ); break;
case XK_F2: network_ChannelJoin( p_vout, 2 ); break;
case XK_F3: network_ChannelJoin( p_vout, 3 ); break;
case XK_F4: network_ChannelJoin( p_vout, 4 ); break;
case XK_F5: network_ChannelJoin( p_vout, 5 ); break;
case XK_F6: network_ChannelJoin( p_vout, 6 ); break;
case XK_F7: network_ChannelJoin( p_vout, 7 ); break;
case XK_F8: network_ChannelJoin( p_vout, 8 ); break;
case XK_F9: network_ChannelJoin( p_vout, 9 ); break;
case XK_F10: network_ChannelJoin( p_vout, 10 ); break;
case XK_F11: network_ChannelJoin( p_vout, 11 ); break;
case XK_F12: network_ChannelJoin( p_vout, 12 ); break;
default:
/* "Normal Keys"
* The reason why I use this instead of XK_0 is that
......@@ -698,17 +711,6 @@ static int vout_Manage( vout_thread_t *p_vout )
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
break;
case '0': network_ChannelJoin( p_vout, 0 ); break;
case '1': network_ChannelJoin( p_vout, 1 ); break;
case '2': network_ChannelJoin( p_vout, 2 ); break;
case '3': network_ChannelJoin( p_vout, 3 ); break;
case '4': network_ChannelJoin( p_vout, 4 ); break;
case '5': network_ChannelJoin( p_vout, 5 ); break;
case '6': network_ChannelJoin( p_vout, 6 ); break;
case '7': network_ChannelJoin( p_vout, 7 ); break;
case '8': network_ChannelJoin( p_vout, 8 ); break;
case '9': network_ChannelJoin( p_vout, 9 ); break;
default:
break;
}
......
po/de.po
View file @ 7291e0a7
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc 0.73.3\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -20,7 +20,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, fuzzy, c-format
msgid ""
"%s module options:\n"
......@@ -28,27 +28,27 @@ msgid ""
msgstr "%s Modul Optionen:\n"
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr "text"
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr "zahl"
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr "gleitpunktzahl"
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
#, fuzzy
msgid ""
"\n"
......@@ -79,7 +79,7 @@ msgstr ""
"pausieren\n"
" vlc:quit \tVLC beenden"
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
#, fuzzy
msgid ""
"\n"
......@@ -89,19 +89,19 @@ msgstr ""
"Drck die Eingabetaste um weiterzufahren..."
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, fuzzy, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
#: src/libvlc.c:1002
#: src/libvlc.c:1053
#, fuzzy
msgid "[module] [description]\n"
msgstr "[Modul] [Beschreibung]"
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -687,7 +687,7 @@ msgid "Playlist"
msgstr "Abspielliste"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -735,11 +735,11 @@ msgstr "boolesch"
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -747,7 +747,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr "a52 ATSC A/52 aka AC-3 Audio Dekoder Modul"
......@@ -1889,7 +1889,7 @@ msgstr "3D Now! Motion Compensation Modul"
msgid "AltiVec motion compensation module"
msgstr "AltiVec Motion Compensation Modul"
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr "MMX Motion Compensation Modul"
......@@ -1909,11 +1909,11 @@ msgstr "ISO 13818-2 MPEG Elementarz Stream Eingabe"
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr "ISO 13818-1 MPEG Program Stream Eingabe"
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr "ISO 13818-1 MPEG Transport Stream Eingabe"
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
#, fuzzy
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr "ISO 13818-1 MPEG Transport Stream Eingabe"
......
po/en_GB.po
View file @ 7291e0a7
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -19,7 +19,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -27,27 +27,27 @@ msgid ""
msgstr ""
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -63,25 +63,25 @@ msgid ""
" vlc:quit quit VLC\n"
msgstr ""
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -624,7 +624,7 @@ msgid "Playlist"
msgstr ""
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -670,11 +670,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -682,7 +682,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1805,7 +1805,7 @@ msgstr ""
msgid "AltiVec motion compensation module"
msgstr ""
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr ""
......@@ -1825,11 +1825,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
po/fr.po
View file @ 7291e0a7
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -19,7 +19,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Utilisation: %s [options] [paramtres] [fichier]...\n"
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -29,27 +29,27 @@ msgstr ""
"\n"
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr "chane"
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr "entier"
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr "flottant"
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -77,7 +77,7 @@ msgstr ""
" vlc:pause fait une pause dans la playlist\n"
" vlc:quit quitter VLC\n"
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
......@@ -86,7 +86,7 @@ msgstr ""
"Appuyez sur ENTRE pour continuer...\n"
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
......@@ -95,11 +95,11 @@ msgstr ""
"Utilisation: %s [options] [paramtres] [fichier]...\n"
"\n"
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr "[module] [description]\n"
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -678,7 +678,7 @@ msgid "Playlist"
msgstr "Playlist"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -724,11 +724,11 @@ msgstr "bool
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -736,7 +736,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr "module de dcodage son ATSC A/52 (ou AC-3)"
......@@ -1880,7 +1880,7 @@ msgstr "module de compensation de mouvement optimis
msgid "AltiVec motion compensation module"
msgstr "module de compensation de mouvement optimis AltiVec"
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr "module de compensation de mouvement optimis MMX"
......@@ -1900,11 +1900,11 @@ msgstr "entr
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr "entre ISO 13818-1 MPEG Program Stream"
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr "entre ISO 13818-1 MPEG Transport Stream"
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr "entre ISO 13818-1 MPEG Transport Stream (libdvbpsi)"
......
po/ja.po
View file @ 7291e0a7
......@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -18,7 +18,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -26,27 +26,27 @@ msgid ""
msgstr ""
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -62,25 +62,25 @@ msgid ""
" vlc:quit quit VLC\n"
msgstr ""
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -623,7 +623,7 @@ msgid "Playlist"
msgstr "リスト"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -671,11 +671,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -683,7 +683,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1837,7 +1837,7 @@ msgstr ""
msgid "AltiVec motion compensation module"
msgstr ""
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr ""
......@@ -1857,11 +1857,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
po/nl.po
View file @ 7291e0a7
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -20,7 +20,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, fuzzy, c-format
msgid ""
"%s module options:\n"
......@@ -28,27 +28,27 @@ msgid ""
msgstr "%s module opties:\n"
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
#, fuzzy
msgid ""
"\n"
......@@ -77,7 +77,7 @@ msgstr ""
" vlc:pause \tpauzeer speellijst items\n"
" vlc:quit \tstop VLC"
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
#, fuzzy
msgid ""
"\n"
......@@ -87,19 +87,19 @@ msgstr ""
"Druk op RETURN om verder te gaan..."
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, fuzzy, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
#: src/libvlc.c:1002
#: src/libvlc.c:1053
#, fuzzy
msgid "[module] [description]\n"
msgstr "[module] [beschrijving]"
#: src/libvlc.c:1043
#: src/libvlc.c:1094
#, fuzzy
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
......@@ -705,7 +705,7 @@ msgid "Playlist"
msgstr "Speellijst"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -753,11 +753,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -765,7 +765,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1919,7 +1919,7 @@ msgstr "3D Now! motion compensatie module"
msgid "AltiVec motion compensation module"
msgstr "AltiVec motion compensatie module"
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr "MMX motion compensatie module"
......@@ -1939,11 +1939,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
po/no.po
View file @ 7291e0a7
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc-cvs\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -19,7 +19,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -27,27 +27,27 @@ msgid ""
msgstr ""
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -63,25 +63,25 @@ msgid ""
" vlc:quit quit VLC\n"
msgstr ""
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -630,7 +630,7 @@ msgid "Playlist"
msgstr "Spilleliste"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -678,11 +678,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -690,7 +690,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1858,7 +1858,7 @@ msgstr ""
msgid "AltiVec motion compensation module"
msgstr ""
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr ""
......@@ -1878,11 +1878,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
po/pl.po
View file @ 7291e0a7
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+0200\n"
"PO-Revision-Date: 2002-05-26 18:31+0200\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: polish <pl@li.org>\n"
......@@ -19,7 +19,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr "Uycie: %s [opcje] [parametry] [plik]...\n"
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, fuzzy, c-format
msgid ""
"%s module options:\n"
......@@ -27,27 +27,27 @@ msgid ""
msgstr "opcje moduu %s:\n"
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr "napis"
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr "liczba cakowita"
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr "liczba zmiennoprz."
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
#, fuzzy
msgid ""
"\n"
......@@ -76,7 +76,7 @@ msgstr ""
" vlc:pause zatrzymanie odtwarzania obiektw listy\n"
" vlc:quit wyjcie z VLC"
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
#, fuzzy
msgid ""
"\n"
......@@ -86,19 +86,19 @@ msgstr ""
"Nacinij klawisz ENTER aby kontynuowa..."
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, fuzzy, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr "Uycie: %s [opcje] [parametry] [plik]...\n"
#: src/libvlc.c:1002
#: src/libvlc.c:1053
#, fuzzy
msgid "[module] [description]\n"
msgstr "[modu] [opis]"
#: src/libvlc.c:1043
#: src/libvlc.c:1094
#, fuzzy
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
......@@ -742,7 +742,7 @@ msgid "Playlist"
msgstr "Lista odtwarzania"
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -790,12 +790,12 @@ msgstr "zm. logiczna"
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
#, fuzzy
msgid "A/52 dynamic range compression"
msgstr "wyczona kompresja dynamicznego zakresu A/52"
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
#, fuzzy
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
......@@ -809,7 +809,7 @@ msgstr ""
"Jeli zostanie wyczona kompresja dynamicznego zakresu bdzie to lepiej "
"pasujca opcja w przypadku sali kinowej lub pokoju akustycznego."
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr "modu dekodera dwiku a52 ATSC A/52 aka AC-3"
......@@ -1973,7 +1973,7 @@ msgstr "modu
msgid "AltiVec motion compensation module"
msgstr "modu kompensacji ruchu AltiVec"
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr "modu kompensacji ruchu MMX"
......@@ -1993,11 +1993,11 @@ msgstr "Elementarne wej
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr "Programowe wejcie strumienia ISO 13818-1 MPEG"
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr "Wejcie transportu strumienia ISO 13818-1 MPEG"
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr "Wejcie transportu strumienia ISO 13818-1 MPEG (libdvbpsi)"
......
po/ru.po
View file @ 7291e0a7
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnome-vlc\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -20,7 +20,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -28,27 +28,27 @@ msgid ""
msgstr ""
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -64,25 +64,25 @@ msgid ""
" vlc:quit quit VLC\n"
msgstr ""
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -611,7 +611,7 @@ msgid "Playlist"
msgstr " "
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -657,11 +657,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -669,7 +669,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1817,7 +1817,7 @@ msgstr ""
msgid "AltiVec motion compensation module"
msgstr ""
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr ""
......@@ -1837,11 +1837,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
po/vlc.pot
View file @ 7291e0a7
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-06-02 10:58+0200\n"
"POT-Creation-Date: 2002-06-04 02:09+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"
......@@ -20,7 +20,7 @@ msgid "Usage: %s [options] [parameters] [file]...\n"
msgstr ""
#. Print module name
#: src/libvlc.c:868
#: src/libvlc.c:891
#, c-format
msgid ""
"%s module options:\n"
......@@ -28,27 +28,27 @@ msgid ""
msgstr ""
#. We could also have "=<" here
#: src/libvlc.c:888 src/misc/configuration.c:798
#: src/libvlc.c:911 src/misc/configuration.c:798
msgid "string"
msgstr ""
#: src/libvlc.c:891 src/misc/configuration.c:783
#: src/libvlc.c:914 src/misc/configuration.c:783
msgid "integer"
msgstr ""
#: src/libvlc.c:894 src/misc/configuration.c:790
#: src/libvlc.c:917 src/misc/configuration.c:790
msgid "float"
msgstr ""
#: src/libvlc.c:900
#: src/libvlc.c:923
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:901
#: src/libvlc.c:924
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:955
#: src/libvlc.c:1006
msgid ""
"\n"
"Playlist items:\n"
......@@ -64,25 +64,25 @@ msgid ""
" vlc:quit quit VLC\n"
msgstr ""
#: src/libvlc.c:976 src/libvlc.c:1025 src/libvlc.c:1049 src/libvlc.c:1068
#: src/libvlc.c:1027 src/libvlc.c:1076 src/libvlc.c:1100 src/libvlc.c:1119
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
#: src/libvlc.c:999
#: src/libvlc.c:1050
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1002
#: src/libvlc.c:1053
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1043
#: src/libvlc.c:1094
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"
......@@ -611,7 +611,7 @@ msgid "Playlist"
msgstr ""
#. Misc options
#: plugins/a52/a52.c:83 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
......@@ -657,11 +657,11 @@ msgstr ""
#. ****************************************************************************
#. * Build configuration structure.
#. ****************************************************************************
#: plugins/a52/a52.c:74
#: plugins/a52/a52.c:76
msgid "A/52 dynamic range compression"
msgstr ""
#: plugins/a52/a52.c:76
#: plugins/a52/a52.c:78
msgid ""
"Dynamic range compression makes the loud sounds softer, and the soft sounds "
"louder, so you can more easily listen to the stream in a noisy environment "
......@@ -669,7 +669,7 @@ msgid ""
"playback will be more adapted to a movie theater or a listening room."
msgstr ""
#: plugins/a52/a52.c:88
#: plugins/a52/a52.c:90
msgid "a52 ATSC A/52 aka AC-3 audio decoder module"
msgstr ""
......@@ -1792,7 +1792,7 @@ msgstr ""
msgid "AltiVec motion compensation module"
msgstr ""
#: plugins/motion/motionmmx.c:47
#: plugins/motion/motionmmx.c:48
msgid "MMX motion compensation module"
msgstr ""
......@@ -1812,11 +1812,11 @@ msgstr ""
msgid "ISO 13818-1 MPEG Program Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:79
#: plugins/mpeg_system/mpeg_ts.c:88
msgid "ISO 13818-1 MPEG Transport Stream input"
msgstr ""
#: plugins/mpeg_system/mpeg_ts.c:83
#: plugins/mpeg_system/mpeg_ts.c:92
msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
msgstr ""
......
src/input/input.c
View file @ 7291e0a7
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.200 2002/06/02 11:59:46 sam Exp $
* $Id: input.c,v 1.201 2002/06/04 00:11:12 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -153,7 +153,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
vlc_object_attach( p_input, p_parent );
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", RunThread, 1 ) )
if( vlc_thread_create( p_input, "input", RunThread, VLC_TRUE ) )
{
msg_Err( p_input, "cannot create input thread (%s)", strerror(errno) );
free( p_input );
......@@ -202,17 +202,18 @@ void input_DestroyThread( input_thread_t *p_input )
*****************************************************************************/
static int RunThread( input_thread_t *p_input )
{
/* Signal right now, otherwise we'll get stuck in a peek */
vlc_thread_ready( p_input );
if( InitThread( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
p_input->b_error = 1;
vlc_thread_ready( p_input );
ErrorThread( p_input );
p_input->b_dead = 1;
return 0;
}
vlc_thread_ready( p_input );
/* initialization is complete */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_changed = 1;
......
src/input/input_ext-intf.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* input_ext-intf.c: services to the interface
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_ext-intf.c,v 1.37 2002/06/01 12:32:01 sam Exp $
* $Id: input_ext-intf.c,v 1.38 2002/06/04 00:11:12 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -387,7 +387,6 @@ int input_ChangeES( input_thread_t * p_input, es_descriptor_t * p_es,
int input_ToggleES( input_thread_t * p_input, es_descriptor_t * p_es,
vlc_bool_t b_select )
{
vlc_mutex_lock( &p_input->stream.stream_lock );
if( p_es != NULL )
......
src/interface/interface.c
View file @ 7291e0a7
......@@ -4,7 +4,7 @@
* interface, such as command line.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: interface.c,v 1.95 2002/06/01 18:04:49 sam Exp $
* $Id: interface.c,v 1.96 2002/06/04 00:11:12 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -96,8 +96,8 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this )
msg_Dbg( p_intf, "interface initialized" );
/* An interface's parent is always the root */
vlc_object_attach( p_intf, p_intf->p_vlc );
/* Attach interface to its parent object */
vlc_object_attach( p_intf, p_this );
return p_intf;
}
......
src/libvlc.c
View file @ 7291e0a7
......@@ -4,7 +4,7 @@
* and spawns threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: libvlc.c,v 1.6 2002/06/02 23:11:48 sam Exp $
* $Id: libvlc.c,v 1.7 2002/06/04 00:11:12 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -135,8 +135,8 @@ vlc_t * vlc_create( void )
p_vlc->p_global_lock = &global_lock;
p_vlc->pp_global_data = &p_global_data;
p_vlc->b_verbose = 0;
p_vlc->b_quiet = 0; /* FIXME: delay message queue output! */
p_vlc->b_verbose = VLC_FALSE;
p_vlc->b_quiet = VLC_FALSE; /* FIXME: delay message queue output! */
/* Initialize the threads system */
vlc_threads_init( p_vlc );
......@@ -261,7 +261,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
p_vlc->module_bank.first = p_help_module;
/* End hack */
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, 1 ) )
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{
p_vlc->module_bank.first = p_help_module->next;
config_Free( p_help_module );
......@@ -383,7 +383,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/*
* Override configuration with command line settings
*/
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, 0 ) )
if( config_LoadCmdLine( p_vlc, &i_argc, ppsz_argv, VLC_FALSE ) )
{
#ifdef WIN32
ShowConsole();
......@@ -466,7 +466,7 @@ vlc_error_t vlc_init( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/* On error during Channels initialization, switch off channels */
msg_Err( p_vlc,
"channels initialization failed, deactivating channels" );
config_PutInt( p_vlc, "network-channel", 0 );
config_PutInt( p_vlc, "network-channel", VLC_FALSE );
}
/* Update the handle status */
......@@ -632,7 +632,7 @@ vlc_error_t vlc_stop( vlc_t *p_vlc )
vlc_object_release( p_vout );
vout_DestroyThread( p_vout );
}
/*
* Free audio outputs
*/
......@@ -783,6 +783,8 @@ vlc_status_t vlc_status( vlc_t *p_vlc )
vlc_error_t vlc_add_target( vlc_t *p_vlc, char *psz_target )
{
playlist_t *p_playlist;
if( !p_vlc || ( p_vlc->i_status != VLC_STATUS_STOPPED
&& p_vlc->i_status != VLC_STATUS_RUNNING ) )
{
......@@ -790,7 +792,24 @@ vlc_error_t vlc_add_target( vlc_t *p_vlc, char *psz_target )
return VLC_ESTATUS;
}
playlist_Add( p_vlc, PLAYLIST_END, psz_target );
p_playlist = vlc_object_find( p_vlc, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL )
{
msg_Dbg( p_vlc, "no playlist present, creating one" );
p_playlist = playlist_Create( p_vlc );
if( p_playlist == NULL )
{
return VLC_EGENERIC;
}
vlc_object_yield( p_playlist );
}
playlist_Add( p_playlist, PLAYLIST_END, psz_target );
vlc_object_release( p_playlist );
return VLC_SUCCESS;
}
......@@ -809,7 +828,7 @@ static int GetFilenames( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
/* We assume that the remaining parameters are filenames */
for( i_opt = optind; i_opt < i_argc; i_opt++ )
{
playlist_Add( p_vlc, PLAYLIST_END, ppsz_argv[ i_opt ] );
vlc_add_target( p_vlc, ppsz_argv[ i_opt ] );
}
return VLC_SUCCESS;
......@@ -929,13 +948,13 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL
&& !b_help_module )
{
vlc_bool_t b_dash = 0;
vlc_bool_t b_dash = VLC_FALSE;
psz_prefix = p_item->psz_name;
while( *psz_prefix )
{
if( *psz_prefix++ == '-' )
{
b_dash = 1;
b_dash = VLC_TRUE;
break;
}
}
......@@ -1165,7 +1184,7 @@ static void SimpleSignalHandler( int i_signal )
static void FatalSignalHandler( int i_signal )
{
static mtime_t abort_time = 0;
static volatile vlc_bool_t b_die = 0;
static volatile vlc_bool_t b_die = VLC_FALSE;
int i_index;
/* Once a signal has been trapped, the termination sequence will be
......@@ -1175,7 +1194,7 @@ static void FatalSignalHandler( int i_signal )
vlc_mutex_lock( &global_lock );
if( !b_die )
{
b_die = 1;
b_die = VLC_TRUE;
abort_time = mdate();
/* Try to terminate everything - this is done by requesting the end of
......@@ -1185,7 +1204,7 @@ static void FatalSignalHandler( int i_signal )
/* Acknowledge the signal received */
msg_Err( pp_vlc[ i_index ], "signal %d received, exiting - do it "
"again in case vlc gets stuck", i_signal );
pp_vlc[ i_index ]->b_die = 1;
pp_vlc[ i_index ]->b_die = VLC_TRUE;
}
}
else if( mdate() > abort_time + 1000000 )
......
src/misc/configuration.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: configuration.c,v 1.29 2002/06/02 23:11:48 sam Exp $
* $Id: configuration.c,v 1.30 2002/06/04 00:11:12 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -326,7 +326,7 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
}
/* Initialize the global lock */
vlc_mutex_init( p_module, &p_module->config_lock );
vlc_mutex_init( p_module, &p_module->object_lock );
/* Do the duplication job */
for( i = 0; i < i_lines ; i++ )
......@@ -346,7 +346,7 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
p_module->p_config[i].psz_value = p_orig[i].psz_value ?
strdup( _(p_orig[i].psz_value) ) : NULL;
p_module->p_config[i].p_lock = &p_module->config_lock;
p_module->p_config[i].p_lock = &p_module->object_lock;
/* the callback pointer is only valid when the module is loaded so this
* value is set in ActivateModule() and reset in DeactivateModule() */
......@@ -390,7 +390,7 @@ void config_Free( module_t *p_module )
p_module->p_config = NULL;
/* Remove the global lock */
vlc_mutex_destroy( &p_module->config_lock );
vlc_mutex_destroy( &p_module->object_lock );
}
/*****************************************************************************
......@@ -1002,8 +1002,8 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
module_config_t *p_conf;
char *psz_name = (char *)p_longopts[i_index].name;
/* Check if we deal with a --no-foo long option */
if( flag ) psz_name += 3;
/* Check if we deal with a --nofoo or --no-foo long option */
if( flag ) psz_name += psz_name[2] == '-' ? 3 : 2;
/* Store the configuration option */
p_conf = config_FindConfig( p_this, psz_name );
......
src/misc/cpu.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* cpu.c: CPU detection code
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: cpu.c,v 1.2 2002/06/01 18:04:49 sam Exp $
* $Id: cpu.c,v 1.3 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -50,7 +50,9 @@ static void IllegalSignalHandler( int i_signal );
*****************************************************************************/
static jmp_buf env;
static int i_illegal;
#if defined( __i386__ )
static char *psz_capability;
#endif
/*****************************************************************************
* CPUCapabilities: list the processors MMX support and other capabilities
......@@ -250,7 +252,6 @@ u32 __CPUCapabilities( vlc_object_t *p_this )
# ifdef CAN_COMPILE_ALTIVEC
signal( SIGILL, IllegalSignalHandler );
psz_capability = "AltiVec";
i_illegal = 0;
vlc_mutex_lock( p_this->p_vlc->p_global_lock );
......
src/misc/modules_plugin.h
View file @ 7291e0a7
......@@ -269,17 +269,8 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->__network_ChannelJoin_inner = __network_ChannelJoin; \
(p_symbols)->__network_ChannelCreate_inner = __network_ChannelCreate; \
(p_symbols)->playlist_Command_inner = playlist_Command; \
(p_symbols)->__playlist_Add_inner = __playlist_Add; \
(p_symbols)->playlist_Add_inner = playlist_Add; \
(p_symbols)->playlist_Delete_inner = playlist_Delete; \
(p_symbols)->__vlc_threads_init_inner = __vlc_threads_init; \
(p_symbols)->vlc_threads_end_inner = vlc_threads_end; \
(p_symbols)->__vlc_mutex_init_inner = __vlc_mutex_init; \
(p_symbols)->__vlc_mutex_destroy_inner = __vlc_mutex_destroy; \
(p_symbols)->vlc_cond_init_inner = vlc_cond_init; \
(p_symbols)->__vlc_cond_destroy_inner = __vlc_cond_destroy; \
(p_symbols)->__vlc_thread_create_inner = __vlc_thread_create; \
(p_symbols)->__vlc_thread_ready_inner = __vlc_thread_ready; \
(p_symbols)->__vlc_thread_join_inner = __vlc_thread_join; \
(p_symbols)->__vout_CreateThread_inner = __vout_CreateThread; \
(p_symbols)->vout_DestroyThread_inner = vout_DestroyThread; \
(p_symbols)->vout_ChromaCmp_inner = vout_ChromaCmp; \
......@@ -310,4 +301,13 @@ static inline const char * module_error( char *psz_buffer )
(p_symbols)->__vlc_object_detach_all_inner = __vlc_object_detach_all; \
(p_symbols)->__vlc_object_attach_inner = __vlc_object_attach; \
(p_symbols)->__vlc_dumpstructure_inner = __vlc_dumpstructure; \
(p_symbols)->__vlc_threads_init_inner = __vlc_threads_init; \
(p_symbols)->vlc_threads_end_inner = vlc_threads_end; \
(p_symbols)->__vlc_mutex_init_inner = __vlc_mutex_init; \
(p_symbols)->__vlc_mutex_destroy_inner = __vlc_mutex_destroy; \
(p_symbols)->vlc_cond_init_inner = vlc_cond_init; \
(p_symbols)->__vlc_cond_destroy_inner = __vlc_cond_destroy; \
(p_symbols)->__vlc_thread_create_inner = __vlc_thread_create; \
(p_symbols)->__vlc_thread_ready_inner = __vlc_thread_ready; \
(p_symbols)->__vlc_thread_join_inner = __vlc_thread_join; \
src/misc/netutils.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: netutils.c,v 1.68 2002/06/01 18:04:49 sam Exp $
* $Id: netutils.c,v 1.69 2002/06/04 00:11:12 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -156,6 +156,11 @@ int __network_ChannelJoin( vlc_object_t *p_this, int i_channel )
struct timeval delay;
fd_set fds;
if( p_this->p_vlc->p_channel->i_channel == i_channel )
{
return 0;
}
if( !config_GetInt( p_this, "network-channel" ) )
{
msg_Err( p_this, "channels disabled, to enable them, use the"
......@@ -163,18 +168,6 @@ int __network_ChannelJoin( vlc_object_t *p_this, int i_channel )
return -1;
}
/* If last change is too recent, wait a while */
// if( mdate() - p_this->p_vlc->p_channel->last_change
// < INPUT_CHANNEL_CHANGE_DELAY )
// {
// msg_Warn( p_this, "waiting before changing channel" );
/* XXX Isn't this completely brain-damaged ??? -- Sam */
/* Yes it is. I don't think this is still justified with the new
* vlanserver --Meuuh */
// mwait( p_this->p_vlc->p_channel->last_change
// + INPUT_CHANNEL_CHANGE_DELAY );
// }
if( config_GetInt( p_this, "ipv4" ) )
{
psz_network = "ipv4";
......
src/misc/objects.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* objects.c: vlc_object_t handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: objects.c,v 1.5 2002/06/02 15:51:30 gbazin Exp $
* $Id: objects.c,v 1.6 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -146,6 +146,9 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
p_new->pp_children = NULL;
p_new->i_children = 0;
vlc_mutex_init( p_new, &p_new->object_lock );
vlc_cond_init( &p_new->object_wait );
//msg_Dbg( p_new, "created object" );
return p_new;
......@@ -180,6 +183,9 @@ void __vlc_object_destroy( vlc_object_t *p_this )
//msg_Dbg( p_this, "destroyed object" );
vlc_mutex_destroy( &p_this->object_lock );
vlc_cond_destroy( &p_this->object_wait );
free( p_this );
}
......
src/misc/threads.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* threads.c : threads implementation for the VideoLAN client
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: threads.c,v 1.5 2002/06/02 15:51:30 gbazin Exp $
* $Id: threads.c,v 1.6 2002/06/04 00:11:12 sam Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -371,9 +371,7 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
{
int i_ret;
vlc_mutex_init( p_this, &p_this->thread_lock );
vlc_cond_init( &p_this->thread_wait );
vlc_mutex_lock( &p_this->thread_lock );
vlc_mutex_lock( &p_this->object_lock );
#ifdef GPROF
wrapper_t wrapper;
......@@ -448,18 +446,16 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
if( b_wait )
{
msg_Dbg( p_this, "waiting for thread completion" );
vlc_cond_wait( &p_this->thread_wait, &p_this->thread_lock );
vlc_cond_wait( &p_this->object_wait, &p_this->object_lock );
}
vlc_mutex_unlock( &p_this->thread_lock );
vlc_mutex_unlock( &p_this->object_lock );
}
else
{
msg_Err( p_this, "%s thread could not be created at %s:%d (%s)",
psz_name, psz_file, i_line, strerror(i_ret) );
vlc_mutex_unlock( &p_this->thread_lock );
vlc_mutex_destroy( &p_this->thread_lock );
vlc_cond_destroy( &p_this->thread_wait );
vlc_mutex_unlock( &p_this->object_lock );
}
return i_ret;
......@@ -470,9 +466,9 @@ int __vlc_thread_create( vlc_object_t *p_this, char * psz_file, int i_line,
*****************************************************************************/
void __vlc_thread_ready( vlc_object_t *p_this )
{
vlc_mutex_lock( &p_this->thread_lock );
vlc_cond_signal( &p_this->thread_wait );
vlc_mutex_unlock( &p_this->thread_lock );
vlc_mutex_lock( &p_this->object_lock );
vlc_cond_signal( &p_this->object_wait );
vlc_mutex_unlock( &p_this->object_lock );
}
/*****************************************************************************
......@@ -504,9 +500,6 @@ void __vlc_thread_join( vlc_object_t *p_this, char * psz_file, int i_line )
#endif
vlc_mutex_destroy( &p_this->thread_lock );
vlc_cond_destroy( &p_this->thread_wait );
if( i_ret )
{
msg_Err( p_this, "thread_join(%d) failed at %s:%d (%s)",
......
src/playlist/playlist.c
View file @ 7291e0a7
......@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.4 2002/06/02 11:59:46 sam Exp $
* $Id: playlist.c,v 1.5 2002/06/04 00:11:12 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -57,8 +57,6 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
return NULL;
}
vlc_object_attach( p_playlist, p_parent );
p_playlist->p_input = NULL;
p_playlist->i_status = PLAYLIST_RUNNING;
p_playlist->i_index = -1;
......@@ -66,11 +64,13 @@ playlist_t * __playlist_Create ( vlc_object_t *p_parent )
p_playlist->pp_items = NULL;
vlc_mutex_init( p_playlist, &p_playlist->change_lock );
vlc_object_attach( p_playlist, p_parent );
if( vlc_thread_create( p_playlist, "playlist", RunThread, 0 ) )
{
msg_Err( p_playlist, "cannot spawn playlist thread" );
vlc_mutex_destroy( &p_playlist->change_lock );
vlc_object_detach_all( p_playlist );
vlc_mutex_destroy( &p_playlist->change_lock );
vlc_object_destroy( p_playlist );
return NULL;
}
......@@ -99,26 +99,9 @@ void playlist_Destroy( playlist_t * p_playlist )
* Add an item to the playlist at position i_pos. If i_pos is PLAYLIST_END,
* add it at the end regardless of the playlist current size.
*****************************************************************************/
int __playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
int playlist_Add( playlist_t *p_playlist, int i_pos, const char * psz_item )
{
playlist_t *p_playlist;
p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist == NULL )
{
msg_Dbg( p_this, "no playlist present, creating one" );
p_playlist = playlist_Create( p_this->p_vlc );
if( p_playlist == NULL )
{
return VLC_EGENERIC;
}
vlc_object_yield( p_playlist );
}
msg_Warn( p_this, "adding playlist item %s ", psz_item );
msg_Warn( p_playlist, "adding playlist item %s ", psz_item );
vlc_mutex_lock( &p_playlist->change_lock );
......@@ -139,8 +122,9 @@ int __playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
p_playlist->pp_items[i_pos]->i_type = 0;
p_playlist->pp_items[i_pos]->i_status = 0;
p_playlist->i_status = PLAYLIST_RUNNING;
vlc_mutex_unlock( &p_playlist->change_lock );
vlc_object_release( p_playlist );
return 0;
}
......@@ -152,6 +136,10 @@ int __playlist_Add( vlc_object_t *p_this, int i_pos, const char * psz_item )
*****************************************************************************/
int playlist_Delete( playlist_t * p_playlist, int i_pos )
{
vlc_mutex_lock( &p_playlist->change_lock );
vlc_mutex_unlock( &p_playlist->change_lock );
return 0;
}
......@@ -162,6 +150,8 @@ int playlist_Delete( playlist_t * p_playlist, int i_pos )
*****************************************************************************/
void playlist_Command( playlist_t * p_playlist, int i_command, int i_arg )
{
vlc_mutex_lock( &p_playlist->change_lock );
switch( i_command )
{
case PLAYLIST_STOP:
......@@ -184,6 +174,8 @@ void playlist_Command( playlist_t * p_playlist, int i_command, int i_arg )
break;
}
vlc_mutex_unlock( &p_playlist->change_lock );
return;
}
......@@ -199,6 +191,7 @@ static void RunThread ( playlist_t *p_playlist )
/* If there is an input, check that it doesn't need to die. */
if( p_playlist->p_input )
{
/* This input is dead. Remove it ! */
if( p_playlist->p_input->b_dead )
{
input_thread_t *p_input;
......@@ -207,14 +200,20 @@ static void RunThread ( playlist_t *p_playlist )
vlc_mutex_lock( &p_playlist->change_lock );
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
vlc_object_detach_all( p_input );
vlc_mutex_unlock( &p_playlist->change_lock );
/* Destroy input */
vlc_object_detach_all( p_input );
vlc_object_release( p_input );
input_DestroyThread( p_input );
vlc_object_destroy( p_input );
}
/* This input is dying, let him do */
else if( p_playlist->p_input->b_die )
{
;
}
/* This input has finished, ask him to die ! */
else if( p_playlist->p_input->b_error
|| p_playlist->p_input->b_eof )
{
......@@ -264,14 +263,19 @@ static void RunThread ( playlist_t *p_playlist )
vlc_mutex_lock( &p_playlist->change_lock );
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
vlc_object_detach_all( p_input );
vlc_mutex_unlock( &p_playlist->change_lock );
/* Destroy input */
vlc_object_detach_all( p_input );
vlc_object_release( p_input );
input_DestroyThread( p_input );
vlc_object_destroy( p_input );
}
/* This input is dying, let him do */
else if( p_playlist->p_input->b_die )
{
;
}
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
{
input_StopThread( p_playlist->p_input );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment