diff options
author | David Robillard <d@drobilla.net> | 2007-10-08 17:26:36 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-10-08 17:26:36 +0000 |
commit | 507d9ffa4771978b6964b4c4b261ee923ba7e324 (patch) | |
tree | a257d349fc357e7fd0ba29d08125296cc4dbf1ff /src/libs/module | |
parent | ec9540a559c40046123a2ac4be83faf90b79fbb0 (diff) | |
download | ingen-507d9ffa4771978b6964b4c4b261ee923ba7e324.tar.gz ingen-507d9ffa4771978b6964b4c4b261ee923ba7e324.tar.bz2 ingen-507d9ffa4771978b6964b4c4b261ee923ba7e324.zip |
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
Diffstat (limited to 'src/libs/module')
-rw-r--r-- | src/libs/module/Makefile.am | 4 | ||||
-rw-r--r-- | src/libs/module/global.cpp (renamed from src/libs/module/module.cpp) | 4 | ||||
-rw-r--r-- | src/libs/module/global.hpp (renamed from src/libs/module/module.h) | 12 |
3 files changed, 10 insertions, 10 deletions
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/module.cpp b/src/libs/module/global.cpp index f19f9e46..15e844c1 100644 --- a/src/libs/module/module.cpp +++ b/src/libs/module/global.cpp @@ -16,7 +16,7 @@ */ #include <iostream> -#include "module.h" +#include "global.hpp" #include "World.hpp" #include CONFIG_H_PATH @@ -31,6 +31,7 @@ namespace Shared { static World* world = NULL; + World* get_world() { @@ -55,6 +56,7 @@ get_world() return world; } + void destroy_world() { diff --git a/src/libs/module/module.h b/src/libs/module/global.hpp index 4fe0d4cc..1aa46be6 100644 --- a/src/libs/module/module.h +++ b/src/libs/module/global.hpp @@ -15,21 +15,19 @@ * 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" +#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_MODULE_H +#endif // INGEN_GLOBAL_H |