Changeset 3144:f8cd1e36b390 in roaraudio for libroaross/libroaross.c

Timestamp:

01/15/10 13:09:40 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

open stream, fixed a lot things

File:

• libroaross/libroaross.c (modified) (6 diffs)

libroaross/libroaross.c

@@ -84 +84 @@
  struct roar_stream    stream;
  struct roar_vio_calls stream_vio;
+ int                   stream_dir;
  int                   stream_opened;
 };
@@ -157 +158 @@
  session->refc--;
 
+ ROAR_DBG("_close_session(session=%p): session->refc=%i", session, session->refc);
+
  if ( session->refc == 0 ) {
   roar_disconnect(&(session->con));
@@ -174 +177 @@
  session->refc++; // TODO: better warp this
  handle->type = HT_NONE;
- roar_stream_new_empty(&(handle->stream));
+ handle->stream_dir = ROAR_DIR_PLAY;
+ roar_stream_new(&(handle->stream), ROAR_RATE_DEFAULT, ROAR_CHANNELS_DEFAULT, ROAR_BITS_DEFAULT, ROAR_CODEC_DEFAULT);
 
  return handle;
@@ -185 +189 @@
  handle->refc--;
 
+ ROAR_DBG("_close_handle(handle=%p): handle->refc=%i", handle, handle->refc);
+
  if ( handle->refc == 0 ) {
-  _close_session(handle->session);
-
   if ( handle->stream_opened )
    roar_vio_close(&(handle->stream_vio));
 
+  handle->session->refc--;
+
+  _close_session(handle->session);
+
   roar_mm_free(handle);
  }
-}
-
-static int _open_stream (struct handle * handle) {
-  return -1;
 }
 
@@ -261 +265 @@
   return -2;
 
- _os.write(1, "DOOF!\n", 6);
-
  if ( (session = _open_session(NULL, NULL)) == NULL ) {
   return -1;
@@ -280 +282 @@
 
  return pointer->fh;
+}
+
+// -------------------------------------
+// open function for streams:
+// -------------------------------------
+
+static int _open_stream (struct handle * handle) {
+  // FIXME: this should be re-written much more cleanly:
+
+ if ( handle == NULL )
+  return -1;
+
+ if ( roar_vio_simple_new_stream_obj(&(handle->stream_vio),
+                                     &(handle->session->con), &(handle->stream),
+                                     handle->stream.info.rate,
+                                     handle->stream.info.channels,
+                                     handle->stream.info.bits,
+                                     handle->stream.info.codec,
+                                     handle->stream_dir
+                                    ) == -1 )
+  return -1;
+
+ handle->stream_opened++;
+
+ return 0;
 }