Changeset 1660:99bfd21f00ef in roaraudio for libroaryiff

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:

libroaryiff

Files:

• audiocd.c (modified) (2 diffs)
• connection.c (modified) (1 diff)
• ctl.c (modified) (1 diff)
• events.c (modified) (1 diff)
• playback.c (modified) (2 diffs)

libroaryiff/audiocd.c

@@ -42 +42 @@
   return -1;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  if ( ! _g_roaryiff_cdrom.is_open ) {
@@ -58 +58 @@
   return -1;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  if ( _g_roaryiff_cdrom.is_playing ) {

libroaryiff/connection.c

@@ -52 +52 @@
  }
 
- ycon->fd = con.fh;
+ if ( (ycon->fd = roar_get_connection_fh(&con)) == -1 ) {
+  roar_disconnect(&con);
+  free(ycon);
+  return NULL;
+ }
 
  return ycon;

libroaryiff/ctl.c

@@ -31 +31 @@
   return;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  roar_exit(&rcon);

libroaryiff/events.c

@@ -34 +34 @@
   return -1;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  if ( con->prev_generated_yid != YIDNULL ) {

libroaryiff/playback.c

@@ -39 +39 @@
   return YIDNULL;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  // hm,... find out how to do this.
@@ -62 +62 @@
   return;
 
- rcon.fh = con->fd;
+ roar_connect_fh(&rcon, con->fd);
 
  roar_kick(&rcon, ROAR_OT_STREAM, ROARYIFF_YID2ROAR(yid));