Changeset 5296:b7fd2c45243e in roaraudio for include

Timestamp:

11/25/11 02:27:12 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated connection object. (Closes: #188)

File:

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

include/libroar/basic.h

@@ -47 +47 @@
 #endif
 
-#define ROAR_CON_FLAGS_NONE        0x00
-#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 /* mandatory if con.version == 2 */
-#define ROAR_CON_FLAGS_SUPPORT_EF  0x10 /* Both peers support error frames */
+#define ROAR_CON_FLAGS_NONE        0x00000000UL
+#define ROAR_CON_FLAGS_FH          0x00000001UL /* obsoleted */
+#define ROAR_CON_FLAGS_VIO         0x00000002UL /* mandatory */
+#define ROAR_CON_FLAGS_ISCLIENT    0x00000004UL
+#define ROAR_CON_FLAGS_SUPPORT_V2  0x00000008UL /* mandatory if con.version == 2 */
+#define ROAR_CON_FLAGS_SUPPORT_EF  0x00000010UL /* Both peers support error frames */
+#define ROAR_CON_FLAGS_FREESELF    0x00000020UL /* Free the connection object */
 
 struct roar_message {
@@ -67 +68 @@
 };
 
+struct roar_stds; // "caps.h" will be included later.
+
 struct roar_connection {
  size_t refc;
  uint32_t flags;
  int version;
- struct roar_vio_calls viocon;
+ struct roar_vio_calls * viocon;
+ struct roar_vio_calls   viocon_store;
  struct roar_error_frame errorframe;
  void * cb_userdata;
  void (*cb)(struct roar_connection * con, struct roar_message * mes, void * data, void * userdata);
+ struct roar_stds * server_stds;
+ char * server_name;
 };
 
@@ -84 +90 @@
 int roar_get_connection_fh  (struct roar_connection * con);
 struct roar_vio_calls * roar_get_connection_vio2 (struct roar_connection * con);
-int roar_disconnect   (struct roar_connection * con);
+const char * roar_get_connection_server(struct roar_connection * con);
+int roar_connectionref(struct roar_connection * con);
+int roar_connectionunref(struct roar_connection * con);
+#define roar_disconnect(x) roar_connectionunref((x))
 
 int roar_set_connection_callback(struct roar_connection * con,