Changeset 1660:99bfd21f00ef in roaraudio for libroaresd
- Timestamp:
- 05/08/09 16:56:40 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroaresd
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libroaresd/esdbasic.c
r705 r1660 45 45 int esd_open_sound( const char *host ) { 46 46 struct roar_connection con; 47 int fh; 47 48 48 49 if ( roar_simple_connect(&con, (char*) host, NULL) == -1 ) { … … 51 52 } 52 53 53 return con.fh; 54 if ( (fh = roar_get_connection_fh(&con)) == -1 ) { 55 roar_disconnect(&con); 56 return -1; 57 } 58 59 return fh; 54 60 } 55 61 … … 79 85 m.datalen = 0; 80 86 81 con.fh = esd;87 roar_connect_fh(&con, esd); 82 88 83 89 gettimeofday(&try, NULL); -
libroaresd/esdctl.c
r705 r1660 54 54 struct roar_connection con; 55 55 56 con.fh = esd;56 roar_connect_fh(&con, esd); 57 57 58 58 return roar_set_standby(&con, ROAR_STANDBY_ACTIVE); … … 62 62 struct roar_connection con; 63 63 64 con.fh = esd;64 roar_connect_fh(&con, esd); 65 65 66 66 return roar_set_standby(&con, ROAR_STANDBY_INACTIVE); … … 148 148 r->version = 0; // seems to be static 149 149 150 con.fh = esd;150 roar_connect_fh(&con, esd); 151 151 m.cmd = ROAR_CMD_SERVER_OINFO; 152 152 m.datalen = 0; … … 201 201 esd_player_info_t * new_player, * cur = NULL; // = NULL to avoid gcc warning 202 202 203 con->fh = esd;203 roar_connect_fh(con, esd); 204 204 205 205 r = malloc(sizeof(esd_info_t)); … … 334 334 struct roar_mixer_settings mixer; 335 335 336 con.fh = esd;336 roar_connect_fh(&con, esd); 337 337 338 338 mixer.mixer[0] = left_scale == 256 ? 65535 : left_scale * 256;
Note: See TracChangeset
for help on using the changeset viewer.