core/core: Move core_init() out of the core namespace
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
03196c3efa
commit
04291f4296
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue