summaryrefslogtreecommitdiffstats
path: root/src/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /src/ingen
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz
ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2
ingen-629fb50716083c71146340de97eb8651679ca9fb.zip
Merge Ingen::Shared namespace into Ingen namespace and core libingen library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
-rw-r--r--src/ingen/main.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp
index 847a08f5..651c7ad0 100644
--- a/src/ingen/main.cpp
+++ b/src/ingen/main.cpp
@@ -33,9 +33,9 @@
#include "ingen/EngineBase.hpp"
#include "ingen/Interface.hpp"
#include "ingen/serialisation/Parser.hpp"
-#include "ingen/shared/Configuration.hpp"
-#include "ingen/shared/World.hpp"
-#include "ingen/shared/runtime_paths.hpp"
+#include "ingen/Configuration.hpp"
+#include "ingen/World.hpp"
+#include "ingen/runtime_paths.hpp"
#include "ingen/client/ThreadedSigClientInterface.hpp"
#ifdef WITH_BINDINGS
#include "bindings/ingen_bindings.hpp"
@@ -44,7 +44,7 @@
using namespace std;
using namespace Ingen;
-Ingen::Shared::World* world = NULL;
+Ingen::World* world = NULL;
void
ingen_interrupt(int signal)
@@ -75,11 +75,11 @@ int
main(int argc, char** argv)
{
Glib::thread_init();
- Shared::set_bundle_path_from_code((void*)&main);
+ Ingen::set_bundle_path_from_code((void*)&main);
// Create world
try {
- world = new Ingen::Shared::World(argc, argv, NULL, NULL);
+ world = new Ingen::World(argc, argv, NULL, NULL);
if (argc <= 1) {
world->conf().print_usage("ingen", cout);
return EXIT_FAILURE;
@@ -92,7 +92,7 @@ main(int argc, char** argv)
return EXIT_FAILURE;
}
- Shared::Configuration& conf = world->conf();
+ Configuration& conf = world->conf();
if (conf.option("uuid").is_valid()) {
world->set_jack_uuid(conf.option("uuid").get_string());
}