diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/libs/client/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libs/engine/InputPort.cpp | 33 | ||||
| -rw-r--r-- | src/libs/engine/events/RequestPortValueEvent.cpp | 4 | ||||
| -rw-r--r-- | src/progs/ingenuity/ConnectWindow.cpp | 4 | ||||
| -rw-r--r-- | src/progs/ingenuity/NodeControlWindow.cpp | 8 |
6 files changed, 18 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index 2074e0df..7cb18f36 100644 --- a/configure.ac +++ b/configure.ac @@ -200,9 +200,9 @@ AC_ARG_ENABLE([gtk-client], # Ingenuity with internal engine monolithic_ingenuity="$build_gtk_client" -AC_ARG_ENABLE([monolithic-gtk-client], - AS_HELP_STRING(--enable-monolithic-gtk-client [Build Ingenuity with internal engine (true, if building Ingenuity)]), - [ if test x$enable_monolithic_gtk_client = xno ; then monolithic_gtk_client=no ; fi ]) +AC_ARG_ENABLE([monolithic-ingenuity], + AS_HELP_STRING(--enable-monolithic-ingenuity [Build Ingenuity with internal engine (true, if building Ingenuity)]), + [ if test x$enable_monolithic_ingenuity = xno ; then monolithic_ingenuity=no ; fi ]) diff --git a/src/libs/client/Makefile.am b/src/libs/client/Makefile.am index 732dc55c..e35e9a9b 100644 --- a/src/libs/client/Makefile.am +++ b/src/libs/client/Makefile.am @@ -3,8 +3,8 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common if BUILD_CLIENT_LIB noinst_LTLIBRARIES = libingenclient.la -libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" @LXML2_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ -libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @RAUL_LIBS@ @GLIBMM_LIBS@ +libingenclient_la_CXXFLAGS = -I$(top_srcdir)/src/common -DPKGDATADIR=\"$(pkgdatadir)\" @LXML2_CFLAGS@ @RASQAL_CFLAGS@ @RAPTOR_CFLAGS@ @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ +libingenclient_la_LIBADD = @LXML2_LIBS@ @LOSC_LIBS@ @RASQAL_LIBS@ @RAPTOR_LIBS@ @LSIGCPP_LIBS@ @RAUL_LIBS@ @GLIBMM_LIBS@ libingenclient_la_SOURCES = \ OSCEngineSender.h \ diff --git a/src/libs/engine/InputPort.cpp b/src/libs/engine/InputPort.cpp index 8b170958..178a111c 100644 --- a/src/libs/engine/InputPort.cpp +++ b/src/libs/engine/InputPort.cpp @@ -155,39 +155,6 @@ template bool InputPort<Sample>::is_connected_to(const OutputPort<Sample>* const template bool InputPort<MidiMessage>::is_connected_to(const OutputPort<MidiMessage>* const port) const; -/** "Ties" this port to an OutputPort, so they share the same buffer. - * - * This is used by OutputNode and InputNode to provide two different ports - * (internal and external) that share a buffer. - */ -/* -template <typename T> -void -InputPort<T>::tie(OutputPort<T>* const port) -{ - assert((Port*)port != (Port*)this); - assert(port->poly() == this->poly()); - assert(!m_is_tied); - assert(m_tied_port == NULL); - - if (Port::parent_node() != NULL) { - assert(_poly == port->poly()); - - for (size_t i=0; i < _poly; ++i) - port->buffer(i)->join(m_buffers.at(i)); - } - m_is_tied = true; - m_tied_port = port; - port->set_tied_port(this); - - assert(m_buffers.at(0)->data() == port->buffer(0)->data()); - - //cerr << "*** Tied " << this->path() << " <-> " << port->path() << endl; -} -template void InputPort<Sample>::tie(OutputPort<Sample>* const port); -template void InputPort<MidiMessage>::tie(OutputPort<MidiMessage>* const port); -*/ - /** Prepare buffer for access, mixing if necessary. Realtime safe. * FIXME: nframes parameter not used, */ diff --git a/src/libs/engine/events/RequestPortValueEvent.cpp b/src/libs/engine/events/RequestPortValueEvent.cpp index a3346086..8457486f 100644 --- a/src/libs/engine/events/RequestPortValueEvent.cpp +++ b/src/libs/engine/events/RequestPortValueEvent.cpp @@ -54,7 +54,7 @@ RequestPortValueEvent::execute(SampleCount nframes, FrameTime start, FrameTime e assert(_time >= start && _time <= end); if (m_port != NULL && m_port->type() == DataType::FLOAT) - m_value = ((TypedPort<Sample>*)m_port)->buffer(0)->value_at(_time - start); + m_value = ((TypedPort<Sample>*)m_port)->buffer(0)->value_at(0/*_time - start*/); else m_port = NULL; // triggers error response } @@ -64,7 +64,7 @@ void RequestPortValueEvent::post_process() { string msg; - if (m_port) { + if (!m_port) { _responder->respond_error("Unable to find port for get_value responder."); } else if (m_client) { _responder->respond_ok(); 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); |