Commit e9a918cb authored by unknown's avatar unknown

This commit was manufactured by cvs2svn to create tag 'v0_5_3'.

parent 68998b36
......@@ -4,5 +4,6 @@ obj
config.log
config.cache
config.status
autom4te.cache
Makefile.opts
build-stamp
......@@ -2,18 +2,41 @@
# ChangeLog for vls #
#===================#
0.4.5
0.5.3
* localinput.cpp: add the ability to choose the DVD chapter and title
* parser.cpp: fix the multicast IP addresses range for automatic detection
in command line parsing
0.5.2
* configure.in: fix a bug in DVB configuration when driver headers are not
make installed
* dvbinput.cpp: fix a bug when streaming more than one DVB channel
0.5.1
* ALL: Windows bug fixed
* netoutput: add the possibility to set the TTL under windows
* file.cpp filereader.cpp: loop on bad PS files
0.5.0
* netoutput: fix a bug in the PCR calculation
* parser: fix the --ttl option in command line launching
* netoutput: fix the ttl setting on windows platforms
* dvbinput: use with lidvb-0.2.2. No more ioctl
* application.cpp: search for vls.cfg in current path
* dvbreader: timeout workaround
* dvbinput: multiple stream support
* Makefile configure configure.in: Fixed 'make dist'
* ALL: Fixed compile issues on OpenBSD.
* ALL: Added a command line launching solution for easy configuration
* application.cpp parsers.cpp: stream type audectection when using command line
* /cvs/videolan/vls/src/modules/dvbinput/: new dvbinput working with the new
linuxtv drivers and the libdvb (also prodvide by linuxtv.org)
* application.cpp parsers.cpp: stream type audectection when using command
line
* src/modules/dvbinput/: new dvbinput working with the new linuxtv drivers
and the libdvb (also prodvide by linuxtv.org)
* src/extras/: added GNU getopt functions for command line compilation under
Windows and MacOS X
* /cvs/videolan/vls/doc/: Update of the VLS documentation
* configure.in: Changed configure.in in order to be able to specify the path for
dvb source files
* configure.in: Changed configure.in in order to be able to specify the path
for dvb source files
* src/modules/filechannel/fileoutput.cpp: Added the patch by Michael Muller
and Chen Xiaodong about the windows fileoutput bug opening in 'wb+' mode
under windows instead of 'w+'
......
......@@ -2,7 +2,7 @@
# vls (VideoLAN Server) main Makefile
#-------------------------------------------------------------------------------
# (c)1999-2001 VideoLAN
# $Id: Makefile,v 1.102 2002/12/08 15:55:29 nitrox Exp $
# $Id: Makefile,v 1.102.4.3 2003/05/16 20:56:51 nitrox Exp $
################################################################################
......@@ -156,7 +156,9 @@ clean: module_clean vls_clean
distclean: vls_clean
rm -f bin/vls
rm -f bin/vls.exe
rm -f bin/vlsd
rm -f bin/vlsd.exe
rm -f config*status config*cache config*log
rm -f Makefile.opts src/core/defs.h src/server/config.h
rm -f src/server/vls_builtins.cpp
......@@ -175,7 +177,6 @@ ifneq (,$(PLUGINS))
endif
mkdir -p $(DESTDIR)$(sysconfdir)/videolan/vls
test -r $(DESTDIR)$(sysconfdir)/videolan/vls/vls.cfg || $(INSTALL) -m 644 vls.cfg $(DESTDIR)$(sysconfdir)/videolan/vls
test -r $(DESTDIR)$(sysconfdir)/videolan/vls/input.cfg || $(INSTALL) -m 644 input.cfg $(DESTDIR)$(sysconfdir)/videolan/vls
@echo "Installation succeeded."
uninstall:
......@@ -192,9 +193,9 @@ dep: Makefile.opts $(DEP)
vls: Makefile.opts $(OBJ) $(C_OBJ) $(BUILTINS)
@echo "Linking $@..."
@test -d bin || mkdir -p bin
$(CXX) $(LCFLAGS) -o bin/$@ $(OBJ) $(C_OBJ) $(BUILTINS:%=obj/%.a) $(VLS_LIB)
@test -f bin/vlsd || ln -s $@ bin/$@d
chmod 755 bin/$@
$(CXX) $(LCFLAGS) -o bin/$@$(EXEEXT) $(OBJ) $(C_OBJ) $(BUILTINS:%=obj/%.a) $(VLS_LIB)
@test -f bin/vlsd$(EXEEXT) || ln -s $@ bin/$@d$(EXEEXT)
chmod 755 bin/$@$(EXEEXT)
dep/server/vls.dpp: src/server/vls_builtins.cpp
......@@ -249,6 +250,8 @@ $(C_DEP): dep/%.d: src/%.c
FORCE:
#
# Package generation rules
#
......@@ -283,10 +286,12 @@ dist:
do cp $$file tmp/vls/doc/developer ; done
# Copy misc files
cp AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
vls.cfg input.cfg Makefile Makefile.dep Makefile.module \
vls.cfg Makefile Makefile.dep Makefile.module \
Makefile.module.dep Makefile.opts.in \
configure configure.in install-sh config.sub config.guess \
tmp/vls/
# Copy MS Visual Studio project files
cp vls.sln vls.vcproj tmp/vls
# Copy Debian control files
for file in debian/*dirs debian/*docs debian/*menu debian/*desktop \
debian/*copyright debian/*conffiles ; \
......
......@@ -77,7 +77,7 @@ $(BUILTIN_OBJ): obj/BUILTIN_%.o: dep/%.d
$(BUILTIN_OBJ): obj/BUILTIN_%.o: %.cpp
@test -d obj/$(dir $*) || mkdir -p obj/$(dir $*)
@echo "Compiling $<..."
$(CXX) $(CCFLAGS) $(MODULE_CCFLAGS) -D__BUILTIN__ $(INCLUDE) -fPIC -o $@ -c $<
$(CXX) $(CCFLAGS) $(MODULE_CCFLAGS) -D__BUILTIN__ $(INCLUDE) -o $@ -c $<
$(MODULE_DEP): ../../../Makefile.module FORCE
$(MODULE_DEP): dep/%.d: %.cpp
......
......@@ -58,9 +58,11 @@ SYSLOG=@SYSLOG@
# Environnement specific settings
################################################################################
CC=@CC@
CXX=@CXX@
RANLIB=@RANLIB@
AR=@AR@
EXEEXT=@EXEEXT@
#
# Common flags
......
......@@ -4,8 +4,8 @@ How to build VLS under Windows
DISCLAIMER: the windows port of the VideoLAN Server is experimental !
Please report any bug to vls-devel@videolan.org.
With Microsoft Visual C++
-------------------------
With Microsoft Visual C++ .NET
------------------------------
You have to rename some files before doing anything:
......@@ -17,30 +17,8 @@ You have to link dvbpsi with vls. All the needed files can be found in
ftp://ftp.videolan.org/pub/videolan/libdvbpsi/0.1.1/win/dvbpsi_win32.zip
(uncompress it in the root vls directory)
Then open the project file 'vls.dsp' and build it.
With MINGW (www.mingw.org)
--------------------------
If you are cross-compiling using the mingw32 package provided by
www.videolan.org, you have to use something along those lines:
CXX=i586-mingw32msvc-g++ \
PATH=/usr/local/cross-tools/bin:$PATH \
./configure --host=i586-mingw32msvc --build=i386-linux \
--with-dvbpsi-tree=../libdvbpsi-win \
--disable-dvd
If you are compiling natively on Windoze (You need to download and
install the latest MSYS and MINGW at www.mingw.org), then you can
use something along those lines:
./configure \
--with-dvbpsi-tree=../libdvbpsi-win \
--disable-dvd
Also note that you will need to compile libdvbpsi beforehand, which
is really straightforward with MINGW.
Then open the project file 'vls.sln' and build it.
--------
Cyril Deguet <asmax@via.ecp.fr>
--
Cyril Deguet <asmax@videolan.org>
Damien Lucas <nitrox@videolan.org>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@ AC_CONFIG_HEADER(src/core/defs.h)
AC_CANONICAL_SYSTEM
VLS_VERSION=0.4.5
VLS_VERSION=0.5.3
AC_SUBST(VLS_VERSION)
dnl Main sources default
......@@ -23,6 +23,7 @@ save_LDFLAGS="${LDFLAGS}"
dnl Check for tools
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CXXCPP
AC_CHECK_TOOL(RANLIB, ranlib, :)
......@@ -216,6 +217,7 @@ AC_HEADER_TIME
dnl
dnl Check the operating system
dnl
EXEEXT=""
case ${target_os} in
bsdi*)
SYS=bsdi
......@@ -225,6 +227,7 @@ case ${target_os} in
;;
*mingw32*)
SYS=mingw32
EXEEXT=".exe"
VLS_LIB="${VLS_LIB} -lws2_32"
;;
*)
......@@ -312,8 +315,14 @@ then
HAVE_LIBDVDREAD=1, HAVE_LIBDVDREAD=0)
if test ${HAVE_LIBDVDREAD} = 1
then
PLUGINS="${PLUGINS} dvdreader"
DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
if test ${SYS} != mingw32
then
PLUGINS="${PLUGINS} dvdreader"
DVDREADER_LIB="${DVDREADER_LIB} -ldvdread"
else
BUILTINS="${BUILTINS} dvdreader"
DVDREADER_LIB="${DVDREADER_LIB} -ldvdread -ldvdcss"
fi
else
AC_MSG_ERROR([The development package for libdvdread is not installed.
Please install it and try again. Alternatively you can also configure with
......@@ -321,13 +330,15 @@ Please install it and try again. Alternatively you can also configure with
fi
fi
dnl
dnl DVB module
dnl
dnl DVB module
dnl
AC_ARG_ENABLE(dvb,
AC_HELP_STRING(--enable-dvb, DVB support (default disabled)))
AC_ARG_WITH(dvb,
AC_HELP_STRING(--with-dvb=[PATH], path to DVB driver header files))
AC_ARG_WITH(dvb,
AC_HELP_STRING(--with-libdvb=[PATH], path to libdvb))
if test x$enable_dvb = xyes
then
dnl Test for driver header files
......@@ -346,30 +357,30 @@ then
[AC_MSG_ERROR([Could not find dvbdriver on your system: you may get it from http://www.linuxtv.org/])])
CPPFLAGS="$save_CPPFLAGS"
dnl Test for the libdvb library (depends on driver header)
AC_MSG_CHECKING(for libdvb headers in ${with_dvb}/libdvb)
dnl Test for the libdvb library
AC_MSG_CHECKING(for libdvb headers in ${with_libdvb})
if test "x$with_dvb" != x
then
test_CFLAGS="-I${with_dvb}/libdvb"
test_CFLAGS="-I${with_libdvb}"
fi
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS $DVBINPUT_CCFLAGS"
AC_CHECK_HEADERS([DVB.hh],[
DVBINPUT_CCFLAGS="${DVBINPUT_CCFLAGS} ${test_CFLAGS}"
],[
AC_MSG_ERROR([Could not find libdvb headers on your system: you may get it from http://www.linuxtv.org/])
AC_MSG_ERROR([Could not find libdvb headers on your system: you may get it from http://www.metzlerbros.org/dvb/index.html])
])
CPPFLAGS="$save_CPPFLAGS"
dnl Test for the lib existence
if test -f "${with_dvb}/libdvb/libdvb.a"
if test -f "${with_libdvb}/libdvb.a"
then
DVBINPUT_LIB="${DVBINPUT_LIB} -ldvb"
DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_dvb}/libdvb"
DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_dvb}/libdvb"
DVBINPUT_DCFLAGS="${DVBINPUT_DCFLAGS} -I${with_libdvb}"
DVBINPUT_LCFLAGS="${DVBINPUT_LCFLAGS} -L${with_libdvb}"
PLUGINS="${PLUGINS} dvbinput dvbreader"
else
AC_MSG_ERROR([cannot find ${with_dvb}/libdvb/libdvb.a, make sure you compiled libdvbpsi in ${with_dvb}/libdvb])
AC_MSG_ERROR([cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}])
fi
fi
......@@ -460,6 +471,7 @@ AC_SUBST(PLUGINS)
AC_SUBST(DEBUG)
AC_SUBST(PROFILING)
AC_SUBST(SYSLOG)
AC_SUBST(EXEEXT)
AC_SUBST(CCFLAGS)
AC_SUBST(DCFLAGS)
......
......@@ -2,7 +2,7 @@
* application.cpp: Application class
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: application.cpp,v 1.17 2002/12/08 15:55:29 nitrox Exp $
* $Id: application.cpp,v 1.17.4.4 2003/03/06 03:18:20 tooney Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -27,7 +27,7 @@
*******************************************************************************/
#define COPYRIGHT \
"VideoLAN Server - version 0.4.5 - (c)1996-2002 VideoLAN\n"
"VideoLAN Server - version 0.5.0 - (c)1996-2002 VideoLAN\n"
#define VERSION \
COPYRIGHT \
......@@ -44,19 +44,23 @@
" vls [options] target\n" \
" \n" \
" options: \n" \
" -v --verbose verbosity (v, vv, vvv)\n" \
" -h --help display this help\n" \
" -d <ip[:port]> --destination ip and port destination\n" \
" -f <file> --file <file> configuration file\n" \
" -t <number> --ttl <number> ttl value\n" \
" -l --loop looping at end of program\n" \
" --log <file> log to <file> \n" \
" --version display version and exit\n" \
" -v --verbose verbosity (v, vv, vvv)\n" \
" -h --help display this help\n" \
" -d <target> --destination output \n" \
" -f <file> --file <file> configuration file\n" \
" -t <number> --ttl <number> ttl value\n" \
" -l --loop looping at end of program\n" \
" --log <file> log to <file> \n" \
" \n" \
" target:\n" \
" dvd:<device> for streaming of a dvd\n" \
" dvd:<dir> for streaming of a dvd stored on hard drive\n" \
" file:<file> for streaming of a file\n" \
" dvb:<channel> for streaming of a dvb channel\n"
" dvd:<device> for streaming from a dvd\n" \
" dvd:<dir> for streaming from a dvd stored on hard drive\n" \
" file:<file> for streaming from a file\n" \
" dvb:<channel> for streaming from a dvb channel\n" \
" udp:<ip[:port]> for streaming in udp to ip \n" \
" rtp:<ip[:port]> for streaming in rtp to ip \n" \
" file:<filename> for dumping output to filename \n"
//------------------------------------------------------------------------------
// Preamble
......@@ -382,10 +386,14 @@ int C_Application::RetrieveConfig(int iArgc, char* paArg[])
C_String strDest;
int iRc = NO_ERR;
int iCommandline=0;
int opt;
int opt;
C_String strName = m_strName.ToLower() + ".cfg";
#ifndef _WIN32
C_String strName = m_strName.ToLower() + ".cfg";
strCfgFile = CONFIG_PATH "/" + strName;
#else
strCfgFile = strName;
#endif
static const struct option longopts[]={
......@@ -463,8 +471,13 @@ int C_Application::RetrieveConfig(int iArgc, char* paArg[])
C_File cFile(strCfgFile);
if(!cFile.Exists())
{
printf("No configuration file found (%s)\n", strCfgFile.GetString());
iRc = GEN_ERR;
strCfgFile = m_strName.ToLower()+".cfg";
cFile=C_File(strCfgFile);
if(!cFile.Exists())
{
printf("No configuration file found (%s)\n", strCfgFile.GetString());
iRc = GEN_ERR;
}
}
if(!iRc)
......
......@@ -2,7 +2,7 @@
* common.h: common definitions
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: common.h,v 1.5 2002/07/12 18:09:36 massiot Exp $
* $Id: common.h,v 1.5.4.1 2003/02/03 12:26:39 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -99,8 +99,41 @@ typedef void* handle;
// Counter for statistics and profiling
typedef unsigned long count;
#ifdef HAVE_STDINT_H
# include <stdint.h>
typedef uint8_t u8;
typedef int8_t s8;
typedef uint16_t u16;
typedef int16_t s16;
typedef uint32_t u32;
typedef int32_t s32;
typedef uint64_t u64;
typedef int64_t s64;
#else
typedef unsigned char u8;
typedef signed char s8;
typedef unsigned short u16;
typedef signed short s16;
typedef unsigned int u32;
typedef signed int s32;
# if defined( _MSC_VER ) || ( defined( WIN32 ) && !defined( __MINGW32__ ) )
typedef unsigned __int64 u64;
typedef signed __int64 s64;
# else
typedef unsigned long long u64;
typedef signed long long s64;
# endif
#endif
#if defined( WIN32)
typedef int ssize_t;
#endif
//------------------------------------------------------------------------------
// Byte manipulation macros
//------------------------------------------------------------------------------
......
......@@ -18,11 +18,14 @@
/* Define to 1 if you have the <dvbpsi/dvbpsi.h> header file. */
#undef HAVE_DVBPSI_DVBPSI_H
/* Define to 1 if you have the <DVB.hh> header file. */
#undef HAVE_DVB_HH
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
/* getopt support */
#undef HAVE_GETOPT_LONG
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
......@@ -36,6 +39,9 @@
/* Define if the system have IPv6 structures. */
#undef HAVE_IPV6
/* Define to 1 if you have the <linux/dvb/frontend.h> header file. */
#undef HAVE_LINUX_DVB_FRONTEND_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
......
......@@ -2,7 +2,7 @@
* file.cpp: File management
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: file.cpp,v 1.4 2002/04/10 10:47:18 asmax Exp $
* $Id: file.cpp,v 1.4.4.3 2003/05/16 19:43:59 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -147,7 +147,7 @@ int C_File::Read(byte* pBuff, int iSize)
int iRc = fread(pBuff, sizeof(byte), iSize, m_hFd);
if(iRc != iSize)
{
if(feof(m_hFd) && iRc == 0)
if(feof(m_hFd))
{
// No byte could be read before the end of the file
iRc = FILE_EOF;
......@@ -640,7 +640,9 @@ void C_Directory::Close()
//------------------------------------------------------------------------------
int C_Directory::Update()
{
ASSERT(m_pDir);
#ifdef HAVE_OPENDIR
ASSERT(m_pDir);
#endif
// First empty old vectors
m_vFiles.Empty();
......@@ -697,7 +699,10 @@ int C_Directory::Update()
//------------------------------------------------------------------------------
const C_Vector<C_String>& C_Directory::GetFiles() const
{
ASSERT(m_pDir);
#ifdef HAVE_OPENDIR
ASSERT(m_pDir);
#endif
return m_vFiles;
}
......@@ -709,7 +714,10 @@ const C_Vector<C_String>& C_Directory::GetFiles() const
//------------------------------------------------------------------------------
const C_Vector<C_String>& C_Directory::GetSubDirs() const
{
ASSERT(m_pDir);
#ifndef WIN32
ASSERT(m_pDir);
#endif
return m_vSubDirs;
}
......@@ -2,7 +2,7 @@
* parsers.cpp: Command line and configuration files parsers
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: parsers.cpp,v 1.11 2002/12/09 01:36:24 nitrox Exp $
* $Id: parsers.cpp,v 1.11.2.1.2.3 2003/06/04 17:49:33 alexis Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -315,7 +315,7 @@ void C_CfgFileParser::AddCmdLineSetting(unsigned char sOption, C_String sValue)
m_pCallBack->OnStartSection("output1");
m_pCallBack->OnProperty("DstHost", sDest1);
if(sDest2!="") m_pCallBack->OnProperty("DstPort", sDest2);
if(sDest1.ToInt()<=239 && sDest1.ToInt()>=234)
if(sDest1.ToInt()<=239 && sDest1.ToInt()>=224)
m_pCallBack->OnProperty("Type", "multicast");
if(sMeth=="udp") m_pCallBack->OnProperty("Protocol", "udp");
else m_pCallBack->OnProperty("Protocol", "rtp");
......@@ -337,9 +337,9 @@ void C_CfgFileParser::AddCmdLineSetting(unsigned char sOption, C_String sValue)
case 't':
if(sValue.ToInt()>0)
{
m_pCallBack->OnStartSection("channel1");
m_pCallBack->OnProperty("ttl", sValue.ToInt());
m_pCallBack->OnEndSection("channel1");
m_pCallBack->OnStartSection("output1");
m_pCallBack->OnProperty("TTL", sValue.ToInt());
m_pCallBack->OnEndSection("output1");
}
else
{
......@@ -394,9 +394,9 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input section */
m_pCallBack->OnStartSection("Input");
m_pCallBack->OnStartSection("input1");
m_pCallBack->OnProperty("ProgramCount", "1");
m_pCallBack->OnEndSection("Input");
m_pCallBack->OnEndSection("input1");
/* Inputs section */
m_pCallBack->OnStartSection("Inputs");
......@@ -413,12 +413,12 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input Section */
if(sMeth == "dvd")
{
m_pCallBack->OnStartSection("1");
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("Device", sFile);
m_pCallBack->OnProperty("Type", "Dvd");
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1");
m_pCallBack->OnEndSection("input1.1");
}
else if(sMeth == "dvb")
{
......@@ -431,7 +431,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
}
else if(sMeth == "file")
{
m_pCallBack->OnStartSection("1");
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("FileName", sFile);
C_File fFile = C_File(sFile);
......@@ -445,7 +445,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "MPEG2-PS");
fFile.Close();
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1");
m_pCallBack->OnEndSection("input1.1");
}
/* Automatic start section */
......
......@@ -2,7 +2,7 @@
* buffer.cpp: Buffers management
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: buffer.cpp,v 1.4 2002/07/12 18:09:36 massiot Exp $
* $Id: buffer.cpp,v 1.4.4.1 2003/03/06 03:08:25 tooney Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -82,7 +82,12 @@ void C_SyncFifo::HandlePacket(C_TsPacket* pPacket)
// Warn the waiting threads if any that they have data to pop
iRc = m_cNotEmptySignal.Post();
#ifdef WIN32
ASSERT(iRc);
#else
ASSERT(!iRc);
#endif
/*
unsigned int iSize = m_pFifo->Size();
......@@ -119,7 +124,13 @@ C_TsPacket* C_SyncFifo::Pop()
// Warn the waiting threads if any that they have data to push
iRc = m_cNotFullSignal.Post();
#ifdef WIN32
ASSERT(iRc);
#else
ASSERT(!iRc);
#endif
return pPacket;
......
......@@ -4,7 +4,7 @@
* --Meuuh
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: config.h.in,v 1.4 2002/07/12 18:09:36 massiot Exp $
* $Id: config.h.in,v 1.4.4.1 2003/05/16 19:43:59 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -36,7 +36,7 @@
//------------------------------------------------------------------------------
#define PGRM_VERSION "@VLS_VERSION@"
#define PGRM_INFO "VideoLAN Server v @VLS_VERSION@ (" __DATE__ ") " \
"- (c)1999-2002 VideoLAN\n"
"- (c)1999-2003 VideoLAN\n"
#define PLUGIN_PATH "@prefix@/lib/videolan/vls"
......
......@@ -2,7 +2,7 @@
* config.h: Configuration variables
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: config.h.win,v 1.3 2002/10/14 16:21:31 asmax Exp $
* $Id: config.h.win,v 1.3.4.3 2003/06/05 22:00:31 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -32,11 +32,11 @@
//------------------------------------------------------------------------------
// Program description
//------------------------------------------------------------------------------
#define PGRM_VERSION "0.4.0"
#define PGRM_INFO "VideoLAN Server v 0.4.0 (" __DATE__ ") " \
"- (c)1999-2002 VideoLAN\n"
#define PGRM_VERSION "0.5.2"
#define PGRM_INFO "VideoLAN Server v 0.5.3 (" __DATE__ ") " \
"- (c)1999-2003 VideoLAN\n"
#define PLUGIN_PATH "C:\vls"
#define PLUGIN_PATH "C:\\vls"
#else
......
......@@ -2,7 +2,7 @@
* telnet.cpp:
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: telnet.cpp,v 1.8 2002/11/05 02:10:53 nitrox Exp $
* $Id: telnet.cpp,v 1.8.4.1 2003/03/06 04:19:20 tooney Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -710,7 +710,11 @@ int C_Telnet::Init()
int iRc = NO_ERR;
//Don't start the telnet server when Telnet.Use is false
#ifdef WIN32
if(pApp->GetSetting("Telnet.Use", "true").ToLower()=="true")
#else
if(pApp->GetSetting("Telnet.Use", "false").ToLower()=="true")
#endif
{
// Get config
C_String strDomain = pApp->GetSetting("Telnet.Domain", "Inet4").ToLower();
......
......@@ -5,7 +5,7 @@ BEGIN "Vls"
LogFile = "vls.log" # log file
ScreenLog = "enable" # log to the console
SystemLog = "disable" # log to the systemlog
END
END
# Security informations :
#
......@@ -34,6 +34,7 @@ END
BEGIN "Telnet"
# Domain = "Inet6" # Inet4 or Inet6
LocalPort = "9999" # Port to use for that purpose
Use = "true"
END
# Streams sources declaration
......@@ -46,10 +47,6 @@ BEGIN "Inputs"
# dvb = "dvb" # Video input example (DVB card)
END
BEGIN "Input"
ProgramCount = "4"
END
# --- Format:
# BEGIN "program_number"
# Name = "program_name"
......@@ -71,16 +68,20 @@ BEGIN "2" # another file
Type = "Mpeg2-PS"
END
BEGIN "3" # Dvd
Name = "film"
Device = "/dev/cdrom"
Type = "Dvd"
BEGIN "3" # DVD
Name = "film"
Device = "/dev/cdrom"
Type = "dvd"
DvdTitle = "1" # Start title
DvdChapter = "1" # Start chapter
END
BEGIN "4" # Dvd stored on a hard disk
Name = "matrix"
Device = "/mnt/data/matrix/VIDEO_TS"
Type = "Dvd"
BEGIN "4" # DVD stored on a hard disk
Name = "matrix"
Device = "/media/matrix/VIDEO_TS"
Type = "dvd"
DvdTitle = "1" # Start title
DvdChapter = "1" # Start chapter
END
# Video input configuration
......
This diff is collapsed.
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