[pulseaudio-commits] 3 commits - src/pulsecore

[Peter Meerwald]

 src/pulsecore/asyncmsgq.c |    2 --
 src/pulsecore/pstream.c   |    1 -
 src/pulsecore/resampler.c |    7 -------
 3 files changed, 10 deletions(-)

New commits:
commit 8ce2bfa4d0f973a73305968d8a9b9e65f38f39f0
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Fri Oct 24 12:06:30 2014 +0200

    pstream: Duplicate assignment, write.data is always NULL
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index c32b44c..5b15b10 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -570,7 +570,6 @@ static void prepare_next_write_item(pa_pstream *p) {
             p->write.descriptor[PA_PSTREAM_DESCRIPTOR_LENGTH] = htonl((uint32_t) p->write.current->chunk.length);
             p->write.memchunk = p->write.current->chunk;
             pa_memblock_ref(p->write.memchunk.memblock);
-            p->write.data = NULL;
         }
 
         p->write.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS] = htonl(flags);

commit 7bb708d953e5b6b3e4b9097fd0ea1633438769ad
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Mon Nov 3 15:18:48 2014 +0100

    asyncmsgq: Drop weird assert
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/asyncmsgq.c b/src/pulsecore/asyncmsgq.c
index 58cd7ac..2ed550a 100644
--- a/src/pulsecore/asyncmsgq.c
+++ b/src/pulsecore/asyncmsgq.c
@@ -157,8 +157,6 @@ int pa_asyncmsgq_send(pa_asyncmsgq *a, pa_msgobject *object, int code, const voi
     if (!(i.semaphore = pa_flist_pop(PA_STATIC_FLIST_GET(semaphores))))
         i.semaphore = pa_semaphore_new(0);
 
-    pa_assert_se(i.semaphore);
-
     /* This mutex makes the queue multiple-writer safe. This lock is only used on the writing side */
     pa_mutex_lock(a->mutex);
     pa_assert_se(pa_asyncq_push(a->asyncq, &i, true) == 0);

commit 70973d58e69b8be374bd15f5158649599e0af404
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Oct 29 11:56:59 2014 +0100

    resampler: Drop pointless remix variable
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 5e9dc39..8b30c24 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -737,7 +737,6 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
     unsigned oc, ic;
     unsigned n_oc, n_ic;
     bool ic_connected[PA_CHANNELS_MAX];
-    bool remix;
     pa_strbuf *s;
     char *t;
 
@@ -755,16 +754,12 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
     memset(m->map_table_i, 0, sizeof(m->map_table_i));
 
     memset(ic_connected, 0, sizeof(ic_connected));
-    remix = (r->flags & (PA_RESAMPLER_NO_REMAP | PA_RESAMPLER_NO_REMIX)) == 0;
 
     if (r->flags & PA_RESAMPLER_NO_REMAP) {
-        pa_assert(!remix);
-
         for (oc = 0; oc < PA_MIN(n_ic, n_oc); oc++)
             m->map_table_f[oc][oc] = 1.0f;
 
     } else if (r->flags & PA_RESAMPLER_NO_REMIX) {
-        pa_assert(!remix);
         for (oc = 0; oc < n_oc; oc++) {
             pa_channel_position_t b = r->o_cm.map[oc];
 
@@ -849,8 +844,6 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
             ic_unconnected_lfe = 0;
         bool ic_unconnected_center_mixed_in = 0;
 
-        pa_assert(remix);
-
         for (ic = 0; ic < n_ic; ic++) {
             if (on_left(r->i_cm.map[ic]))
                 ic_left++;