Changeset 5514:c35fedd1cdf7 in roaraudio

Timestamp:

05/29/12 00:43:21 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

allow fn to be -1

File:

• libroar/roardl.c (modified) (4 diffs)

libroar/roardl.c

@@ -69 +69 @@
 
 // TODO: this should be removed on next SONAME change.
-static struct roar_dl_lhandle * __currently_inited = NULL;
+static struct roar_dl_lhandle * __currently_inited    = NULL;
+static int                      __currently_inited_fn = -1;
 
 struct roar_dl_librarypara * roar_dl_para_new(const char * args, void * binargv,
@@ -538 +539 @@
                                          struct roar_dl_librarypara * para) {
  struct roar_dl_lhandle * old_init;
+ int old_fn;
 #define _SUFFIX "_roaraudio_library_init"
  char name[80] = _SUFFIX;
@@ -638 +640 @@
 
  old_init = __currently_inited;
+ old_fn   = __currently_inited_fn;
  __currently_inited = lhandle;
  for (i = 0; i < ROAR_DL_FN_MAX; i++) {
+  __currently_inited_fn = i;
   if ( lib->func[i] != NULL )
    lib->func[i](para, lib);
  }
+ __currently_inited_fn = old_fn;
  __currently_inited = old_init;
 
@@ -926 +931 @@
   lhandle = __currently_inited;
 
+ if ( fn == -1 )
+  fn = __currently_inited_fn;
+
  if ( lhandle == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);