diff options
| author | David Robillard <d@drobilla.net> | 2008-08-19 18:51:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-08-19 18:51:06 +0000 |
| commit | e16206982d074e62956de00eeef611478f01c430 (patch) | |
| tree | 388bc6e5ad9220cf9cdedf865a2d45856f418ae4 /src/progs | |
| parent | 14764da12f3808da0c40b643ac8224716f060729 (diff) | |
| download | ingen-e16206982d074e62956de00eeef611478f01c430.tar.gz ingen-e16206982d074e62956de00eeef611478f01c430.tar.bz2 ingen-e16206982d074e62956de00eeef611478f01c430.zip | |
Preliminary connecting via HTTP in Gtk client.
Better handling of overflowed client event receive buffer.
Store fixes, complain only once about orphans, don't request an orphan parent over and over.
git-svn-id: http://svn.drobilla.net/lad/ingen@1447 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs')
| -rw-r--r-- | src/progs/ingen/main.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index d0efb113..c8adf207 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -133,14 +133,14 @@ main(int argc, char** argv) cerr << "Unable to load client module." << endl; } - /* If we don't have a local engine interface (for GUI), use OSC */ + /* If we don't have a local engine interface (for GUI), use network */ if (client_module && ! engine_interface) { - SharedPtr<Shared::EngineInterface> (*new_osc_interface)(const std::string&) = NULL; + SharedPtr<Shared::EngineInterface> (*new_remote_interface)(const std::string&) = NULL; - if (client_module->get_symbol("new_osc_interface", (void*&)new_osc_interface)) { - engine_interface = new_osc_interface(args.connect_arg); + if (client_module->get_symbol("new_remote_interface", (void*&)new_remote_interface)) { + engine_interface = new_remote_interface(args.connect_arg); } else { - cerr << "Unable to find symbol 'new_osc_interface' in " + cerr << "Unable to find symbol 'new_remote_interface' in " "ingen_client module, aborting." << endl; return -1; } @@ -157,7 +157,7 @@ main(int argc, char** argv) /* Load a patch */ if (args.load_given && engine_interface) { - boost::optional<Glib::ustring> engine_base; + Glib::ustring engine_base = "/"; if (args.path_given) engine_base = string(args.path_arg) + "/"; @@ -185,7 +185,7 @@ main(int argc, char** argv) engine_interface->load_plugins(); - parser->parse_document(world, engine_interface.get(), uri, uri, engine_base); + parser->parse_document(world, engine_interface.get(), uri, engine_base, uri); } else { cerr << "Unable to load serialisation module, aborting." << endl; |