Changeset 4078:19d24e1dc238 in roaraudio

Timestamp:

07/23/10 18:01:42 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

another fix to get it working again: handle internal fh=-1 correctly

File:

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

libroaross/libroaross.c

@@ -364 +364 @@
  int p[2];
 
+ ROAR_DBG("_open_dummy(void) = ?");
+
  if ( pipe(p) == -1 )
   return -1;
@@ -369 +371 @@
  close(p[1]);
 
+ ROAR_DBG("_open_dummy(void) = %i", p[0]);
  return p[0];
 }
@@ -490 +493 @@
 }
 
-static struct pointer * _get_pointer_by_fh (int fh) {
+static struct pointer * _get_pointer_by_fh_or_new (int fh) {
  int i;
-
- if ( fh == -1 )
-  return NULL;
 
  for (i = 0; i < _MAX_POINTER; i++) {
@@ -504 +504 @@
 }
 
+static struct pointer * _get_pointer_by_fh (int fh) {
+ int i;
+
+ if ( fh == -1 )
+  return NULL;
+
+ return _get_pointer_by_fh_or_new(fh);
+}
+
 static struct pointer * _open_pointer(struct handle * handle) {
- struct pointer * ret = _get_pointer_by_fh(-1);
-
- if ( ret == NULL )
+ struct pointer * ret = _get_pointer_by_fh_or_new(-1);
+
+ ROAR_DBG("_open_pointer(handle=%p) = ?", handle);
+
+ if ( ret == NULL ) {
+  ROAR_DBG("_open_pointer(handle=%p) = NULL", handle);
   return NULL;
-
- if ( (ret->fh = _open_dummy()) == -1 )
+ }
+
+ if ( (ret->fh = _open_dummy()) == -1 ) {
+  ROAR_DBG("_open_pointer(handle=%p) = NULL", handle);
   return NULL;
+ }
 
  ret->handle = handle;
 
+ ROAR_DBG("_open_pointer(handle=%p) = %p", handle, ret);
+
  return ret;
 }
 
 static struct pointer * _attach_pointer(struct handle * handle, int fh) {
- struct pointer * ret = _get_pointer_by_fh(-1);
+ struct pointer * ret = _get_pointer_by_fh_or_new(-1);
 
  if ( ret == NULL )
@@ -724 +741 @@
    break;
  }
+
+ ROAR_DBG("_open_file(pathname='%s', flags=0x%x) = ?", pathname, flags);
 
  if ( (pointer = _open_pointer(handle)) == NULL ) {