Changeset 5116:ec18cb54f717 in roaraudio for libroar

Timestamp:

08/01/11 03:22:19 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

rewrote roar_vio_simple_stream() to not use any deprecated functions

File:

• libroar/vio_stream.c (modified) (2 diffs)

libroar/vio_stream.c

@@ -36 +36 @@
 #include "libroar.h"
 
+static ssize_t _vio_stream_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
+ return roar_vio_read(roar_get_connection_vio2(vio->inst), buf, count);
+}
+
+static ssize_t _vio_stream_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
+ return roar_vio_write(roar_get_connection_vio2(vio->inst), buf, count);
+}
+
+static off_t   _vio_stream_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
+ return roar_vio_lseek(roar_get_connection_vio2(vio->inst), offset, whence);
+}
+static int     _vio_stream_nonblock(struct roar_vio_calls * vio, int state) {
+ return roar_vio_nonblock(roar_get_connection_vio2(vio->inst), state);
+}
+static int     _vio_stream_sync    (struct roar_vio_calls * vio) {
+ return roar_vio_sync(roar_get_connection_vio2(vio->inst));
+}
+static int     _vio_stream_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+ if (vio == NULL) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if (cmd == -1) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_NAME:
+    if ( data == NULL ) {
+     roar_err_set(ROAR_ERROR_FAULT);
+     return -1;
+    }
+
+    *(char**)data = "stream";
+    return 0;
+   break;
+  case ROAR_VIO_CTL_GET_NEXT:
+    *(struct roar_vio_calls **)data = roar_get_connection_vio2(vio->inst);
+    return 0;
+   break;
+  case ROAR_VIO_CTL_SET_NEXT:
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return -1;
+   break;
+ }
+
+ return roar_vio_ctl(roar_get_connection_vio2(vio->inst), cmd, data);
+}
+
+static int     _vio_stream_close   (struct roar_vio_calls * vio) {
+ roar_vio_close(roar_get_connection_vio2(vio->inst));
+ roar_mm_free(vio->inst);
+
+ return 0;
+}
 
 int     roar_vio_simple_stream (struct roar_vio_calls * calls, int rate, int channels, int bits, int codec,
                                                                const char * server, int dir, const char * name) {
- int fh;
+ struct roar_connection * con = NULL;
+ struct roar_stream       stream;
+ int err;
 
  if ( calls == NULL ) {
@@ -46 +105 @@
  }
 
- roar_libroar_nowarn();
- if ( (fh = roar_simple_stream(rate, channels, bits, codec, server, dir, name)) == -1 ) {
-  roar_libroar_warn();
+ if ( roar_stream_new(&stream, rate, channels, bits, codec) == -1 )
+  return -1;
+
+ con = roar_mm_malloc(sizeof(struct roar_connection));
+ if ( con == NULL )
+  return -1;
+
+ memset(con, 0, sizeof(struct roar_connection));
+
+ if ( roar_simple_connect(con, server, name) == -1 ) {
+  err = roar_error;
+  roar_mm_free(con);
+  roar_error = err;
   return -1;
  }
- roar_libroar_warn();
 
- return roar_vio_open_fh_socket(calls, fh);
+ if ( roar_stream_connect(con, &stream, dir) == -1 ) {
+  err = roar_error;
+  roar_disconnect(con);
+  roar_mm_free(con);
+  roar_error = err;
+  return -1;
+ }
+
+ if ( roar_stream_exec(con, &stream) == -1 ) {
+  err = roar_error;
+  roar_disconnect(con);
+  roar_mm_free(con);
+  roar_error = err;
+  return -1;
+ }
+
+ roar_vio_clear_calls(calls);
+
+ calls->inst       = con;
+ calls->read       = _vio_stream_read;
+ calls->write      = _vio_stream_write;
+ calls->lseek      = _vio_stream_lseek;
+ calls->nonblock   = _vio_stream_nonblock;
+ calls->sync       = _vio_stream_sync;
+ calls->ctl        = _vio_stream_ctl;
+ calls->close      = _vio_stream_close;
+
+ if ( dir == ROAR_DIR_PLAY ) {
+  roar_vio_shutdown(calls, SHUT_RD);
+ } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
+  roar_vio_shutdown(calls, SHUT_WR);
+ }
+
+ return 0;
 }