Merge commit 'meins/master'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index 07e6a78c3aa4bcaf61e8645019c262473dbca023..8c0eed2731837da4e8d3847d1d3d6caeddfe5102 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.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -91,15 +91,14 @@ void afh_init(void)
        }
 }
 
        }
 }
 

-

 /**
  * Guess the audio format judging from filename.
  *
  * \param name The filename.
  *
 /**
  * Guess the audio format judging from filename.
  *
  * \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)
 {
  */
 int guess_audio_format(const char *name)
 {


@@ -119,14 +118,32 @@ int guess_audio_format(const char *name)
                        return i;
                }
        }
                        return i;
                }
        }

-       return -1;
+       return -E_AUDIO_FORMAT;

 }
 
 }
 

+/**
+ * Pretty-print the given meta-info.
+ *
+ * \param title The title of the audio file.
+ * \param artist The artist.
+ * \param album The name of the album.
+ * \param year Year of release.
+ * \param comment Further comments.
+ *
+ * This function is called by each audio format handler to produce the tag info
+ * status items. Usually, the audio format handlers read this info from the
+ * audio file (id3 tags, vorbis comments, ...).
+ *
+ * It is OK to pass \p NULL pointers for any argument in which case a suitable
+ * string is inserted which indicates that this information is not available.
+ *
+ * \return The status item string. It must be freed by the caller.
+ */

 char *make_taginfo(char *title, char *artist, char *album, char *year,
                char *comment)
 {
        return make_message("%s: %s, by %s\n" /* taginfo1 */
 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*/
+               "%s: A: %s, Y: %s, C: %s\n", /* taginfo2 */

                status_item_list[SI_TAGINFO1],
                (title && *title)? title : "(title tag not set)",
                (artist && *artist)? artist : "(artist tag not set)",
                status_item_list[SI_TAGINFO1],
                (title && *title)? title : "(title tag not set)",
                (artist && *artist)? artist : "(artist tag not set)",


@@ -196,7 +213,18 @@ const char *audio_format_name(int i)
        return i >= 0?  afl[i].name : "(none)";
 }
 
        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)
 {
 void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
                void *map, const char **buf, size_t *len)
 {


@@ -205,6 +233,15 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
        *len = afhi->chunk_table[chunk_num + 1] - pos;
 }
 
        *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.
  *
 /**
  * Get the header of an audio file.
  *


@@ -219,9 +256,10 @@ void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
  */
 void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len)
 {
  */
 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;
                *buf = NULL;
                *len = 0;

+               return;

        }
        *len = afhi->header_len;
        *buf = map + afhi->header_offset;
        }
        *len = afhi->header_len;
        *buf = map + afhi->header_offset;