Changeset 4882:e6ef52e26c53 in roaraudio

Timestamp:

04/26/11 20:59:05 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved listing of audio profiles.

Files:

• ChangeLog (modified) (1 diff)
• roarclients/roarctl.c (modified) (3 diffs)
• roard/roard.c (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
 v. 0.4beta6 - ?
         * Added new error codes.
+        * Improved listing of audio profiles.
 
 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST

roarclients/roarctl.c

@@ -962 +962 @@
 int show_aiprofile (const char * profile) {
  struct roar_audio_info info;
+ const char * mime;
 
  if ( roar_profile2info(&info, profile) == -1 ) {
@@ -967 +968 @@
   return -1;
  }
+
+ mime = roar_codec2mime(info.codec);
 
  printf("Profile Name          : %s\n", profile);
@@ -977 +980 @@
   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" : "");
+ printf("Profile codec         : %2i (%s%s%s%s)\n", info.codec, roar_codec2str(info.codec),
+                                       info.codec == ROAR_CODEC_DEFAULT ? " native" : "",
+                                       mime == NULL ? "" : " mimetype:",
+                                       mime == NULL ? "" : mime);
 
  return 0;

roard/roard.c

@@ -333 +333 @@
         "     --list-proto      - List supported protocols\n"
         "     --list-profiles   - List supported profiles for --proto-profile\n"
+        "     --list-aiprofiles - List supported profiles for --proto-aiprofile\n"
         "     --new-sock        - Parameters for new socket follow\n"
 #ifdef ROAR_HAVE_LIBSLP
@@ -902 +903 @@
 #endif
 
+static void list_aiprofiles (void) {
+ struct roar_audio_info info;
+ const char * list[1024];
+ const char * mime;
+ ssize_t ret;
+ ssize_t i;
+
+ ret = roar_profiles_list(list, 1024, 0);
+
+ if ( ret == -1 )
+  return;
+
+ printf("  Name       Rate  Bits  Channels  Codec\n");
+ printf("---------------------------------------------\n");
+ for (i = 0; i < ret; i++) {
+  roar_profile2info(&info, list[i]);
+
+  mime = roar_codec2mime(info.codec);
+
+  printf("  %-10s %5u %4u  %8u  %3u (%s%s%s%s)\n", list[i],
+            info.rate, info.bits, info.channels,
+            info.codec, roar_codec2str(info.codec),
+            info.codec == ROAR_CODEC_DEFAULT ? " native" : "",
+            mime == NULL ? "" : " mimetype:",
+            mime == NULL ? "" : mime
+        );
+ }
+}
+
 int update_stream_flags (char * str) {
  int    dir;
@@ -1662 +1692 @@
    }
 
+  } else if ( strcmp(k, "--list-aiprofiles") == 0 ) {
+   list_aiprofiles();
+   return 0;
+
   } else if ( strcmp(k, "--list-driver") == 0 ) {
    print_driverlist();