Changeset 3857:8ed6d81a32d6 in roaraudio

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()

Location:

libroar

Files:

• file.c (modified) (2 diffs)
• simple.c (modified) (3 diffs)
• stream.c (modified) (2 diffs)

libroar/file.c

@@ -106 +106 @@
 #endif
 
+ roar_debug_warn_obsolete("roar_file_send_raw", "roar_vio_copy_data", NULL);
+
 #ifdef ROAR_HAVE_LINUX_SENDFILE
  while ((ret = sendfile(out, in, NULL, BUFMAX)) > 0)
@@ -268 +270 @@
   }
 
+  roar_libroar_nowarn();
   if ( (out = roar_get_connection_fh(con)) == -1 ) {
    ROAR_ERR("roar_file_play_full(*): Can not get socket of server connection for exec data transmition.");
    close(in);
-   return -1;
-  }
+   roar_libroar_warn();
+   return -1;
+  }
+  roar_libroar_warn();
 
   ROAR_SHUTDOWN(out, SHUT_RD);

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;

libroar/stream.c

@@ -264 +264 @@
  ROAR_DBG("roar_stream_passfh(con=%p{...}, s={.id=%i,...}, fh=%i) = ?", con, s->id, fh);
 
- if ( (confh = roar_get_connection_fh(con)) == -1 )
-  return -1;
+ roar_libroar_nowarn();
+ if ( (confh = roar_get_connection_fh(con)) == -1 ) {
+  roar_libroar_warn();
+  return -1;
+ }
+ roar_libroar_warn();
 
  if ( roar_send_message(con, &m, NULL) == -1 ) {
@@ -339 +343 @@
 
 int roar_stream_send_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) {
- if ( ! s )
+
+ roar_debug_warn_obsolete("roar_stream_send_data", "roar_vio_write", NULL);
+
+ if ( s == NULL )
   return -1;
 
  if ( s->fh == -1 ) {
-  if ( !con )
+  if ( con == NULL )
    return -1;