X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FDuplicators.hh;h=1f58c730ed6dee7c448954608438aaa4f6ae0d94;hb=af1d0936ba912bb301ac6604965df5b28d79c63e;hp=f5ea38936a5d4bd942ae84155a389141777ceb22;hpb=bf762ee0cef226cad371646bfdec8b286866d84c;p=senf.git

diff --git a/PPI/Duplicators.hh b/PPI/Duplicators.hh
index f5ea389..1f58c73 100644
--- a/PPI/Duplicators.hh
+++ b/PPI/Duplicators.hh
@@ -31,20 +31,13 @@
 #include "predecl.hh"
 #include "Connectors.hh"
 #include "Module.hh"
+#include "MultiConnectorMixin.hh"
 
 //#include "Duplicators.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
-
-#ifndef DOXYGEN
-
-    template <class Target>
-    connector::GenericActiveOutput & connect(module::ActiveDuplicator & source, Target & target);
-    
-#endif
-
 namespace module {
 
     /** \brief Copy every incoming packet to each output
@@ -65,7 +58,8 @@ namespace module {
         \ingroup routing_modules
      */
     class ActiveDuplicator
-        : public Module
+        : public Module,
+          public MultiConnectorMixin<ActiveDuplicator, connector::ActiveOutput<> >
     {
         SENF_PPI_MODULE(ActiveDuplicator);
     public:
@@ -74,19 +68,10 @@ namespace module {
         ActiveDuplicator();
 
     private:
-        connector::ActiveOutput<> & newOutput();
-
-#ifndef DOXYGEN
-    public:
-#endif
-        template <class Target>
-        connector::GenericActiveOutput & connect(Target & target);
-
-    private:
+        void connectorSetup(ActiveDuplicator::ConnectorType & conn);
         void request();
 
-        typedef boost::ptr_vector<connector::ActiveOutput<> > Outputs;
-        Outputs outputs_;
+        friend class MultiConnectorMixin<ActiveDuplicator, connector::ActiveOutput<> >;
     };
 
 }}}
@@ -96,7 +81,7 @@ namespace module {
 ///////////////////////////////hh.e////////////////////////////////////////
 #include "Duplicators.cci"
 //#include "Duplicators.ct"
-#include "Duplicators.cti"
+//#include "Duplicators.cti"
 #endif