Changeset 5296:b7fd2c45243e in roaraudio

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

Updated connection object. (Closes: #188)

Files:

• ChangeLog (modified) (1 diff)
• doc/man3/roar_disconnect.3 (modified) (2 diffs)
• doc/symlinks.src (modified) (1 diff)
• include/libroar/basic.h (modified) (3 diffs)
• libroar/basic.c (modified) (7 diffs)
• libroar/simple.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 v. 1.0beta0 - ?
-        * Updated API (SONAME change) (Closes: #184, #185, #128, #135, #134, #133, #129)
+        * Updated API (SONAME change) (Closes: #184, #185, #128, #135, #134, #133, #129, #188)
         * Do not set errno to zero in ogg_vorbis codec filter (Closes: #191)
         * Updated data types for struct roar_audio_info (Closes: #189)

doc/man3/roar_disconnect.3

@@ -1 +1 @@
 .\" roar_simple_play.3:
 
-.TH "roar_disconnect" "3" "May 2011" "RoarAudio" "System Manager's Manual: RoarAudio"
+.TH "roar_connectionref" "3" "May 2011" "RoarAudio" "System Manager's Manual: RoarAudio"
 
 .SH NAME
-roar_disconnect \- disconnect from RoarAudio's sound server
+roar_connectionref, roar_connectionunref \- change reference counter for RoarAudio connections
 
 .SH SYNOPSIS
@@ -10 +10 @@
 #include <roaraudio.h>
 
-int roar_disconnect(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))
 
 .SH "DESCRIPTION"
-Closes es connection previously opend via \fBBroar_simple_connect\fR(3) or \fBBroar_simple_connect2\fR(3).
-
+Those functions change the reference counter for connection objects
+previously opend via \fBroar_connect\fR(3), \fBroar_connect_fh\fR(3) or \fBroar_simple_connect\fR(3).
+If the reference counter hints zero the connection is closed and the object is destroyed.
+.PP
+The \fBroar_disconnect\fR(3) macro is provided to be source compatible (recompile needed)
+with RoarAudio 0.4 or older.
 
 .SH "PARAMETERS"
 .TP
 \fBcon\fR
-The connection to be closed.
+The connection to be altered.
 
 .SH "RETURN VALUE"

doc/symlinks.src

@@ -29 +29 @@
 roar_vs_latency                 3       roar_vs_position        3
 roar_vs_latency2                3       roar_vs_position        3
+roar_connectionref              3       roar_disconnect         3
+roar_connectionunref            3       roar_disconnect         3

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,

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;