Commit efcc27fd authored by Damien Lucas's avatar Damien Lucas

. Fixed the --ttl option

. Removed few bugs added in my last commit
parent ea2f6d38
......@@ -5185,7 +5185,7 @@ if test $ac_cv_lib_gnugetopt_getopt_long = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_GETOPT_LONG 1
_ACEOF
VLS_LIB="${LDFLAGS_vlc} -lgnugetopt"
VLS_LIB="${VLS_LIB} -lgnugetopt"
else
need_getopt=:
fi
......@@ -6140,7 +6140,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
CCFLAGS="${CCFLAGS} ${test_CFLAGS}"
CCFLAGS="${CCFLAGS} ${test_CFLAGS}" DCFLAGS="${DCFLAGS} ${test_CFLAGS}"
else
{ { echo "$as_me:$LINENO: error: Could not find dvbdriver on your system: you may get it from http://www.linuxtv.org/" >&5
echo "$as_me: error: Could not find dvbdriver on your system: you may get it from http://www.linuxtv.org/" >&2;}
......@@ -6285,7 +6285,8 @@ done
if test -f "${with_dvb}/libdvb/libdvb.a"
then
VLS_LIB="${VLS_LIB} -ldvb"
DCFLAGS="${DCFLAGS} -L${with_dvb}/libdvb"
DCFLAGS="${DCFLAGS} -I${with_dvb}/libdvb"
LCFLAGS="${LCFLAGS} -L${with_dvb}/libdvb"
PLUGINS="${PLUGINS} dvbinput dvbreader"
else
{ { echo "$as_me:$LINENO: error: cannot find ${with_dvb}/libdvb/libdvb.a, make sure you compiled libdvbpsi in ${with_dvb}/libdvb" >&5
......
......@@ -131,7 +131,7 @@ need_getopt=false
AC_CHECK_FUNC(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)],
[ # FreeBSD has a gnugetopt library for this:
AC_CHECK_LIB([gnugetopt],[getopt_long],
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) VLS_LIB="${LDFLAGS_vlc} -lgnugetopt"],
[AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) VLS_LIB="${VLS_LIB} -lgnugetopt"],
[need_getopt=:])])
......@@ -328,7 +328,7 @@ then
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
AC_CHECK_HEADERS([linux/dvb/frontend.h],
[CCFLAGS="${CCFLAGS} ${test_CFLAGS}"],
[CCFLAGS="${CCFLAGS} ${test_CFLAGS}" DCFLAGS="${DCFLAGS} ${test_CFLAGS}"],
[AC_MSG_ERROR([Could not find dvbdriver on your system: you may get it from http://www.linuxtv.org/])])
dnl Test for the libdvb library (depends on driver header)
......@@ -350,7 +350,8 @@ then
if test -f "${with_dvb}/libdvb/libdvb.a"
then
VLS_LIB="${VLS_LIB} -ldvb"
DCFLAGS="${DCFLAGS} -L${with_dvb}/libdvb"
DCFLAGS="${DCFLAGS} -I${with_dvb}/libdvb"
LCFLAGS="${LCFLAGS} -L${with_dvb}/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])
......
......@@ -2,7 +2,7 @@
* application.cpp: Application class
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: application.cpp,v 1.15 2002/11/30 16:00:24 nitrox Exp $
* $Id: application.cpp,v 1.16 2002/12/03 23:32:17 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -441,6 +441,8 @@ int C_Application::RetrieveConfig(int iArgc, char* paArg[])
{
if(GetSetting("program1.loop", "false")=="true") sTags+="--loop ";
if(GetSetting("output1.protocol", "udp")=="rtp") sTags+="--rtp ";
int iTtl = GetSetting("channel1.ttl", "0").ToInt();
if(iTtl) sTags=sTags+"--ttl "+iTtl+" ";
m_cSettings.AddCmdLineTarget(paArg[optind], sTags);
}
catch(E_Exception e)
......
......@@ -2,7 +2,7 @@
* dvbinput.cpp: DVB streams
*-------------------------------------------------------------------------------
* (c)1999-2002 VideoLAN
* $Id: dvbinput.cpp,v 1.19 2002/11/19 14:08:07 nitrox Exp $
* $Id: dvbinput.cpp,v 1.20 2002/12/03 23:32:17 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Damien Lucas <nitrox@videolan.org>
......@@ -50,7 +50,7 @@
#include <linux/dvb/frontend.h>
#include <linux/dvb/dmx.h>
#include <dvb/DVB.hh>
#include <DVB.hh>
#include "../../mpeg/mpeg.h"
#include "../../mpeg/ts.h"
......
......@@ -2,7 +2,7 @@
* fileoutput.cpp: file output
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: fileoutput.cpp,v 1.3 2002/12/03 22:33:14 nitrox Exp $
* $Id: fileoutput.cpp,v 1.4 2002/12/03 23:32:17 nitrox Exp $
*
* Authors: James Courtier-Dutton <James@superbug.demon.co.uk>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -85,7 +85,7 @@ void C_FileOutput::OnInit()
#else
m_cFile.Open("w+");
#endif
}
}
......
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