Changeset 82:395b9657ca85 in roaraudio

Timestamp:

07/12/08 18:49:34 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_simple_new_stream()

Files:

• include/libroar/simple.h (modified) (1 diff)
• include/libroar/stream.h (modified) (1 diff)
• libroar/simple.c (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)

include/libroar/simple.h

@@ -9 +9 @@
 
 int roar_simple_stream  (int rate, int channels, int bits, int codec, char * server, int dir, char * name);
+
+int roar_simple_new_stream (struct roar_connection * con, int rate, int channels, int bits, int codec, int dir);
 
 int roar_simple_play    (int rate, int channels, int bits, int codec, char * server, char * name);

include/libroar/stream.h

@@ -19 +19 @@
 int roar_stream_exec    (struct roar_connection * con, struct roar_stream * s);
 int roar_stream_connect_to (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port);
+int roar_stream_connect_to_ask (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port);
 
 int roar_stream_add_data (struct roar_connection * con, struct roar_stream * s, char * data, size_t len);

libroar/simple.c

@@ -58 +58 @@
 }
 
+int roar_simple_new_stream (struct roar_connection * con, int rate, int channels, int bits, int codec, int dir) {
+ struct roar_stream     s;
+ struct roar_message    mes;
+ char file[80];
+ int fh = -1, listen;
+ static int count = 0;
+
+ sprintf(file, "/tmp/.libroar-simple-stream.%i-%i", getpid(), count++);
+
+ if ( (listen = roar_socket_listen(ROAR_SOCKET_TYPE_UNIX, file, 0)) == -1 ) {
+  return -1;
+ }
+
+ if ( roar_stream_new(&s, rate, channels, bits, codec) == -1 ) {
+  return -1;
+ }
+
+ if ( roar_stream_connect(con, &s, dir) == -1 ) {
+  return -1;
+ }
+
+ if ( roar_stream_connect_to_ask(con, &s, ROAR_SOCKET_TYPE_UNIX, file, 0) != -1 ) {
+
+  if ( (fh = accept(listen, NULL, NULL)) != -1 ) {
+   if ( dir == ROAR_DIR_PLAY ) {
+    shutdown(fh, SHUT_RD);
+   } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
+    shutdown(fh, SHUT_WR);
+   }
+  }
+   if ( roar_recv_message(con, &mes, NULL) == -1 ) {
+    close(fh);
+    fh = -1;
+   } else if ( mes.cmd != ROAR_CMD_OK ) {
+    close(fh);
+    fh = -1;
+   }
+ }
+
+ close(listen);
+ unlink(file);
+
+ return fh;
+}
+
 int roar_simple_play(int rate, int channels, int bits, int codec, char * server, char * name) {
  return roar_simple_stream(rate, channels, bits, codec, server, ROAR_DIR_PLAY, name);

libroar/stream.c

@@ -75 +75 @@
 int roar_stream_connect_to (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port) {
  struct roar_message m;
+
+ if ( roar_stream_connect_to_ask(con, s, type, host, port) == -1 )
+  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_connect_to_ask (struct roar_connection * con, struct roar_stream * s, int type, char * host, int port) {
+ struct roar_message m;
  int len = 0;
 
@@ -97 +111 @@
  m.datalen = len + 4;
 
- if ( roar_req(con, &m, NULL) == -1 )
+ if ( roar_send_message(con, &m, NULL) == -1 )
   return -1;
 
- if ( m.cmd == ROAR_CMD_OK )
-  return 0;
- return -1;
+ return 0;
 }