Merged revisions 570-575,577-578 via svnmerge from

[senf.git] / Socket / Protocols / DVB / DVBDemuxProtocol.cc

diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.cc b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
index 0e9847f..21745b8 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.cc
+++ b/Socket/Protocols/DVB/DVBDemuxProtocol.cc
@@ -32,7 +32,7 @@
 #include <string>
 #include <sys/ioctl.h>
 #include <linux/sockios.h>
-#include "Socket/SocketHandle.hh"
+#include "../../../Socket/SocketHandle.hh"
 
 //#include "DVBDemuxProtocol.mpp"
 #define prefix_
@@ -41,22 +41,22 @@
 prefix_ void senf::DVBDemuxProtocol::setBufferSize(unsigned long size)
     const
 {
-    if (::ioctl(body().fd(), DMX_SET_BUFFER_SIZE, size) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(), DMX_SET_BUFFER_SIZE, size) < 0)
+        throwErrno();
 }
 
 prefix_ void senf::DVBDemuxProtocol::startFiltering()
     const
 {
-    if (::ioctl(body().fd(), DMX_START) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(), DMX_START) < 0)
+        throwErrno();
 }
 
 prefix_ void senf::DVBDemuxProtocol::stopFiltering()
     const
 {
-    if (::ioctl(body().fd(), DMX_STOP) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(), DMX_STOP) < 0)
+        throwErrno();
 }
 
 prefix_ bool senf::DVBDemuxProtocol::eof()