Author: duncan
Date: Sun Oct 22 13:30:07 2006
New Revision: 8451
Modified:
branches/rel-1-6/freevo/freevo_config.py
Log:
Removed unused configuration
Modified: branches/rel-1-6/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-6/freevo/freevo_config.py (original)
+++ branches/rel-1-6/freevo/freevo_config.py Sun Oct 22 13:30:07 2006
@@ -236,6 +236,20 @@
Added AUTOSHUTDOWN_ settings to turn off and on the machine automatically
Added Multi-tuner support to allow recording and watching at the same time
Added plug-in "upsoon" to stop the player when a recording is about to
start''' ),
+ (5.17,
+ '''Using the name of the helper in local_conf.py
+ Changed the TV_RECORD_SERVER_* to RECORDSERVER_*,
+ Added optional RECORDSERVER_DEBUG, if not defined uses DEBUG
+ Changed the TV_RECORD_SERVER_* to WEBSERVER_*,
+ Changed WWW_PORT to WEBSERVER_PORT = 80
+ Added WEBSERVER_UID and WEBSERVER_GID
+ Added optional WEBSERVER_DEBUG, if not defined uses DEBUG
+ Added ENCODINGSERVER_UID and ENCODINGSERVER_GID
+ Added optional ENCODINGSERVER_DEBUG, if not defined uses DEBUG
+ Added experimental plug-ins: Apple trailers, reencode
+ Added plug-ins: XM online
+ Added helpers: encodingserver, rssServer
+ ''' ),
]
@@ -1400,8 +1414,6 @@
TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
-TV_CHANNEL_PROG = './chchan %(channel)s %(norm)s %(freqtable)s'
-
TV_DATEFORMAT = '%e-%b' # Day-Month: 11-Jun
TV_TIMEFORMAT = '%H:%M' # Hour-Minute 14:05
TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am
@@ -1427,13 +1439,13 @@
# if using the persitant recordserver
TV_RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
-TV_RECORD_SERVER_IP = 'localhost'
-TV_RECORD_SERVER_PORT = 18001
+RECORDSERVER_IP = 'localhost'
+RECORDSERVER_PORT = 18001
# If the recordserver runs as root, set the uid to the given one
# after startup. The gui must also match one of the users group ids
-TV_RECORD_SERVER_UID = 0
-TV_RECORD_SERVER_GID = 0
+RECORDSERVER_UID = 0
+RECORDSERVER_UID = 0
# start every recording X minutes before scheduled,
# and stop X minutes after scheduled - default to zero minutes.
@@ -1651,14 +1663,18 @@
# runs as root. Port 8080 is the default, change to 80 if
# needed.
#
-WWW_PORT = 8080
+WEBSERVER_PORT = 80
+WEBSERVER_UID = 0
+WEBSERVER_GID = 0
#
# Username / Password combinations to login to the web interface.
# These should be overridden in local_conf.py
#
-# WWW_USERS = { "user1" : "changeme",
-# "optional" : "changeme2" }
+# WWW_USERS = {
+# "user1" : "changeme",
+# "optional" : "changeme2"
+# }
#
WWW_USERS = { 0 : 0 }
@@ -1682,6 +1698,14 @@
WWW_JAVASCRIPT = 'scripts/display_prog-head.js'
+# ======================================================================
+# Freevo builtin encoding server settings:
+# ======================================================================
+ENCODINGSERVER_UID = 0
+ENCODINGSERVER_GID = 0
+
+ENCODINGSERVER_IP = 'localhost'
+ENCODINGSERVER_PORT = 6666
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
