Changeset 5148:73d76a74be61 in roaraudio for libroar/simple.c

Timestamp:

10/15/11 14:29:29 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved error handling some more, marked some stuff as obsolete

File:

• libroar/simple.c (modified) (3 diffs)

libroar/simple.c

@@ -73 +73 @@
  struct roar_connection con;
  int ret;
+ int safe_error;
 
  roar_debug_warn_sysio("roar_simple_stream_obj", NULL, NULL);
@@ -83 +84 @@
 
  if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
+  safe_error = roar_error;
   roar_disconnect(&con);
+  roar_err_set(safe_error);
   return -1;
  }
 
  if ( roar_stream_connect2(&con, s, dir, -1) == -1 ) {
+  safe_error = roar_error;
   roar_disconnect(&con);
+  roar_err_set(safe_error);
   return -1;
  }
 
  if ( roar_stream_exec(&con, s) == -1 ) {
+  safe_error = roar_error;
   roar_disconnect(&con);
+  roar_err_set(safe_error);
   return -1;
  }
@@ -99 +106 @@
  roar_libroar_nowarn();
  if ( (ret = roar_get_connection_fh(&con)) == -1 ) {
+  safe_error = roar_error;
   roar_libroar_warn();
   roar_disconnect(&con);
+  roar_err_set(safe_error);
   return -1;
  }