Author: duncan
Date: Mon Feb 25 17:35:11 2008
New Revision: 10446
Log:
REmoved DJW print messages
Modified:
branches/rel-1-7/freevo/src/childapp.py
branches/rel-1-7/freevo/src/tv/record_types.py
branches/rel-1-7/freevo/src/tv/v4l2.py
branches/rel-1-7/freevo/src/video/plugins/xine.py
branches/rel-1/freevo/src/childapp.py
branches/rel-1/freevo/src/tv/record_types.py
branches/rel-1/freevo/src/tv/v4l2.py
branches/rel-1/freevo/src/video/plugins/xine.py
Modified: branches/rel-1-7/freevo/src/childapp.py
==============================================================================
--- branches/rel-1-7/freevo/src/childapp.py (original)
+++ branches/rel-1-7/freevo/src/childapp.py Mon Feb 25 17:35:11 2008
@@ -81,7 +81,6 @@
command = ('%s %s' % (config.RUNAPP, app)).strip()
debug_name = app[:app.find(' ')]
- _debug_('DJW:command=%r debug_name=%r' % (command, debug_name))
else:
while '' in app:
@@ -141,7 +140,6 @@
command_str = ' '.join(command)
self.child = None
try:
- _debug_('DJW:going to run %r' % command)
self.child = Popen(command, shell=command_shell, stdin=PIPE,
stdout=PIPE, stderr=PIPE, \
universal_newlines=True)
try:
@@ -405,7 +403,7 @@
"""
stop everything when child is dead
"""
- _debug_('ChildApp2.poll()', 1)
+ _debug_('ChildApp2.poll()', 3)
if not self.isAlive():
rc.post_event(self.stop_event())
self.stop()
Modified: branches/rel-1-7/freevo/src/tv/record_types.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/record_types.py (original)
+++ branches/rel-1-7/freevo/src/tv/record_types.py Mon Feb 25 17:35:11 2008
@@ -108,9 +108,8 @@
favorites_fh.close()
except Exception, why:
print Exception, why
- print 'DJW:self.favorites=%r' % (self.favorites,)
for favorite in self.favorites:
- print 'DJW:favorite=%r' % (favorite,)
+ pass
#print 'exactchan=%r, exactdow=%r, exacttod=%r, priority=%r,
allowDuplicates=%r, onlyNew=%r' % \
# (exactchan, exactdow, exacttod, priority, allowDuplicates,
onlyNew)
Modified: branches/rel-1-7/freevo/src/tv/v4l2.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/v4l2.py (original)
+++ branches/rel-1-7/freevo/src/tv/v4l2.py Mon Feb 25 17:35:11 2008
@@ -501,7 +501,6 @@
_debug_('setstdbyname(name=%r)' % (name,), 1)
v_norm = name.upper()
tmp = self.getstd()
- print 'DJW:getstd=%r' % (tmp,)
try:
self.setstd(NORMS[v_norm])
_debug_('setstdbyname: %s (0x%08X) set' % (name, NORMS[v_norm]), 3)
Modified: branches/rel-1-7/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/xine.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/xine.py Mon Feb 25 17:35:11 2008
@@ -430,7 +430,7 @@
_debug_('playback started')
# Has it finished?
- if line.find('playback finished for mrl') >= 0:
+ if line.find('playback finished for mrl') >= 0 or
line.find('xine_exit: bye!') > 0:
_debug_('playback finished')
if self.player:
self.player.stop()
Modified: branches/rel-1/freevo/src/childapp.py
==============================================================================
--- branches/rel-1/freevo/src/childapp.py (original)
+++ branches/rel-1/freevo/src/childapp.py Mon Feb 25 17:35:11 2008
@@ -81,7 +81,6 @@
command = ('%s %s' % (config.RUNAPP, app)).strip()
debug_name = app[:app.find(' ')]
- _debug_('DJW:command=%r debug_name=%r' % (command, debug_name))
else:
while '' in app:
@@ -141,7 +140,6 @@
command_str = ' '.join(command)
self.child = None
try:
- _debug_('DJW:going to run %r' % command)
self.child = Popen(command, shell=command_shell, stdin=PIPE,
stdout=PIPE, stderr=PIPE, \
universal_newlines=True)
try:
@@ -405,7 +403,7 @@
"""
stop everything when child is dead
"""
- _debug_('ChildApp2.poll()', 1)
+ _debug_('ChildApp2.poll()', 3)
if not self.isAlive():
rc.post_event(self.stop_event())
self.stop()
Modified: branches/rel-1/freevo/src/tv/record_types.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_types.py (original)
+++ branches/rel-1/freevo/src/tv/record_types.py Mon Feb 25 17:35:11 2008
@@ -108,9 +108,8 @@
favorites_fh.close()
except Exception, why:
print Exception, why
- print 'DJW:self.favorites=%r' % (self.favorites,)
for favorite in self.favorites:
- print 'DJW:favorite=%r' % (favorite,)
+ pass
#print 'exactchan=%r, exactdow=%r, exacttod=%r, priority=%r,
allowDuplicates=%r, onlyNew=%r' % \
# (exactchan, exactdow, exacttod, priority, allowDuplicates,
onlyNew)
Modified: branches/rel-1/freevo/src/tv/v4l2.py
==============================================================================
--- branches/rel-1/freevo/src/tv/v4l2.py (original)
+++ branches/rel-1/freevo/src/tv/v4l2.py Mon Feb 25 17:35:11 2008
@@ -501,7 +501,6 @@
_debug_('setstdbyname(name=%r)' % (name,), 1)
v_norm = name.upper()
tmp = self.getstd()
- print 'DJW:getstd=%r' % (tmp,)
try:
self.setstd(NORMS[v_norm])
_debug_('setstdbyname: %s (0x%08X) set' % (name, NORMS[v_norm]), 3)
Modified: branches/rel-1/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/xine.py (original)
+++ branches/rel-1/freevo/src/video/plugins/xine.py Mon Feb 25 17:35:11 2008
@@ -430,7 +430,7 @@
_debug_('playback started')
# Has it finished?
- if line.find('playback finished for mrl') >= 0:
+ if line.find('playback finished for mrl') >= 0 or
line.find('xine_exit: bye!') > 0:
_debug_('playback finished')
if self.player:
self.player.stop()
-------------------------------------------------------------------------
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
