Commit b262b783 authored by Damien Lucas's avatar Damien Lucas

same commit, devel branch

parent f644a5fe
This diff is collapsed.
......@@ -321,13 +321,15 @@ Please install it and try again. Alternatively you can also configure with
fi
fi
dnl
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,33 +348,34 @@ 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 libdvb in ${with_dvb}/libdvb])
AC_MSG_ERROR([cannot find ${with_libdvb}/libdvb.a, make sure you compiled libdvb in ${with_libdvb}])
fi
fi
dnl
dnl V4L-ffmpeg module
dnl
......
......@@ -2,7 +2,7 @@
* dvbinput.cpp: DVB streams
*-------------------------------------------------------------------------------
* (c)1999-2002 VideoLAN
* $Id: dvbinput.cpp,v 1.22 2003/02/03 11:47:32 nitrox Exp $
* $Id: dvbinput.cpp,v 1.23 2003/02/18 12:40:40 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Damien Lucas <nitrox@videolan.org>
......@@ -140,7 +140,8 @@ void C_DvbInput::OnInit()
C_String strType;
C_String dvbrc;
char filen[FILELEN];
char devname[80];
// Retrieve config
C_Application* pApp = C_Application::GetApp();
ASSERT(pApp);
......@@ -153,12 +154,12 @@ void C_DvbInput::OnInit()
{
strncpy(filen, dvbrc.GetString(), dvbrc.Length()+1);
}
dvb->init("", "", iNumber);
m_strDVR = C_String(ADAPTER)+iNumber+"/dvr0";
m_strDEMUX = C_String(ADAPTER)+iNumber+DEMUX_DEV;
m_strVIDEO = C_String(ADAPTER)+iNumber+"/video0";
dvb->init("", "", 0, iNumber);
sprintf(devname, DVR_DEV, iNumber, 0); m_strDVR = C_String(devname);
sprintf(devname, DEMUX_DEV, iNumber, 0); m_strDEMUX = C_String(devname);
sprintf(devname, VIDEO_DEV, iNumber, 0); m_strVIDEO = C_String(devname);
//Check whether card has a decoder:
//When opening the video device, we should get an error
int iDummy=open(m_strVIDEO.GetString(), O_RDWR|O_NONBLOCK);
......
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