X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=b04598b844043cc96fa01b8aa834030ee9d7697e;hp=bf8fc73ba5dcd95118720c7f8243b3a2f285b074;hb=98f2c8aea52a49fad3fd6df67b1eb32c1499176c;hpb=02d818d9e4d816d6decb319b522f0074038e68e2 diff --git a/playlist.c b/playlist.c index bf8fc73b..b04598b8 100644 --- a/playlist.c +++ b/playlist.c @@ -1,14 +1,18 @@ /* - * Copyright (C) 2007 Andre Noll + * Copyright (C) 2007-2010 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" /** \file playlist.c Functions for loading and saving playlists. */ @@ -28,7 +32,7 @@ static struct playlist_info current_playlist; * * \return The return value of score_update(). */ -int playlist_update_audio_file(struct osl_row *aft_row) +static int playlist_update_audio_file(const struct osl_row *aft_row) { /* always re-insert to the top of the tree */ return score_update(aft_row, 0); @@ -41,12 +45,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++; @@ -80,31 +84,19 @@ 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; } -static int load_first_available_playlist(struct playlist_info *playlist) -{ - int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, playlist, - load_playlist); - if (ret == -E_PLAYLIST_LOADED) /* success */ - return 1; - if (ret < 0) - return ret; /* error */ - PARA_NOTICE_LOG("no valid playlist found\n"); - return -E_NO_PLAYLIST; -} - static int check_playlist_path(char *path, void *data) { struct para_buffer *pb = data; struct osl_row *aft_row; 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; + if (ret >= 0) + return 1; + return para_printf(pb, "%s: %s\n", path, para_strerror(-ret)); } static int check_playlist(struct osl_row *row, void *data) @@ -114,39 +106,44 @@ 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) { - para_printf(pb, "failed to get playlist data: %s\n", - PARA_STRERROR(-ret)); - return 1; - } + if (ret < 0) + return para_printf(pb, "failed to get playlist data: %s\n", + para_strerror(-ret)); 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, + ret = para_printf(pb, "checking playlist %s...\n", playlist_name); + if (ret < 0) + return ret; + ret = for_each_line_ro(playlist_def.data, playlist_def.size, check_playlist_path, pb); } osl_close_disk_object(&playlist_def); - return 1; + return ret; } /** * Check the playlist table for inconsistencies. * + * \param fd The afs socket. * \param query Unused. - * \param result Contains messages about inconsistencies. * * \return The return value of the underlying call to osl_rbtree_loop(). */ -int playlist_check_callback(__a_unused const struct osl_object *query, - struct osl_object *result) +void playlist_check_callback(int fd, __a_unused const struct osl_object *query) { - struct para_buffer pb = {.buf = NULL}; + struct para_buffer pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; + int ret = para_printf(&pb, "checking playlists...\n"); - para_printf(&pb, "checking playlists...\n"); + if (ret < 0) + return; osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb, check_playlist); - result->data = pb.buf; - result->size = pb.size; - return 1; + if (pb.offset) + pass_buffer_as_shm(pb.buf, pb.offset, &fd); + free(pb.buf); } /** @@ -156,6 +153,8 @@ int playlist_check_callback(__a_unused const struct osl_object *query, */ void playlist_close(void) { + if (!current_playlist.name) + return; free(current_playlist.name); current_playlist.name = NULL; } @@ -165,12 +164,10 @@ void playlist_close(void) * * \param name The name of the playlist to open. * - * If name is \p NULL, load the first available playlist. Files which are - * listed in the playlist, but not contained in the database are ignored. - * This is not considered an error. + * Files which are listed in the playlist, but not contained in the database + * are ignored. This is not considered an error. * - * \return Positive on success, negative on errors. Possible errors - * include: Given playlist not found, -E_NO_PLAYLIST (no playlist defined). + * \return Standard. */ int playlist_open(char *name) { @@ -178,17 +175,16 @@ int playlist_open(char *name) int ret; struct osl_row *row; - if (!name) - return load_first_available_playlist(¤t_playlist); obj.data = 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; } + playlist_close(); ret = load_playlist(row, ¤t_playlist); - return (ret == -E_PLAYLIST_LOADED)? 1 : ret; + return (ret == -E_PLAYLIST_LOADED)? current_playlist.length : ret; } static int search_path(char *path, void *data) @@ -236,12 +232,24 @@ static int handle_audio_file_event(enum afs_events event, void *data) return score_add(row, 0); /* play it immediately */ } -int playlists_event_handler(enum afs_events event, struct para_buffer *pb, - void *data) +/** + * 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) { + 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);