Changeset 5226:3cb3cab29e5e in roaraudio for libroar

Timestamp:

11/12/11 13:20:14 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roarcat2sock as well as roar_simple_stream(), roar_simple_new_stream(), roar_simple_play(), roar_simple_monitor(), roar_simple_record(), roar_simple_filter(), roar_simple_close() and roar_simple_get_standby().

File:

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

libroar/simple.c

@@ -62 +62 @@
 }
 
-int roar_simple_stream(int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) {
- struct roar_stream     s;
-
- roar_debug_warn_sysio("roar_simple_stream", "roar_vio_simple_stream", NULL);
-
- return roar_simple_stream_obj(&s, rate, channels, bits, codec, server, dir, name);
-}
-
 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) {
  struct roar_connection con;
@@ -78 +70 @@
 
  if ( roar_simple_connect(&con, server, name) == -1 ) {
-  ROAR_DBG("roar_simple_play(*): roar_simple_connect() faild!");
-  ROAR_ERR("roar_simple_stream(*): Can not connect to server");
+  ROAR_DBG("roar_simple_stream_obj(*): roar_simple_connect() faild!");
+  ROAR_ERR("roar_simple_stream_obj(*): Can not connect to server");
   return -1;
  }
@@ -140 +132 @@
 
  return fh;
-}
-
-int roar_simple_new_stream (struct roar_connection * con, int rate, int channels, int bits, int codec, int dir) {
- struct roar_stream     s;
- 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;
 }
 
@@ -421 +400 @@
 }
 
-int roar_simple_play(int rate, int channels, int bits, int codec, char * server, char * name) {
- roar_debug_warn_sysio("roar_simple_play", "roar_vio_simple_stream", NULL);
-
- return roar_simple_stream(rate, channels, bits, codec, server, ROAR_DIR_PLAY, name);
-}
-
-int roar_simple_monitor(int rate, int channels, int bits, int codec, char * server, char * name) {
- roar_debug_warn_sysio("roar_simple_monitor", "roar_vio_simple_stream", NULL);
-
- return roar_simple_stream(rate, channels, bits, codec, server, ROAR_DIR_MONITOR, name);
-}
-
-int roar_simple_record(int rate, int channels, int bits, int codec, char * server, char * name) {
- roar_debug_warn_sysio("roar_simple_record", "roar_vio_simple_stream", NULL);
-
- return roar_simple_stream(rate, channels, bits, codec, server, ROAR_DIR_RECORD, name);
-}
-
-int roar_simple_filter(int rate, int channels, int bits, int codec, char * server, char * name) {
- roar_debug_warn_sysio("roar_simple_filter", "roar_vio_simple_stream", NULL);
-
- return roar_simple_stream(rate, channels, bits, codec, server, ROAR_DIR_FILTER, name);
-}
-
 int roar_simple_connect_virtual(struct roar_connection * con, struct roar_stream * s, int parent, int dir) {
  struct roar_stream parent_stream;
@@ -473 +428 @@
 }
 
-int roar_simple_close(int fh) {
- roar_debug_warn_sysio("roar_simple_close", "roar_vio_close", NULL);
-
-#ifdef ROAR_TARGET_WIN32
- closesocket(fh);
- return 0;
-#else
-
-#ifdef ROAR_HAVE_IO_POSIX
- return close(fh);
-#else
- return -1;
-#endif
-
-#endif
-}
-
-int roar_simple_get_standby (int fh) {
- struct roar_connection con;
-
- roar_debug_warn_sysio("roar_simple_get_standby", "roar_get_standby", NULL);
-
- if ( roar_connect_fh(&con, fh) == -1 )
-  return -1;
-
- return roar_get_standby(&con);
-}
-
 //ll