Changeset 1614:7d8deb4b9dfc in roaraudio

Timestamp:

04/25/09 14:49:16 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

do not double close a vio object

File:

• roard/sources.c (modified) (4 diffs)

roard/sources.c

@@ -145 +145 @@
 #endif
 
-#define _ret(x) roar_vio_close(vio); streams_delete(stream); return (x)
+#define _ret(x) streams_delete(stream); return (x)
 
 int sources_add_cf (char * driver, char * device, char * container, char * options, int primary) {
@@ -154 +154 @@
  struct roar_stream    * s;
  struct roar_vio_calls * vio;
+ struct roar_vio_defaults def;
+
+ if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 )
+  return -1;
 
  if ( (stream = streams_new()) == -1 ) {
@@ -178 +182 @@
  vio = &(ROAR_STREAM_SERVER(s)->vio);
 
- if ( roar_vio_open_file(vio, device, O_RDONLY, 0644) == -1 ) {
+ //if ( roar_vio_open_file(vio, device, O_RDONLY, 0644) == -1 ) {
+ if ( roar_vio_open_dstr(vio, device, &def, 1) == -1 ) {
   _ret(-1);
  }
+
+ ROAR_DBG("sources_add_cf(*) = ?");
 
  // TODO: finy out a better way of doing auto detetion without need for seek!
@@ -208 +215 @@
  ROAR_STREAM_SERVER(s)->codec_orgi = codec;
 
+ ROAR_DBG("sources_add_cf(*) = ?");
  streams_set_fh(stream, -2);
+ ROAR_DBG("sources_add_cf(*) = ?");
  streams_set_socktype(stream, ROAR_SOCKET_TYPE_FILE);