Changeset 671:59e319049464 in roaraudio

Timestamp:

08/27/08 14:12:59 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roardsp_filter_ctl() and done roardsp_filter_init()

File:

• libroardsp/filter.c (modified) (4 diffs)

libroardsp/filter.c

@@ -30 +30 @@
  int (*  init      )(struct roardsp_filter * filter, struct roar_stream * stream, int id);
  int (*uninit      )(struct roardsp_filter * filter);
+ int (*ctl         )(struct roardsp_filter * filter, int cmd, void * data);
  int (*calc  [5][3])(struct roardsp_filter * filter, void * data, size_t samples);
 } _roardsp_filterlist[] = {
- {ROARDSP_FILTER_AMP, "AMP", NULL, NULL, {
+ {ROARDSP_FILTER_AMP, "AMP", NULL, NULL, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_LOWP, "Lowpass", NULL, NULL, {
+ {ROARDSP_FILTER_LOWP, "Lowpass", NULL, NULL, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {ROARDSP_FILTER_HIGHP, "Highpass", NULL, NULL, {
+ {ROARDSP_FILTER_HIGHP, "Highpass", NULL, NULL, NULL, {
            {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}},
- {-1, NULL, NULL, NULL, {{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}}
+ {-1, NULL, NULL, NULL, NULL, {
+           {NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL},{NULL, NULL, NULL}}}
 };
 
@@ -64 +66 @@
 
 int roardsp_filter_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id) {
+ struct _roardsp_filterlist * l = _roardsp_filterlist;
+ int bytes;
+ int (*calc)(struct roardsp_filter * filter, void * data, size_t samples) = NULL;
+
  if ( filter == NULL )
   return -1;
@@ -72 +78 @@
  filter->bits     = stream->info.bits;
 
- return -1;
+ bytes            = stream->info.bits / 8;
+
+ while ( l->id != id )
+  if ( l->id == -1 )
+   return -1;
+
+ filter->uninit = l->uninit;
+ filter->ctl    = l->ctl;
+
+ if ( filter->channels < 3 )
+  calc = l->calc[bytes][filter->channels];
+
+ if ( calc == NULL )
+  calc = l->calc[bytes][0]; // for n channels
+
+ if ( calc == NULL )
+  return -1;
+
+ if ( l->init )
+  return l->init(filter, stream, id);
+
+ return 0;
 }
 
@@ -101 +128 @@
 }
 
+int    roardsp_filter_ctl   (struct roardsp_filter * filter, int cmd, void * data) {
+ if ( filter == NULL )
+  return -1;
+
+ if ( filter->ctl )
+  return filter->ctl(filter, cmd, data);
+
+ return -1;
+}
+
 //ll