X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Finput_manager.cpp;h=880f8ce8057dbf79d0cd03f714823f54c1094ad9;hb=96b4ee1ee2da310e9ea951a29672a7609dbf831e;hp=78b799bfd18dbfaa7c6c4e92217758e19b44e439;hpb=1c14f28a25e7e222473c3b5497983985581a24f6;p=vlc

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 78b799bfd1..880f8ce805 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -30,10 +30,12 @@
 #include "input_manager.hpp"
 #include "dialogs_provider.hpp"
 
-static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o,
-                        vlc_value_t n, void *param );
-static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o,
-                        vlc_value_t n, void *param );
+static int ChangeSPU( vlc_object_t *p_this, const char *var, vlc_value_t o,
+                      vlc_value_t n, void *param );
+
+static int ChangeTeletext( vlc_object_t *p_this, const char *var, vlc_value_t o,
+                           vlc_value_t n, void *param );
+
 static int ItemChanged( vlc_object_t *, const char *,
                         vlc_value_t, vlc_value_t, void * );
 static int PLItemChanged( vlc_object_t *, const char *,
@@ -60,12 +62,12 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
                            QObject( parent ), p_intf( _p_intf )
 {
     i_old_playing_status = END_S;
-    b_had_audio  = b_had_video = b_has_audio = b_has_video = false;
     old_name     = "";
     artUrl       = "";
     p_input      = NULL;
     i_rate       = 0;
     i_input_id   = 0;
+    b_transparentTelextext = false;
 }
 
 InputManager::~InputManager()
@@ -80,15 +82,15 @@ void InputManager::setInput( input_thread_t *_p_input )
 {
     delInput();
     p_input = _p_input;
-    b_had_audio = b_had_video = b_has_audio = b_has_video = false;
-    if( p_input && !( p_input->b_dead || p_input->b_die ) )
+    if( p_input && !( p_input->b_dead || !vlc_object_alive (p_input) ) )
     {
         vlc_object_yield( p_input );
         emit statusChanged( PLAYING_S );
         UpdateMeta();
-        UpdateTracks();
-        UpdateNavigation();
         UpdateArt();
+        UpdateSPU();
+        UpdateTeletext();
+        UpdateNavigation();
         addCallbacks();
         i_input_id = input_GetItem( p_input )->i_id;
     }
@@ -108,17 +110,19 @@ void InputManager::delInput()
     if( p_input )
     {
         delCallbacks();
-        vlc_object_release( p_input );
         i_old_playing_status = END_S;
-
         i_input_id = 0;
-        old_name=qfu("");
-        artUrl = qfu("");
+        old_name   = "";
+        artUrl     = "";
         emit positionUpdated( 0.0, 0 ,0 );
         emit statusChanged( END_S );
         emit nameChanged( "" );
         emit artChanged( "" );
+        emit rateChanged( INPUT_RATE_DEFAULT );
+        vlc_object_release( p_input );
         p_input = NULL;
+        UpdateSPU();
+        UpdateTeletext();
     }
 }
 
@@ -126,7 +130,6 @@ void InputManager::delInput()
 void InputManager::addCallbacks()
 {
     /* We don't care about:
-       - spu-es
        - chapter
        - programs
        - audio-delay
@@ -136,10 +139,10 @@ void InputManager::addCallbacks()
      */
     /* src/input/input.c:1629 */
     var_AddCallback( p_input, "state", ItemStateChanged, this );
-    /* src/input/es-out.c:550 */
-    var_AddCallback( p_input, "audio-es", ChangeAudio, this );
-    /* src/input/es-out.c:551 */
-    var_AddCallback( p_input, "video-es", ChangeVideo, this );
+    /* src/input/es-out.c:552 */
+    var_AddCallback( p_input, "spu-es", ChangeSPU, this );
+    /* src/input/es-out.c: */
+    var_AddCallback( p_input, "teletext-es", ChangeTeletext, this );
     /* src/input/input.c:1765 */
     var_AddCallback( p_input, "rate-change", ItemRateChanged, this );
     /* src/input/input.c:2003 */
@@ -151,8 +154,8 @@ void InputManager::addCallbacks()
 /* Delete the callbacks on Input. Self explanatory */
 void InputManager::delCallbacks()
 {
-    var_DelCallback( p_input, "audio-es", ChangeAudio, this );
-    var_DelCallback( p_input, "video-es", ChangeVideo, this );
+    var_DelCallback( p_input, "spu-es", ChangeSPU, this );
+    var_DelCallback( p_input, "teletext-es", ChangeTeletext, this );
     var_DelCallback( p_input, "state", ItemStateChanged, this );
     var_DelCallback( p_input, "rate-change", ItemRateChanged, this );
     var_DelCallback( p_input, "title", ItemTitleChanged, this );
@@ -169,13 +172,20 @@ void InputManager::customEvent( QEvent *event )
          type != ItemChanged_Type &&
          type != ItemRateChanged_Type &&
          type != ItemTitleChanged_Type &&
+         type != ItemSpuChanged_Type &&
+         type != ItemTeletextChanged_Type &&
          type != ItemStateChanged_Type )
         return;
 
     if( !hasInput() ) return;
 
-    if( ( type != PositionUpdate_Type && type != ItemRateChanged_Type ) &&
-        ( i_input_id != ple->i_id ) )
+    if( ( type != PositionUpdate_Type  &&
+          type != ItemRateChanged_Type &&
+          type != ItemSpuChanged_Type &&
+          type != ItemTeletextChanged_Type &&
+          type != ItemStateChanged_Type
+        )
+        && ( i_input_id != ple->i_id ) )
         return;
 
     if( type != PositionUpdate_Type )
@@ -189,21 +199,26 @@ void InputManager::customEvent( QEvent *event )
         break;
     case ItemChanged_Type:
         UpdateMeta();
-        UpdateNavigation();
-        UpdateTracks();
         UpdateStatus();
         UpdateArt();
         break;
-    case ItemRateChanged_Type:
-        UpdateRate();
+    case ItemStateChanged_Type:
+        UpdateStatus();
+        UpdateNavigation();
+        UpdateMeta();
         break;
     case ItemTitleChanged_Type:
         UpdateNavigation();
         UpdateMeta();
         break;
-    case ItemStateChanged_Type:
-        UpdateTracks();
-        UpdateStatus();
+    case ItemRateChanged_Type:
+        UpdateRate();
+        break;
+    case ItemSpuChanged_Type:
+        UpdateSPU();
+        break;
+    case ItemTeletextChanged_Type:
+        UpdateTeletext();
         break;
     }
 }
@@ -301,24 +316,44 @@ void InputManager::UpdateMeta()
     }
 }
 
-void InputManager::UpdateTracks()
+bool InputManager::hasAudio()
 {
-    /* Has Audio, has Video Tracks ? */
-    vlc_value_t val;
-    var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
-    b_has_audio = val.i_int > 0;
-    var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
-    b_has_video = val.i_int > 0;
+    if( hasInput() )
+    {
+        vlc_value_t val;
+        var_Change( p_input, "audio-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        return val.i_int > 0;
+    }
+    return false;
+}
+
+bool InputManager::hasVideo()
+{
+    if( hasInput() )
+    {
+        vlc_value_t val;
+        var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &val, NULL );
+        return val.i_int > 0;
+    }
+    return false;
 
-    msg_Dbg( p_input, "I have audio-video: %i %i", b_has_audio, b_has_video );
+}
 
-    /* Update ZVBI status */
-#ifdef ZVBI_COMPILED
-    /* Update teletext status*/
-    emit teletextEnabled( true );/* FIXME */
-#endif
+void InputManager::UpdateSPU()
+{
+    UpdateTeletext();
 }
 
+void InputManager::UpdateTeletext()
+{
+    if( hasInput() )
+        telexToggle( var_GetInteger( p_input, "teletext-es" ) >= 0 );
+    else
+        telexToggle( false );
+}
+
+
+
 void InputManager::UpdateArt()
 {
     /* Update Art meta */
@@ -358,7 +393,7 @@ void InputManager::sectionPrev()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        vlc_value_t val; val.b_bool = VLC_TRUE;
+        vlc_value_t val; val.b_bool = true;
         var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
                             "prev-chapter":"prev-title", val );
     }
@@ -369,7 +404,7 @@ void InputManager::sectionNext()
     if( hasInput() )
     {
         int i_type = var_Type( p_input, "next-chapter" );
-        vlc_value_t val; val.b_bool = VLC_TRUE;
+        vlc_value_t val; val.b_bool = true;
         var_Set( p_input, (i_type & VLC_VAR_TYPE) != 0 ?
                             "next-chapter":"next-title", val );
     }
@@ -378,33 +413,81 @@ void InputManager::sectionNext()
 void InputManager::sectionMenu()
 {
     if( hasInput() )
-        var_SetInteger( p_input, "title 0", 2 );
+    {
+        vlc_value_t val; val.i_int = 2;
+        var_Set( p_input, "title  0", val );
+    }
 }
 
-#ifdef ZVBI_COMPILED
 void InputManager::telexGotoPage( int page )
 {
     if( hasInput() )
     {
-        vlc_object_t *p_vbi;
-        p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
-                    "zvbi", FIND_ANYWHERE );
-        if( p_vbi )
+        const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
+        const int i_spu_es = var_GetInteger( p_input, "spu-es" );
+
+        if( i_teletext_es >= 0 && i_teletext_es == i_spu_es )
         {
-            var_SetInteger( p_vbi, "vbi-page", page );
-            vlc_object_release( p_vbi );
+            vlc_object_t *p_vbi;
+            p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
+                        "zvbi", FIND_ANYWHERE );
+            if( p_vbi )
+            {
+                var_SetInteger( p_vbi, "vbi-page", page );
+                vlc_object_release( p_vbi );
+            }
         }
     }
+    emit setNewTelexPage( page );
 }
 
 void InputManager::telexToggle( bool b_enabled )
 {
-    int i_page = b_enabled ? 100 : 0 ;
+    if( hasInput() )
+    {
+        const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
+        const int i_spu_es = var_GetInteger( p_input, "spu-es" );
 
-    telexGotoPage( i_page );
+        b_enabled = (i_teletext_es >= 0);
+        emit teletextEnabled( b_enabled );
+        if( b_enabled && (i_teletext_es == i_spu_es) )
+        {
+            vlc_object_t *p_vbi;
+            int i_page = 100;
+            p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
+                        "zvbi", FIND_ANYWHERE );
+            if( p_vbi )
+            {
+                i_page = var_GetInteger( p_vbi, "vbi-page" );
+                vlc_object_release( p_vbi );
+                i_page = b_enabled ? i_page : 0;
+                telexGotoPage( i_page );
+            }
+        }
+    }
+    else emit teletextEnabled( b_enabled );
+}
+
+void InputManager::telexToggleButtons()
+{
+    if( hasInput() )
+    {
+        const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
+        if( i_teletext_es >= 0 )
+        {
+            const int i_spu_es = var_GetInteger( p_input, "spu-es" );
+
+            if( i_teletext_es == i_spu_es )
+                var_SetInteger( p_input, "spu-es", -1 );
+            else
+                var_SetInteger( p_input, "spu-es", i_teletext_es );
+
+            emit toggleTelexButtons();
+        }
+    }
 }
 
-void InputManager::telexSetTransparency( bool b_transp )
+void InputManager::telexSetTransparency()
 {
     if( hasInput() )
     {
@@ -413,12 +496,13 @@ void InputManager::telexSetTransparency( bool b_transp )
                     "zvbi", FIND_ANYWHERE );
         if( p_vbi )
         {
-            var_SetBool( p_input->p_libvlc, "vbi-opaque", b_transp );
+            var_SetBool( p_vbi, "vbi-opaque", b_transparentTelextext );
+            b_transparentTelextext = !b_transparentTelextext;
             vlc_object_release( p_vbi );
         }
     }
+    emit toggleTelexTransparency();
 }
-#endif
 
 void InputManager::slower()
 {
@@ -470,6 +554,13 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf )
     /* Warn our embedded IM about input changes */
     CONNECT( this, inputChanged( input_thread_t * ),
              im, setInput( input_thread_t * ) );
+
+    /* emit check if playlist has allready started playing */
+    vlc_value_t val;
+    var_Change( THEPL, "playlist-current", VLC_VAR_CHOICESCOUNT, &val, NULL );
+    IMEvent *event = new IMEvent( ItemChanged_Type, val.i_int);
+    QApplication::postEvent( this, static_cast<QEvent*>(event) );
+
 }
 
 MainInputManager::~MainInputManager()
@@ -504,10 +595,10 @@ void MainInputManager::customEvent( QEvent *event )
     }
 
     /* Should be PLItemChanged Event */
-    if( VLC_OBJECT_INTF == p_intf->i_object_type )
+    if( VLC_OBJECT_INTF == p_intf->i_object_type ) /* FIXME: don't use object type */
     {
         vlc_mutex_lock( &p_intf->change_lock );
-        if( p_input && ( p_input->b_dead || p_input->b_die ) )
+        if( p_input && ( p_input->b_dead || !vlc_object_alive (p_input) ) )
         {
             var_DelCallback( p_input, "state", PLItemChanged, this );
             vlc_object_release( p_input );
@@ -521,7 +612,7 @@ void MainInputManager::customEvent( QEvent *event )
         {
             QPL_LOCK;
             p_input = THEPL->p_input;
-            if( p_input && !( p_input->b_die || p_input->b_dead) )
+            if( p_input && !( !vlc_object_alive (p_input) || p_input->b_dead) )
             {
                 vlc_object_yield( p_input );
                 var_AddCallback( p_input, "state", PLItemChanged, this );
@@ -536,13 +627,11 @@ void MainInputManager::customEvent( QEvent *event )
     else
     {
         /* we are working as a dialogs provider */
-        playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_intf,
-                                       VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-        if( p_playlist )
-        {
-            p_input = p_playlist->p_input;
-            emit inputChanged( p_input );
-        }
+        playlist_t *p_playlist = pl_Yield( p_intf );
+        p_input = playlist_CurrentInput( p_playlist );
+        emit inputChanged( p_input );
+        vlc_object_release( p_input );
+        pl_Release( p_intf );
     }
 }
 
@@ -572,6 +661,19 @@ void MainInputManager::togglePlayPause()
     getIM()->togglePlayPause();
 }
 
+bool MainInputManager::teletextState()
+{
+    im = getIM();
+    if( im->hasInput() )
+    {
+        const int i_teletext_es = var_GetInteger( getInput(), "teletext-es" );
+        const int i_spu_es = var_GetInteger( getInput(), "spu-es" );
+
+        return i_teletext_es >= 0 && i_teletext_es == i_spu_es;
+    }
+    return false;
+}
+
 /* Static callbacks */
 
 /* IM */
@@ -581,7 +683,7 @@ static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var,
     static int counter = 0;
     InputManager *im = (InputManager*)param;
 
-    counter = counter++ % 4;
+    counter = ++counter % 4;
     if(!counter)
         return VLC_SUCCESS;
     IMEvent *event = new IMEvent( PositionUpdate_Type, 0 );
@@ -590,7 +692,7 @@ static int InterfaceChanged( vlc_object_t *p_this, const char *psz_var,
 }
 
 static int ItemStateChanged( vlc_object_t *p_this, const char *psz_var,
-                            vlc_value_t oldval, vlc_value_t newval, void *param )
+                           vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     InputManager *im = (InputManager*)param;
 
@@ -600,17 +702,17 @@ static int ItemStateChanged( vlc_object_t *p_this, const char *psz_var,
 }
 
 static int ItemRateChanged( vlc_object_t *p_this, const char *psz_var,
-                            vlc_value_t oldval, vlc_value_t newval, void *param )
+                           vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     InputManager *im = (InputManager*)param;
-    
+
     IMEvent *event = new IMEvent( ItemRateChanged_Type, 0 );
     QApplication::postEvent( im, static_cast<QEvent*>(event) );
     return VLC_SUCCESS;
 }
 
 static int ItemTitleChanged( vlc_object_t *p_this, const char *psz_var,
-                            vlc_value_t oldval, vlc_value_t newval, void *param )
+                           vlc_value_t oldval, vlc_value_t newval, void *param )
 {
     InputManager *im = (InputManager*)param;
 
@@ -629,20 +731,22 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
     return VLC_SUCCESS;
 }
 
-
-static int ChangeAudio( vlc_object_t *p_this, const char *var, vlc_value_t o,
+static int ChangeSPU( vlc_object_t *p_this, const char *var, vlc_value_t o,
                         vlc_value_t n, void *param )
 {
     InputManager *im = (InputManager*)param;
-    im->b_has_audio = true;
+    IMEvent *event = new IMEvent( ItemSpuChanged_Type, 0 );
+    QApplication::postEvent( im, static_cast<QEvent*>(event) );
     return VLC_SUCCESS;
 }
 
-static int ChangeVideo( vlc_object_t *p_this, const char *var, vlc_value_t o,
-                        vlc_value_t n, void *param )
+static int ChangeTeletext( vlc_object_t *p_this, const char *var, vlc_value_t o,
+                           vlc_value_t n, void *param )
 {
+
     InputManager *im = (InputManager*)param;
-    im->b_has_video = true;
+    IMEvent *event = new IMEvent( ItemTeletextChanged_Type, 0 );
+    QApplication::postEvent( im, static_cast<QEvent*>(event) );
     return VLC_SUCCESS;
 }