Changeset 486:5f7954982f5a in roaraudio

Timestamp:

08/13/08 16:57:00 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some bugfixed because of roar_stream_m2s() change

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• codecfilter_vorbis.c (modified) (1 diff)
• meta.c (modified) (1 diff)
• req.c (modified) (2 diffs)

roard/codecfilter.c

@@ -61 +61 @@
 
  *codecfilter_id = -1;
+
+ ROAR_DBG("codecfilter_open(*): codecfilter='%s', info->id=%i", codecfilter, ROAR_STREAM(info)->id);
 
  for (i = 0; g_codecfilter[i].name != NULL; i++) {

roard/codecfilter_vorbis.c

@@ -19 +19 @@
  self->stream               = info;
 // self->outlen               = ROAR_OUTPUT_BUFFER_SAMPLES * s->info.channels * s->info.bits / 8; // optimal size
+
+ ROAR_DBG("cf_vorbis_open(*): info->id=%i", ROAR_STREAM(info)->id);
 
  if ( (self->in = fdopen(((struct roar_stream*)info)->fh, "r")) == NULL ) {

roard/meta.c

@@ -119 +119 @@
 int stream_meta_clear (int id) {
  int i;
- struct roar_stream_server * s = g_streams[id];
+ struct roar_stream_server * s = NULL;
+
+ if ( id < 0 || id > ROAR_STREAMS_MAX ) {
+  ROAR_ERR("stream_meta_clear(id=%i): Can not clear meta data on stream: invalid stream ID", id);
+  return -1;
+ }
+
+ s = g_streams[id];
 
  if ( s == NULL )

roard/req.c

@@ -1 @@
-//req.c:
+
 
 #include "roard.h"
@@ -87 +87 @@
  }
 
+ ROAR_STREAM(s)->id = stream; // roar_stream_m2s() resets this
+
  mes->cmd     = ROAR_CMD_OK;
  mes->stream  = stream;