Changeset 562:1f94749e6f9d in roaraudio

Timestamp:

08/18/08 21:58:04 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first small changes to make it compile ;)

Location:

roard

Files:

• codecfilter_wave.c (modified) (4 diffs)
• include/codecfilter_wave.h (added)

roard/codecfilter_wave.c

@@ -2 +2 @@
 
 #include "roard.h"
-
-struct codecfilter_wave_inst {
- struct roar_stream_server * stream;
- int opened;
-};
 
 int cf_wave_open(CODECFILTER_USERDATA_T * inst, int codec,
@@ -39 +34 @@
 
 int cf_wave_close(CODECFILTER_USERDATA_T   inst) {
- struct codecfilter_wave_inst * self = (struct codecfilter_wave_inst *) inst;
+// struct codecfilter_wave_inst * self = (struct codecfilter_wave_inst *) inst;
 
  if ( !inst )
@@ -52 +47 @@
  int fh = ((struct roar_stream *)self->stream)->fh;
  int r = -1;
- char buf[44];
+ char tbuf[44];
  struct roar_stream * s = ROAR_STREAM(self->stream);
 
@@ -58 +53 @@
   return read(fh, buf, len);
  } else {
-  if (read(fh, buf, 44) != 44) {
+  if (read(fh, tbuf, 44) != 44) {
    close(fh);
    return -1;
   }
 
-  memcpy(&(s->info.rate    ), buf+24, 4);
-  memcpy(&(s->info.channels), buf+22, 2);
-  memcpy(&(s->info.bits    ), buf+34, 2);
+  memcpy(&(s->info.rate    ), tbuf+24, 4);
+  memcpy(&(s->info.channels), tbuf+22, 2);
+  memcpy(&(s->info.bits    ), tbuf+34, 2);
 
   errno = EAGAIN;