stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

let http server be default on, and make it possible to change listen port from the config

Browse source
This commit is contained in:
Andreas Öman 2007-11-22 20:48:56 +00:00
parent 902766d9f3
commit cded21d8e4
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main.c
View file

@ -108,11 +108,11 @@ main(int argc, char **argv)
char *cfgfile = NULL;
int logfacility = LOG_DAEMON;
int disable_dvb = 0;
int http_port = 0;
int p;
signal(SIGPIPE, handle_sigpipe);
while((c = getopt(argc, argv, "c:fu:g:dh:")) != -1) {
while((c = getopt(argc, argv, "c:fu:g:d")) != -1) {
switch(c) {
case 'd':
disable_dvb = 1;
@ -129,9 +129,6 @@ main(int argc, char **argv)
case 'g':
groupnam = optarg;
break;
case 'h':
http_port = atoi(optarg);
break;
}
}
@ -188,8 +185,6 @@ main(int argc, char **argv)
epg_init();
xmltv_init();
pvr_init();
subscriptions_init();
htmlui_start();
@ -202,10 +197,13 @@ main(int argc, char **argv)
syslog(LOG_NOTICE,
"Initial input setup completed, starting output modules");
pvr_init();
output_multicast_setup();
client_start();
if(http_port)
http_start(http_port);
p = atoi(config_get_str("http-server-port", "9980"));
if(p)
http_start(p);
}
dispatcher();