X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=efacd56e6bae6ed10ee773efdcd7922eb41adcda;hb=bc7bbbdfcc9933129d7838224cdef3983ce53c26;hp=adc0e1ba335d3859ef18b6cad8dc576a66218775;hpb=615ac0827db3a53bc34e496ff921cc5bc559bcea;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index adc0e1b..efacd56 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -45,6 +45,7 @@ static config_t configuration;
 #define DEFAULT_MAX_BANDWIDTH 48000
 #define DEFAULT_BINDPORT 64738
 #define DEFAULT_BAN_LENGTH (60*60)
+#define DEFAULT_OPUS_THRESHOLD 100
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
@@ -195,6 +196,17 @@ const char *getStrConf(param_t param)
 			return NULL;
 		}
 		break;
+	case BANFILE:
+		setting = config_lookup(&configuration, "banfile");
+		if (!setting)
+			return NULL;
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+			return NULL;
+		}
+		break;
 	default:
 		doAssert(false);
 		break;
@@ -239,6 +251,45 @@ int getIntConf(param_t param)
 			return config_setting_get_int(setting);
 		}
 		break;
+	case OPUS_THRESHOLD:
+		setting = config_lookup(&configuration, "opus_threshold");
+		if (!setting)
+			return DEFAULT_OPUS_THRESHOLD;
+		else {
+			return config_setting_get_int(setting);
+		}
+		break;
+	default:
+		doAssert(false);
+	}
+}
+
+bool_t getBoolConf(param_t param)
+{
+	config_setting_t *setting = NULL;
+	
+	switch (param) {
+	case ALLOW_TEXTMESSAGE:
+		setting = config_lookup(&configuration, "allow_textmessage");
+		if (!setting)
+			return true;
+		else
+			return config_setting_get_bool(setting);
+		break;
+	case ENABLE_BAN:
+		setting = config_lookup(&configuration, "enable_ban");
+		if (!setting)
+			return false;
+		else
+			return config_setting_get_bool(setting);
+		break;
+	case SYNC_BANFILE:
+		setting = config_lookup(&configuration, "sync_banfile");
+		if (!setting)
+			return false;
+		else
+			return config_setting_get_bool(setting);
+		break;
 	default:
 		doAssert(false);
 	}