Changeset 634:01d26682dd80 in roaraudio

Timestamp:

08/20/08 20:12:05 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow setting -1 as fh for stream, added ROAR_DIR_OUTPUT where ROAR_DIR_MONITOR is in the code

Location:

roard

Files:

• codecfilter_celt.c (modified) (1 diff)
• codecfilter_vorbis.c (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/codecfilter_celt.c

@@ -66 +66 @@
  if ( s->dir == ROAR_DIR_PLAY ) {
    self->decoder = celt_decoder_create(self->mode);
- } else if ( s->dir == ROAR_DIR_MONITOR ) {
+ } else if ( s->dir == ROAR_DIR_MONITOR || s->dir == ROAR_DIR_OUTPUT ) {
    self->encoder = celt_encoder_create(self->mode);
  } else {

roard/codecfilter_vorbis.c

@@ -38 +38 @@
  if ( s->dir == ROAR_DIR_PLAY ) {
   return 0;
- } else if ( s->dir == ROAR_DIR_MONITOR ) {
+ } else if ( s->dir == ROAR_DIR_MONITOR || s->dir == ROAR_DIR_OUTPUT ) {
 #ifdef ROAR_HAVE_LIBVORBISENC
   // set up the encoder here

roard/streams.c

@@ -143 +143 @@
  }
 
+ if ( fh == -1 ) { // yes, this is valid, indecats full vio!
+  return 0;
+ }
+
  dir = ROAR_STREAM(g_streams[id])->dir;
 
- if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
+ if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD || dir == ROAR_DIR_OUTPUT ) {
   shutdown(fh, SHUT_RD);
  }
@@ -629 +633 @@
   return 0;
 
- if ( s->dir != ROAR_DIR_MONITOR )
+ if ( s->dir != ROAR_DIR_MONITOR && s->dir != ROAR_DIR_OUTPUT )
   return 0;