summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-01-02 04:15:10 +0000
committerDavid Robillard <d@drobilla.net>2007-01-02 04:15:10 +0000
commit9c5f7e9dc2029f97d0baf622165701e7c124b25e (patch)
tree806222dbbd5cb95d2fc4a5932d4d868cd7a49863 /src/progs
parent84906b5777d6748c09dd5ca56169aa3366d13c71 (diff)
downloadingen-9c5f7e9dc2029f97d0baf622165701e7c124b25e.tar.gz
ingen-9c5f7e9dc2029f97d0baf622165701e7c124b25e.tar.bz2
ingen-9c5f7e9dc2029f97d0baf622165701e7c124b25e.zip
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
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/ingenuity/ConnectWindow.cpp4
-rw-r--r--src/progs/ingenuity/NodeControlWindow.cpp8
2 files changed, 11 insertions, 1 deletions
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<Ingen::Engine> 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);