Changeset 3857:8ed6d81a32d6 in roaraudio for libroar/simple.c

Timestamp:

05/16/10 23:05:16 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use roar_debug_warn_obsolete() and roar_libroar_*warn()

File:

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

libroar/simple.c

@@ -93 +93 @@
  }
 
+ roar_libroar_nowarn();
  if ( (ret = roar_get_connection_fh(&con)) == -1 ) {
+  roar_libroar_warn();
   roar_disconnect(&con);
   return -1;
  }
+ roar_libroar_warn();
 
  if ( dir == ROAR_DIR_PLAY ) {
@@ -128 +131 @@
 int roar_simple_new_stream (struct roar_connection * con, int rate, int channels, int bits, int codec, int dir) {
  struct roar_stream     s;
- return roar_simple_new_stream_obj(con, &s, rate, channels, bits, codec, dir);
+ int ret;
+
+ roar_debug_warn_sysio("roar_simple_new_stream", "roar_vio_simple_new_stream_obj", NULL);
+
+ roar_libroar_nowarn();
+ ret = roar_simple_new_stream_obj(con, &s, rate, channels, bits, codec, dir);
+ roar_libroar_warn();
+
+ return ret;
 }
 
@@ -170 +181 @@
 
 #ifdef ROAR_HAVE_BSDSOCKETS
+ roar_libroar_nowarn();
  if ( getsockname(roar_get_connection_fh(con), (struct sockaddr *)&socket_addr, &len) == -1 ) {
-  return -1;
- }
+  roar_libroar_warn();
+  return -1;
+ }
+ roar_libroar_warn();
 #else
  return -1;