[Freevo-cvslog] r9774 - in branches/rel-1/freevo: . src src/video/plugins

[Duncan W. <du...@fr...>]

Author: duncan
Date: Fri Jul 27 15:09:32 2007
New Revision: 9774

Log:
[ 1762273 ] Patch: change avsync during playback
Patch from Pierre Ossman applied


Modified:
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/src/event.py
   branches/rel-1/freevo/src/video/plugins/mplayer.py

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog	(original)
+++ branches/rel-1/freevo/ChangeLog	Fri Jul 27 15:09:32 2007
@@ -17,6 +17,7 @@
 --------------------------------
 
  * New Chinese Translation (F#1752417)
+ * Updated French Translation (F#1762163)
  * Added personal web pages to the webserver, using PERSONAL_WWW_PAGE (F#1729595)
  * Added audio scrobbler plug-in for last fm (F#1760242)
  * Added sounds to menu selection, enabled with OSD_SOUNDS_ENABLED (F#1732380)
@@ -26,6 +27,7 @@
  * Updated freevo to allow X server options to be passed when using -fs (F#1749908)
  * Updated headlines to allow the window to be scrolled (F#1752971)
  * Updated local_conf.py.example with MPLAYER_HAS_FIELD_DOMINANCE (F#1729404)
+ * Updated mplayer to allow av sync to be adjusted during playback (F#1762273)
  * Updated record_client to allow favourites to be added from the command line (F#1734781)
  * Updated recordings manager to show full scrollable description (F#1759171)
  * Updated skins to adjust the window heights when the button bar is active (F#1733061)
@@ -34,6 +36,7 @@
  * Updated xine video plug-in to allow bookmarks to work (F#1729024)
  * Updated xine video plug-in to process stdout and stderr message (F#1729603)
  * Updated xmltv's use of element tree for Python-2.5 (F#1731775)
+ * Fixed apple trailers after web site update (B#1762274)
  * Fixed audio channel selection for AVI files, when no id is present (B#1731232)
  * Fixed auto shutdown when the record server is running remotely (B#1721638)
  * Fixed button bar raising an exception when using colour actions (B#1732378)

Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py	(original)
+++ branches/rel-1/freevo/src/event.py	Fri Jul 27 15:09:32 2007
@@ -167,6 +167,7 @@
 VIDEO_NEXT_SUBTITLE    = Event('VIDEO_NEXT_SUBTITLE')
 VIDEO_TOGGLE_INTERLACE = Event('VIDEO_TOGGLE_INTERLACE')
 VIDEO_NEXT_ANGLE       = Event('VIDEO_NEXT_ANGLE')
+VIDEO_AVSYNC           = Event('VIDEO_AVSYNC')
 STORE_BOOKMARK         = Event('STORE_BOOKMARK')
 MENU                   = Event('MENU')
 
@@ -357,7 +358,9 @@
     'MENU'      : MENU,
     'DISPLAY'   : TOGGLE_OSD,
     'REC'       : STORE_BOOKMARK,
-    '0'         : VIDEO_MANUAL_SEEK
+    '0'         : VIDEO_MANUAL_SEEK,
+    'AVSYNC+'   : Event(VIDEO_AVSYNC, arg=0.100),
+    'AVSYNC-'   : Event(VIDEO_AVSYNC, arg=-0.100),
     }
 
 DVD_EVENTS = {

Modified: branches/rel-1/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/mplayer.py	(original)
+++ branches/rel-1/freevo/src/video/plugins/mplayer.py	Fri Jul 27 15:09:32 2007
@@ -414,6 +414,10 @@
             self.app.write('seek %s\n' % event.arg)
             return True
 
+        if event == VIDEO_AVSYNC:
+            self.app.write('audio_delay %g\n' % event.arg);
+            return True
+
         if event == OSD_MESSAGE:
             self.app.write('osd_show_text "%s"\n' % event.arg);
             return True