Changeset 1660:99bfd21f00ef in roaraudio for libroaresd

Timestamp:

05/08/09 16:56:40 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed name of fh in con struct to fh, this should all apps requiring the private member to fail to build, added function to get fh, change code to use them both everythere

Location:

libroaresd

Files:

• esdbasic.c (modified) (3 diffs)
• esdctl.c (modified) (5 diffs)

libroaresd/esdbasic.c

@@ -45 +45 @@
 int esd_open_sound( const char *host ) {
  struct roar_connection con;
+ int fh;
 
  if ( roar_simple_connect(&con, (char*) host, NULL) == -1 ) {
@@ -51 +52 @@
  }
 
- return con.fh;
+ if ( (fh = roar_get_connection_fh(&con)) == -1 ) {
+  roar_disconnect(&con);
+  return -1;
+ }
+
+ return fh;
 }
 
@@ -79 +85 @@
  m.datalen = 0;
 
- con.fh = esd;
+ roar_connect_fh(&con, esd);
 
  gettimeofday(&try, NULL);

libroaresd/esdctl.c

@@ -54 +54 @@
  struct roar_connection con;
 
- con.fh = esd;
+ roar_connect_fh(&con, esd);
 
  return roar_set_standby(&con, ROAR_STANDBY_ACTIVE);
@@ -62 +62 @@
  struct roar_connection con;
 
- con.fh = esd;
+ roar_connect_fh(&con, esd);
 
  return roar_set_standby(&con, ROAR_STANDBY_INACTIVE);
@@ -148 +148 @@
  r->version = 0; // seems to be static
 
- con.fh    = esd;
+ roar_connect_fh(&con, esd);
  m.cmd     = ROAR_CMD_SERVER_OINFO;
  m.datalen = 0;
@@ -201 +201 @@
  esd_player_info_t * new_player, * cur = NULL; // = NULL to avoid gcc warning
 
- con->fh = esd;
+ roar_connect_fh(con, esd);
 
  r = malloc(sizeof(esd_info_t));
@@ -334 +334 @@
  struct roar_mixer_settings mixer;
 
- con.fh = esd;
+ roar_connect_fh(&con, esd);
 
  mixer.mixer[0] = left_scale  == 256 ? 65535 : left_scale  * 256;