From 34a71ea377fbc2b5df7e42fbfcf982d330b71a05 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 3 Jun 2009 04:42:01 +0000 Subject: Organize ingen_module like other modules. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2080 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/Engine.hpp | 2 +- src/engine/LV2Info.hpp | 1 - src/engine/NodeFactory.hpp | 4 +-- src/gui/App.cpp | 1 - src/gui/LoadRemotePatchWindow.cpp | 1 - src/gui/PatchCanvas.cpp | 1 - src/gui/ThreadedLoader.cpp | 1 - src/gui/UploadPatchWindow.cpp | 1 - src/gui/gui.hpp | 6 +--- src/ingen/main.cpp | 2 +- src/module/global.cpp | 75 --------------------------------------- src/module/global.hpp | 33 ----------------- src/module/ingen_module.cpp | 75 +++++++++++++++++++++++++++++++++++++++ src/module/ingen_module.hpp | 33 +++++++++++++++++ src/module/wscript | 2 +- 15 files changed, 114 insertions(+), 124 deletions(-) delete mode 100644 src/module/global.cpp delete mode 100644 src/module/global.hpp create mode 100644 src/module/ingen_module.cpp create mode 100644 src/module/ingen_module.hpp diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp index 479a4832..16635561 100644 --- a/src/engine/Engine.hpp +++ b/src/engine/Engine.hpp @@ -23,7 +23,7 @@ #include #include #include "raul/SharedPtr.hpp" -#include "module/global.hpp" +#include "module/World.hpp" #include "interface/DataType.hpp" #include "interface/EventType.hpp" diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp index 63b1b9c2..f689e45f 100644 --- a/src/engine/LV2Info.hpp +++ b/src/engine/LV2Info.hpp @@ -26,7 +26,6 @@ #include #include #include "slv2/slv2.h" -#include "module/global.hpp" #include "module/World.hpp" #include "shared/LV2URIMap.hpp" #include "shared/LV2Features.hpp" diff --git a/src/engine/NodeFactory.hpp b/src/engine/NodeFactory.hpp index fe443424..1c8299b2 100644 --- a/src/engine/NodeFactory.hpp +++ b/src/engine/NodeFactory.hpp @@ -24,9 +24,9 @@ #include #include #include "raul/SharedPtr.hpp" -#include "ingen-config.h" -#include "module/global.hpp" #include "raul/URI.hpp" +#include "module/World.hpp" +#include "ingen-config.h" namespace Ingen { diff --git a/src/gui/App.cpp b/src/gui/App.cpp index fd9a947f..29b00283 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -26,7 +26,6 @@ #include #include "raul/Path.hpp" #include "flowcanvas/Connection.hpp" -#include "module/global.hpp" #include "module/Module.hpp" #include "module/World.hpp" #include "engine/Engine.hpp" diff --git a/src/gui/LoadRemotePatchWindow.cpp b/src/gui/LoadRemotePatchWindow.cpp index 0f57fbf9..149648c8 100644 --- a/src/gui/LoadRemotePatchWindow.cpp +++ b/src/gui/LoadRemotePatchWindow.cpp @@ -22,7 +22,6 @@ #include "client/PatchModel.hpp" #include "interface/EngineInterface.hpp" #include "module/World.hpp" -#include "module/global.hpp" #include "App.hpp" #include "Configuration.hpp" #include "LoadRemotePatchWindow.hpp" diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp index bbe3d2c8..d25095e3 100644 --- a/src/gui/PatchCanvas.cpp +++ b/src/gui/PatchCanvas.cpp @@ -16,7 +16,6 @@ */ #include "ingen-config.h" -#include "module/global.hpp" #include "module/World.hpp" #include diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 7664ffc7..1a2a209e 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -17,7 +17,6 @@ #include #include -#include "module/global.hpp" #include "module/World.hpp" #include "module/Module.hpp" #include "App.hpp" diff --git a/src/gui/UploadPatchWindow.cpp b/src/gui/UploadPatchWindow.cpp index 1d930cb5..c24de34c 100644 --- a/src/gui/UploadPatchWindow.cpp +++ b/src/gui/UploadPatchWindow.cpp @@ -22,7 +22,6 @@ #include #include #include "redlandmm/Query.hpp" -#include "module/global.hpp" #include "module/World.hpp" #include "client/ClientStore.hpp" #include "interface/EngineInterface.hpp" diff --git a/src/gui/gui.hpp b/src/gui/gui.hpp index 343bc618..19eabe0b 100644 --- a/src/gui/gui.hpp +++ b/src/gui/gui.hpp @@ -18,13 +18,9 @@ #ifndef INGEN_GUI_H #define INGEN_GUI_H -#include "module/global.hpp" - namespace Ingen { -class Engine; - -namespace Shared { class EngineInterface; } +namespace Shared { class World; } namespace GUI { diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 3ead6146..caf65e78 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -29,7 +29,7 @@ #include "raul/SharedPtr.hpp" #include "redlandmm/World.hpp" #include "shared/runtime_paths.hpp" -#include "module/global.hpp" +#include "module/ingen_module.hpp" #include "module/Module.hpp" #include "module/World.hpp" #include "engine/tuning.hpp" diff --git a/src/module/global.cpp b/src/module/global.cpp deleted file mode 100644 index 2415f6ef..00000000 --- a/src/module/global.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include "redlandmm/World.hpp" -#include "shared/LV2Features.hpp" -#include "global.hpp" -#include "World.hpp" - -#include "ingen-config.h" -#ifdef HAVE_SLV2 -#include "slv2/slv2.h" -#endif - -using namespace std; - -namespace Ingen { -namespace Shared { - -static World* world = NULL; - - -World* -get_world() -{ - static World* world = NULL; - - if (!world) { - world = new World(); - world->rdf_world = new Redland::World(); -#ifdef HAVE_SLV2 - world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world()); - world->lv2_features = new LV2Features(); - slv2_world_load_all(world->slv2_world); -#endif - world->engine.reset(); - world->local_engine.reset(); - } - - return world; -} - - -void -destroy_world() -{ - if (world) { -#ifdef HAVE_SLV2 - slv2_world_free(world->slv2_world); - delete world->lv2_features; -#endif - delete world->rdf_world; - delete world; - world = NULL; - } -} - - -} // namesace Shared -} // namespace Ingen - diff --git a/src/module/global.hpp b/src/module/global.hpp deleted file mode 100644 index ef373430..00000000 --- a/src/module/global.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 Dave Robillard - * - * Ingen is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef INGEN_GLOBAL_H -#define INGEN_GLOBAL_H - -namespace Ingen { -namespace Shared { - -class World; - -World* get_world(); -void destroy_world(); - -} // namesace Shared -} // namespace Ingen - -#endif // INGEN_GLOBAL_H - diff --git a/src/module/ingen_module.cpp b/src/module/ingen_module.cpp new file mode 100644 index 00000000..c9a6d9d4 --- /dev/null +++ b/src/module/ingen_module.cpp @@ -0,0 +1,75 @@ +/* This file is part of Ingen. + * Copyright (C) 2007-2009 Dave Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include "redlandmm/World.hpp" +#include "shared/LV2Features.hpp" +#include "ingen_module.hpp" +#include "World.hpp" + +#include "ingen-config.h" +#ifdef HAVE_SLV2 +#include "slv2/slv2.h" +#endif + +using namespace std; + +namespace Ingen { +namespace Shared { + +static World* world = NULL; + + +World* +get_world() +{ + static World* world = NULL; + + if (!world) { + world = new World(); + world->rdf_world = new Redland::World(); +#ifdef HAVE_SLV2 + world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world()); + world->lv2_features = new LV2Features(); + slv2_world_load_all(world->slv2_world); +#endif + world->engine.reset(); + world->local_engine.reset(); + } + + return world; +} + + +void +destroy_world() +{ + if (world) { +#ifdef HAVE_SLV2 + slv2_world_free(world->slv2_world); + delete world->lv2_features; +#endif + delete world->rdf_world; + delete world; + world = NULL; + } +} + + +} // namesace Shared +} // namespace Ingen + diff --git a/src/module/ingen_module.hpp b/src/module/ingen_module.hpp new file mode 100644 index 00000000..ef373430 --- /dev/null +++ b/src/module/ingen_module.hpp @@ -0,0 +1,33 @@ +/* This file is part of Ingen. + * Copyright (C) 2007-2009 Dave Robillard + * + * Ingen is free software; you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef INGEN_GLOBAL_H +#define INGEN_GLOBAL_H + +namespace Ingen { +namespace Shared { + +class World; + +World* get_world(); +void destroy_world(); + +} // namesace Shared +} // namespace Ingen + +#endif // INGEN_GLOBAL_H + diff --git a/src/module/wscript b/src/module/wscript index 50103f7e..6c7e726e 100644 --- a/src/module/wscript +++ b/src/module/wscript @@ -5,7 +5,7 @@ def build(bld): obj = bld.new_task_gen('cxx', 'shlib') obj.source = ''' Module.cpp - global.cpp + ingen_module.cpp ''' obj.export_incdirs = ['.'] obj.includes = ['.', '..', '../..', '../common'] -- cgit v1.2.1