From 57dc42709fa258844db05f2042dfffe6ca8ade8b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 27 Jun 2004 17:50:02 +0000
Subject: many fixes

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@37 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pstream.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/pstream.c')

diff --git a/src/pstream.c b/src/pstream.c
index 4a3a648b..e3f59816 100644
--- a/src/pstream.c
+++ b/src/pstream.c
@@ -131,11 +131,11 @@ static void item_free(void *item, void *p) {
     struct item_info *i = item;
     assert(i);
 
-    if (i->type == PSTREAM_ITEM_PACKET) {
+    if (i->type == PSTREAM_ITEM_MEMBLOCK) {
         assert(i->chunk.memblock);
         memblock_unref(i->chunk.memblock);
     } else {
-        assert(i->type == PSTREAM_ITEM_MEMBLOCK);
+        assert(i->type == PSTREAM_ITEM_PACKET);
         assert(i->packet);
         packet_unref(i->packet);
     }
@@ -184,7 +184,7 @@ void pstream_send_packet(struct pstream*p, struct packet *packet) {
 
 void pstream_send_memblock(struct pstream*p, uint32_t channel, int32_t delta, struct memchunk *chunk) {
     struct item_info *i;
-    assert(p && channel && chunk);
+    assert(p && channel != (uint32_t) -1 && chunk);
     
     i = malloc(sizeof(struct item_info));
     assert(i);
@@ -258,7 +258,7 @@ static void do_write(struct pstream *p) {
         l = PSTREAM_DESCRIPTOR_SIZE - p->write.index;
     } else {
         d = (void*) p->write.data + p->write.index - PSTREAM_DESCRIPTOR_SIZE;
-        l = ntohl(p->write.descriptor[PSTREAM_DESCRIPTOR_LENGTH]) - p->write.index - PSTREAM_DESCRIPTOR_SIZE;
+        l = ntohl(p->write.descriptor[PSTREAM_DESCRIPTOR_LENGTH]) - (p->write.index - PSTREAM_DESCRIPTOR_SIZE);
     }
 
     if ((r = iochannel_write(p->io, d, l)) < 0) 
@@ -298,7 +298,7 @@ static void do_read(struct pstream *p) {
     } else {
         assert(p->read.data);
         d = (void*) p->read.data + p->read.index - PSTREAM_DESCRIPTOR_SIZE;
-        l = ntohl(p->read.descriptor[PSTREAM_DESCRIPTOR_LENGTH]) - p->read.index - PSTREAM_DESCRIPTOR_SIZE;
+        l = ntohl(p->read.descriptor[PSTREAM_DESCRIPTOR_LENGTH]) - (p->read.index - PSTREAM_DESCRIPTOR_SIZE);
     }
 
     if ((r = iochannel_read(p->io, d, l)) <= 0)
-- 
cgit