From 507d9ffa4771978b6964b4c4b261ee923ba7e324 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 8 Oct 2007 17:26:36 +0000 Subject: Reorganize modules module (heh) to make a bit more sense. But not much. git-svn-id: http://svn.drobilla.net/lad/ingen@851 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/Engine.hpp | 2 +- src/libs/engine/NodeFactory.cpp | 3 +- src/libs/engine/NodeFactory.hpp | 2 +- src/libs/gui/App.cpp | 4 +- src/libs/gui/LoadRemotePatchWindow.cpp | 7 +-- src/libs/gui/PatchCanvas.cpp | 15 ++++--- src/libs/gui/ThreadedLoader.cpp | 3 +- src/libs/gui/UploadPatchWindow.cpp | 3 +- src/libs/gui/gui.hpp | 2 +- src/libs/module/Makefile.am | 4 +- src/libs/module/global.cpp | 81 ++++++++++++++++++++++++++++++++++ src/libs/module/global.hpp | 33 ++++++++++++++ src/libs/module/module.cpp | 79 --------------------------------- src/libs/module/module.h | 35 --------------- src/progs/ingen/main.cpp | 4 +- 15 files changed, 143 insertions(+), 134 deletions(-) create mode 100644 src/libs/module/global.cpp create mode 100644 src/libs/module/global.hpp delete mode 100644 src/libs/module/module.cpp delete mode 100644 src/libs/module/module.h (limited to 'src') diff --git a/src/libs/engine/Engine.hpp b/src/libs/engine/Engine.hpp index 355d8c4d..ca8f4f78 100644 --- a/src/libs/engine/Engine.hpp +++ b/src/libs/engine/Engine.hpp @@ -23,7 +23,7 @@ #include #include #include -#include "module/module.h" +#include "module/global.hpp" #include "interface/DataType.hpp" template class Queue; diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index 09d69e18..b2714e23 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -15,13 +15,14 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "NodeFactory.hpp" #include CONFIG_H_PATH #include #include #include #include #include +#include "module/World.hpp" +#include "NodeFactory.hpp" #include "ThreadManager.hpp" #include "MidiNoteNode.hpp" #include "MidiTriggerNode.hpp" diff --git a/src/libs/engine/NodeFactory.hpp b/src/libs/engine/NodeFactory.hpp index 2dacc82a..a956a938 100644 --- a/src/libs/engine/NodeFactory.hpp +++ b/src/libs/engine/NodeFactory.hpp @@ -19,7 +19,7 @@ #define NODEFACTORY_H #include CONFIG_H_PATH -#include "module/module.h" +#include "module/global.hpp" #include #include diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index ef81b0cc..fb185384 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -16,7 +16,6 @@ */ #include CONFIG_H_PATH -#include "module/module.h" #include "App.hpp" #include #include @@ -25,6 +24,9 @@ #include #include #include +#include "module/global.hpp" +#include "module/Module.hpp" +#include "module/World.hpp" #include "interface/EngineInterface.hpp" #include "client/ObjectModel.hpp" #include "client/PatchModel.hpp" diff --git a/src/libs/gui/LoadRemotePatchWindow.cpp b/src/libs/gui/LoadRemotePatchWindow.cpp index 20c1533c..c6020ead 100644 --- a/src/libs/gui/LoadRemotePatchWindow.cpp +++ b/src/libs/gui/LoadRemotePatchWindow.cpp @@ -15,16 +15,17 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "module/module.h" -#include "LoadRemotePatchWindow.hpp" #include #include #include #include -#include "interface/EngineInterface.hpp" #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" #include "ThreadedLoader.hpp" using boost::optional; diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index a02235bf..07301aa4 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -16,7 +16,8 @@ */ #include CONFIG_H_PATH -#include "module/module.h" +#include "module/global.hpp" +#include "module/World.hpp" #include #include @@ -458,17 +459,17 @@ PatchCanvas::destroy_selection() void PatchCanvas::copy_selection() { - Serialiser serializer(*App::instance().world()->rdf_world); - serializer.start_to_string(); + Serialiser serialiser(*App::instance().world()->rdf_world); + serialiser.start_to_string(); for (list >::iterator m = _selected_items.begin(); m != _selected_items.end(); ++m) { boost::shared_ptr module = boost::dynamic_pointer_cast(*m); if (module) { - serializer.serialize(module->node()); + serialiser.serialize(module->node()); } else { boost::shared_ptr port_module = boost::dynamic_pointer_cast(*m); if (port_module) - serializer.serialize(port_module->port()); + serialiser.serialize(port_module->port()); } } @@ -476,10 +477,10 @@ PatchCanvas::copy_selection() c != _selected_connections.end(); ++c) { boost::shared_ptr connection = boost::dynamic_pointer_cast(*c); if (connection) - serializer.serialize_connection(connection->model()); + serialiser.serialize_connection(connection->model()); } - string result = serializer.finish(); + string result = serialiser.finish(); Glib::RefPtr clipboard = Gtk::Clipboard::get(); clipboard->set_text(result); diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp index 11a2bcd7..3cac84f6 100644 --- a/src/libs/gui/ThreadedLoader.cpp +++ b/src/libs/gui/ThreadedLoader.cpp @@ -18,8 +18,9 @@ #include #include #include +#include "module/global.hpp" +#include "module/World.hpp" #include "client/PatchModel.hpp" -#include "module/module.h" #include "App.hpp" #include "ThreadedLoader.hpp" using std::cout; using std::endl; diff --git a/src/libs/gui/UploadPatchWindow.cpp b/src/libs/gui/UploadPatchWindow.cpp index a31f0cf0..b5e414a1 100644 --- a/src/libs/gui/UploadPatchWindow.cpp +++ b/src/libs/gui/UploadPatchWindow.cpp @@ -22,7 +22,8 @@ #include #include #include -#include "module/module.h" +#include "module/global.hpp" +#include "module/World.hpp" #include "interface/EngineInterface.hpp" #include "serialisation/Serialiser.hpp" #include "client/PatchModel.hpp" diff --git a/src/libs/gui/gui.hpp b/src/libs/gui/gui.hpp index cc290851..fa31fe8d 100644 --- a/src/libs/gui/gui.hpp +++ b/src/libs/gui/gui.hpp @@ -19,7 +19,7 @@ #define INGEN_GUI_H #include CONFIG_H_PATH -#include "module/module.h" +#include "module/global.hpp" #include namespace Ingen { diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am index baebfea5..57219c85 100644 --- a/src/libs/module/Makefile.am +++ b/src/libs/module/Makefile.am @@ -5,8 +5,8 @@ libingen_module_la_CXXFLAGS = @RAUL_CFLAGS@ @SLV2_CFLAGS@ @GLIBMM_CFLAGS@ -DINGE libingen_module_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ @SLV2_LIBS@ libingen_module_la_SOURCES = \ - module.h \ - module.cpp \ + global.hpp \ + global.cpp \ World.hpp \ Module.hpp \ Module.cpp diff --git a/src/libs/module/global.cpp b/src/libs/module/global.cpp new file mode 100644 index 00000000..15e844c1 --- /dev/null +++ b/src/libs/module/global.cpp @@ -0,0 +1,81 @@ +/* This file is part of Ingen. + * Copyright (C) 2007 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 "global.hpp" +#include "World.hpp" + +#include CONFIG_H_PATH +#ifdef HAVE_SLV2 +#include +#endif + +using namespace std; + +namespace Ingen { +namespace Shared { + +static World* world = NULL; + + +World* +get_world() +{ + static World* world = NULL; + + if (&world == NULL) { + cerr << "ERROR: Ingen::Shared::world undefined." << endl; + return NULL; + } + + if (!world) { + world = new World(); + world->rdf_world = new Raul::RDF::World(); +#ifdef HAVE_SLV2 + world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world()); + slv2_world_load_all(world->slv2_world); +#endif + world->engine = NULL; + world->local_engine = NULL; + } + + return world; +} + + +void +destroy_world() +{ + if (&world == NULL) { + cerr << "ERROR: Ingen::Shared::world undefined." << endl; + return; + } + + if (world) { +#ifdef HAVE_SLV2 + slv2_world_free(world->slv2_world); +#endif + delete world->rdf_world; + delete world; + world = NULL; + } +} + + +} // namesace Shared +} // namespace Ingen + diff --git a/src/libs/module/global.hpp b/src/libs/module/global.hpp new file mode 100644 index 00000000..1aa46be6 --- /dev/null +++ b/src/libs/module/global.hpp @@ -0,0 +1,33 @@ +/* This file is part of Ingen. + * Copyright (C) 2007 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/libs/module/module.cpp b/src/libs/module/module.cpp deleted file mode 100644 index f19f9e46..00000000 --- a/src/libs/module/module.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 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 "module.h" -#include "World.hpp" - -#include CONFIG_H_PATH -#ifdef HAVE_SLV2 -#include -#endif - -using namespace std; - -namespace Ingen { -namespace Shared { - -static World* world = NULL; - -World* -get_world() -{ - static World* world = NULL; - - if (&world == NULL) { - cerr << "ERROR: Ingen::Shared::world undefined." << endl; - return NULL; - } - - if (!world) { - world = new World(); - world->rdf_world = new Raul::RDF::World(); -#ifdef HAVE_SLV2 - world->slv2_world = slv2_world_new_using_rdf_world(world->rdf_world->world()); - slv2_world_load_all(world->slv2_world); -#endif - world->engine = NULL; - world->local_engine = NULL; - } - - return world; -} - -void -destroy_world() -{ - if (&world == NULL) { - cerr << "ERROR: Ingen::Shared::world undefined." << endl; - return; - } - - if (world) { -#ifdef HAVE_SLV2 - slv2_world_free(world->slv2_world); -#endif - delete world->rdf_world; - delete world; - world = NULL; - } -} - - -} // namesace Shared -} // namespace Ingen - diff --git a/src/libs/module/module.h b/src/libs/module/module.h deleted file mode 100644 index 4fe0d4cc..00000000 --- a/src/libs/module/module.h +++ /dev/null @@ -1,35 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007 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_MODULE_H -#define INGEN_MODULE_H - -#include "World.hpp" -#include "Module.hpp" -#include "raul/SharedPtr.hpp" - -namespace Ingen { -namespace Shared { - -World* get_world(); -void destroy_world(); - -} // namesace Shared -} // namespace Ingen - -#endif // INGEN_MODULE_H - diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index 31453315..f6400e2e 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -28,7 +28,9 @@ #include #include #include -#include "module/module.h" +#include "module/global.hpp" +#include "module/Module.hpp" +#include "module/World.hpp" #include "engine/Engine.hpp" #include "engine/QueuedEngineInterface.hpp" #include "serialisation/Loader.hpp" -- cgit v1.2.1