From 14764da12f3808da0c40b643ac8224716f060729 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 19 Aug 2008 02:33:04 +0000 Subject: Remove weird virtual inheritance interface overlay thing from client in favour of wrappers. git-svn-id: http://svn.drobilla.net/lad/ingen@1445 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/ConnectWindow.cpp | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'src/libs/gui/ConnectWindow.cpp') diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp index f1b0912a..03f8408a 100644 --- a/src/libs/gui/ConnectWindow.cpp +++ b/src/libs/gui/ConnectWindow.cpp @@ -44,19 +44,6 @@ namespace Ingen { namespace GUI { -// Paste together some interfaces to get the combination we want - - -struct OSCSigEmitter : public OSCClientReceiver, public ThreadedSigClientInterface { - OSCSigEmitter(size_t queue_size, int listen_port) - : Ingen::Shared::ClientInterface() - , OSCClientReceiver(listen_port) - , ThreadedSigClientInterface(queue_size) - { - } -}; - - // ConnectWindow @@ -170,9 +157,10 @@ ConnectWindow::connect(bool existing) world->engine = SharedPtr(new OSCEngineSender(url)); } - OSCSigEmitter* ose = new OSCSigEmitter(1024, 16181); // FIXME: args - SharedPtr client(ose); - App::instance().attach(client); + // FIXME: static args + SharedPtr tsci(new ThreadedSigClientInterface(1024)); + SharedPtr client(new OSCClientReceiver(16181, tsci)); + App::instance().attach(tsci, client); Glib::signal_timeout().connect( sigc::mem_fun(App::instance(), &App::gtk_main_iteration), 40, G_PRIORITY_DEFAULT); @@ -191,9 +179,10 @@ ConnectWindow::connect(bool existing) world->engine = SharedPtr( new OSCEngineSender(string("osc.udp://localhost:").append(port_str))); - OSCSigEmitter* ose = new OSCSigEmitter(1024, 16181); // FIXME: args - SharedPtr client(ose); - App::instance().attach(client); + // FIXME: static args + SharedPtr tsci(new ThreadedSigClientInterface(1024)); + SharedPtr client(new OSCClientReceiver(16181, tsci)); + App::instance().attach(tsci, client); Glib::signal_timeout().connect( sigc::mem_fun(App::instance(), &App::gtk_main_iteration), 40, G_PRIORITY_DEFAULT); -- cgit v1.2.1