From: Andre Noll Date: Wed, 8 Jun 2011 17:44:56 +0000 (+0200) Subject: Merge branch 't/net_cleanups' X-Git-Tag: v0.4.8~33 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=0440ca41086eafb233b5cb516419de830a0bec13;hp=530f881a4e583dca22ba53eb6f8cd37fd7896d06 Merge branch 't/net_cleanups' --- diff --git a/Makefile.in b/Makefile.in index cfc6909a..7e6287e0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") uname_rs := $(shell uname -rs) cc_version := $(shell $(CC) --version | head -n 1) -codename := infinite rollback +codename := nested assignment GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h) @@ -70,7 +70,7 @@ object_dir := objects man_dir := man/man1 test_dir := t -m4_ggos := afh audioc audiod client filter gui recv server write +m4_ggos := afh audioc audiod client filter gui recv server write ao_write all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \ osx_write udp_recv amp_filter compress_filter file_write \ mp3dec_filter prebuffer_filter diff --git a/NEWS b/NEWS index c56fc719..da1398db 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,11 @@ ------------------------------------------- -0.4.7 (to be announced) "infinite rollback" +0.4.8 (to be announced) "nested assignment" ------------------------------------------- +-------------------------------------- +0.4.7 (2011-06-01) "infinite rollback" +-------------------------------------- + The new ao writer, support for ssh RSA keys and a couple of other enhancements. diff --git a/alsa_write.c b/alsa_write.c index c2a4cc1e..047eeaa3 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -145,7 +145,6 @@ static void alsa_write_pre_select(struct sched *s, struct task *t) { struct writer_node *wn = container_of(t, struct writer_node, task); struct private_alsa_write_data *pad = wn->private_data; - struct timeval tv; snd_pcm_sframes_t avail, underrun; int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); @@ -171,8 +170,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t) if (underrun < 50) underrun = 50; underrun -= 50; - ms2tv(underrun, &tv); - sched_request_timeout(&tv, s); + sched_request_timeout_ms(underrun, s); } static void alsa_close(struct writer_node *wn) diff --git a/ggo/.gitignore b/ggo/.gitignore index 8b70bd4f..82d505b5 100644 --- a/ggo/.gitignore +++ b/ggo/.gitignore @@ -9,3 +9,4 @@ recv.ggo server.ggo write.ggo ao_write.ggo +alsa_write.ggo diff --git a/ogg_afh_common.c b/ogg_afh_common.c index cb59d363..564b0bec 100644 --- a/ogg_afh_common.c +++ b/ogg_afh_common.c @@ -170,7 +170,7 @@ int ogg_get_file_info(char *map, size_t numbytes, struct afh_info *afhi, for (j = 1; ogg_sync_pageseek(&oss, &op) > 0; /* nothing */) { int granule = ogg_page_granulepos(&op); - while (granule > j * frames_per_chunk) { + while (granule >= (j + 1) * frames_per_chunk) { j++; if (j >= ct_size) { ct_size *= 2; diff --git a/versions/paraslash-0.4.7.tar.bz2 b/versions/paraslash-0.4.7.tar.bz2 new file mode 100644 index 00000000..5982f1a5 Binary files /dev/null and b/versions/paraslash-0.4.7.tar.bz2 differ diff --git a/versions/paraslash-0.4.7.tar.bz2.asc b/versions/paraslash-0.4.7.tar.bz2.asc new file mode 100644 index 00000000..6cc5971d --- /dev/null +++ b/versions/paraslash-0.4.7.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAk3mTO4ACgkQWto1QDEAkw9f4wCeKUyeKmFV/ssVw/pv0slKqVCS +EREAmgJpmAMMxgLRb1en5lRBdB/yDFEH +=sGEa +-----END PGP SIGNATURE----- diff --git a/web/index.in.html b/web/index.in.html index f9009e4f..138e9a8c 100644 --- a/web/index.in.html +++ b/web/index.in.html @@ -1,6 +1,10 @@

Events