X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=vss.c;h=0943efac0def4dde3530682832526abb726c21f2;hb=b0cfbd054cba9add14976decab4b6f43dd5f6267;hp=f92e15e0d653ada1f541975876d77384ba3c5b57;hpb=753b26859be2150d3f4e7840a86412f96f60627a;p=paraslash.git diff --git a/vss.c b/vss.c index f92e15e0..0943efac 100644 --- a/vss.c +++ b/vss.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -32,7 +32,7 @@ extern struct misc_meta_data *mmd; extern void dccp_send_init(struct sender *); extern void http_send_init(struct sender *); -extern void ortp_send_init(struct sender *); +extern void udp_send_init(struct sender *); /** The list of supported senders. */ struct sender senders[] = { @@ -44,12 +44,10 @@ struct sender senders[] = { .name = "dccp", .init = dccp_send_init, }, -#ifdef HAVE_ORTP { - .name = "ortp", - .init = ortp_send_init, + .name = "udp", + .init = udp_send_init, }, -#endif { .name = NULL, } @@ -418,7 +416,6 @@ static void vss_send_chunk(struct vss_task *vsst) if (chk_barrier("data send", &vsst->data_send_barrier, &due, 1) < 0) return; - mmd->new_vss_status_flags &= ~VSS_REPOS; if (mmd->current_chunk >= mmd->afd.afhi.chunks_total) { /* eof */ mmd->new_vss_status_flags |= VSS_NEXT; return; @@ -502,6 +499,7 @@ void init_vss_task(int afs_socket) free(hn); free(home); mmd->sender_cmd_data.cmd_num = -1; + make_empty_status_items(mmd->afd.verbose_ls_output); if (conf.autoplay_given) { struct timeval tmp; mmd->vss_status_flags |= VSS_PLAYING;