X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=8ea1854bddfc004db52d6d0afe577d6601960b07;hp=5012d4c446739db9617eb00671bfe15a298e62f9;hb=12db646294a320f4afd813edece6d00c4f29248a;hpb=a3dc441fc0219d417923b04e863ceca5a1427c0e diff --git a/playlist.c b/playlist.c index 5012d4c4..8ea1854b 100644 --- a/playlist.c +++ b/playlist.c @@ -1,14 +1,19 @@ /* - * Copyright (C) 2007 Andre Noll + * Copyright (C) 2007 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ +#include +#include + #include "para.h" #include "error.h" #include "string.h" #include "afh.h" #include "afs.h" +#include "ipc.h" +#include "sideband.h" /** \file playlist.c Functions for loading and saving playlists. */ @@ -41,12 +46,12 @@ static int add_playlist_entry(char *path, void *data) int ret = aft_get_row_of_path(path, &aft_row); if (ret < 0) { - PARA_NOTICE_LOG("%s: %s\n", path, PARA_STRERROR(-ret)); + PARA_NOTICE_LOG("%s: %s\n", path, para_strerror(-ret)); return 1; } ret = score_add(aft_row, -playlist->length); if (ret < 0) { - PARA_ERROR_LOG("failed to add %s: %s\n", path, PARA_STRERROR(-ret)); + PARA_ERROR_LOG("failed to add %s: %s\n", path, para_strerror(-ret)); return ret; } playlist->length++; @@ -65,8 +70,8 @@ static int load_playlist(struct osl_row *row, void *data) if (ret < 0) goto err; playlist->length = 0; - ret = for_each_line_ro(playlist_def.data, playlist_def.size, - add_playlist_entry, playlist); + ret = for_each_line(FELF_READ_ONLY, playlist_def.data, + playlist_def.size, add_playlist_entry, playlist); osl_close_disk_object(&playlist_def); if (ret < 0) goto err; @@ -80,7 +85,7 @@ static int load_playlist(struct osl_row *row, void *data) err: if (ret != -E_DUMMY_ROW) PARA_NOTICE_LOG("unable to load playlist (%s)\n", - PARA_STRERROR(-ret)); + para_strerror(-ret)); return 1; } @@ -91,8 +96,8 @@ static int check_playlist_path(char *path, void *data) int ret = aft_get_row_of_path(path, &aft_row); if (ret < 0) - para_printf(pb, "%s: %s\n", path, PARA_STRERROR(-ret)); - return 1; + para_printf(pb, "%s: %s\n", path, para_strerror(-ret)); + return 1; /* do not fail the loop on bad paths */ } static int check_playlist(struct osl_row *row, void *data) @@ -102,15 +107,15 @@ static int check_playlist(struct osl_row *row, void *data) char *playlist_name; int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def); - if (ret < 0) { + if (ret < 0) { /* log error, but continue */ para_printf(pb, "failed to get playlist data: %s\n", - PARA_STRERROR(-ret)); + para_strerror(-ret)); return 1; } if (*playlist_name) { /* skip dummy row */ para_printf(pb, "checking playlist %s...\n", playlist_name); - for_each_line_ro(playlist_def.data, playlist_def.size, - check_playlist_path, pb); + for_each_line(FELF_READ_ONLY, playlist_def.data, + playlist_def.size, check_playlist_path, pb); } osl_close_disk_object(&playlist_def); return 1; @@ -119,22 +124,16 @@ static int check_playlist(struct osl_row *row, void *data) /** * Check the playlist table for inconsistencies. * - * \param query Unused. - * \param result Contains messages about inconsistencies. + * \param aca This callback ignores ->query. * - * \return The return value of the underlying call to osl_rbtree_loop(). + * \return Standard. Invalid paths are reported, but are not considered an + * error. */ -int playlist_check_callback(__a_unused const struct osl_object *query, - struct osl_object *result) +int playlist_check_callback(struct afs_callback_arg *aca) { - struct para_buffer pb = {.buf = NULL}; - - para_printf(&pb, "checking playlists...\n"); - osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb, - check_playlist); - result->data = pb.buf; - result->size = pb.size; - return 1; + para_printf(&aca->pbout, "checking playlists...\n"); + return osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, &aca->pbout, + check_playlist)); } /** @@ -160,15 +159,15 @@ void playlist_close(void) * * \return Standard. */ -int playlist_open(char *name) +int playlist_open(const char *name) { struct osl_object obj; int ret; struct osl_row *row; - obj.data = name; + obj.data = (char *)name; obj.size = strlen(obj.data); - ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row); + ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { PARA_NOTICE_LOG("failed to load playlist %s\n", name); return ret; @@ -192,8 +191,6 @@ static int handle_audio_file_event(enum afs_events event, void *data) char *new_path; const struct osl_row *row = data; - if (!current_playlist.name) - return 1; if (event == AUDIO_FILE_RENAME) { ret = row_belongs_to_score_table(row, NULL); if (ret < 0) @@ -206,8 +203,8 @@ static int handle_audio_file_event(enum afs_events event, void *data) ret = pl_get_def_by_name(current_playlist.name, &playlist_def); if (ret < 0) return ret; - ret = for_each_line_ro(playlist_def.data, playlist_def.size, - search_path, new_path); + ret = for_each_line(FELF_READ_ONLY, playlist_def.data, + playlist_def.size, search_path, new_path); osl_close_disk_object(&playlist_def); is_admissible = (ret < 0); if (was_admissible && is_admissible) @@ -223,12 +220,26 @@ static int handle_audio_file_event(enum afs_events event, void *data) return score_add(row, 0); /* play it immediately */ } +/** + * Handle afs events relevant to playlists. + * + * \param event The event type. + * \param pb Unused. + * \param data Depends on the event type. + * + * \return Standard. + */ int playlists_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, void *data) { int ret; + struct afsi_change_event_data *aced = data; - switch(event) { + if (!current_playlist.name) + return 1; + switch (event) { + case AFSI_CHANGE: + return playlist_update_audio_file(aced->aft_row); case AUDIO_FILE_RENAME: case AUDIO_FILE_ADD: return handle_audio_file_event(event, data);