diff options
| author | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-03-16 04:13:23 +0000 |
| commit | 9da093217352daa1fb61a6f2daf5195640e286a7 (patch) | |
| tree | fb3489c04451dc14a61170ba2418123727414340 /src/ingen | |
| parent | 119468f621a59d86da10bedf75c4427b70f9d370 (diff) | |
| download | ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.gz ingen-9da093217352daa1fb61a6f2daf5195640e286a7.tar.bz2 ingen-9da093217352daa1fb61a6f2daf5195640e286a7.zip | |
Merge ClientInterface and ServerInterface.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4067 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
| -rw-r--r-- | src/ingen/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 61d8a90e..2a9645af 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -40,7 +40,7 @@ #include "ingen_config.h" #include "ingen/EngineBase.hpp" -#include "ingen/ServerInterface.hpp" +#include "ingen/Interface.hpp" #include "ingen/serialisation/Parser.hpp" #include "ingen/shared/Configuration.hpp" #include "ingen/shared/World.hpp" @@ -107,7 +107,7 @@ main(int argc, char** argv) // Set bundle path from executable location so resources can be found Shared::set_bundle_path_from_code((void*)&main); - SharedPtr<ServerInterface> engine_interface; + SharedPtr<Interface> engine_interface; Glib::thread_init(); #ifdef HAVE_SOUP @@ -156,7 +156,7 @@ main(int argc, char** argv) "Unable to load HTTP client module"); #endif const char* const uri = conf.option("connect").get_string(); - SharedPtr<ClientInterface> client(new Client::SigClientInterface()); + SharedPtr<Interface> client(new Client::SigClientInterface()); ingen_try((engine_interface = world->interface(uri, client)), (string("Unable to create interface to `") + uri + "'").c_str()); } |