Changeset 5296:b7fd2c45243e in roaraudio for libroar

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Updated connection object. (Closes: #188)

Location:

libroar

Files:

• basic.c (modified) (7 diffs)
• simple.c (modified) (1 diff)

libroar/basic.c

@@ -262 +262 @@
 int roar_connect     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) {
  int fh;
+ int err;
 
  if ( con == NULL ) {
@@ -274 +275 @@
   return -1;
 
- return roar_connect_fh(con, fh);
+ if ( roar_connect_fh(con, fh) == -1 ) {
+  err = roar_error;
+#ifdef ROAR_TARGET_WIN32
+  closesocket(fh);
+#else
+  close(fh);
+#endif
+  roar_error = err;
+  return -1;
+ }
+
+ if ( server != NULL ) {
+  con->server_name = roar_mm_strdup(server);
+ }
+
+ return 0;
 }
 
@@ -289 +305 @@
 
  memset(con, 0, sizeof(struct roar_connection));
- con->refc        = 0;
+ con->refc        = 1;
  con->flags       = ROAR_CON_FLAGS_NONE;
  con->version     = 0;
  con->cb_userdata = NULL;
  con->cb          = NULL;
+ con->server_stds = NULL;
+ con->server_name = NULL;
 
  roar_err_init(&(con->errorframe));
 
- if ( roar_vio_open_fh_socket(&(con->viocon), fh) != -1 ) {
+ con->viocon = &(con->viocon_store);
+
+ if ( roar_vio_open_fh_socket(con->viocon, fh) != -1 ) {
   con->flags |= ROAR_CON_FLAGS_VIO;
  }
@@ -317 +337 @@
  ROAR_DBG("roar_get_connection_fh(con=%p) = ?", con);
 
- if ( roar_vio_ctl(&(con->viocon), ROAR_VIO_CTL_GET_FH, &fh) == -1 )
+ if ( roar_vio_ctl(con->viocon, ROAR_VIO_CTL_GET_FH, &fh) == -1 )
   return -1;
 
@@ -330 +350 @@
 
  if ( con->flags & ROAR_CON_FLAGS_VIO )
-  return &(con->viocon);
+  return con->viocon;
 
 // TODO: try to open the VIO.
@@ -337 +357 @@
 }
 
-int roar_disconnect (struct roar_connection * con) {
+const char * roar_get_connection_server(struct roar_connection * con) {
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return NULL;
+ }
+
+ return con->server_name;
+}
+
+int roar_connectionref(struct roar_connection * con) {
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ con->refc++;
+
+ return 0;
+}
+
+int roar_connectionunref(struct roar_connection * con) {
  struct roar_vio_calls * vio;
  struct roar_message m;
+
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ con->refc--;
+
+ if ( con->refc )
+  return 0;
 
  memset(&m, 0, sizeof(m));
@@ -354 +404 @@
  }
 
- roar_connect_fh(con, -2);
-
- roar_err_set(ROAR_ERROR_NONE);
+ if ( con->server_stds != NULL ) {
+  roar_stds_free(con->server_stds);
+  con->server_stds = NULL;
+ }
+
+ if ( con->server_name != NULL ) {
+  roar_mm_free(con->server_name);
+  con->server_name = NULL;
+ }
+
+ if ( con->flags & ROAR_CON_FLAGS_FREESELF ) {
+  roar_mm_free(con);
+ } else {
+  roar_connect_fh(con, -2);
+ }
 
  return 0;

libroar/simple.c

@@ -120 +120 @@
  int fh;
 
- if ( (fh = roar_simple_stream_obj(s, rate, channels, bits, codec, NULL /* server, we hope this is ok here... */,
+ if ( (fh = roar_simple_stream_obj(s, rate, channels, bits, codec, roar_get_connection_server(con),
                                    dir, "libroar temp stream", mixer)) == -1 )
   return -1;