Merge branch 'next'

diff --git a/Makefile.in b/Makefile.in
index 670be971b5f10a9d9510667ff2af7989648f18b3..f63c21fa13a74fc9a61dd2bda5ae824cd524e7e2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,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 := elliptic inheritance
+codename := symplectic separability
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls

diff --git a/NEWS b/NEWS
index 98057cd5c10d1ef43668c4414bf35bc6ae1185b7..4570fbc783d9b9d4aa3e20be77c3e8eed6c7b1c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
 NEWS
 ====
 
-----------------------------------------------
-0.3.4 (to be announced) "elliptic inheritance"
-----------------------------------------------
+------------------------------------------------
+0.3.5 (to be announced) "symplectic separability"
+------------------------------------------------
+
+-----------------------------------------
+0.3.4 (2009-05-07) "elliptic inheritance"
+-----------------------------------------
 
 The new udp sender, forward error correcton, colored logs and various
 other improvements. As the udp sender does not depend on any special

diff --git a/alsa_write.c b/alsa_write.c
index 456c5178981f201aad9d048ca63079d3133952df..f01b8cf36763ab3ccae6e0e9d5d5c638ce3225d6 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -116,7 +116,7 @@ static int alsa_init(struct private_alsa_write_data *pad,
                * pad->channels / 8;
        if (pad->bytes_per_frame <= 0)
                return -E_PHYSICAL_WIDTH;
-       PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
+       PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
        if (snd_pcm_nonblock(pad->handle, 1))
                PARA_ERROR_LOG("failed to set nonblock mode\n");
        return 1;

diff --git a/configure.ac b/configure.ac
index f783db789781bfc5e40fc48699c8d670fc0d99e3..da5ec770802ec1a0fa0410141b3d96f8017440d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -684,7 +684,7 @@ AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
        enum of supported filters)
 inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = \"'$i'\", .init = '$i'_filter_init},'; done)"
+array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
 AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 1f57dd123eb86d906740f347a58a6d8ab27c28cf..103f4ffc7b2d5f53b6bff2ac98a7e71092b464f4 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -371,7 +371,7 @@ static ssize_t fecdec(char *buf, size_t len, struct filter_node *fn)
        ret = read_fec_header(buf, len, &h);
        if (ret <= 0)
                return ret;
-       if (!h.slice_bytes || h.slice_bytes > fn->bufsize)
+       if (!h.slice_bytes)
                return -E_BAD_SLICE_SIZE;
        if (h.slice_num > h.slices_per_group)
                return -E_BAD_SLICE_NUM;

diff --git a/mp3_afh.c b/mp3_afh.c
index c62a523af473b6fe8cc215545d878ef7f5752547..2d18d5e5de7df641f6cbe7b7ad937cb3f2d69e3e 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -411,7 +411,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, int fd,
                fpos += len;
                len = find_valid_start(map, numbytes, &fpos, &header);
                if (len <= 0) {
-                       uint32_t end;
+                       size_t end;
                        ret = -E_MP3_INFO;
                        if (!afhi->chunks_total)
                                goto err_out;

diff --git a/udp_recv.c b/udp_recv.c
index edbd7c3993bb5f4b3eb18a0efc9f1233e3d9da83..ad8d51fe1bb4e0092e5c99a478e6ef66c358a218 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -6,6 +6,7 @@
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <dirent.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "para.h"

diff --git a/udp_send.c b/udp_send.c
index 79f384ab865c8227e19d710fb49cde43754bf44a..0838d0283f8d78e4ab375096312d3df2610da393 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -9,6 +9,7 @@
 
 #include <sys/time.h>
 #include <dirent.h>
+#include <sys/socket.h>
 #include <net/if.h>
 
 #include "server.cmdline.h"

diff --git a/versions/paraslash-0.3.4.tar.bz2 b/versions/paraslash-0.3.4.tar.bz2
new file mode 100644 (file)
index 0000000..a43cd56
Binary files /dev/null and b/versions/paraslash-0.3.4.tar.bz2 differ

diff --git a/versions/paraslash-0.3.4.tar.bz2.asc b/versions/paraslash-0.3.4.tar.bz2.asc
new file mode 100644 (file)
index 0000000..3edfffc
--- /dev/null
+++ b/versions/paraslash-0.3.4.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBKAwBlWto1QDEAkw8RAvFfAJ0dE2mAQVFxFLFoWO1LjG3jWx0RdQCfRuTt
+5Aqhv5fCNxE+Nk4BrScQB5s=
+=UeHb
+-----END PGP SIGNATURE-----

diff --git a/web/index.in.html b/web/index.in.html
index ac3d3cd0566a9e7fc7bfe4a7331ba333de57c189..14464e72129c56079958eff7d2b2e7d2b5ff1858 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
 <h1>Events</h1>
 <hr>
 <ul>
+       <li>2009-05-07: <a href="versions/paraslash-0.3.4.tar.bz2">paraslash-0.3.4</a>
+               <a href="versions/paraslash-0.3.4.tar.bz2.asc">(sig)</a>
+               "elliptic inheritance"
+       </li>
        <li>2008-12-01: <a href="versions/paraslash-0.3.3.tar.bz2">paraslash-0.3.3</a>
                <a href="versions/paraslash-0.3.3.tar.bz2.asc">(sig)</a>
                "axiomatic perspectivity"