X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FDVB%2FDVBDemuxHandles.cc;h=e54b3f92c17ed185a6152c5dbbf5461556d87dfb;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=2abb6f97e069a9e3955573c78fa7f24747f9fc72;hpb=1f3b4447179d0cd771037d02b9a5671eeaaaec8d;p=senf.git

diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/Socket/Protocols/DVB/DVBDemuxHandles.cc
index 2abb6f9..e54b3f9 100644
--- a/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,16 +27,11 @@
 //#include "DVBDemuxHandles.ih"
 
 // Custom includes
-#include <sys/types.h>
+#include <boost/format.hpp>
 #include <sys/socket.h>
-#include <iostream>
-#include <string>
 #include <sys/ioctl.h>
-#include <linux/sockios.h>
-#include <stdio.h>
 #include <fcntl.h>
-
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "DVBDemuxHandles.mpp"
 #define prefix_
@@ -45,13 +40,15 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::DVBDemuxHandles
 
-prefix_ void senf::DVBDemuxSectionProtocol::init_client()
+prefix_ void senf::DVBDemuxSectionProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
-    int fd = open("/dev/dvb/adapter0/demux0", O_RDONLY | O_NONBLOCK);
-    if (fd < 0)
-        throw SystemException(errno);
-    body().fd(fd);
+    std::string devDemux = str( boost::format(
+            "/dev/dvb/adapter%d/demux%d") % adapter % device);
+    int f = open(devDemux.c_str(), O_RDONLY | O_NONBLOCK);
+    if (f < 0)
+        throwErrno();
+    fd(f);
 }
 
 prefix_ unsigned senf::DVBDemuxSectionProtocol::available()
@@ -60,28 +57,24 @@ prefix_ unsigned senf::DVBDemuxSectionProtocol::available()
     return 4096;
 }
 
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::DVBDemuxSectionProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new DVBDemuxSectionProtocol());
-}
-
 prefix_ void senf::DVBDemuxSectionProtocol::setSectionFilter(struct dmx_sct_filter_params *filter)
     const
 {
-    if (::ioctl(body().fd(), DMX_SET_FILTER, filter) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(), DMX_SET_FILTER, filter) < 0)
+        throwErrno();
 }
 
 // ----------------------------------------------------------------
 
-prefix_ void senf::DVBDemuxPESProtocol::init_client()
+prefix_ void senf::DVBDemuxPESProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
-    int fd = open("/dev/dvb/adapter0/demux0", O_RDONLY | O_NONBLOCK);
-    if (fd < 0)
-        throw SystemException(errno);
-    body().fd(fd);
+    std::string devDemux = str( boost::format(
+            "/dev/dvb/adapter%d/demux%d") % adapter % device);
+    int f = open(devDemux.c_str(), O_RDONLY | O_NONBLOCK);
+    if (f < 0)
+        throwErrno();
+    fd(f);
 }
 
 prefix_ unsigned senf::DVBDemuxPESProtocol::available()
@@ -90,28 +83,24 @@ prefix_ unsigned senf::DVBDemuxPESProtocol::available()
     return 4096; //???
 }
 
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::DVBDemuxPESProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new DVBDemuxPESProtocol());
-}
-
 prefix_ void senf::DVBDemuxPESProtocol::setPESFilter(struct dmx_pes_filter_params *filter)
     const
 {
-    if (::ioctl(body().fd(), DMX_SET_PES_FILTER, filter) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(), DMX_SET_PES_FILTER, filter) < 0)
+        throwErrno();
 }
 
 // ----------------------------------------------------------------
 
-prefix_ void senf::DVBDvrProtocol::init_client()
+prefix_ void senf::DVBDvrProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
-    int fd = open("/dev/dvb/adapter0/dvr0", O_RDONLY | O_NONBLOCK);
-    if (fd < 0)
-        throw SystemException(errno);
-    body().fd(fd);
+    std::string devDvr = str( boost::format(
+            "/dev/dvb/adapter%d/dvr%d") % adapter % device);
+    int f = open(devDvr.c_str(), O_RDONLY | O_NONBLOCK);
+    if (f < 0)
+        throwErrno();
+    fd(f);
 }
 
 prefix_ unsigned senf::DVBDvrProtocol::available()
@@ -120,12 +109,6 @@ prefix_ unsigned senf::DVBDvrProtocol::available()
     return 188;
 }
 
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::DVBDvrProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new DVBDvrProtocol());
-}
-
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "DVBDemuxHandles.mpp"