Author: duncan
Date: Sat Jun 30 11:04:26 2007
New Revision: 9737
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/video/plugins/xine.py
Log:
Added XINE_BOOKMARK which enables the use of get_time in xine
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sat Jun 30 11:04:26 2007
@@ -19,6 +19,7 @@
* Added personal web pages to the webserver, using PERSONAL_WWW_PAGE
(F#1729595)
* Added sounds to menu selection, enabled with OSD_SOUNDS_ENABLED (F#1732380)
* Added translation for Greek (F#)
+ * Added XINE_BOOKMARK for when xine has support for get_time, default is off
(B#1745076)
* Updated childapp to use subprocess instead of popen (F#1729597)
* Updated local_conf.py.example with MPLAYER_HAS_FIELD_DOMINANCE (F#1729404)
* Updated record_client to allow favourites to be added from the command line
(F#1734781)
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sat Jun 30 11:04:26 2007
@@ -284,6 +284,7 @@
Added SKIN_DEBUG to show boxes around each skin area for debugging skins
Added IMAGEVIEWER_REVERSED_IMAGES for when the images are incorrectly
rotated
Added SHOPPINGCART_CLOBBER to allow a move to clobber an existing file
+ Added XINE_BOOKMARK to enable the resume function to work with xine
''' ),
]
@@ -1512,6 +1513,9 @@
# Set to False if xine doesn't have '--no-lirc' option
XINE_HAS_NO_LIRC = True
+# Set to True is xine supports get_time this enables the position to be saved
+XINE_BOOKMARK = False
+
# Defaults to XINE_VO/AO_DEV:
XINE_TV_VO_DEV = None
XINE_TV_AO_DEV = None
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 Sat Jun 30 11:04:26 2007
@@ -1090,6 +1090,9 @@
# Set to False if xine doesn't have '--no-lirc' option
# XINE_HAS_NO_LIRC = True
+# Set to True is xine supports get_time this enables the position to be saved
+# XINE_BOOKMARK = False
+
# ======================================================================
# IVTV Xine TV settings:
@@ -1303,7 +1306,7 @@
# 'br=128:cbr:mode=3 ' + # MP3 const. bitrate, 128 kbit/s
# '-ffourcc divx ' + # Force 'divx' ident, better
compat.
# '-endpos %(seconds)s ' + # only mencoder uses this so do
it here.
-# '-o %(filename)s') # Filled in by Freevo
+# '-o %(filename)s') # Filled in by Freevo
#
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 Sat Jun 30 11:04:26 2007
@@ -199,21 +199,22 @@
if not self.app:
return
- # if the file ends do nothing, else get elapsed time
- if event in (STOP, USER_END):
- command = "%s -S get_time --stdctl --no-splash --hide-gui " %
config.CONF.xine
- handle = subprocess.Popen(command, shell=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE )
- (cin, cout) = (handle.stdin, handle.stdout)
- try:
- position = cout.read();
- _debug_("Elapsed = %s" % position)
- if position:
- self.item.elapsed = int(position)
- finally:
- #xine should exit nicely, but if the first xine is already
closed this xine will hang
- exit_code = handle.poll()
- if not exit_code:
- cin.write('quit\n')
+ if config.XINE_BOOKMARK:
+ # if the file ends do nothing, else get elapsed time
+ if event in (STOP, USER_END):
+ command = "%s -S get_time --stdctl --no-splash --hide-gui" %
config.CONF.xine
+ handle = subprocess.Popen(command, shell=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE )
+ (cin, cout) = (handle.stdin, handle.stdout)
+ try:
+ position = cout.read();
+ _debug_("Elapsed = %s" % position)
+ if position:
+ self.item.elapsed = int(position)
+ finally:
+ #xine should exit nicely, but if the first xine is already
closed this xine will hang
+ exit_code = handle.poll()
+ if not exit_code and not cin.closed:
+ cin.write('quit\n')
self.app.stop('quit\n')
rc.app(None)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
