Changeset 3652:b5d0c4533431 in roaraudio for libroaross

Timestamp:

03/29/10 16:36:09 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added option to support new session for each stream

File:

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

libroaross/libroaross.c

@@ -244 +244 @@
 
 static struct session * _open_session (char * server, char * name) {
+ struct session * ses = &_session;
+ int new_session = getenv("ROAR_OSS_NEW_SESSION") == NULL ? 0 : 1;
+
  ROAR_DBG("_open_session(server='%s', name='%s') = ?", server, name);
  ROAR_DBG("_open_session(server='%s', name='%s'): _session.refc=%i", server, name, _session.refc);
 
- if ( _session.refc == 0 ) {
+ if ( new_session ) {
+  ses = malloc(sizeof(struct session));
+  if ( ses == NULL )
+   return NULL;
+
+  memset(ses, 0, sizeof(struct session));
+ }
+
+ if ( ses->refc == 0 ) {
 
   if ( name == NULL )
@@ -255 +266 @@
    name = "libroaross client";
 
-  if ( roar_simple_connect(&(_session.con), server, name) == -1 )
+  if ( roar_simple_connect(&(ses->con), server, name) == -1 ) {
+   if ( new_session )
+    free(ses);
+
    return NULL;
-
-  _find_volume_sid(&_session);
-
-  if ( getenv("ROAR_OSS_KEEP_SESSION") != NULL )
-   _session.refc++;
- }
-
- _session.refc++;
-
- ROAR_DBG("_open_session(server='%s', name='%s') = %p", server, name, &_session);
- return &_session;
+  }
+
+  _find_volume_sid(ses);
+
+  if ( !new_session ) {
+   if ( getenv("ROAR_OSS_KEEP_SESSION") != NULL )
+    ses->refc++;
+  }
+ }
+
+ ses->refc++;
+
+ ROAR_DBG("_open_session(server='%s', name='%s') = %p", server, name, ses);
+ return ses;
 }
 
@@ -281 +298 @@
   roar_disconnect(&(session->con));
  }
+
+ if ( session != &_session )
+  free(session);
 }