diff options
| author | David Robillard <d@drobilla.net> | 2007-07-25 06:07:42 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-25 06:07:42 +0000 |
| commit | 75911e8ae28f011727ce303961a1adb56643689d (patch) | |
| tree | ed83fcfc6bf11a6c5d48ef2337f7458fe29ea7a3 /src/libs/gui/gui.cpp | |
| parent | 68861e30d860010424112ebaacf960a7839a009a (diff) | |
| download | ingen-75911e8ae28f011727ce303961a1adb56643689d.tar.gz ingen-75911e8ae28f011727ce303961a1adb56643689d.tar.bz2 ingen-75911e8ae28f011727ce303961a1adb56643689d.zip | |
Fix running with ingen -eg.
Start basic framework of an Ingen "Core" system/library (in module library for now).
git-svn-id: http://svn.drobilla.net/lad/ingen@624 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui/gui.cpp')
| -rw-r--r-- | src/libs/gui/gui.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/libs/gui/gui.cpp b/src/libs/gui/gui.cpp index 689adf62..ca160e00 100644 --- a/src/libs/gui/gui.cpp +++ b/src/libs/gui/gui.cpp @@ -25,27 +25,11 @@ namespace GUI { void run(int argc, char** argv, + Ingen::Shared::World* world, SharedPtr<Ingen::Engine> engine, SharedPtr<Shared::EngineInterface> interface) { - App::run(argc, argv, engine, interface); -#if 0 - Gnome::Canvas::init(); - Gtk::Main gtk_main(argc, argv); - Gtk::Window::set_default_icon_from_file(PKGDATADIR "/ingen.svg"); - - /* Instantiate singleton (bad, FIXME) */ - App::instantiate(argc, argv); - - /* Load settings */ - App::instance().configuration()->load_settings(); - App::instance().configuration()->apply_settings(); - - App::instance().connect_window()->start(); - gtk_main.run(); - - return 0; -#endif + App::run(argc, argv, world, engine, interface); } |