Changeset 5270:e25346c13638 in roaraudio for libroaresd/esdctl.c
- Timestamp:
- 11/17/11 18:20:12 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroaresd/esdctl.c
r5236 r5270 45 45 // so always return -1 46 46 int esd_lock( int esd ) { 47 (void)esd; 48 errno = ENOSYS; 47 49 return -1; 48 50 } 49 51 int esd_unlock( int esd ) { 52 (void)esd; 53 errno = ENOSYS; 50 54 return -1; 51 55 } … … 66 70 67 71 return roar_set_standby(&con, ROAR_STANDBY_INACTIVE); 72 } 73 74 static void _format2str(char * buf, size_t len, esd_format_t format) { 75 76 if ( (format & ESD_BITS16) == ESD_BITS16 ) { 77 roar_mm_strlcat(buf, "16 bit ", len); 78 } else { 79 roar_mm_strlcat(buf, "8 bit ", len); 80 } 81 82 if ( (format & ESD_STEREO) == ESD_STEREO ) { 83 roar_mm_strlcat(buf, "stereo ", len); 84 } else { 85 roar_mm_strlcat(buf, "mono ", len); 86 } 68 87 } 69 88 … … 72 91 char buf[80] = ""; 73 92 74 if ( server_info->format & ESD_BITS16 ) 75 strcat(buf, "16 bit "); 76 else 77 strcat(buf, "8 bit "); 78 79 if ( server_info->format & ESD_STEREO ) 80 strcat(buf, "stereo "); 81 else 82 strcat(buf, "mono "); 93 _format2str(buf, sizeof(buf), server_info->format); 83 94 84 95 printf("server version = %i\n", server_info->version); … … 87 98 } 88 99 89 90 100 void esd_print_player_info( esd_player_info_t *player_info ) { 91 101 char buf[80] = ""; 92 102 93 if ( (player_info->format & ESD_BITS16) == ESD_BITS16 ) 94 strcat(buf, "16 bit "); 95 else 96 strcat(buf, "8 bit "); 97 98 if ( (player_info->format & ESD_STEREO) == ESD_STEREO ) 99 strcat(buf, "stereo "); 100 else 101 strcat(buf, "mono "); 103 _format2str(buf, sizeof(buf), player_info->format); 102 104 103 105 printf("player %i name = %s\n", player_info->source_id, player_info->name); … … 109 111 110 112 void esd_print_sample_info( esd_sample_info_t *sample_info ) { 113 char buf[80] = ""; 114 115 _format2str(buf, sizeof(buf), sample_info->format); 116 117 printf("sample %i name = %s\n", sample_info->sample_id, sample_info->name); 118 printf("sample %i format = 0x%08x %s\n", sample_info->sample_id, sample_info->format, buf); 119 printf("sample %i rate = %i\n", sample_info->sample_id, sample_info->rate); 120 printf("sample %i left = %i\n", sample_info->sample_id, sample_info->left_vol_scale); 121 printf("sample %i right = %i\n", sample_info->sample_id, sample_info->right_vol_scale); 122 printf("sample %i length = %i\n", sample_info->sample_id, sample_info->length); 111 123 } 112 124 … … 282 294 /* retrieve all information from server, and update until unsubsribed or closed */ 283 295 esd_info_t *esd_subscribe_all_info( int esd ) { 296 (void)esd; 297 errno = ENOSYS; 284 298 return NULL; // Not yet implemented in upstream esd 285 299 } … … 288 302 esd_info_t *esd_update_info( int esd, esd_info_t *info, 289 303 esd_update_info_callbacks_t *callbacks ) { 304 (void)esd, (void)info, (void)callbacks; 305 errno = ENOSYS; 290 306 return NULL; // Not yet implemented in upstream esd 291 307 } 292 308 293 309 esd_info_t *esd_unsubscribe_info( int esd ) { 310 (void)esd; 311 errno = ENOSYS; 294 312 return NULL; // Not yet implemented in upstream esd 295 313 } … … 362 380 int esd_set_default_sample_pan( int esd, int sample_id, 363 381 int left_scale, int right_scale ) { 382 // this is not yet implemented by the RA protocol. 383 (void)esd, (void)sample_id, (void)left_scale, (void)right_scale; 384 errno = ENOSYS; 364 385 return -1; 365 386 }
Note: See TracChangeset
for help on using the changeset viewer.