From 04291f42964fcf8bf094af498d7125d4c3326146 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Thu, 17 Dec 2015 10:00:42 -0500 Subject: [PATCH] core/core: Move core_init() out of the core namespace Signed-off-by: Anna Schumaker --- core/core.cpp | 2 +- gui/ocarina.cpp | 2 +- include/core/core.h | 8 +++----- tests/core/audio.cpp | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/core.cpp b/core/core.cpp index 7fa7d303..a3d6ab00 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -13,7 +13,7 @@ extern "C" { } -void core :: init(int *argc, char ***argv, struct core_init_data *init) +void core_init(int *argc, char ***argv, struct core_init_data *init) { filter_init(); tags_init(); diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp index 2ba44946..5192a2a9 100644 --- a/gui/ocarina.cpp +++ b/gui/ocarina.cpp @@ -63,7 +63,7 @@ int main(int argc, char **argv) exit(1); gst :: init_pre(); - core :: init(&argc, &argv, &init_data); + core_init(&argc, &argv, &init_data); gst :: init(); plist :: init(); diff --git a/include/core/core.h b/include/core/core.h index d5d027c1..901e8c49 100644 --- a/include/core/core.h +++ b/include/core/core.h @@ -21,13 +21,11 @@ struct core_init_data { namespace core { - /** - * Initializes all components of the core library, including reading - * databases from disk and setting up gstreamer. - */ - void init(int *, char ***, struct core_init_data *); void deinit(); } +/* Called to initialize all core Ocarina components. */ +void core_init(int *, char ***, struct core_init_data *); + #endif /* OCARINA_CORE_CORE_H */ diff --git a/tests/core/audio.cpp b/tests/core/audio.cpp index 062bef47..9bbb792c 100644 --- a/tests/core/audio.cpp +++ b/tests/core/audio.cpp @@ -68,7 +68,7 @@ static void test_init() test_equal(audio_cur_state(), GST_STATE_NULL); test_equal(audio_next(), NULL); - core :: init(NULL, NULL, &test_init_data); + core_init(NULL, NULL, &test_init_data); test_equal(audio_load(NULL), false); test_equal(audio_next(), NULL);