* ALL: separation of the SPU engine from the VOUT.

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 78e84855378acef23bdd918eea20bcb57ebb5ff0..6145792352dd142cb61ee823f08125f50b649a99 100755 (executable)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -228,8 +228,8 @@ static void Run( intf_thread_t *p_intf )
         {
             for( i = 0; i < CHANNELS_NUMBER; i++ )
             {
-                p_intf->p_sys->p_channels[ i ] =
-                    vout_RegisterOSDChannel( p_vout );
+                spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
+                             &p_intf->p_sys->p_channels[ i ] );
             }
         }
 
@@ -734,10 +734,11 @@ static void ClearChannels( intf_thread_t *p_intf, vout_thread_t *p_vout )
 
     if( p_vout )
     {
-        vout_ClearOSDChannel( p_vout, DEFAULT_CHAN );
+        spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR, DEFAULT_CHAN );
         for( i = 0; i < CHANNELS_NUMBER; i++ )
         {
-            vout_ClearOSDChannel( p_vout, p_intf->p_sys->p_channels[ i ] );
+            spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
+                         p_intf->p_sys->p_channels[ i ] );
         }
     }
 }