Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

(playlist.c) Cleanups

Browse source
This commit is contained in:
twinaphex 2016-08-28 18:47:34 +02:00
parent 3526a2454b
commit cd9e10b3d1
3 changed files with 54 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
menu/menu_displaylist.c
View file

@ -2569,18 +2569,6 @@ static int menu_displaylist_parse_settings_enum(void *data,
);
}
static int menu_displaylist_sort_playlist(const playlist_entry_t *a,
const playlist_entry_t *b)
{
const char *a_label = playlist_entry_get_label(a);
const char *b_label = playlist_entry_get_label(b);
if (!a_label || !b_label)
return 0;
return strcasecmp(a_label, b_label);
}
static int menu_displaylist_parse_horizontal_list(
menu_displaylist_info_t *info)
{
@ -2632,7 +2620,7 @@ static int menu_displaylist_parse_horizontal_list(
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
playlist_qsort(playlist, menu_displaylist_sort_playlist);
playlist_qsort(playlist);
if (string_is_equal(lpl_basename, "content_history"))
is_historylist = true;
@ -5487,7 +5475,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
playlist_qsort(playlist, menu_displaylist_sort_playlist);
playlist_qsort(playlist);
ret = menu_displaylist_parse_playlist(info,
playlist, path_playlist, false);

75
playlist.c
View file

@ -52,6 +52,10 @@ struct content_playlist
char *conf_path;
};
typedef int (playlist_sort_fun_t)(
const struct playlist_entry *a,
const struct playlist_entry *b);
/**
* playlist_get_index:
* @playlist : Playlist handle.
@ -139,7 +143,7 @@ bool playlist_entry_exists(playlist_t *playlist,
*
* Frees playlist entry.
**/
static void playlist_free_entry(playlist_entry_t *entry)
static void playlist_free_entry(struct playlist_entry *entry)
{
if (!entry)
return;
@ -177,7 +181,7 @@ void playlist_update(playlist_t *playlist, size_t idx,
const char *crc32,
const char *db_name)
{
playlist_entry_t *entry = NULL;
struct playlist_entry *entry = NULL;
if (!playlist)
return;
if (idx > playlist->size)
@ -185,27 +189,38 @@ void playlist_update(playlist_t *playlist, size_t idx,
entry = &playlist->entries[idx];
if (path && (path != entry->path)) {
if (path && (path != entry->path))
{
free(entry->path);
entry->path = strdup(path);
}
if (label && (label != entry->label)) {
if (label && (label != entry->label))
{
free(entry->label);
entry->label = strdup(label);
}
if (core_path && (core_path != entry->core_path)) {
if (core_path && (core_path != entry->core_path))
{
free(entry->core_path);
entry->core_path = strdup(core_path);
}
if (core_name && (core_name != entry->core_name)) {
if (core_name && (core_name != entry->core_name))
{
free(entry->core_name);
entry->core_name = strdup(core_name);
}
if (db_name && (db_name != entry->db_name)) {
if (db_name && (db_name != entry->db_name))
{
free(entry->db_name);
entry->db_name = strdup(db_name);
}
if (crc32 && (crc32 != entry->crc32)) {
if (crc32 && (crc32 != entry->crc32))
{
free(entry->crc32);
entry->crc32 = strdup(crc32);
}
@ -256,7 +271,7 @@ bool playlist_push(playlist_t *playlist,
for (i = 0; i < playlist->size; i++)
{
playlist_entry_t tmp;
struct playlist_entry tmp;
bool equal_path = (!path && !playlist->entries[i].path) ||
(path && playlist->entries[i].path &&
string_is_equal(path,playlist->entries[i].path));
@ -277,7 +292,7 @@ bool playlist_push(playlist_t *playlist,
/* Seen it before, bump to top. */
tmp = playlist->entries[i];
memmove(playlist->entries + 1, playlist->entries,
i * sizeof(playlist_entry_t));
i * sizeof(struct playlist_entry));
playlist->entries[0] = tmp;
return true;
@ -290,7 +305,7 @@ bool playlist_push(playlist_t *playlist,
}
memmove(playlist->entries + 1, playlist->entries,
(playlist->cap - 1) * sizeof(playlist_entry_t));
(playlist->cap - 1) * sizeof(struct playlist_entry));
playlist->entries[0].path = NULL;
playlist->entries[0].label = NULL;
@ -405,20 +420,13 @@ size_t playlist_size(playlist_t *playlist)
return playlist->size;
}
const char *playlist_entry_get_label(
const playlist_entry_t *entry)
{
if (!entry)
return NULL;
return entry->label;
}
static bool playlist_read_file(
playlist_t *playlist, const char *path)
{
unsigned i;
char buf[PLAYLIST_ENTRIES][1024] = {{0}};
playlist_entry_t *entry = NULL;
struct playlist_entry *entry = NULL;
char *last = NULL;
RFILE *file = filestream_open(path, RFILE_MODE_READ_TEXT, -1);
@ -481,7 +489,7 @@ playlist_t *playlist_init(const char *path, size_t size)
if (!playlist)
return NULL;
playlist->entries = (playlist_entry_t*)calloc(size,
playlist->entries = (struct playlist_entry*)calloc(size,
sizeof(*playlist->entries));
if (!playlist->entries)
goto error;
@ -498,10 +506,29 @@ error:
return NULL;
}
void playlist_qsort(playlist_t *playlist,
playlist_sort_fun_t *fn)
static const char *playlist_entry_get_label(
const struct playlist_entry *entry)
{
if (!entry)
return NULL;
return entry->label;
}
static int playlist_qsort_func(const struct playlist_entry *a,
const struct playlist_entry *b)
{
const char *a_label = playlist_entry_get_label(a);
const char *b_label = playlist_entry_get_label(b);
if (!a_label || !b_label)
return 0;
return strcasecmp(a_label, b_label);
}
void playlist_qsort(playlist_t *playlist)
{
qsort(playlist->entries, playlist->size,
sizeof(playlist_entry_t),
(int (*)(const void *, const void *))fn);
sizeof(struct playlist_entry),
(int (*)(const void *, const void *))playlist_qsort_func);
}

11
playlist.h
View file

@ -25,13 +25,8 @@
RETRO_BEGIN_DECLS
typedef struct playlist_entry playlist_entry_t;
typedef struct content_playlist playlist_t;
typedef int (playlist_sort_fun_t)(
const playlist_entry_t *a,
const playlist_entry_t *b);
/**
* playlist_init:
* @path : Path to playlist contents file.
@ -68,9 +63,6 @@ void playlist_clear(playlist_t *playlist);
**/
size_t playlist_size(playlist_t *playlist);
const char *playlist_entry_get_label(
const playlist_entry_t *entry);
/**
* playlist_get_index:
* @playlist : Playlist handle.
@ -122,8 +114,7 @@ bool playlist_entry_exists(playlist_t *playlist,
void playlist_write_file(playlist_t *playlist);
void playlist_qsort(playlist_t *playlist,
playlist_sort_fun_t *fn);
void playlist_qsort(playlist_t *playlist);
RETRO_END_DECLS