Qt: add a close to systray menu option.

[vlc] / modules / gui / qt4 / actions_manager.cpp

diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index b8b9e823de966017cfa442ec904b81915d13c6e7..cc4e535af99add8325db3f5c0099826835494384 100644 (file)
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include <vlc_vout.h>
+#include <vlc_aout.h>
 #include <vlc_keys.h>
 
 #include "actions_manager.hpp"
@@ -37,66 +38,65 @@
 ActionsManager * ActionsManager::instance = NULL;
 
 ActionsManager::ActionsManager( intf_thread_t * _p_i, QObject *_parent )
-                   : QObject( _parent )
+               : QObject( _parent )
 {
     p_intf = _p_i;
 }
 
-ActionsManager::~ActionsManager()
-{
-}
-//* Actions */
+ActionsManager::~ActionsManager(){}
+
 void ActionsManager::doAction( int id_action )
 {
     switch( id_action )
     {
         case PLAY_ACTION:
             play(); break;
+        case STOP_ACTION:
+            THEMIM->stop(); break;
+        case OPEN_ACTION:
+            THEDP->openDialog(); break;
         case PREVIOUS_ACTION:
-            prev(); break;
+            THEMIM->prev(); break;
         case NEXT_ACTION:
-            next(); break;
-        case STOP_ACTION:
-            stop(); break;
+            THEMIM->next(); break;
         case SLOWER_ACTION:
-            slower(); break;
+            THEMIM->getIM()->slower(); break;
         case FASTER_ACTION:
-            faster(); break;
+            THEMIM->getIM()->faster(); break;
         case FULLSCREEN_ACTION:
             fullscreen(); break;
         case EXTENDED_ACTION:
-            extSettings(); break;
+            THEDP->extendedDialog(); break;
         case PLAYLIST_ACTION:
             playlist(); break;
         case SNAPSHOT_ACTION:
             snapshot(); break;
         case RECORD_ACTION:
             record(); break;
-        case ATOB_ACTION:
-            THEMIM->getIM()->setAtoB(); break;
         case FRAME_ACTION:
             frame(); break;
+        case ATOB_ACTION:
+            THEMIM->getIM()->setAtoB(); break;
         case REVERSE_ACTION:
-            reverse(); break;
+            THEMIM->getIM()->reverse(); break;
         case SKIP_BACK_ACTION:
-            var_SetInteger( p_intf->p_libvlc, "key-pressed",
-                    ACTIONID_JUMP_BACKWARD_SHORT );
+            skipBackward();
             break;
         case SKIP_FW_ACTION:
-            var_SetInteger( p_intf->p_libvlc, "key-pressed",
-                    ACTIONID_JUMP_FORWARD_SHORT );
+            skipForward();
             break;
+        case QUIT_ACTION:
+            THEDP->quit();  break;
+        case RANDOM_ACTION:
+            THEMIM->toggleRandom(); break;
+        case INFO_ACTION:
+            THEDP->mediaInfoDialog(); break;
         default:
             msg_Dbg( p_intf, "Action: %i", id_action );
             break;
     }
 }
 
-void ActionsManager::stop()
-{
-    THEMIM->stop();
-}
-
 void ActionsManager::play()
 {
     if( THEPL->current.i_size == 0 )
@@ -108,16 +108,6 @@ void ActionsManager::play()
     THEMIM->togglePlayPause();
 }
 
-void ActionsManager::prev()
-{
-    THEMIM->prev();
-}
-
-void ActionsManager::next()
-{
-    THEMIM->next();
-}
-
 /**
   * TODO
  * This functions toggle the fullscreen mode
@@ -126,46 +116,25 @@ void ActionsManager::next()
  */
 void ActionsManager::fullscreen()
 {
-    vout_thread_t *p_vout =
-      (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    bool fs = var_ToggleBool( THEPL, "fullscreen" );
+    vout_thread_t *p_vout = THEMIM->getVout();
     if( p_vout)
     {
-        var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) );
+        var_SetBool( p_vout, "fullscreen", fs );
         vlc_object_release( p_vout );
     }
 }
 
 void ActionsManager::snapshot()
 {
-    vout_thread_t *p_vout =
-      (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    vout_thread_t *p_vout = THEMIM->getVout();
     if( p_vout )
     {
-        vout_Control( p_vout, VOUT_SNAPSHOT );
+        var_TriggerCallback( p_vout, "video-snapshot" );
         vlc_object_release( p_vout );
     }
 }
 
-void ActionsManager::extSettings()
-{
-    THEDP->extendedDialog();
-}
-
-void ActionsManager::reverse()
-{
-    THEMIM->getIM()->reverse();
-}
-
-void ActionsManager::slower()
-{
-    THEMIM->getIM()->slower();
-}
-
-void ActionsManager::faster()
-{
-    THEMIM->getIM()->faster();
-}
-
 void ActionsManager::playlist()
 {
     if( p_intf->p_sys->p_mi ) p_intf->p_sys->p_mi->togglePlaylist();
@@ -177,8 +146,7 @@ void ActionsManager::record()
     if( p_input )
     {
         /* This method won't work fine if the stream can't be cut anywhere */
-        const bool b_recording = var_GetBool( p_input, "record" );
-        var_SetBool( p_input, "record", !b_recording );
+        var_ToggleBool( p_input, "record" );
 #if 0
         else
         {
@@ -189,7 +157,7 @@ void ActionsManager::record()
 
             char *psz = input_item_GetURI( p_item );
             if( psz )
-                THEDP->streamingDialog( NULL, psz, true );
+                THEDP->streamingDialog( NULL, qfu(psz), true );
         }
 #endif
     }
@@ -199,7 +167,31 @@ void ActionsManager::frame()
 {
     input_thread_t *p_input = THEMIM->getInput();
     if( p_input )
-        var_SetVoid( p_input, "frame-next" );
+        var_TriggerCallback( p_input, "frame-next" );
+}
+
+void ActionsManager::toggleMuteAudio()
+{
+     aout_ToggleMute( THEPL, NULL );
 }
 
+void ActionsManager::AudioUp()
+{
+    aout_VolumeUp( THEPL, 1, NULL );
+}
+
+void ActionsManager::AudioDown()
+{
+    aout_VolumeDown( THEPL, 1, NULL );
+}
+
+void ActionsManager::skipForward()
+{
+    THEMIM->getIM()->jumpFwd();
+}
+
+void ActionsManager::skipBackward()
+{
+    THEMIM->getIM()->jumpBwd();
+}