Merge branch 'master' into next

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 47104500e23417850ef2d164e1c98a68eac74632..bb04453f599e29218abb955d18fcb74a078d1eb8 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,6 +10,7 @@
 #include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
 #include <dirent.h>
+#include <regex.h>
 
 #include "para.h"
 #include "error.h"
@@ -91,7 +92,6 @@ void afh_init(void)
        }
 }
 
-
 /**
  * Guess the audio format judging from filename.
  *
@@ -122,21 +122,6 @@ int guess_audio_format(const char *name)
        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)"
-       );
-}
-
 /**
  * Call get_file_info() to obtain an afhi structure.
  *
@@ -163,22 +148,52 @@ int compute_afhi(const char *path, char *data, size_t size, int fd,
 
        afhi->header_offset = 0;
        afhi->header_len = 0;
+       afhi->techinfo = NULL;
+       afhi->tags.artist = NULL;
+       afhi->tags.title = NULL;
+       afhi->tags.year = NULL;
+       afhi->tags.album = NULL;
+       afhi->tags.comment = NULL;
        format = guess_audio_format(path);
 
        if (format >= 0) {
                ret = afl[format].get_file_info(data, size, fd, afhi);
-               if (ret >= 0)
-                       return format;
+               if (ret >= 0) {
+                       ret = format;
+                       goto success;
+               }
        }
        FOR_EACH_AUDIO_FORMAT(i) {
                if (i == format) /* we already tried this one to no avail */
                        continue;
                ret = afl[i].get_file_info(data, size, fd, afhi);
-               if (ret >= 0)
-                       return i;
+               if (ret >= 0) {
+                       ret = i;
+                       goto success;
+               }
                PARA_WARNING_LOG("%s\n", para_strerror(-ret));
        }
        return -E_AUDIO_FORMAT;
+success:
+       if (!afhi->techinfo)
+               afhi->techinfo = para_strdup(NULL);
+       if (!afhi->tags.artist)
+               afhi->tags.artist = para_strdup(NULL);
+       if (!afhi->tags.title)
+               afhi->tags.title = para_strdup(NULL);
+       if (!afhi->tags.year)
+               afhi->tags.year = para_strdup(NULL);
+       if (!afhi->tags.album)
+               afhi->tags.album = para_strdup(NULL);
+       if (!afhi->tags.comment)
+               afhi->tags.comment = para_strdup(NULL);
+       PARA_DEBUG_LOG("techinfo: %s\n", afhi->techinfo);
+       PARA_DEBUG_LOG("artist: %s\n", afhi->tags.artist);
+       PARA_DEBUG_LOG("title: %s\n", afhi->tags.title);
+       PARA_DEBUG_LOG("year: %s\n", afhi->tags.year);
+       PARA_DEBUG_LOG("album: %s\n", afhi->tags.album);
+       PARA_DEBUG_LOG("comment: %s\n", afhi->tags.comment);
+       return ret;
 }
 
 /**
@@ -196,7 +211,18 @@ const char *audio_format_name(int i)
        return i >= 0?  afl[i].name : "(none)";
 }
 
-
+/**
+ * Get one chunk of audio data.
+ *
+ * \param chunk_num The number of the chunk to get.
+ * \param afhi Describes the audio file.
+ * \param map The memory mapped audio file.
+ * \param buf Result pointer.
+ * \param len The length of the chunk in bytes.
+ *
+ * Upon return, \a buf will point so memory inside \a map. The returned buffer
+ * must therefore not be freed by the caller.
+ */
 void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
                void *map, const char **buf, size_t *len)
 {
@@ -205,6 +231,15 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
        *len = afhi->chunk_table[chunk_num + 1] - pos;
 }
 
+uint32_t afh_get_largest_chunk_size(struct afh_info *afhi)
+{
+       uint32_t n, largest = 0, *ct = afhi->chunk_table;
+
+       for (n = 1; n <= afhi->chunks_total; n++)
+               largest = PARA_MAX(largest, ct[n] - ct[n - 1]);
+       return largest;
+}
+
 /**
  * Get the header of an audio file.
  *
@@ -215,13 +250,14 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
  *
  * This function sets \a buf to \p NULL and \a len to zero if \a map or \a
  * afhi is \p NULL, or if the current audio format does not need special
- * header treamtment.
+ * header treatment.
  */
 void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len)
 {
-       if (!map || !afhi || ! afhi->header_len) {
+       if (!map || !afhi || !afhi->header_len) {
                *buf = NULL;
                *len = 0;
+               return;
        }
        *len = afhi->header_len;
        *buf = map + afhi->header_offset;