X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=bf11dc9b8e82c06c78a684e983836fc4348090d7;hp=cb99366be353bdf40f852afc291ac0d1b1ae532c;hb=99daab96f932309995188ee7f7618c036994eb46;hpb=51cab2aba416fc1d57336f4e72da6b76ec60174c diff --git a/vss.c b/vss.c index cb99366b..bf11dc9b 100644 --- a/vss.c +++ b/vss.c @@ -167,8 +167,7 @@ static struct timeval *vss_compute_timeout(void) if (!vss_playing() || !map) return NULL; vss_next_chunk_time(&next_chunk); - if (chk_barrier(audio_format_name(mmd->afd.afsi.audio_format_id), - &now, &next_chunk, &the_timeout, 0) < 0) + if (chk_barrier("chunk", &now, &next_chunk, &the_timeout, 0) < 0) return &the_timeout; /* chunk is due or bof */ the_timeout.tv_sec = 0; @@ -201,8 +200,6 @@ static void vss_eof(void) strncpy(mmd->afd.afhi.info_string, tmp, sizeof(mmd->afd.afhi.info_string)); mmd->afd.afhi.info_string[sizeof(mmd->afd.afhi.info_string) - 1] = '\0'; free(tmp); - mmd->afd.afsi.lyrics_id = 0; - mmd->afd.afsi.image_id = 0; mmd->mtime = 0; mmd->size = 0; mmd->events++;