Changeset 3942:a160d7f5f19e in roaraudio

Timestamp:

06/23/10 23:31:13 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for ai-profiles

Files:

• include/libroar/stream.h (modified) (1 diff)
• libroar/stream.c (modified) (1 diff)
• roarclients/roarctl.c (modified) (2 diffs)

include/libroar/stream.h

@@ -162 +162 @@
 ssize_t roar_info2bitspersec (struct roar_audio_info * info);
 
+int     roar_profile2info    (struct roar_audio_info * info, const char * profile);
+ssize_t roar_profiles_list   (const char ** list, size_t len, size_t offset);
+
 #endif
 

libroar/stream.c

@@ -1011 +1011 @@
 }
 
+static struct {
+ const char * name;
+ struct roar_audio_info info;
+} _libroar_aiprofiles[] = {
+ {"default", {.rate     = ROAR_RATE_DEFAULT,
+              .bits     = ROAR_BITS_DEFAULT,
+              .channels = ROAR_CHANNELS_DEFAULT,
+              .codec    = ROAR_CODEC_DEFAULT}},
+ {"cd",      {.rate =  44100, .bits = 16, .channels = 2, .codec = ROAR_CODEC_DEFAULT}},
+ {"cdr",     {.rate =  44100, .bits = 16, .channels = 2, .codec = ROAR_CODEC_PCM_S_BE}},
+ {"dat",     {.rate =  48000, .bits = 16, .channels = 2, .codec = ROAR_CODEC_PCM_S_LE}},
+ {"isdn-eu", {.rate =   8000, .bits =  8, .channels = 1, .codec = ROAR_CODEC_ALAW}},
+ {NULL,      {.rate =      0, .bits =  0, .channels = 0, .codec = 0}}
+};
+
+int     roar_profile2info    (struct roar_audio_info * info, const char * profile) {
+ int i;
+
+ for (i = 0; _libroar_aiprofiles[i].name != NULL; i++) {
+  if ( !strcasecmp(_libroar_aiprofiles[i].name, profile) ) {
+   memcpy(info, &(_libroar_aiprofiles[i].info), sizeof(struct roar_audio_info));
+   return 0;
+  }
+ }
+
+ return -1;
+}
+
+ssize_t   roar_profiles_list   (const char ** list, size_t len, size_t offset) {
+ size_t i;
+ int idx = 0;
+
+ if ( list == NULL )
+  return -1;
+
+ if ( len == 0 )
+  return 0;
+
+ if ( offset >= (sizeof(_libroar_aiprofiles)/sizeof(*_libroar_aiprofiles)) )
+  return 0;
+
+ for (i = offset; _libroar_aiprofiles[i].name != NULL; i++) {
+  list[idx++] = _libroar_aiprofiles[i].name;
+ }
+
+ return idx;
+}
+
 //ll

roarclients/roarctl.c

@@ -875 +875 @@
 }
 
+int show_aiprofile (const char * profile) {
+ struct roar_audio_info info;
+
+ if ( roar_profile2info(&info, profile) == -1 ) {
+  fprintf(stderr, "Error: unknown profile: %s\n", profile);
+  return -1;
+ }
+
+ printf("Profile Name          : %s\n", profile);
+ printf("Profile sample rate   : %i\n", info.rate);
+ printf("Profile bits          : %i\n", info.bits);
+ printf("Profile channels      : %i\n", info.channels);
+ printf("Profile codec         : %2i (%s%s)\n", info.codec, roar_codec2str(info.codec),
+                                       info.codec == ROAR_CODEC_DEFAULT ? " native" : "");
+
+ return 0;
+}
+
+int list_aiprofiles (void) {
+ const char * list[1024];
+ ssize_t ret;
+ ssize_t i;
+
+ ret = roar_profiles_list(list, 1024, 0);
+
+ if ( ret == -1 ) {
+  fprintf(stderr, "Error: can not read list of profiles\n");
+  return -1;
+ }
+
+ for (i = 0; i < ret; i++) {
+  printf("profile %lli:\n", (long long signed int)i);
+  show_aiprofile(list[i]);
+ }
+
+ return 0;
+}
+
 int main (int argc, char * argv[]) {
  struct roar_connection con;
@@ -1073 +1111 @@
    i++;
 
+
+  } else if ( !strcmp(k, "listprofiles") ) {
+   if ( list_aiprofiles() == -1 ) {
+    fprintf(stderr, "Error: can not list profiles\n");
+   }
+  } else if ( !strcmp(k, "profileget") ) {
+   i++;
+   if ( show_aiprofile(argv[i]) == -1 ) {
+    fprintf(stderr, "Error: can not get profile data\n");
+   }
   } else {
    fprintf(stderr, "Error: invalid command: %s\n", k);