storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete up/downstream_bitrate code.

Browse Source
This commit is contained in:
Justin Maggard 2009-01-22 23:49:11 +00:00
parent 577deb028b
commit 4925fa0587
6 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
minidlna.c
View File

@ -324,12 +324,6 @@ init(int argc, char * * argv, struct runtime_vars * v)
case UPNPPORT: case UPNPPORT:
v->port = atoi(ary_options[i].value); v->port = atoi(ary_options[i].value);
break; 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: case UPNPPRESENTATIONURL:
presurl = ary_options[i].value; presurl = ary_options[i].value;
break; break;
@ -447,15 +441,6 @@ init(int argc, char * * argv, struct runtime_vars * v)
else else
fprintf(stderr, "Option -%c takes one argument.\n", argv[i][1]); fprintf(stderr, "Option -%c takes one argument.\n", argv[i][1]);
break; 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': case 'a':
if(i+1 < argc) if(i+1 < argc)
{ {

8
minidlna.conf
View File

@ -5,15 +5,13 @@ port=5555
enable_upnp=yes enable_upnp=yes
media_dir=/opt 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 location
#lease_file=/var/log/upnp.leases #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 # "secure" mode : UPnP client are allowed to add mappings only
# to their IP # to their IP
secure_mode=no secure_mode=no

2
options.c
View File

@ -25,8 +25,6 @@ static const struct {
{ UPNPEXT_IP, "ext_ip" }, { UPNPEXT_IP, "ext_ip" },
{ UPNPLISTENING_IP, "listening_ip" }, { UPNPLISTENING_IP, "listening_ip" },
{ UPNPPORT, "port" }, { UPNPPORT, "port" },
{ UPNPBITRATE_UP, "bitrate_up" },
{ UPNPBITRATE_DOWN, "bitrate_down" },
{ UPNPPRESENTATIONURL, "presentation_url" }, { UPNPPRESENTATIONURL, "presentation_url" },
{ UPNPNOTIFY_INTERVAL, "notify_interval" }, { UPNPNOTIFY_INTERVAL, "notify_interval" },
{ UPNPSYSTEM_UPTIME, "system_uptime" }, { UPNPSYSTEM_UPTIME, "system_uptime" },

2
options.h
View File

@ -17,8 +17,6 @@ enum upnpconfigoptions {
UPNPEXT_IP, /* ext_ip */ UPNPEXT_IP, /* ext_ip */
UPNPLISTENING_IP, /* listening_ip */ UPNPLISTENING_IP, /* listening_ip */
UPNPPORT, /* "port" */ UPNPPORT, /* "port" */
UPNPBITRATE_UP, /* "bitrate_up" */
UPNPBITRATE_DOWN, /* "bitrate_down" */
UPNPPRESENTATIONURL, /* presentation_url */ UPNPPRESENTATIONURL, /* presentation_url */
UPNPNOTIFY_INTERVAL, /* notify_interval */ UPNPNOTIFY_INTERVAL, /* notify_interval */
UPNPSYSTEM_UPTIME, /* "system_uptime" */ UPNPSYSTEM_UPTIME, /* "system_uptime" */

3
upnpglobalvars.c
View File

@ -23,9 +23,6 @@ const char * use_ext_ip_addr = 0;
/* LAN address */ /* LAN address */
/*const char * listen_addr = 0;*/ /*const char * listen_addr = 0;*/
unsigned long downstream_bitrate = 0;
unsigned long upstream_bitrate = 0;
/* startup time */ /* startup time */
time_t startup_time = 0; time_t startup_time = 0;

4
upnpglobalvars.h
View File

@ -25,10 +25,6 @@ extern const char * lease_file;
* when NULL, getifaddr() is used */ * when NULL, getifaddr() is used */
extern const char * use_ext_ip_addr; 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 */ /* statup time */
extern time_t startup_time; extern time_t startup_time;