Fix play/pause icons

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

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 1ff6f17460b3391300a04e76ff809bce32cb9be8..f541210463e2dd5d0785d55915bd51c7911125bd 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * input_manager.cpp : Manage an input and interact with its GUI elements
  ****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
- * $Id: wxwidgets.cpp 15731 2006-05-25 14:43:53Z zorglub $
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *
@@ -21,17 +21,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <assert.h>
+
 #include "input_manager.hpp"
 #include "dialogs_provider.hpp"
 #include "qt4.hpp"
 
+/**********************************************************************
+ * InputManager implementation
+ **********************************************************************/
+
 InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
                            QObject( parent ), p_intf( _p_intf )
 {
+    i_old_playing_status = END_S;
     p_input = NULL;
     /* Subscribe to updates */
-    QObject::connect( DialogsProvider::getInstance( p_intf )->fixed_timer,
-                      SIGNAL( timeout() ), this, SLOT( update() ) );
+    connect( THEDP->fixed_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
 }
 
 InputManager::~InputManager()
@@ -47,13 +53,13 @@ void InputManager::setInput( input_thread_t *_p_input )
 void InputManager::update()
 {
     /// \todo Emit the signals only if it changed
-    if( !p_input || p_input->b_die ) return;
+    if( !p_input  ) return;
 
-    if( p_input->b_dead )
+    if( p_input->b_dead || p_input->b_die )
     {
         emit positionUpdated( 0.0, 0, 0 );
-       emit navigationChanged( 0 );
-       emit statusChanged( 0 ); // 0 = STOPPED, 1 = PAUSE, 2 = PLAY
+        emit navigationChanged( 0 );
+        emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE
     }
 
     /* Update position */
@@ -71,14 +77,14 @@ void InputManager::update()
     {
         vlc_value_t val;
         var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
-       if( val.i_int > 0 )
-           emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 3 = NO
-       else
-           emit navigationChanged( 2 );
+    if( val.i_int > 0 )
+        emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 3 = NO
+    else
+        emit navigationChanged( 2 );
     }
     else
     {
-       emit navigationChanged( 0 );
+        emit navigationChanged( 0 );
     }
 
     /* Update text */
@@ -87,16 +93,24 @@ void InputManager::update()
         p_input->input.p_item->p_meta->psz_nowplaying &&
         *p_input->input.p_item->p_meta->psz_nowplaying )
     {
-       text.sprintf( "%s - %s", 
-                     p_input->input.p_item->p_meta->psz_nowplaying,
-                     p_input->input.p_item->psz_name );
+        text.sprintf( "%s - %s",
+                  p_input->input.p_item->p_meta->psz_nowplaying,
+                  p_input->input.p_item->psz_name );
     }
     else
     {
-       text.sprintf( "%s", p_input->input.p_item->psz_name );
+        text.sprintf( "%s", p_input->input.p_item->psz_name );
     }
     emit nameChanged( text );
 
+    /* Update playing status */
+    var_Get( p_input, "state", &val );
+    val.i_int = val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S;
+    if( i_old_playing_status != val.i_int )
+    {
+        i_old_playing_status = val.i_int;
+        emit statusChanged(  val.i_int == PAUSE_S ? PAUSE_S : PLAYING_S );
+    }
 }
 
 void InputManager::sliderUpdate( float new_pos )
@@ -104,3 +118,83 @@ void InputManager::sliderUpdate( float new_pos )
    if( p_input && !p_input->b_die && !p_input->b_dead )
         var_SetFloat( p_input, "position", new_pos );
 }
+
+void InputManager::togglePlayPause()
+{
+    vlc_value_t state;
+    var_Get( p_input, "state", &state );
+    if( state.i_int != PAUSE_S )
+    {
+        /* A stream is being played, pause it */
+        state.i_int = PAUSE_S;
+    }
+    else
+    {
+        /* Stream is paused, resume it */
+        state.i_int = PLAYING_S;
+    }
+    var_Set( p_input, "state", state );
+    emit statusChanged( state.i_int );
+}
+
+/**********************************************************************
+ * MainInputManager implementation. Wrap an input manager and
+ * take care of updating the main playlist input
+ **********************************************************************/
+MainInputManager * MainInputManager::instance = NULL;
+
+MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL),
+                                                p_intf( _p_intf )
+{
+    p_input = NULL;
+    im = new InputManager( this, p_intf );
+    /* Get timer updates */
+    connect( DialogsProvider::getInstance(p_intf)->fixed_timer,
+             SIGNAL(timeout() ), this, SLOT( updateInput() ) );
+    /* Warn our embedded IM about input changes */
+    connect( this, SIGNAL( inputChanged( input_thread_t * ) ),
+             im, SLOT( setInput( input_thread_t * ) ) );
+}
+
+MainInputManager::~MainInputManager()
+{
+    if( p_input ) vlc_object_release( p_input );
+}
+
+void MainInputManager::updateInput()
+{
+    vlc_mutex_lock( &p_intf->change_lock );
+    if( p_input && p_input->b_dead )
+    {
+        vlc_object_release( p_input );
+        p_input = NULL;
+        emit inputChanged( NULL );
+    }
+
+    if( !p_input )
+    {
+        playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_intf,
+                                        VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+        assert( p_playlist );
+        PL_LOCK;
+        p_input = p_playlist->p_input;
+        if( p_input )
+        {
+            vlc_object_yield( p_input );
+            emit inputChanged( p_input );
+        }
+        PL_UNLOCK;
+        vlc_object_release( p_playlist );
+    }
+    vlc_mutex_unlock( &p_intf->change_lock );
+}
+
+void MainInputManager::togglePlayPause()
+{
+    if( p_input == NULL )
+    {
+        playlist_Play( THEPL );
+        return;
+    }
+    getIM()->togglePlayPause();
+}