From 4925fa0587ed6a0480bb235c180a3a8d9a4c47a6 Mon Sep 17 00:00:00 2001
From: Justin Maggard <jmaggard@netgear.com>
Date: Thu, 22 Jan 2009 23:49:11 +0000
Subject: [PATCH] Remove obsolete up/downstream_bitrate code.

---
 minidlna.c       | 15 ---------------
 minidlna.conf    |  8 +++-----
 options.c        |  2 --
 options.h        |  2 --
 upnpglobalvars.c |  3 ---
 upnpglobalvars.h |  4 ----
 6 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/minidlna.c b/minidlna.c
index f719c93..3cc2840 100644
--- a/minidlna.c
+++ b/minidlna.c
@@ -324,12 +324,6 @@ init(int argc, char * * argv, struct runtime_vars * v)
 			case UPNPPORT:
 				v->port = atoi(ary_options[i].value);
 				break;
-			case UPNPBITRATE_UP:
-				upstream_bitrate = strtoul(ary_options[i].value, 0, 0);
-				break;
-			case UPNPBITRATE_DOWN:
-				downstream_bitrate = strtoul(ary_options[i].value, 0, 0);
-				break;
 			case UPNPPRESENTATIONURL:
 				presurl = ary_options[i].value;
 				break;
@@ -447,15 +441,6 @@ init(int argc, char * * argv, struct runtime_vars * v)
 			else
 				fprintf(stderr, "Option -%c takes one argument.\n", argv[i][1]);
 			break;
-		case 'B':
-			if(i+2<argc)
-			{
-				downstream_bitrate = strtoul(argv[++i], 0, 0);
-				upstream_bitrate = strtoul(argv[++i], 0, 0);
-			}
-			else
-				fprintf(stderr, "Option -%c takes two arguments.\n", argv[i][1]);
-			break;
 		case 'a':
 			if(i+1 < argc)
 			{
diff --git a/minidlna.conf b/minidlna.conf
index 892a70b..bb21444 100644
--- a/minidlna.conf
+++ b/minidlna.conf
@@ -5,15 +5,13 @@ port=5555
 enable_upnp=yes
 
 media_dir=/opt
-#media_dir=/c/DLNA
+
+# set this if you want to customize the name that shows up on your clients
+#friendly_name=My DLNA Server
 
 # lease file location
 #lease_file=/var/log/upnp.leases
 
-# bitrates reported by daemon in bits per second
-bitrate_up=1000000
-bitrate_down=10000000
-
 # "secure" mode : UPnP client are allowed to add mappings only
 # to their IP
 secure_mode=no
diff --git a/options.c b/options.c
index a6ac7af..78a7138 100644
--- a/options.c
+++ b/options.c
@@ -25,8 +25,6 @@ static const struct {
 	{ UPNPEXT_IP,	"ext_ip" },
 	{ UPNPLISTENING_IP, "listening_ip" },
 	{ UPNPPORT, "port" },
-	{ UPNPBITRATE_UP, "bitrate_up" },
-	{ UPNPBITRATE_DOWN, "bitrate_down" },
 	{ UPNPPRESENTATIONURL, "presentation_url" },
 	{ UPNPNOTIFY_INTERVAL, "notify_interval" },
 	{ UPNPSYSTEM_UPTIME, "system_uptime" },
diff --git a/options.h b/options.h
index f606744..c15e687 100644
--- a/options.h
+++ b/options.h
@@ -17,8 +17,6 @@ enum upnpconfigoptions {
 	UPNPEXT_IP,				/* ext_ip */
 	UPNPLISTENING_IP,		/* listening_ip */
 	UPNPPORT,				/* "port" */
-	UPNPBITRATE_UP,			/* "bitrate_up" */
-	UPNPBITRATE_DOWN,		/* "bitrate_down" */
 	UPNPPRESENTATIONURL,	/* presentation_url */
 	UPNPNOTIFY_INTERVAL,	/* notify_interval */
 	UPNPSYSTEM_UPTIME,		/* "system_uptime" */
diff --git a/upnpglobalvars.c b/upnpglobalvars.c
index 8d99a00..335f909 100644
--- a/upnpglobalvars.c
+++ b/upnpglobalvars.c
@@ -23,9 +23,6 @@ const char * use_ext_ip_addr = 0;
 /* LAN address */
 /*const char * listen_addr = 0;*/
 
-unsigned long downstream_bitrate = 0;
-unsigned long upstream_bitrate = 0;
-
 /* startup time */
 time_t startup_time = 0;
 
diff --git a/upnpglobalvars.h b/upnpglobalvars.h
index ad8d52a..32a5eb9 100644
--- a/upnpglobalvars.h
+++ b/upnpglobalvars.h
@@ -25,10 +25,6 @@ extern const char * lease_file;
  * when NULL, getifaddr() is used */
 extern const char * use_ext_ip_addr;
 
-/* parameters to return to upnp client when asked */
-extern unsigned long downstream_bitrate;
-extern unsigned long upstream_bitrate;
-
 /* statup time */
 extern time_t startup_time;