X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh_common.c;h=5be43550c202b516aaedf332dbbfba341da20dcb;hp=7ecab4e47a9bd7e47bcc7e378043d62d663cf343;hb=8bcf75a3921d15e03c4351b3efa609eac67c3817;hpb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3

diff --git a/afh_common.c b/afh_common.c
index 7ecab4e4..5be43550 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,9 +7,7 @@
 /** \file afh_common.c Common audio format handler functions. */
 
 #include <sys/mman.h> /* mmap */
-#include <sys/time.h> /* gettimeofday */
 #include <sys/types.h>
-#include <dirent.h>
 #include <regex.h>
 
 #include "para.h"
@@ -29,8 +27,19 @@ void mp3_init(struct audio_format_handler *);
 #ifdef HAVE_SPEEX
 	void spx_afh_init(struct audio_format_handler *);
 #endif
+#ifdef HAVE_FLAC
+	void flac_afh_init(struct audio_format_handler *);
+#endif
+
+#ifdef HAVE_OPUS
+	void opus_afh_init(struct audio_format_handler *);
+#endif
 
 void wma_afh_init(struct audio_format_handler *);
+
+/** The list of all status items */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+
 /**
  * The list of supported audio formats.
  *
@@ -68,6 +77,18 @@ static struct audio_format_handler afl[] = {
 		.name = "spx",
 #ifdef HAVE_SPEEX
 		.init = spx_afh_init,
+#endif
+	},
+	{
+		.name = "flac",
+#ifdef HAVE_FLAC
+		.init = flac_afh_init,
+#endif
+	},
+	{
+		.name = "opus",
+#ifdef HAVE_OPUS
+		.init = opus_afh_init,
 #endif
 	},
 	{
@@ -97,8 +118,7 @@ void afh_init(void)
 {
 	int i;
 
-	PARA_INFO_LOG("supported audio formats: %s\n",
-		SERVER_AUDIO_FORMATS);
+	PARA_INFO_LOG("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		PARA_NOTICE_LOG("initializing %s handler\n",
 			audio_format_name(i));
@@ -209,12 +229,32 @@ success:
 	return ret;
 }
 
+/**
+ * Deallocate contents of a filled-in ahi structure
+ *
+ * \param afhi The structure to clear.
+ *
+ * The given pointer is kept, everything else is freed.
+ */
+void clear_afhi(struct afh_info *afhi)
+{
+	if (!afhi)
+		return;
+	free(afhi->chunk_table);
+	free(afhi->techinfo);
+	free(afhi->tags.artist);
+	free(afhi->tags.title);
+	free(afhi->tags.year);
+	free(afhi->tags.album);
+	free(afhi->tags.comment);
+}
+
 /**
  * Get the name of the given audio format.
  *
  * \param i The audio format number.
  *
- * This returns a pointer to statically allocated memory so it
+ * \return This returns a pointer to statically allocated memory so it
  * must not be freed by the caller.
  */
 const char *audio_format_name(int i)
@@ -297,3 +337,47 @@ void afh_free_header(char *header_buf, uint8_t audio_format_id)
 	if (afh->get_header)
 		free(header_buf);
 }
+
+/**
+ * Pretty-print the contents of a struct afh_info into a buffer.
+ *
+ * \param audio_format_num The audio format number.
+ * \param afhi Pointer to the structure that contains the information.
+ * \param result Pretty-printed ahfi is here after the call.
+ *
+ * The \a result buffer is dynamically allocated and should be freed by the
+ * caller.
+ *
+ * \return The number of bytes. This function never fails.
+ */
+unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **result)
+{
+	return xasprintf(result, "%s: %dkbit/s\n" /* bitrate */
+		"%s: %s\n" /* format */
+		"%s: %dHz\n" /* frequency */
+		"%s: %d\n" /* channels */
+		"%s: %lu\n" /* seconds total */
+		"%s: %lu: %lu\n" /* chunk time */
+		"%s: %lu\n" /* num chunks */
+		"%s: %s\n" /* techinfo */
+		"%s: %s\n" /* artist */
+		"%s: %s\n" /* title */
+		"%s: %s\n" /* year */
+		"%s: %s\n" /* album */
+		"%s: %s\n", /* comment */
+		status_item_list[SI_BITRATE], afhi->bitrate,
+		status_item_list[SI_FORMAT], audio_format_name(audio_format_num),
+		status_item_list[SI_FREQUENCY], afhi->frequency,
+		status_item_list[SI_CHANNELS], afhi->channels,
+		status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total,
+		status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec,
+			(long unsigned)afhi->chunk_tv.tv_usec,
+		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total,
+		status_item_list[SI_TECHINFO], afhi->techinfo? afhi->techinfo : "",
+		status_item_list[SI_ARTIST], afhi->tags.artist? afhi->tags.artist : "",
+		status_item_list[SI_TITLE], afhi->tags.title? afhi->tags.title : "",
+		status_item_list[SI_YEAR], afhi->tags.year? afhi->tags.year : "",
+		status_item_list[SI_ALBUM], afhi->tags.album? afhi->tags.album : "",
+		status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : ""
+	);
+}