Changeset 5238:5117fb0e7ed4 in roaraudio for libroar

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

Location:

libroar

Files:

• enumdev.c (modified) (1 diff)
• simple.c (modified) (3 diffs)
• stream.c (modified) (3 diffs)
• vio_stream.c (modified) (1 diff)
• vs.c (modified) (1 diff)

libroar/enumdev.c

@@ -52 +52 @@
 
  roar_libroar_nowarn();
- if ( roar_connect2(&con, c->server, 0, 0) == -1 ) {
+ if ( roar_connect(&con, c->server, 0, 0) == -1 ) {
   roar_libroar_warn();
   return -1;

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;

libroar/stream.c

@@ -36 +36 @@
 #include "libroar.h"
 
-int roar_stream_connect  (struct roar_connection * con, struct roar_stream * s, int dir) {
- return roar_stream_connect2(con, s, dir, -1);
-}
-
-int roar_stream_connect2 (struct roar_connection * con, struct roar_stream * s, int dir, int mixer) {
+int roar_stream_connect(struct roar_connection * con, struct roar_stream * s, int dir, int mixer) {
  struct roar_libroar_config * config = roar_libroar_get_config();
  struct roar_stream  ms;
@@ -380 +376 @@
 }
 
-int roar_stream_add_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) {
- struct roar_message m;
-
- if ( con == NULL || s == NULL || data == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- memset(&m,  0, sizeof(m));
-
- m.cmd     = ROAR_CMD_ADD_DATA;
- m.stream  = s->id;
- m.pos     = 0;
- m.datalen = len;
-
-// if ( roar_req(con, &m, (void**)&data) == -1 )
-//  return -1;
- if ( roar_send_message(con, &m, data) != 0 )
-  return -1;
-
- if ( roar_recv_message(con, &m, NULL) == -1 )
-  return -1;
-
- if ( m.cmd == ROAR_CMD_OK )
-  return 0;
- return -1;
-}
-
-int roar_stream_send_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len) {
-
- roar_debug_warn_obsolete("roar_stream_send_data", "roar_vio_write", NULL);
-
- if ( s == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- if ( s->fh == -1 ) {
-  if ( con == NULL ) {
-   roar_err_set(ROAR_ERROR_NOTSUP);
-   return -1;
-  }
-
-  if ( roar_stream_add_data(con, s, data, len) == -1 )
-   return -1;
-
-  return len;
- }
-
-#ifdef ROAR_HAVE_IO_POSIX
- return ROAR_NETWORK_WRITE(s->fh, data, len);
-#endif
-
- roar_err_set(ROAR_ERROR_NOTSUP);
- return -1;
-}
-
 int roar_stream_get_info (struct roar_connection * con, struct roar_stream * s, struct roar_stream_info * info) {
  struct roar_message m;
@@ -709 +648 @@
 
 
-int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, int flags, int reset) {
- return roar_stream_set_flags2(con, s, flags, reset == ROAR_RESET_FLAG ? ROAR_RESET_FLAG : ROAR_SET_FLAG);
-}
-
-int roar_stream_set_flags2 (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action) {
+int roar_stream_set_flags (struct roar_connection * con, struct roar_stream * s, uint32_t flags, int action) {
  struct roar_message m;
  uint16_t * data = (uint16_t *) m.data;

libroar/vio_stream.c

@@ -121 +121 @@
  }
 
- if ( roar_stream_connect2(con, &stream, dir, -1) == -1 ) {
+ if ( roar_stream_connect(con, &stream, dir, -1) == -1 ) {
   err = roar_error;
   roar_disconnect(con);

libroar/vs.c

@@ -1050 +1050 @@
   case ROAR_VS_TRUE:
   case ROAR_VS_FALSE:
-    if ( roar_stream_set_flags2(vss->con, &(vss->stream), flag,
+    if ( roar_stream_set_flags(vss->con, &(vss->stream), flag,
                                 val == ROAR_VS_TRUE ? ROAR_SET_FLAG : ROAR_RESET_FLAG) == -1 ) {
      _seterrre();