From 75911e8ae28f011727ce303961a1adb56643689d Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 25 Jul 2007 06:07:42 +0000 Subject: 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 --- src/libs/module/Makefile.am | 2 ++ src/libs/module/World.hpp | 58 +++++++++++++++++++++++++++++++++++++++++++++ src/libs/module/module.cpp | 50 ++++++++++++++++++++++++++++++++++++++ src/libs/module/module.h | 39 ++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+) create mode 100644 src/libs/module/World.hpp create mode 100644 src/libs/module/module.cpp create mode 100644 src/libs/module/module.h (limited to 'src/libs/module') diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am index bcd2ea4f..7f5865db 100644 --- a/src/libs/module/Makefile.am +++ b/src/libs/module/Makefile.am @@ -5,5 +5,7 @@ libingen_module_la_CXXFLAGS = -I$(top_srcdir)/raul -DINGEN_MODULE_DIR=\"$(libdir libingen_module_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ libingen_module_la_SOURCES = \ + module.h \ + module.cpp \ Module.hpp \ Module.cpp diff --git a/src/libs/module/World.hpp b/src/libs/module/World.hpp new file mode 100644 index 00000000..c809080b --- /dev/null +++ b/src/libs/module/World.hpp @@ -0,0 +1,58 @@ +/* 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_WORLD_HPP +#define INGEN_WORLD_HPP + +#include +#include +#include +#include + +#include "../../../../config/config.h" + +#ifdef HAVE_SLV2 +#include +#endif + +namespace Ingen { +namespace Shared { + + +/** The "world" all Ingen modules may share. + * + * This is required for shared access to things like Redland, so locking can + * take place centrally and the engine/gui using the same library won't + * explode horribly. + * + * Hopefully at some point in the future it can allow some fun things like + * scripting bindings that play with all loaded components of + * The Ingen System(TM) and whatnot. + */ +struct World { +#ifdef HAVE_SLV2 + SLV2World slv2_world; +#endif + Raul::RDF::World rdf_world; +}; + + +} // namespace Shared +} // namespace Ingen + +#endif // INGEN_WORLD_HPP + diff --git a/src/libs/module/module.cpp b/src/libs/module/module.cpp new file mode 100644 index 00000000..25c68c67 --- /dev/null +++ b/src/libs/module/module.cpp @@ -0,0 +1,50 @@ +/* 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 "module.h" +#include "World.hpp" + +namespace Ingen { +namespace Shared { + +World* world; + +World* +get_world() +{ + if (!world) { + world = new 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 + } + + return world; +} + +void +destroy_world() +{ + slv2_world_free(world->slv2_world); + delete world; +} + + +} // namesace Shared +} // namespace Ingen + diff --git a/src/libs/module/module.h b/src/libs/module/module.h new file mode 100644 index 00000000..6c809f7e --- /dev/null +++ b/src/libs/module/module.h @@ -0,0 +1,39 @@ +/* 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" + +namespace Ingen { +namespace Shared { + +extern "C" { + + World* get_world(); + void destroy_world(); + +} + + +} // namesace Shared +} // namespace Ingen + +#endif // INGEN_MODULE_H + -- cgit v1.2.1