Changeset 5238:5117fb0e7ed4 in roaraudio for libroar/simple.c

Timestamp:

11/12/11 17:41:13 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roar_stream_connect(), roar_stream_add_data(), roar_stream_send_data() and roar_stream_set_flags().

File:

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

libroar/simple.c

@@ -82 +82 @@
  }
 
- if ( roar_stream_connect2(&con, s, dir, -1) == -1 ) {
+ if ( roar_stream_connect(&con, s, dir, -1) == -1 ) {
   safe_error = roar_error;
   roar_disconnect(&con);
@@ -254 +254 @@
  }
 
- if ( roar_stream_connect2(con, s, dir, -1) == -1 ) {
+ if ( roar_stream_connect(con, s, dir, -1) == -1 ) {
   return -1;
  }
@@ -417 +417 @@
   return -1;
 
- if ( roar_stream_connect2(con, s, dir, -1) == -1 )
-  return -1;
-
- if ( roar_stream_set_flags2(con, s, ROAR_FLAG_VIRTUAL, ROAR_SET_FLAG) == -1 ) {
+ if ( roar_stream_connect(con, s, dir, -1) == -1 )
+  return -1;
+
+ if ( roar_stream_set_flags(con, s, ROAR_FLAG_VIRTUAL, ROAR_SET_FLAG) == -1 ) {
   roar_kick(con, ROAR_OT_STREAM, roar_stream_get_id(s));
   return -1;