guess_audio_format(): Return proper error code.

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 6f6e832484f1c7f2021885e9b2cab144789da27f..47104500e23417850ef2d164e1c98a68eac74632 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -97,9 +97,9 @@ void afh_init(void)
  *
  * \param name The filename.
  *
- * \return This function returns -1 if it has no idea what kind of audio
- * file this might be. Otherwise the (non-negative) number of the audio format
- * is returned.
+ * \return This function returns \p -E_AUDIO_FORMAT if it has no idea what kind
+ * of audio file this might be. Otherwise the (non-negative) number of the
+ * audio format is returned.
  */
 int guess_audio_format(const char *name)
 {
@@ -119,7 +119,22 @@ int guess_audio_format(const char *name)
                        return i;
                }
        }
-       return -1;
+       return -E_AUDIO_FORMAT;
+}
+
+char *make_taginfo(char *title, char *artist, char *album, char *year,
+               char *comment)
+{
+       return make_message("%s: %s, by %s\n" /* taginfo1 */
+               "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
+               status_item_list[SI_TAGINFO1],
+               (title && *title)? title : "(title tag not set)",
+               (artist && *artist)? artist : "(artist tag not set)",
+               status_item_list[SI_TAGINFO2],
+               (album && *album)?  album : "(album tag not set)",
+               (year && *year)? year : "????",
+               (comment && *comment)? comment : "(comment tag not set)"
+       );
 }
 
 /**