Merge remote branch 'athcx/v0.2' into v0.2

diff --git a/Makefile.in b/Makefile.in
index a0a7fc43623061a88f04bce1d91b424314fbd1fc..52602df7f35aba7ce7f2e86052ad33571b67ea75 100644 (file)
--- 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 93d82b26df196bd29986ba681b726f5c1c8aeba3..35c51a00deb6f469026f5dffe2c5b6a1c0e78923 100644 (file)
--- 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 a0d3785cfe6c96b7e6dfdcc51a947f8b86a3de0a..e7ad80f482ab9c2d4ad2a43c227e3e40b6d8c203 100644 (file)
--- 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 a497ec13f6919e28a9c2174a069ff9fe3ef84b2b..632e2a2a972c6aa386ff0a67417f554a62354bac 100644 (file)
--- 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 83231c895020245d72cea40cd34cae03e9951a29..6672dca4215c3e04de75f576dabc2dfd7c95eb30 100644 (file)
--- 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 (file)
index 0000000..e9a5385
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 (file)
index 0000000..d97ec6f
--- /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 8ab570db9c29a2e11544987b582c644381247807..b5ea750502a452bb35261d9d3ca35a3454076159 100644 (file)
--- 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 </p>
 
 <p>
-git clone git://www.paraslash.org/git paraslash
+git clone git://paraslash.systemlinux.org/git paraslash
 </p>

diff --git a/web/header.html b/web/header.html
index 4f77660c400b0100fb22b3229bec86c5f00d8706..647a64aa131975c4b4037179cb2fc28be1b8c039 100644 (file)
--- a/web/header.html
+++ b/web/header.html
@@ -30,7 +30,7 @@
                        <br><a href="download.html">Download</a>
                        <br><a href="screenshots.html">Screenshots</a>
                        <br><a href="demo.html">Live Demo</a>
-                       <br><a href="/cgi-bin/gitweb.cgi?p=.git;a=shortlog">Changes</a>
+                       <br><a href="/gitweb/gitweb.cgi?p=.git;a=shortlog">Changes</a>
                        <br><a href="documentation.html">Documentation</a>
                        <br><a href="license.html">License</a>
                        <br><a href="contact.html">Contact</a>

diff --git a/web/header2.html b/web/header2.html
index 56703c7eaa40de3cd6b873a3f783db88d8389c73..9a1c4b196b20fa3bca97d9cefa9946305c96cf86 100644 (file)
--- a/web/header2.html
+++ b/web/header2.html
@@ -30,7 +30,7 @@
                        <br><a href="../../download.html">Download</a>
                        <br><a href="../../screenshots.html">Screenshots</a>
                        <br><a href="../../demo.html">Live Demo</a>
-                       <br><a href="/cgi-bin/gitweb.cgi?p=.git;a=shortlog">Changes</a>
+                       <br><a href="../../gitweb/gitweb.cgi?p=.git;a=shortlog">Changes</a>
                        <br><a href="../../documentation.html">Documentation</a>
                        <br><a href="../../license.html">License</a>
                        <br><a href="../../contact.html">Contact</a>

diff --git a/web/index.in.html b/web/index.in.html
index 8b3acb872cc819239bc03caf7372b55548c310af..da61a9d178dee1acc71f65c772a78c0b1d832060 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
 <h1>Events</h1>
 <hr>
 <ul>
+       <li>2007-11-20: <a href="versions/paraslash-0.2.17.tar.bz2">paraslash-0.2.17</a>
+               <a href="versions/paraslash-0.2.17.tar.bz2.asc">(sig)</a>
+               "isotropic threshold"
+       </li>
        <li>2007-04-05: <a href="versions/paraslash-0.2.16.tar.bz2">paraslash-0.2.16</a>
                <a href="versions/paraslash-0.2.16.tar.bz2.asc">(sig)</a>
                "neural discharge"