X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FDVB%2FDVBProtocolWrapper.cc;h=3b9fc87445c58b6ae5755678864daefb55bc851f;hb=7661548b20e6c7627f54bff87e0758396fd523ef;hp=25abd610c97e9a0a323e342b530c657a4ee35eec;hpb=fde4399789762f8257f7361761bd1a798068e717;p=senf.git

diff --git a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc
index 25abd61..3b9fc87 100644
--- a/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc
+++ b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc
@@ -26,87 +26,100 @@
 #include "DVBProtocolWrapper.hh"
 
 // Custom includes
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include <senf/Utils/Console/Utility.hh>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-prefix_ senf::DVBSectionProtocolWrapper::DVBSectionProtocolWrapper(senf::DVBDemuxSectionHandle sh) 
+prefix_ senf::DVBSectionProtocolWrapper::DVBSectionProtocolWrapper(senf::DVBDemuxSectionHandle sh)
     : protocol(sh.protocol()), dir(this)
 {
     namespace kw = senf::console::kw;
     namespace fty = senf::console::factory;
 
     dir.add("buffersize", fty::Command(&DVBSectionProtocolWrapper::setBufferSize, this)
-	    .doc("Set the size of the circular buffer used for filtered data.")
-	    .arg("size", "in byte") );
+            .doc("Set the size of the circular buffer used for filtered data.")
+            .arg("size", "in byte") );
 
     dir.add("start", fty::Command(&DVBSectionProtocolWrapper::startFiltering, this)
-	    .doc("Starts filtering") );
+            .doc("Starts filtering") );
 
     dir.add("stop", fty::Command(&DVBSectionProtocolWrapper::setBufferSize, this)
-	    .doc("Stops filtering") );
-
-    dir.add("filter", 
-	    fty::Command<void (unsigned short int, 
-				    unsigned, 
-				    senf::console::FlagCollection<Flags>, 
-				    unsigned, 
-				    unsigned, 
-				    unsigned)
-	    >(&DVBSectionProtocolWrapper::setSectionFilter, this)
-	    .arg("pid", "pid to filter")
-	    .arg("filter", "filter", 
-		 kw::default_value = 62, 
-		 kw::default_doc = "0x3e")
-	    .arg("flags", "or-able: CHECK_CRC, ONESHOT, IMMEDIATE_START, KERNEL_CLIENT",
-		 kw::default_value = DMX_IMMEDIATE_START | DMX_CHECK_CRC,
-		 kw::default_doc = "(IMMEDIATE_START CHECK_CRC)")
-	    .arg("mask", "mask", 
-		 kw::default_value = 0xff, 
-		 kw::default_doc = "0xff")
-	    .arg("mode", "mode", 
-		 kw::default_value = 0, 
-		 kw::default_doc = "0x00")
-	    .arg("timeout", "timeout", 
-		 kw::default_value = 0, 
-		 kw::default_doc = "0x00")
-	    .doc("Sets parameters for section filter.") );
+            .doc("Stops filtering") );
+
+    dir.add("filter",
+            fty::Command<void (unsigned short int,
+                                    unsigned,
+                                    senf::console::FlagCollection<Flags>,
+                                    unsigned,
+                                    unsigned,
+                                    unsigned)
+            >(&DVBSectionProtocolWrapper::setSectionFilter, this)
+            .arg("pid", "pid to filter")
+            .arg("filter", "filter",
+                 kw::default_value = 62,
+                 kw::default_doc = "0x3e")
+            .arg("flags", "or-able: CHECK_CRC, ONESHOT, IMMEDIATE_START, KERNEL_CLIENT",
+                 kw::default_value = DMX_IMMEDIATE_START | DMX_CHECK_CRC,
+                 kw::default_doc = "(IMMEDIATE_START CHECK_CRC)")
+            .arg("mask", "mask",
+                 kw::default_value = 0xff,
+                 kw::default_doc = "0xff")
+            .arg("mode", "mode",
+                 kw::default_value = 0,
+                 kw::default_doc = "0x00")
+            .arg("timeout", "timeout",
+                 kw::default_value = 0,
+                 kw::default_doc = "0x00")
+            .doc("Sets parameters for section filter.") );
 
     dir.add("stop", fty::Command(&DVBSectionProtocolWrapper::setBufferSize, this)
-	    .doc("Stops filtering") );
+            .doc("Stops filtering") );
 }
 
 
-prefix_ senf::DVBPESProtocolWrapper::DVBPESProtocolWrapper(senf::DVBDemuxPESHandle sh) 
-    : protocol(sh.protocol()), dir(this) 
+prefix_ senf::DVBPESProtocolWrapper::DVBPESProtocolWrapper(senf::DVBDemuxPESHandle sh)
+    : protocol(sh.protocol()), dir(this)
 {
     namespace kw = senf::console::kw;
     namespace fty = senf::console::factory;
 
-    dir.add("filter", 
-	    fty::Command<void (unsigned short int, 
-				    dmx_input_t, 
-				    dmx_output_t, 
-				    dmx_pes_type_t, 
-				    senf::console::FlagCollection<Flags>)
-	    >(&DVBPESProtocolWrapper::setPESFilter, this)
-	    .arg("pid", "pid to filter")
-	    .arg("input", "input-filter: DMX_IN_FRONTEND DMX_IN_DVR ")
-	    .arg("output", "output-filter: DMX_OUT_DECODER DMX_OUT_TAP DMX_OUT_TS_TAP ")
-	    .arg("pesType", "PES type: DMX_PES_AUDIO[0-3] DMX_PES_VIDEO[0-3] "
-		            "DMX_PES_TELETEXT[0-3], DMX_PES_SUBTITLE[0-3], DMX_PES_PCR[0-3], "
-		            "DMX_PES_OTHER")
-	    .arg("flags", "or-able: CHECK_CRC, ONESHOT, IMMEDIATE_START, KERNEL_CLIENT", 
-		 kw::default_value = DMX_IMMEDIATE_START | DMX_CHECK_CRC, 
-		 kw::default_doc = "(IMMEDIATE_START CHECK_CRC)")
-	    .doc("Sets parameters for PES filter.") );
-    
+    dir.add("filter",
+            fty::Command<void (unsigned short int,
+                                    dmx_input_t,
+                                    dmx_output_t,
+                                    dmx_pes_type_t,
+                                    senf::console::FlagCollection<Flags>)
+            >(&DVBPESProtocolWrapper::setPESFilter, this)
+            .arg("pid", "pid to filter")
+            .arg("input", "input-filter: DMX_IN_FRONTEND DMX_IN_DVR ")
+            .arg("output", "output-filter: DMX_OUT_DECODER DMX_OUT_TAP DMX_OUT_TS_TAP ")
+            .arg("pesType", "PES type: DMX_PES_AUDIO[0-3] DMX_PES_VIDEO[0-3] "
+                            "DMX_PES_TELETEXT[0-3], DMX_PES_SUBTITLE[0-3], DMX_PES_PCR[0-3], "
+                            "DMX_PES_OTHER")
+            .arg("flags", "or-able: CHECK_CRC, ONESHOT, IMMEDIATE_START, KERNEL_CLIENT",
+                 kw::default_value = DMX_IMMEDIATE_START | DMX_CHECK_CRC,
+                 kw::default_doc = "(IMMEDIATE_START CHECK_CRC)")
+            .doc("Sets parameters for PES filter.") );
+
     dir.add("start", fty::Command(&DVBPESProtocolWrapper::startFiltering, this)
-	    .doc("Starts filtering") );
+            .doc("Starts filtering") );
 
     dir.add("stop", fty::Command(&DVBPESProtocolWrapper::stopFiltering, this)
-	    .doc("Stops filtering") );
+            .doc("Stops filtering") );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End: