Changeset 3428:44989588ad5a in roaraudio for libroarpulse

Timestamp:

02/11/10 23:51:57 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use struct _roar_pa_stream_cb

File:

• libroarpulse/stream.c (modified) (4 diffs)

libroarpulse/stream.c

@@ -38 +38 @@
 
 #include <libroarpulse/libroarpulse.h>
+
+struct _roar_pa_stream_cb {
+ union {
+  pa_stream_notify_cb_t  ncb;
+  pa_stream_request_cb_t rcb;
+  pa_stream_success_cb_t scb;
+ } cb;
+ void * userdata;
+};
 
 struct pa_stream {
@@ -47 +56 @@
  pa_sample_spec    sspec;
  struct {
-  pa_stream_notify_cb_t   change_state;
-  void                  * change_state_ud;
+  struct _roar_pa_stream_cb change_state;
  } cb;
 };
@@ -229 +237 @@
   return;
 
- s->cb.change_state    = cb;
- s->cb.change_state_ud = userdata;
+ s->cb.change_state.cb.ncb    = cb;
+ s->cb.change_state.userdata  = userdata;
 }
 
@@ -239 +247 @@
  s->state = st;
 
- if ( s->cb.change_state == NULL ) {
-  s->cb.change_state(s, s->cb.change_state_ud);
+ if ( s->cb.change_state.cb.ncb == NULL ) {
+  s->cb.change_state.cb.ncb(s, s->cb.change_state.userdata);
  }
 }