code cleanups

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@38 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce

2 files changed, 24 insertions, 24 deletions

diff --git a/src/converter.c b/src/converter.c
index c5283f6..ad19f82 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -220,20 +220,20 @@ int sa_converter_init(
 
             if (from->channel_map[u] == to->channel_map[t]) {
                 if (u != t)
-                    c->remap_required = 1;
+                    c->remap_required = TRUE;
 
                 c->channel_map_table[u * (from->nchannels+1) + k++] += t;
             }
         }
 
         if (k > 1)
-            c->sum_required = 1;
+            c->sum_required = TRUE;
 
         c->channel_map_table[k] = (unsigned) -1;
     }
 
     if (c->from_nchannels != c->to_nchannels)
-        c->remap_required = 1;
+        c->remap_required = TRUE;
 
     resample_required =
         from->rate != to->rate ||
@@ -391,19 +391,19 @@ void* sa_converter_get_zero_buffer(sa_converter_t *c, size_t size) {
 
 int sa_converter_go(
         sa_converter_t *c,
-        const void *const src[], const size_t sstr[], int sinterleave,
-        void **dst[], size_t *dstr[], int dinterleave,
+        const void *const src[], const size_t sstr[], sa_bool_t sinterleave,
+        void **dst[], size_t *dstr[], sa_bool_t dinterleave,
         size_t *size) {
 
     size_t* stride;
     void** process_data;
-    int is_bounce;
-    int interleave;
+    sa_bool_t is_bounce;
+    sa_bool_t interleave;
     unsigned i;
 
     sa_assert(c);
 
-    is_bounce = 0;
+    is_bounce = FALSE;
     stride = (size_t*) sstr;
     process_data = (void**) src;
     interleave = !!sinterleave;
@@ -438,7 +438,7 @@ int sa_converter_go(
         process_data = c->from_process_data;
         stride = c->from_stride;
         interleave = dinterleave;
-        is_bounce = 1;
+        is_bounce = TRUE;
     }
 
     if (c->pre_format_func) {
@@ -472,7 +472,7 @@ int sa_converter_go(
             stride = c->from_stride;
             *size = new_size;
             interleave = dinterleave;
-            is_bounce = 1;
+            is_bounce = TRUE;
         }
     }
 
@@ -507,7 +507,7 @@ int sa_converter_go(
             process_data = c->from_process_data;
             stride = c->from_stride;
             interleave = dinterleave;
-            is_bounce = 1;
+            is_bounce = TRUE;
         }
     }
 
@@ -559,7 +559,7 @@ int sa_converter_go(
         process_data = c->to_process_data;
         stride = c->to_stride;
         interleave = need_proper_interleave ? -1 : dinterleave;
-        is_bounce = 1;
+        is_bounce = TRUE;
     }
 
     if (c->resample_func) {
@@ -585,7 +585,7 @@ int sa_converter_go(
         stride = c->to_stride;
         *size = new_size;
         interleave = dinterleave;
-        is_bounce = 1;
+        is_bounce = TRUE;
     }
 
     if (c->post_format_func) {
@@ -619,7 +619,7 @@ int sa_converter_go(
             stride = c->to_stride;
             *size = new_size;
             interleave = dinterleave;
-            is_bounce = 1;
+            is_bounce = TRUE;
         }
     }
 
@@ -653,7 +653,7 @@ int sa_converter_go(
             process_data = c->to_process_data;
             stride = c->to_stride;
             interleave = dinterleave;
-            is_bounce = 1;
+            is_bounce = TRUE;
         }
     }
 
@@ -679,7 +679,7 @@ do_interleave:
         process_data = c->to_process_data;
         stride = c->to_stride;
         interleave = dinterleave;
-        is_bounce = 1;
+        is_bounce = TRUE;
     }
 
     *dstr = stride;
@@ -690,7 +690,7 @@ do_interleave:
 
 void sa_converter_set_volume(sa_converter_t *c, const int32_t vol[]) {
     unsigned i;
-    int no_volume = 1;
+    sa_bool_t no_volume = TRUE;
 
     sa_assert(c);
 
@@ -710,7 +710,7 @@ void sa_converter_set_volume(sa_converter_t *c, const int32_t vol[]) {
             sa_continued_fraction(f, 0x7FFF, &num, &denom);
 
             if (num != 1 || denom != 1)
-                no_volume = 0;
+                no_volume = FALSE;
 
             c->volume_factor[i] = (int32_t) num;
             c->volume_divisor[i] = (int32_t) denom;
@@ -740,8 +740,8 @@ int sa_converter_go_interleaved(
 }
 
 void sa_converter_set_ratio(sa_converter_t *c, unsigned rate1, unsigned rate2) {
-    assert(c);
-    assert(c->speex);
+    sa_assert(c);
+    sa_assert(c->speex);
 
     speex_resampler_set_rate(c->speex, rate1, rate2);
 }
diff --git a/src/converter.h b/src/converter.h
index 30453df..39338c2 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -19,8 +19,8 @@ struct sa_converter {
     unsigned from_nchannels, to_nchannels;
     unsigned from_rate, to_rate;
 
-    int sum_required;
-    int remap_required;
+    sa_bool_t sum_required;
+    sa_bool_t remap_required;
 
     sa_pcm_format_t work_pcm_format;
 
@@ -50,7 +50,7 @@ struct sa_converter {
     size_t *from_stride, *to_stride;
 
     int32_t *volume_factor, *volume_divisor;
-    int no_volume;
+    sa_bool_t no_volume;
 
     int *channel_map_table;
 
@@ -58,7 +58,7 @@ struct sa_converter {
     size_t zero_size;
 };
 
-int sa_converter_init(sa_converter_t *c, const pcm_attrs_t *from, const pcm_attrs_t *to, int dynamic_rate_enabled);
+int sa_converter_init(sa_converter_t *c, const pcm_attrs_t *from, const pcm_attrs_t *to, sa_bool_t dynamic_rate_enabled);
 void sa_converter_done(sa_converter_t *c);
 
 int sa_converter_go(