Changeset 6d1a4bca44bac246757ccbca9b8a2f9fc07ebf80

Timestamp:

30/03/08 05:44:29 (8 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1206848669 -0700

git-parent:

[5a6c9e944a90d2d9da88a03b5e3de548a3592d7d]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1206848568 -0700

Message:

Interface to delay subtitles and audio. Most of ##1491

Files:

• modules/gui/qt4/components/extended_panels.cpp (modified) (4 diffs)
• modules/gui/qt4/components/extended_panels.hpp (modified) (1 diff)

modules/gui/qt4/components/extended_panels.cpp

@@ -38 +38 @@
-#include "dialogs_provider.hpp"
-#include "qt4.hpp"
+#include "input_manager.hpp"
-
-#include "../../audio_filter/equalizer_presets.h"
@@ -1169 +1170 @@
-    QToolButton *moinssubs, *plussubs;
-
+    int64_t i_delay;
+
-    QVBoxLayout *vboxLayout = new QVBoxLayout( this );
-
@@ -1198 +1201 @@
-    AVSpin->setToolTip( qtr( "A positive value means that\n"
-                             "the audio is ahead of the video" ) );
-m
+
-    gridLayout->addWidget( AVSpin, 1, 1, 1, 1 );
-    vboxLayout->addWidget( AVBox );
@@ -1230 +1233 @@
-    subsSpin->setToolTip( qtr( "A positive value means that\n"
-                             "the subtitles are ahead of the video" ) );
-m
+
-    subsLayout->addWidget( subsSpin, 1, 1, 1, 1 );
-    vboxLayout->addWidget( subsBox );
+
+    /* Various Connects */
+    CONNECT( moinsAV, clicked(), AVSpin, stepDown () );
+    CONNECT( plusAV, clicked(), AVSpin, stepUp () );
+    CONNECT( moinssubs, clicked(), subsSpin, stepDown () );
+    CONNECT( plussubs, clicked(), subsSpin, stepUp () );
+    CONNECT( AVSpin, valueChanged ( double ), this, advanceAudio( double ) ) ;
+    CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
+
+    /* Set it */
+    if( THEMIM->getInput() )
+    {
+        i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" );
+        AVSpin->setValue( ( (double)i_delay ) / 1000000 );
+        i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
+        subsSpin->setValue( ( (double)i_delay ) / 1000000 );
+    }
+}
+
+void SyncControls::advanceAudio( double f_advance )
+{
+    if( THEMIM->getInput() )
+    {
+        int64_t i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
+        i_delay += f_advance * 1000000;
+        var_SetTime( THEMIM->getInput(), "audio-delay", i_delay );
+        msg_Dbg( p_intf, "I am advancing Audio %d", f_advance );
+    }
+}
+
+void SyncControls::advanceSubs( double f_advance )
+{
+    if( THEMIM->getInput() )
+    {
+        int64_t i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" );
+        i_delay += f_advance * 1000000;
+        var_SetTime( THEMIM->getInput(), "spu-delay", i_delay );
+        msg_Dbg( p_intf, "I am advancing subtitles %d", f_advance );
+    }
-}
-

modules/gui/qt4/components/extended_panels.hpp

@@ -161 +161 @@
-    QDoubleSpinBox *AVSpin;
-    QDoubleSpinBox *subsSpin;
+private slots:
+    void advanceAudio( double );
+    void advanceSubs( double );
-};
-