X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=032f9cd0743a85a492b5cb446ebc965dc3b2cb1f;hp=bcead91ff11ab61582f8fd1b98197cc96433d608;hb=db09455b4bf9f7518485e08811d9a2a42e9f0b05;hpb=7d1805d1559e08e0af701155574aef220925d411 diff --git a/audiod.c b/audiod.c index bcead91f..032f9cd0 100644 --- a/audiod.c +++ b/audiod.c @@ -71,8 +71,7 @@ struct slot_info slot[MAX_STREAM_SLOTS]; int audiod_status = AUDIOD_ON; struct gengetopt_args_info conf; -static char *af_status, /* the audio format announced in server status */ - *socket_name; +static char *socket_name; static FILE *logfile; static struct audio_format_info afi[NUM_AUDIO_FORMATS]; @@ -451,9 +450,9 @@ static int open_current_receiver(struct sched *s) int i; struct timeval diff; - if (!af_status) + if (!stat_task->af_status) return 0; - i = get_audio_format_num(af_status); + i = get_audio_format_num(stat_task->af_status); if (i < 0) return 0; if (decoder_running(i)) @@ -529,8 +528,8 @@ static void check_stat_line(char *line) stat_task->playing = strstr(line, "playing")? 1 : 0; break; case SI_FORMAT: - free(af_status); - af_status = para_strdup(line + ilen + 1); + free(stat_task->af_status); + stat_task->af_status = para_strdup(line + ilen + 1); break; case SI_OFFSET: stat_task->offset_seconds = atoi(line + ilen + 1);