From 9c5f7e9dc2029f97d0baf622165701e7c124b25e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 2 Jan 2007 04:15:10 +0000 Subject: Fix building non-monolithic Ingenuity. Fixed initial node control window control values, git-svn-id: http://svn.drobilla.net/lad/ingen@230 a436a847-0d15-0410-975c-d299462d15a1 --- src/progs/ingenuity/ConnectWindow.cpp | 4 +++- src/progs/ingenuity/NodeControlWindow.cpp | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/progs') diff --git a/src/progs/ingenuity/ConnectWindow.cpp b/src/progs/ingenuity/ConnectWindow.cpp index 66fc9dca..f36fb1db 100644 --- a/src/progs/ingenuity/ConnectWindow.cpp +++ b/src/progs/ingenuity/ConnectWindow.cpp @@ -34,9 +34,9 @@ #include "engine/QueuedEngineInterface.h" #include "engine/DirectResponder.h" #include "engine/tuning.h" +using Ingen::QueuedEngineInterface; #endif using Ingen::Client::ThreadedSigClientInterface; -using Ingen::QueuedEngineInterface; namespace Ingenuity { @@ -54,6 +54,7 @@ struct OSCSigEmitter : public OSCClientReceiver, public ThreadedSigClientInterfa }; +#ifdef MONOLITHIC_INGENUITY struct QueuedModelEngineInterface : public QueuedEngineInterface, public ModelEngineInterface { QueuedModelEngineInterface(SharedPtr engine) : Ingen::Shared::EngineInterface() @@ -62,6 +63,7 @@ struct QueuedModelEngineInterface : public QueuedEngineInterface, public ModelEn QueuedEventSource::start(); } }; +#endif // ConnectWindow diff --git a/src/progs/ingenuity/NodeControlWindow.cpp b/src/progs/ingenuity/NodeControlWindow.cpp index 78574196..00269c21 100644 --- a/src/progs/ingenuity/NodeControlWindow.cpp +++ b/src/progs/ingenuity/NodeControlWindow.cpp @@ -14,6 +14,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "App.h" +#include "ModelEngineInterface.h" #include "NodeControlWindow.h" #include "GladeFactory.h" #include "NodeModel.h" @@ -106,6 +108,12 @@ NodeControlWindow::resize() void NodeControlWindow::on_show() { + for (PortModelList::const_iterator i = m_node->ports().begin(); + i != m_node->ports().end(); ++i) { + App::instance().engine()->request_port_value((*i)->path()); + } + + if (m_position_stored) move(m_x, m_y); -- cgit v1.2.1