Changeset 608:745a06132506 in roaraudio for roard/codecfilter_celt.c

Timestamp:

08/19/08 21:01:30 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make codec filter fuse vio

File:

• roard/codecfilter_celt.c (modified) (3 diffs)

roard/codecfilter_celt.c

@@ -115 +115 @@
 int cf_celt_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_celt_inst * self = (struct codecfilter_celt_inst *) inst;
- int fh = ((struct roar_stream *)self->stream)->fh;
  int r = 0;
  uint16_t fs;
@@ -129 +128 @@
 
  while ( r <= (len - self->s_buf) ) {
-  if ( read(fh, &fs, 2) != 2 )
+  if ( stream_vio_s_read(self->stream, &fs, 2) != 2 )
    break;
 
   fs = ROAR_NET2HOST16(fs);
 
-  if ( read(fh, self->ibuf, fs) != fs )
+  if ( stream_vio_s_read(self->stream, self->ibuf, fs) != fs )
    break;
 
@@ -148 +147 @@
  if ( r < len ) {
 //  printf("r < len!\n");
-  if ( read(fh, &fs, 2) == 2 ) {
+  if ( stream_vio_s_read(self->stream, &fs, 2) == 2 ) {
    fs = ROAR_NET2HOST16(fs);
 //   printf("next: fs=%i\n", fs);
-   if ( read(fh, self->ibuf, fs) == fs ) {
+   if ( stream_vio_s_read(self->stream, self->ibuf, fs) == fs ) {
 //    printf("got data!\n");
     if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs, (celt_int16_t *) self->obuf) >= 0 ) {