From: Andre Noll <maan@systemlinux.org>
Date: Wed, 16 Mar 2011 19:28:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'fml/master'
X-Git-Tag: v0.4.6~14
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=432c494434722b8dd590f712e5298ff7fb6a6719;hp=38c80b2b03dc357fbc28f8ba04764f1e1741078a

Merge remote-tracking branch 'fml/master'
---

diff --git a/audiod.c b/audiod.c
index 8b17d95f..e66373cc 100644
--- a/audiod.c
+++ b/audiod.c
@@ -167,7 +167,7 @@ struct command_task {
  * \return The audio format number on success, -E_UNSUPPORTED_AUDIO_FORMAT if
  * \a name is not a supported audio format.
  */
-int get_audio_format_num(const char *name)
+static int get_audio_format_num(const char *name)
 {
 	int i;
 
@@ -469,20 +469,6 @@ static int get_empty_slot(void)
 	return -E_NO_MORE_SLOTS;
 }
 
-/**
- * get the number of filters
- *
- * \param audio_format_num the number identifying the audio format
- *
- * \return the number of filters for the given audio format
- *
- * \sa struct filter;
- */
-int num_filters(int audio_format_num)
-{
-	return afi[audio_format_num].num_filters;
-}
-
 static void open_filters(struct slot_info *s)
 {
 	struct audio_format_info *a = afi + s->format;
diff --git a/audiod.h b/audiod.h
index 94399602..4c321222 100644
--- a/audiod.h
+++ b/audiod.h
@@ -7,9 +7,6 @@
 /** \file audiod.h symbols exported from audiod.c */
 
 
-int num_filters(int audio_format_num);
-int get_audio_format_num(const char *name);
-
 /** enum of audio formats supported by para_audiod */
 enum {AUDIOD_AUDIO_FORMATS_ENUM};
 
diff --git a/command.c b/command.c
index f9ef6cd7..5217f9b4 100644
--- a/command.c
+++ b/command.c
@@ -255,7 +255,8 @@ int com_si(struct rc4_context *rc4c, int argc, __a_unused char * const * argv)
 		free(info);
 	}
 	ut = uptime_str();
-	ret = rc4_send_va_buffer(rc4c, "up: %s\nplayed: %u\n"
+	ret = rc4_send_va_buffer(rc4c, "version: " GIT_VERSION "\n"
+		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"