Changeset 5623:cd8f318fd1a9 in roaraudio

Timestamp:

08/17/12 02:47:05 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed metadata handling in meta.c.

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/meta.h (modified) (1 diff)
• libroar/meta.c (modified) (2 diffs)

ChangeLog

@@ -6 +6 @@
         * Implemented watchdog (Closes: #291)
         * Added meta generes (See: #301)
+        * Fixed metadata handling in meta.c.
 
 v. 1.0beta4 - Mon Aug 06 2012 16:43 CEST

include/libroar/meta.h

@@ -46 +46 @@
 int roar_meta_free (struct roar_meta * meta);
 
-char * roar_meta_strtype(const int type);
+const char * roar_meta_strtype(const int type);
 int    roar_meta_inttype(const char * type);
 

libroar/meta.c

@@ -424 +424 @@
 };
 
-// TODO: Why do we return a non-const buffer here?
-char * roar_meta_strtype(const int type) {
+const char * roar_meta_strtype(const int type) {
  int i;
  static char name[ROAR_META_MAX_NAMELEN];
@@ -632 +631 @@
   // we test for the key, unknown keys get ignored.
   if ( !strcasecmp(k, "rate") ) {
-   info->rate     = atoi(v);
+   info->rate     = roar_str2rate(v);
   } else if ( !strcasecmp(k, "bits") ) {
-   info->bits     = atoi(v);
+   info->bits     = roar_str2bits(v);
   } else if ( !strcasecmp(k, "channels") ) {
-   info->channels = atoi(v);
+   info->channels = roar_str2channels(v);
   } else if ( !strcasecmp(k, "codec") ) {
    info->codec    = roar_str2codec(v);