<html><head></head><body><div class="gmail_quote">Le 3 août 2017 16:10:48 GMT+03:00, "Hugo Beauzée-Luyssen" <hugo@beauzee.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">From: Thomas Guillem <thomas@gllm.fr><br /><br />---<br /> modules/gui/qt/actions_manager.cpp | 45 ++++----------------------<br /> modules/gui/qt/input_manager.cpp   | 65 ++++++++++----------------------------<br /> modules/gui/qt/qt.hpp              |  1 +<br /> 3 files changed, 24 insertions(+), 87 deletions(-)<br /><br />diff --git a/modules/gui/qt/actions_manager.cpp b/modules/gui/qt/actions_manager.cpp<br />index cc67ff1c0d..bcf1e88e66 100644<br />--- a/modules/gui/qt/actions_manager.cpp<br />+++ b/modules/gui/qt/actions_manager.cpp<br />@@ -125,23 +125,12 @@ void ActionsManager::play()<br />  */<br /> void ActionsManager::fullscreen()<br /> {<br />-    bool fs = var_ToggleBool( THEPL, "fullscreen" );<br />-    vout_thread_t *p_vout = THEMIM->getVout();<br />-    if( p_vout)<br />-    {<br />-        var_SetBool( p_vout, "fullscreen", fs );<br />-        vlc_object_release( p_vout );<br />-    }<br />+    ACTION_DO( ACTIONID_TOGGLE_FULLSCREEN );<br /> }<br /> <br /> void ActionsManager::snapshot()<br /> {<br />-    vout_thread_t *p_vout = THEMIM->getVout();<br />-    if( p_vout )<br />-    {<br />-        var_TriggerCallback( p_vout, "video-snapshot" );<br />-        vlc_object_release( p_vout );<br />-    }<br />+    ACTION_DO( ACTIONID_SNAPSHOT );<br /> }<br /> <br /> void ActionsManager::playlist()<br />@@ -152,47 +141,27 @@ void ActionsManager::playlist()<br /> <br /> void ActionsManager::record()<br /> {<br />-    input_thread_t *p_input = THEMIM->getInput();<br />-    if( p_input )<br />-    {<br />-        /* This method won't work fine if the stream can't be cut anywhere */<br />-        var_ToggleBool( p_input, "record" );<br />-#if 0<br />-        else<br />-        {<br />-            /* 'record' access-filter is not loaded, we open Save dialog */<br />-            input_item_t *p_item = input_GetItem( p_input );<br />-            if( !p_item )<br />-                return;<br />-<br />-            char *psz = input_item_GetURI( p_item );<br />-            if( psz )<br />-                THEDP->streamingDialog( NULL, qfu(psz), true );<br />-        }<br />-#endif<br />-    }<br />+    ACTION_DO( ACTIONID_RECORD );<br /> }<br /> <br /> void ActionsManager::frame()<br /> {<br />-    input_thread_t *p_input = THEMIM->getInput();<br />-    if( p_input )<br />-        var_TriggerCallback( p_input, "frame-next" );<br />+    ACTION_DO( ACTIONID_FRAME_NEXT );<br /> }<br /> <br /> void ActionsManager::toggleMuteAudio()<br /> {<br />-    playlist_MuteToggle( THEPL );<br />+    ACTION_DO( ACTIONID_VOL_MUTE );<br /> }<br /> <br /> void ActionsManager::AudioUp()<br /> {<br />-    playlist_VolumeUp( THEPL, 1, NULL );<br />+    ACTION_DO( ACTIONID_VOL_UP );<br /> }<br /> <br /> void ActionsManager::AudioDown()<br /> {<br />-    playlist_VolumeDown( THEPL, 1, NULL );<br />+    ACTION_DO( ACTIONID_VOL_DOWN );<br /> }<br /> <br /> void ActionsManager::skipForward()<br />diff --git a/modules/gui/qt/input_manager.cpp b/modules/gui/qt/input_manager.cpp<br />index ede449141f..0cbcc88b63 100644<br />--- a/modules/gui/qt/input_manager.cpp<br />+++ b/modules/gui/qt/input_manager.cpp<br />@@ -894,27 +894,27 @@ void InputManager::reverse()<br /> <br /> void InputManager::slower()<br /> {<br />-    var_TriggerCallback( THEPL, "rate-slower" );<br />+    ACTION_DO( ACTIONID_SLOWER );<br /> }<br /> <br /> void InputManager::faster()<br /> {<br />-    var_TriggerCallback( THEPL, "rate-faster" );<br />+    ACTION_DO( ACTIONID_FASTER );<br /> }<br /> <br /> void InputManager::littlefaster()<br /> {<br />-    var_SetInteger( p_intf->obj.libvlc, "key-action", ACTIONID_RATE_FASTER_FINE );<br />+    ACTION_DO( ACTIONID_RATE_FASTER_FINE );<br /> }<br /> <br /> void InputManager::littleslower()<br /> {<br />-    var_SetInteger( p_intf->obj.libvlc, "key-action", ACTIONID_RATE_SLOWER_FINE );<br />+    ACTION_DO( ACTIONID_RATE_SLOWER_FINE );<br /> }<br /> <br /> void InputManager::normalRate()<br /> {<br />-    var_SetFloat( THEPL, "rate", 1. );<br />+    ACTION_DO( ACTIONID_RATE_NORMAL );<br /> }<br /> <br /> void InputManager::setRate( int new_rate )<br />@@ -925,22 +925,12 @@ void InputManager::setRate( int new_rate )<br /> <br /> void InputManager::jumpFwd()<br /> {<br />-    int i_interval = var_InheritInteger( p_input, "short-jump-size" );<br />-    if( i_interval > 0 && hasInput() )<br />-    {<br />-        mtime_t val = CLOCK_FREQ * i_interval;<br />-        var_SetInteger( p_input, "time-offset", val );<br />-    }<br />+    ACTION_DO( ACTIONID_JUMP_FORWARD_SHORT );<br /> }<br /> <br /> void InputManager::jumpBwd()<br /> {<br />-    int i_interval = var_InheritInteger( p_input, "short-jump-size" );<br />-    if( i_interval > 0 && hasInput() )<br />-    {<br />-        mtime_t val = -CLOCK_FREQ * i_interval;<br />-        var_SetInteger( p_input, "time-offset", val );<br />-    }<br />+    ACTION_DO( ACTIONID_JUMP_BACKWARD_SHORT );<br /> }<br /> <br /> void InputManager::setAtoB()<br />@@ -1103,45 +1093,45 @@ void MainInputManager::probeCurrentInput()<br /> /* Playlist Control functions */<br /> void MainInputManager::stop()<br /> {<br />-   playlist_Stop( THEPL );<br />+    ACTION_DO( ACTIONID_STOP );<br /> }<br /> <br /> void MainInputManager::next()<br /> {<br />-   playlist_Next( THEPL );<br />+    ACTION_DO( ACTIONID_NEXT );<br /> }<br /> <br /> void MainInputManager::prev()<br /> {<br />-   playlist_Prev( THEPL );<br />+    ACTION_DO( ACTIONID_PREV );<br /> }<br /> <br /> void MainInputManager::prevOrReset()<br /> {<br />     if( !p_input || var_GetInteger( p_input, "time") < INT64_C(10000) )<br />-        playlist_Prev( THEPL );<br />+        ACTION_DO( ACTIONID_PREV );<br />     else<br />         getIM()->sliderUpdate( 0.0 );<br /> }<br /> <br /> void MainInputManager::togglePlayPause()<br /> {<br />-    playlist_TogglePause( THEPL );<br />+    ACTION_DO( ACTIONID_PLAY_PAUSE );<br /> }<br /> <br /> void MainInputManager::play()<br /> {<br />-    playlist_Play( THEPL );<br />+    ACTION_DO( ACTIONID_PLAY );<br /> }<br /> <br /> void MainInputManager::pause()<br /> {<br />-    playlist_Pause( THEPL );<br />+    ACTION_DO( ACTIONID_PAUSE );<br /> }<br /> <br /> void MainInputManager::toggleRandom()<br /> {<br />-    config_PutInt( p_intf, "random", var_ToggleBool( THEPL, "random" ) );<br />+    ACTION_DO( ACTIONID_RANDOM );<br /> }<br /> <br /> void MainInputManager::notifyRandom(bool value)<br />@@ -1161,30 +1151,7 @@ void MainInputManager::notifyRepeatLoop(bool)<br /> <br /> void MainInputManager::loopRepeatLoopStatus()<br /> {<br />-    /* Toggle Normal -> Loop -> Repeat -> Normal ... */<br />-    bool loop = var_GetBool( THEPL, "loop" );<br />-    bool repeat = var_GetBool( THEPL, "repeat" );<br />-<br />-    if( repeat )<br />-    {<br />-        loop = false;<br />-        repeat = false;<br />-    }<br />-    else if( loop )<br />-    {<br />-        loop = false;<br />-        repeat = true;<br />-    }<br />-    else<br />-    {<br />-        loop = true;<br />-        //repeat = false;<br />-    }<br />-<br />-    var_SetBool( THEPL, "loop", loop );<br />-    var_SetBool( THEPL, "repeat", repeat );<br />-    config_PutInt( p_intf, "loop", loop );<br />-    config_PutInt( p_intf, "repeat", repeat );<br />+    ACTION_DO( ACTIONID_LOOP );<br /> }<br /> <br /> void MainInputManager::activatePlayQuit( bool b_exit )<br />diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp<br />index 569945ebb0..d1b68f98d6 100644<br />--- a/modules/gui/qt/qt.hpp<br />+++ b/modules/gui/qt/qt.hpp<br />@@ -88,6 +88,7 @@ struct intf_sys_t<br /> };<br /> <br /> #define THEPL p_intf->p_sys->p_playlist<br />+#define ACTION_DO(id) vlc_actions_do( p_intf, (id), true)<br /> <br /> /**<br />  * This class may be used for scope-bound locking/unlocking</pre></blockquote></div><br clear="all">This looks like a step backward: You are removing context.<br>
-- <br>
Rémi Denis-Courmont<br>
Typed on an inconvenient virtual keyboard</body></html>