Qt4 - Copyright update and CRs

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

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 6b2ed82de071f0bc55c53ebd796ee4b11bc01822..02cdd440b054832bd7ae4dba3db7e29ab0e430bb 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * input_manager.cpp : Manage an input and interact with its GUI elements
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <assert.h>
-
 #include "qt4.hpp"
 #include "input_manager.hpp"
 #include "dialogs_provider.hpp"
@@ -46,39 +44,52 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
 
 InputManager::~InputManager()
 {
+    delInput();
 }
 
 void InputManager::setInput( input_thread_t *_p_input )
 {
+    delInput();
     p_input = _p_input;
     emit positionUpdated( 0.0,0,0 );
     b_had_audio = b_had_video = b_has_audio = b_has_video = false;
     if( p_input )
     {
+        vlc_object_yield( p_input );
+        vlc_value_t val;
+        var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        b_has_video = val.i_int > 0;
+        var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        b_has_audio = val.i_int > 0;
         var_AddCallback( p_input, "audio-es", ChangeAudio, this );
         var_AddCallback( p_input, "video-es", ChangeVideo, this );
     }
-
 }
+
 void InputManager::delInput()
 {
     if( p_input )
     {
         var_DelCallback( p_input, "audio-es", ChangeAudio, this );
         var_DelCallback( p_input, "video-es", ChangeVideo, this );
+        vlc_object_release( p_input );
+        p_input = NULL;
     }
 }
 
 void InputManager::update()
 {
     /// \todo Emit the signals only if it changed
-    if( !p_input  ) return;
+    if( !p_input ) return;
 
     if( p_input->b_dead || p_input->b_die )
     {
         emit positionUpdated( 0.0, 0, 0 );
+        msg_Dbg( p_intf, "*********** NAV 0");
         emit navigationChanged( 0 );
         emit statusChanged( 0 ); // 0 = STOPPED, 1 = PLAY, 2 = PAUSE
+        delInput();
+        return;
     }
 
     if( !b_had_audio && b_has_audio )
@@ -95,16 +106,22 @@ void InputManager::update()
     emit positionUpdated( f_pos, i_time, i_length );
 
     /* Update disc status */
-    vlc_value_t val;
+    vlc_value_t val; val.i_int = 0;
     var_Change( p_input, "title", VLC_VAR_CHOICESCOUNT, &val, NULL );
     if( val.i_int > 0 )
     {
-        vlc_value_t val;
+        val.i_int = 0;
         var_Change( p_input, "chapter", VLC_VAR_CHOICESCOUNT, &val, NULL );
         if( val.i_int > 0 )
+        {
+            msg_Dbg( p_intf, "******* CHAPTER");
             emit navigationChanged( 1 ); // 1 = chapter, 2 = title, 0 = NO
+        }
         else
+        {
+            msg_Dbg( p_intf, "******* TITLE");
             emit navigationChanged( 2 );
+        }
     }
     else
     {
@@ -113,17 +130,17 @@ void InputManager::update()
 
     /* Update text */
     QString text;
-    if( p_input->input.p_item->p_meta &&
-        p_input->input.p_item->p_meta->psz_nowplaying &&
-        *p_input->input.p_item->p_meta->psz_nowplaying )
+    if( input_GetItem(p_input)->p_meta &&
+        input_GetItem(p_input)->p_meta->psz_nowplaying &&
+        *input_GetItem(p_input)->p_meta->psz_nowplaying )
     {
         text.sprintf( "%s - %s",
-                  p_input->input.p_item->p_meta->psz_nowplaying,
-                  p_input->input.p_item->psz_name );
+                  input_GetItem(p_input)->p_meta->psz_nowplaying,
+                  input_GetItem(p_input)->psz_name );
     }
     else
     {
-        text.sprintf( "%s", p_input->input.p_item->psz_name );
+        text.sprintf( "%s", input_GetItem(p_input)->psz_name );
     }
     emit nameChanged( text );
 
@@ -139,7 +156,7 @@ void InputManager::update()
 
 void InputManager::sliderUpdate( float new_pos )
 {
-    if( p_input && !p_input->b_die && !p_input->b_dead )
+    if( hasInput() )
         var_SetFloat( p_input, "position", new_pos );
 }
 
@@ -161,6 +178,52 @@ void InputManager::togglePlayPause()
     emit statusChanged( state.i_int );
 }
 
+void InputManager::sectionPrev()
+{
+    if( hasInput() )
+    {
+        int i_type = var_Type( p_input, "next-chapter" );
+        vlc_value_t val; val.b_bool = VLC_TRUE;
+        var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "prev-chapter":"prev-title", val );
+    }
+}
+
+void InputManager::sectionNext()
+{
+    if( hasInput() )
+    {
+        int i_type = var_Type( p_input, "next-chapter" );
+        vlc_value_t val; val.b_bool = VLC_TRUE;
+        var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
+                            "next-chapter":"next-title", val );
+    }
+}
+
+void InputManager::sectionMenu()
+{
+    if( hasInput() )
+        var_SetInteger( p_input, "title 0", 2);
+}
+
+void InputManager::slower()
+{
+    if( hasInput() )
+        var_SetVoid( p_input, "rate-slower" );
+}
+
+void InputManager::faster()
+{
+    if( hasInput() )
+        var_SetVoid( p_input, "rate-faster" );
+}
+
+void InputManager::normalRate()
+{
+    if( hasInput() )
+        var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
+}
+
 /**********************************************************************
  * MainInputManager implementation. Wrap an input manager and
  * take care of updating the main playlist input
@@ -208,6 +271,21 @@ void MainInputManager::updateInput()
     vlc_mutex_unlock( &p_intf->change_lock );
 }
 
+void MainInputManager::stop()
+{
+   playlist_Stop( THEPL );
+}
+
+void MainInputManager::next()
+{
+   playlist_Next( THEPL );
+}
+
+void MainInputManager::prev()
+{
+   playlist_Prev( THEPL );
+}
+
 void MainInputManager::togglePlayPause()
 {
     if( p_input == NULL )
@@ -218,7 +296,6 @@ void MainInputManager::togglePlayPause()
     getIM()->togglePlayPause();
 }
 
-
 static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o,
                         vlc_value_t n, void *param )
 {