Author: duncan
Date: Wed Mar 12 03:24:34 2008
New Revision: 10508
Log:
Removed RECORDSERVER_PORT2, as it is no longer needed
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/tv/record_client.py
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Wed Mar 12 03:24:34 2008
@@ -355,6 +355,7 @@
Changed SHUTDOWN_SYS_CMD to SYS_SHUTDOWN_CMD for consistency
Changed RESTART_SYS_CMD to SYS_RESTART_CMD for consistency
Changed SHUTDOWN_SYS_ENABLE to SYS_SHUTDOWN_ENABLE for consistency
+ Removed RECORDSERVER_PORT2 as it is no longer needed, using
RECORDSERVER_PORT instead
'''),
]
@@ -1735,7 +1736,6 @@
RECORDSERVER_IP = 'localhost'
RECORDSERVER_PORT = 18001
-RECORDSERVER_PORT2 = 18002
RECORDSERVER_SECRET = 'secret1'
# If the recordserver runs as root, set the uid to the given one
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Wed Mar 12 03:24:34 2008
@@ -1263,7 +1263,6 @@
# RECORDSERVER_IP = 'localhost'
# RECORDSERVER_PORT = 18001
-# RECORDSERVER_PORT2 = 18002
# RECORDSERVER_SECRET = 'secret1'
# If the recordserver runs as root, set the uid to the given one
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Wed Mar 12 03:24:34 2008
@@ -1379,7 +1379,7 @@
def main():
- socket = ('', config.RECORDSERVER_PORT2)
+ socket = ('', config.RECORDSERVER_PORT)
secret = config.RECORDSERVER_SECRET
_debug_('socket=%r, secret=%r' % (socket, secret))
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Wed Mar 12 03:24:34 2008
@@ -68,7 +68,7 @@
def __init__(self):
""" """
_debug_('RecordClient.__init__()', 1)
- self.socket = (config.RECORDSERVER_IP, config.RECORDSERVER_PORT2)
+ self.socket = (config.RECORDSERVER_IP, config.RECORDSERVER_PORT)
self.secret = config.RECORDSERVER_SECRET
self.server = None
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
