Changeset 5231:8b30ddb689b8 in roaraudio for include

Timestamp:

11/12/11 14:31:25 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first updates to connection object

File:

• include/libroar/basic.h (modified) (4 diffs)

include/libroar/basic.h

@@ -48 +48 @@
 
 #define ROAR_CON_FLAGS_NONE        0x00
-#define ROAR_CON_FLAGS_FH          0x01
-#define ROAR_CON_FLAGS_VIO         0x02
+#define ROAR_CON_FLAGS_FH          0x01 /* obsoleted */
+#define ROAR_CON_FLAGS_VIO         0x02 /* mandatory */
 #define ROAR_CON_FLAGS_ISCLIENT    0x04
-#define ROAR_CON_FLAGS_SUPPORT_V2  0x08
+#define ROAR_CON_FLAGS_SUPPORT_V2  0x08 /* mandatory if con.version == 2 */
+#define ROAR_CON_FLAGS_SUPPORT_EF  0x10 /* Both peers support error frames */
 
 struct roar_message {
@@ -67 +68 @@
 
 struct roar_connection {
- int __fh;
- int32_t flags;
+ size_t refc;
+ uint32_t flags;
+ int version;
  struct roar_vio_calls viocon;
- struct roar_buffer * msgqueue;
- void * userdata;
- void (*cb)(struct roar_connection * con, struct roar_message * mes, void * userdata);
+ struct roar_error_frame errorframe;
+ void * cb_userdata;
+ void (*cb)(struct roar_connection * con, struct roar_message * mes, void * data, void * userdata);
 };
 
@@ -83 +85 @@
 int roar_connect_fh   (struct roar_connection * con, int fh);
 int roar_get_connection_fh  (struct roar_connection * con);
-int roar_get_connection_vio (struct roar_connection * con, struct roar_vio_calls * vio) _LIBROAR_ATTR_DEPRECATED;
 struct roar_vio_calls * roar_get_connection_vio2 (struct roar_connection * con);
 int roar_disconnect   (struct roar_connection * con);
@@ -90 +91 @@
                                  void (*cb)(struct roar_connection * con,
                                             struct roar_message    * mes,
+                                            void                   * data,
                                             void                   * userdata),
                                  void * userdata);