diff options
| author | David Robillard <d@drobilla.net> | 2009-05-13 04:05:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-05-13 04:05:32 +0000 |
| commit | 19928bb583e72802746b89e322f71ecc0fcb7427 (patch) | |
| tree | 95912dc84d8c9dcf57939398514feaf148c1cd63 /src/gui/ConnectWindow.cpp | |
| parent | 96f839e64de70a23210847e322d24690299287fe (diff) | |
| download | ingen-19928bb583e72802746b89e322f71ecc0fcb7427.tar.gz ingen-19928bb583e72802746b89e322f71ecc0fcb7427.tar.bz2 ingen-19928bb583e72802746b89e322f71ecc0fcb7427.zip | |
The great ID refactoring of 2009.
Path is now actually URI (scheme path: for now).
Therefore ingen nodes and such live in the same namespace as ... well, everything.
Including plugins.
Thar be profit, laddies.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1992 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui/ConnectWindow.cpp')
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 028ce1df..f255ebdc 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -167,14 +167,19 @@ ConnectWindow::connect(bool existing) #ifdef HAVE_LIBLO if (_mode == CONNECT_REMOTE) { if (!existing) { - const string url = (_widgets_loaded ? (string)_url_entry->get_text() : world->engine->uri()); - world->engine = SharedPtr<EngineInterface>(new OSCEngineSender(url)); + Raul::URI engine_url("http://localhost:16180"); + if (_widgets_loaded) { + const std::string& url_str = _url_entry->get_text(); + if (Raul::URI::is_valid(url_str)) + engine_url = url_str; + } + world->engine = SharedPtr<EngineInterface>(new OSCEngineSender(engine_url)); } SharedPtr<ThreadedSigClientInterface> tsci(new ThreadedSigClientInterface(1024)); SharedPtr<Raul::Deletable> client; - const string& uri = world->engine->uri(); + const string& uri = world->engine->uri().str(); const string& scheme = uri.substr(0, uri.find(":")); if (scheme == "osc.udp" || scheme == "osc.tcp") client = SharedPtr<OSCClientReceiver>(new OSCClientReceiver(16181, tsci)); // FIXME: port |