mp3: Add support for id3 version 2 tags.

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index e71fca1119d8ea5d292ef2ae34515d4fcfa693d0..6f6e832484f1c7f2021885e9b2cab144789da27f 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -119,7 +119,7 @@ int guess_audio_format(const char *name)
                        return i;
                }
        }
-       return -E_BAD_AUDIO_FILE_SUFFIX;
+       return -1;
 }
 
 /**
@@ -128,6 +128,7 @@ int guess_audio_format(const char *name)
  * \param path The full path of the audio file.
  * \param data Pointer to the contents of the (mapped) file.
  * \param size The file size in bytes.
+ * \param fd The open file descriptor.
  * \param afhi Result pointer.
  *
  * \return The number of the audio format on success, \p -E_AUDIO_FORMAT if no
@@ -140,20 +141,24 @@ int guess_audio_format(const char *name)
  * path. If this doesn't work, all other audio format handlers are tried until
  * one is found that can handle the file.
  */
-int compute_afhi(const char *path, char *data, size_t size,
+int compute_afhi(const char *path, char *data, size_t size, int fd,
                struct afh_info *afhi)
 {
-       int ret, i, format = guess_audio_format(path);
+       int ret, i, format;
+
+       afhi->header_offset = 0;
+       afhi->header_len = 0;
+       format = guess_audio_format(path);
 
        if (format >= 0) {
-               ret = afl[format].get_file_info(data, size, afhi);
+               ret = afl[format].get_file_info(data, size, fd, afhi);
                if (ret >= 0)
                        return format;
        }
        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, afhi);
+               ret = afl[i].get_file_info(data, size, fd, afhi);
                if (ret >= 0)
                        return i;
                PARA_WARNING_LOG("%s\n", para_strerror(-ret));
@@ -176,3 +181,33 @@ const char *audio_format_name(int i)
        return i >= 0?  afl[i].name : "(none)";
 }
 
+
+void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
+               void *map, const char **buf, size_t *len)
+{
+       size_t pos = afhi->chunk_table[chunk_num];
+       *buf = map + pos;
+       *len = afhi->chunk_table[chunk_num + 1] - pos;
+}
+
+/**
+ * Get the header of an audio file.
+ *
+ * \param afhi The audio file handler data describing the file.
+ * \param map The data of the audio file.
+ * \param buf The length of the header is stored here.
+ * \param len Points to a buffer containing the header on return.
+ *
+ * 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.
+ */
+void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len)
+{
+       if (!map || !afhi || ! afhi->header_len) {
+               *buf = NULL;
+               *len = 0;
+       }
+       *len = afhi->header_len;
+       *buf = map + afhi->header_offset;
+}