[vlc-devel] commit: Used vout_OSDEpg for the time hotkeys. (Laurent Aimar )

git version control git at videolan.org
Tue Feb 2 23:03:56 CET 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Feb  2 23:00:51 2010 +0100| [7beb3b358105a2cc60a4359fa3be56071f200763] | committer: Laurent Aimar 

Used vout_OSDEpg for the time hotkeys.

Based on a patch by Adrien Maglo.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7beb3b358105a2cc60a4359fa3be56071f200763
---

 modules/control/hotkeys.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 3667f42..bb989bf 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -737,9 +737,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
                 snprintf( psz_msg, sizeof(psz_msg), _("%.2fx"), f_rate );
                 vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN, "%s", psz_msg );
             }
-            else if( i_action == ACTIONID_POSITION && b_seekable )
+            else if( i_action == ACTIONID_POSITION )
             {
-                DisplayPosition( p_intf, p_vout, p_input );
+                if( ( !p_vout || vout_OSDEpg( p_vout, input_GetItem( p_input ) ) ) && b_seekable )
+                    DisplayPosition( p_intf, p_vout, p_input );
             }
             else if( i_action >= ACTIONID_PLAY_BOOKMARK1 &&
                      i_action <= ACTIONID_PLAY_BOOKMARK10 )




More information about the vlc-devel mailing list