X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=0712cc2720683b3fa8f08194eba95fd5691ab996;hp=bbd68d2fc2f1f42e4d0944d800f94405db862128;hb=54096edf9b0254303dfee9d8f87d2f2f0b17fcce;hpb=b2917b2a0a68f84da34e7435ad697d798a0260da diff --git a/afs.c b/afs.c index bbd68d2f..0712cc27 100644 --- a/afs.c +++ b/afs.c @@ -18,8 +18,8 @@ /** \file afs.c audio file sending functions * - * This contains the audio sending part of para_server which is independent - * of the current audio format, database tool and of the activated senders. + * This contains the audio sending part of para_server which is independent of + * the current audio format, audio file selector and of the activated senders. */ #include /* gettimeofday */ @@ -233,7 +233,7 @@ static int update_mmd(void) static void get_song(void) { - char **sl = dblist[mmd->dbt_num].get_audio_file_list(10); + char **sl = dblist[mmd->selector_num].get_audio_file_list(10); int i; if (!sl) @@ -253,8 +253,8 @@ static void get_song(void) continue; } mmd->num_played++; - if (dblist[mmd->dbt_num].update_audio_file) - dblist[mmd->dbt_num].update_audio_file(sl[i]); + if (dblist[mmd->selector_num].update_audio_file) + dblist[mmd->selector_num].update_audio_file(sl[i]); PARA_DEBUG_LOG("%s", "success\n"); mmd->new_afs_status_flags &= (~AFS_NEXT); gettimeofday(&now, NULL); @@ -353,7 +353,7 @@ static void afs_eof(struct audio_format *af) free(tmp); tmp = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1], status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]); - strcpy(mmd->dbinfo, tmp); + strcpy(mmd->selector_info, tmp); free(tmp); mmd->filename[0] = '\0'; mmd->size = 0;