diff options
| author | David Robillard <d@drobilla.net> | 2006-09-10 20:11:40 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-10 20:11:40 +0000 |
| commit | e772196c07ff58022beaabf5e494be3441d1ba4a (patch) | |
| tree | 4a3dc214fb333d9787c666e1b3d239124b94302e /src/libs/engine/OSCEngineReceiver.cpp | |
| parent | 8854610aac91caaf6bb8db782cc4c9bd2ca53c52 (diff) | |
| download | ingen-e772196c07ff58022beaabf5e494be3441d1ba4a.tar.gz ingen-e772196c07ff58022beaabf5e494be3441d1ba4a.tar.bz2 ingen-e772196c07ff58022beaabf5e494be3441d1ba4a.zip | |
Zoom Full feature in FlowCanvas/Ingenuity.
Fix for reattaching to running engine (reponse ID bug).
More GUI work.
git-svn-id: http://svn.drobilla.net/lad/ingen@126 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine/OSCEngineReceiver.cpp')
| -rw-r--r-- | src/libs/engine/OSCEngineReceiver.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/engine/OSCEngineReceiver.cpp b/src/libs/engine/OSCEngineReceiver.cpp index 84c9f0fe..ad985b7e 100644 --- a/src/libs/engine/OSCEngineReceiver.cpp +++ b/src/libs/engine/OSCEngineReceiver.cpp @@ -66,7 +66,7 @@ OSCEngineReceiver::OSCEngineReceiver(CountedPtr<Engine> engine, size_t queue_siz } // For debugging, print all incoming OSC messages - //lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); + lo_server_add_method(_server, NULL, NULL, generic_cb, NULL); // Set response address for this message. // It's important this is first and returns nonzero. @@ -222,7 +222,7 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types, //cerr << "** osc responder\n"; if (!strcmp(url, me->_osc_responder->url())) { - // Nice one, same address + // Nice one, same address, do nothing (just set the ID below) //cerr << "** Using cached response address, hooray" << endl; } else { // Shitty deal, make a new one @@ -231,6 +231,7 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types, new OSCResponder(me->_engine->broadcaster(), id, url)); me->set_responder(me->_osc_responder); + // (responder takes ownership of url, no leak) } @@ -241,6 +242,8 @@ OSCEngineReceiver::set_response_address_cb(const char* path, const char* types, me->set_responder(me->_osc_responder); //cerr << "** Setting response address to " << url << "(2)" << endl; } + + me->set_next_response_id(id); // Don't respond } else { |