core/core: Move core_deinit() out of the core namespace
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
04291f4296
commit
a59a71eb38
|
@ -24,7 +24,7 @@ void core_init(int *argc, char ***argv, struct core_init_data *init)
|
||||||
audio_init(argc, argv, init->audio_ops);
|
audio_init(argc, argv, init->audio_ops);
|
||||||
}
|
}
|
||||||
|
|
||||||
void core :: deinit()
|
void core_deinit()
|
||||||
{
|
{
|
||||||
audio_deinit();
|
audio_deinit();
|
||||||
tempq_deinit();
|
tempq_deinit();
|
||||||
|
|
|
@ -74,7 +74,7 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
ocarina_app->signal_window_removed().connect(sigc::ptr_fun(on_window_removed));
|
ocarina_app->signal_window_removed().connect(sigc::ptr_fun(on_window_removed));
|
||||||
ocarina_app->run(*window, argc, argv);
|
ocarina_app->run(*window, argc, argv);
|
||||||
core :: deinit();
|
core_deinit();
|
||||||
cleanup_tabs();
|
cleanup_tabs();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -15,17 +15,11 @@ struct core_init_data {
|
||||||
struct audio_ops *audio_ops;
|
struct audio_ops *audio_ops;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Namespace for basic core library functions.
|
|
||||||
*/
|
|
||||||
namespace core
|
|
||||||
{
|
|
||||||
|
|
||||||
void deinit();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Called to initialize all core Ocarina components. */
|
/* Called to initialize all core Ocarina components. */
|
||||||
void core_init(int *, char ***, struct core_init_data *);
|
void core_init(int *, char ***, struct core_init_data *);
|
||||||
|
|
||||||
|
/* Called to deinitialize all core Ocarina componentns. */
|
||||||
|
void core_deinit();
|
||||||
|
|
||||||
#endif /* OCARINA_CORE_CORE_H */
|
#endif /* OCARINA_CORE_CORE_H */
|
||||||
|
|
|
@ -236,8 +236,7 @@ void test_autopause()
|
||||||
|
|
||||||
static void test_deinit()
|
static void test_deinit()
|
||||||
{
|
{
|
||||||
core :: deinit();
|
core_deinit();
|
||||||
|
|
||||||
test_equal(audio_cur_track(), NULL);
|
test_equal(audio_cur_track(), NULL);
|
||||||
test_equal(audio_get_player(), NULL);
|
test_equal(audio_get_player(), NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue