X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=PPI%2FSetup.cti;h=509bbb112a8ea0099932262f9426841e68bc2044;hb=a1fdb7bb122f0b05be809a922d4b7ef5e125fa67;hp=caf151fd9cdf984096bfb77fa5a7fa079a79b877;hpb=0327b3f303ea2a61d44a30bfaac022874dcf2a0d;p=senf.git

diff --git a/PPI/Setup.cti b/PPI/Setup.cti
index caf151f..509bbb1 100644
--- a/PPI/Setup.cti
+++ b/PPI/Setup.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -26,35 +26,40 @@
 //#include "Setup.ih"
 
 // Custom includes
+#include "Jack.hh"
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
 #ifndef DOXYGEN
 
-template <class M, class C>
-prefix_ void
-senf::ppi::connect(M & source, C & target,
-                   typename boost::enable_if< boost::is_base_of<module::Module, M> >::type *,
-                   typename boost::enable_if< boost::is_base_of<connector::Connector, C> >::type *)
+template <class T, class C>
+prefix_ void senf::ppi::
+connect(T & source, C & target,
+        typename boost::disable_if< boost::is_base_of<connector::Connector, T> >::type *,
+        typename boost::enable_if< boost::is_base_of<connector::Connector, C> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Jack, T> >::type *)
 {
     connect(source.output, target);
 }
 
-template <class C, class M>
-prefix_ void
-senf::ppi::connect(C & source, M & target,
-                   typename boost::enable_if< boost::is_base_of<connector::Connector, C> >::type *,
-                   typename boost::enable_if< boost::is_base_of<module::Module, M> >::type *)
+template <class C, class T>
+prefix_ void senf::ppi::
+connect(C & source, T & target,
+        typename boost::enable_if< boost::is_base_of<connector::Connector, C> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Connector,T> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Jack, T> >::type *)
 {
     connect(source, target.input);
 }
 
-template <class M1, class M2>
-prefix_ void
-senf::ppi::connect(M1 & source, M2 & target,
-                   typename boost::enable_if< boost::is_base_of<module::Module, M1> >::type *,
-                   typename boost::enable_if< boost::is_base_of<module::Module, M2> >::type *)
+template <class T1, class T2>
+prefix_ void senf::ppi::
+connect(T1 & source, T2 & target,
+        typename boost::disable_if< boost::is_base_of<connector::Connector, T1> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Connector, T2> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Jack, T1> >::type *,
+        typename boost::disable_if< boost::is_base_of<connector::Jack, T2> >::type *)
 {
     connect(source.output, target.input);
 }