From 9bb7132b97b6b585e2cba743d62143010dd3f76a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Jan 2019 01:57:24 +0100 Subject: [PATCH] Move command_playlist_ functions to playlist.c (RGUI) Header buildfix --- command.c | 50 --------------------------------------------- command.h | 19 ----------------- menu/drivers/rgui.c | 2 ++ playlist.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ playlist.h | 17 +++++++++++++++ 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/command.c b/command.c index 7d97477708..a55eed7c12 100644 --- a/command.c +++ b/command.c @@ -1766,56 +1766,6 @@ static bool command_event_resize_windowed_scale(void) return true; } -void command_playlist_push_write( - playlist_t *playlist, - const char *path, - const char *label, - const char *core_path, - const char *core_name) -{ - if (!playlist) - return; - - if (playlist_push( - playlist, - path, - label, - core_path, - core_name, - NULL, - NULL - )) - playlist_write_file(playlist); -} - -void command_playlist_update_write( - playlist_t *plist, - size_t idx, - const char *path, - const char *label, - const char *core_path, - const char *core_display_name, - const char *crc32, - const char *db_name) -{ - playlist_t *playlist = plist ? plist : playlist_get_cached(); - - if (!playlist) - return; - - playlist_update( - playlist, - idx, - path, - label, - core_path, - core_display_name, - crc32, - db_name); - - playlist_write_file(playlist); -} - /** * command_event: * @cmd : Event command index. diff --git a/command.h b/command.h index 7659ea605a..f6cf023d1a 100644 --- a/command.h +++ b/command.h @@ -27,8 +27,6 @@ #include "config.h" #endif -#include "playlist.h" - RETRO_BEGIN_DECLS typedef struct command command_t; @@ -272,23 +270,6 @@ bool command_free(command_t *handle); **/ bool command_event(enum event_command action, void *data); -void command_playlist_push_write( - playlist_t *playlist, - const char *path, - const char *label, - const char *core_path, - const char *core_name); - -void command_playlist_update_write( - playlist_t *playlist, - size_t idx, - const char *path, - const char *label, - const char *core_path, - const char *core_display_name, - const char *crc32, - const char *db_name); - RETRO_END_DECLS #endif diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 9dd3dceeba..e7d125a7b4 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -23,6 +23,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ #include "../../config.h" #endif +#include "../../playlist.h" #include "../../frontend/frontend_driver.h" #include "menu_generic.h" diff --git a/playlist.c b/playlist.c index 52510d0765..1149fbb1c8 100644 --- a/playlist.c +++ b/playlist.c @@ -1057,3 +1057,53 @@ void playlist_qsort(playlist_t *playlist) sizeof(struct playlist_entry), (int (*)(const void *, const void *))playlist_qsort_func); } + +void command_playlist_push_write( + playlist_t *playlist, + const char *path, + const char *label, + const char *core_path, + const char *core_name) +{ + if (!playlist) + return; + + if (playlist_push( + playlist, + path, + label, + core_path, + core_name, + NULL, + NULL + )) + playlist_write_file(playlist); +} + +void command_playlist_update_write( + playlist_t *plist, + size_t idx, + const char *path, + const char *label, + const char *core_path, + const char *core_display_name, + const char *crc32, + const char *db_name) +{ + playlist_t *playlist = plist ? plist : playlist_get_cached(); + + if (!playlist) + return; + + playlist_update( + playlist, + idx, + path, + label, + core_path, + core_display_name, + crc32, + db_name); + + playlist_write_file(playlist); +} diff --git a/playlist.h b/playlist.h index b6b2414070..308297142e 100644 --- a/playlist.h +++ b/playlist.h @@ -135,6 +135,23 @@ playlist_t *playlist_get_cached(void); bool playlist_init_cached(const char *path, size_t size); +void command_playlist_push_write( + playlist_t *playlist, + const char *path, + const char *label, + const char *core_path, + const char *core_name); + +void command_playlist_update_write( + playlist_t *playlist, + size_t idx, + const char *path, + const char *label, + const char *core_path, + const char *core_display_name, + const char *crc32, + const char *db_name); + RETRO_END_DECLS #endif