From: Andre Noll
Date: Thu, 1 Apr 2010 20:45:33 +0000 (+0200)
Subject: Merge remote branch 'fml/v0.2' into v0.2
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=edc7f2baec546fe66b6faa6ce08f79967920db3d;hp=9587bab7a8dfb0cc2e026a38d98793281bf3c313;p=paraslash.git
Merge remote branch 'fml/v0.2' into v0.2
---
diff --git a/Makefile.in b/Makefile.in
index a0a7fc43..52602df7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ install_sh = @install_sh@
build_date = $(shell date)
system = $(shell uname -rs)
cc_version = $(shell $(CC) --version | head -n 1)
-codename = isotropic threshold
+codename = reproducing reflection
DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
DEBUG_CPPFLAGS += -Wredundant-decls
diff --git a/NEWS b/NEWS
index 93d82b26..35c51a00 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,9 @@
NEWS
====
-----------------------------------------------
-0.2.17 (to be announced) "isotropic threshold"
-----------------------------------------------
+-----------------------------------------
+0.2.17 (2007-11-20) "isotropic threshold"
+-----------------------------------------
Mainly bugfixes and cleanups in this version which marks the end of
the 0.2.x series if no serious bugs show up after the release.
@@ -19,6 +19,8 @@ the 0.2.x series if no serious bugs show up after the release.
- update to ortp-0.13.1.
- autoconf: extend checks for headers, library functions and
compiler characteristics.
+ - Fix streaming of large mp3 files.
+ - Fix an off-by-one bug in playlist handling.
--------------------------------------
0.2.16 (2007-04-05) "neural discharge"
diff --git a/configure.ac b/configure.ac
index a0d3785c..e7ad80f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ(2.60)
-AC_INIT(paraslash, [git], maan@systemlinux.org)
+AC_INIT(paraslash, [0.2.git], maan@systemlinux.org)
AC_CONFIG_HEADER([config.h])
AC_PATH_PROG(UNAMEPATH, uname, no)
diff --git a/playlist_selector.c b/playlist_selector.c
index a497ec13..632e2a2a 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -142,7 +142,7 @@ int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
unsigned i;
PARA_DEBUG_LOG("sending playlist to client (%d entries)\n", playlist_len);
- for (i = 0; i < playlist_len; i++) {
+ for (i = 1; i <= playlist_len; i++) {
int ret = send_va_buffer(fd, "%s\n", playlist[
(i + current_playlist_entry) % playlist_len]);
if (ret < 0)
@@ -217,6 +217,7 @@ static void pls_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
sprintf(mmd->selector_info, "dbinfo1:new playlist: %d files\n"
"dbinfo2:\ndbinfo3:\n", playlist_len);
+ current_playlist_entry = playlist_len - 1;
pcd->retval = 1;
pcd->size = 0;
mutex_unlock(pcd->mutex);
diff --git a/time.c b/time.c
index 83231c89..6672dca4 100644
--- a/time.c
+++ b/time.c
@@ -113,21 +113,10 @@ void tv_scale(const unsigned long mult, const struct timeval *tv,
void tv_divide(const unsigned long divisor, const struct timeval *tv,
struct timeval *result)
{
- long unsigned q;
+ uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) / divisor;
- if (!divisor) {
- PARA_EMERG_LOG("%s\n", "division by zero");
- exit(EXIT_FAILURE);
- }
- q = tv->tv_usec / divisor;
- result->tv_sec = tv->tv_sec / divisor;
- result->tv_usec = (tv->tv_sec - result->tv_sec * divisor)
- * 1000 * 1000 / divisor;
- if (result->tv_usec + q >= 1000 * 1000) {
- result->tv_sec++;
- result->tv_usec = 1000 * 1000 - result->tv_usec - q;
- } else
- result->tv_usec += q;
+ result->tv_sec = x / 1000 / 1000;
+ result->tv_usec = x % (1000 * 1000);
}
/**
diff --git a/versions/paraslash-0.2.17.tar.bz2 b/versions/paraslash-0.2.17.tar.bz2
new file mode 100644
index 00000000..e9a53856
Binary files /dev/null and b/versions/paraslash-0.2.17.tar.bz2 differ
diff --git a/versions/paraslash-0.2.17.tar.bz2.asc b/versions/paraslash-0.2.17.tar.bz2.asc
new file mode 100644
index 00000000..d97ec6fc
--- /dev/null
+++ b/versions/paraslash-0.2.17.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBHQxsRWto1QDEAkw8RAswLAJ49+JOKoMx7w1yhFWmq+iqJ/HltTACgn4P0
+VGyjoF8nDkOf8JcUSwv0gPk=
+=Ct9h
+-----END PGP SIGNATURE-----
diff --git a/web/download.in.html b/web/download.in.html
index 8ab570db..b5ea7505 100644
--- a/web/download.in.html
+++ b/web/download.in.html
@@ -18,5 +18,5 @@ Anonymous (read-only)
access is also available. Checkout a copy with
-git clone git://www.paraslash.org/git paraslash
+git clone git://paraslash.systemlinux.org/git paraslash
diff --git a/web/header.html b/web/header.html
index 4f77660c..647a64aa 100644
--- a/web/header.html
+++ b/web/header.html
@@ -30,7 +30,7 @@
Download
Screenshots
Live Demo
-
Changes
+
Changes
Documentation
License
Contact
diff --git a/web/header2.html b/web/header2.html
index 56703c7e..9a1c4b19 100644
--- a/web/header2.html
+++ b/web/header2.html
@@ -30,7 +30,7 @@
Download
Screenshots
Live Demo
-
Changes
+
Changes
Documentation
License
Contact
diff --git a/web/index.in.html b/web/index.in.html
index 8b3acb87..da61a9d1 100644
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
Events