/*****************************************************************************
* extended_panels.cpp : Extended controls panels
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "components/extended_panels.hpp"
#include "dialogs/preferences.hpp"
-#include "dialogs_provider.hpp"
#include "qt4.hpp"
#include "input_manager.hpp"
+#include "../../audio_filter/equalizer_presets.h"
#include <vlc_aout.h>
#include <vlc_intf_strings.h>
#include <vlc_vout.h>
#include <vlc_osd.h>
+#include <vlc_charset.h> /* us_strtod */
#if 0
class ConfClickHandler : public QObject
}
ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
- p_intf( _p_intf )
+ QObject( _parent ), p_intf( _p_intf )
{
ui.setupUi( _parent );
+ p_vout = NULL;
#define SETUP_VFILTER( widget ) \
{ \
SETUP_VFILTER_OPTION( brightnessThresholdCheck, stateChanged( int ) )
SETUP_VFILTER( extract )
- SETUP_VFILTER_OPTION( extractComponentText, textChanged( QString ) )
+ SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) )
SETUP_VFILTER( colorthres )
- SETUP_VFILTER_OPTION( colorthresColorText, textChanged( QString ) )
+ SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) )
SETUP_VFILTER( marq )
- SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( QString ) )
+ SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( marqPositionCombo, currentIndexChanged( QString ) )
SETUP_VFILTER( logo )
void ExtVideo::cropChange()
{
- p_vout = ( vout_thread_t * )vlc_object_find( p_intf,
- VLC_OBJECT_VOUT, FIND_CHILD );
+ p_vout = THEMIM->getVout();
if( p_vout )
{
var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() );
var_SetInteger( p_vout, "crop-bottom", ui.cropBotPx->value() );
var_SetInteger( p_vout, "crop-left", ui.cropLeftPx->value() );
var_SetInteger( p_vout, "crop-right", ui.cropRightPx->value() );
+ vlc_object_release( p_vout );
}
}
-void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add )
+void ExtVideo::clean()
+{
+ ui.cropTopPx->setValue( 0 );
+ ui.cropBotPx->setValue( 0 );
+ ui.cropLeftPx->setValue( 0 );
+ ui.cropRightPx->setValue( 0 );
+}
+
+void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
{
char *psz_parser, *psz_string;
const char *psz_filter_type;
- /* Please leave p_libvlc_global. This is where cached modules are
- * stored. We're not trying to find a module instance. */
- module_t *p_obj = module_Find( p_intf, psz_name );
+ module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
- msg_Err( p_intf, "Unable to find filter module \"%s\n.", psz_name );
+ msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
return;
}
- if( module_IsCapable( p_obj, "video filter2" ) )
+ if( module_provides( p_obj, "video filter2" ) )
{
psz_filter_type = "video-filter";
}
- else if( module_IsCapable( p_obj, "video filter" ) )
+ else if( module_provides( p_obj, "video filter" ) )
{
psz_filter_type = "vout-filter";
}
- else if( module_IsCapable( p_obj, "sub filter" ) )
+ else if( module_provides( p_obj, "sub filter" ) )
{
psz_filter_type = "sub-filter";
}
else
{
- module_Put( p_obj );
+ module_release (p_obj);
msg_Err( p_intf, "Unknown video filter type." );
return;
}
- module_Put( p_obj );
+ module_release (p_obj);
psz_string = config_GetPsz( p_intf, psz_filter_type );
psz_parser = psz_string;
if( asprintf( &psz_string, ( *psz_string ) ? "%s:%s" : "%s%s",
psz_string, psz_name ) == -1 )
+ {
+ free( psz_parser );
return;
+ }
free( psz_parser );
}
else
ui.subpictureFilterText->setText( psz_string );
/* Try to set on the fly */
- p_vout = ( vout_thread_t * )vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ p_vout = THEMIM->getVout();
if( p_vout )
{
if( !strcmp( psz_filter_type, "sub-filter" ) )
void ExtVideo::updateFilters()
{
QString module = ModuleFromWidgetName( sender() );
- //std::cout << "Module name: " << module.toStdString() << std::endl;
QCheckBox *checkbox = qobject_cast<QCheckBox*>( sender() );
QGroupBox *groupbox = qobject_cast<QGroupBox*>( sender() );
if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
{
- int i_int = 0;
if( slider ) slider->setValue( val.i_int );
else if( checkbox ) checkbox->setCheckState( val.i_int? Qt::Checked
: Qt::Unchecked );
}
else if( i_type == VLC_VAR_FLOAT )
{
- double f_float = 0;
if( slider ) slider->setValue( ( int )( val.f_float*( double )slider->tickInterval() ) ); /* hack alert! */
else if( doublespinbox ) doublespinbox->setValue( val.f_float );
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
vlc_object_find_name( p_intf->p_libvlc,
qtu( module ),
FIND_CHILD );
+ int i_type;
+ bool b_is_command;
if( !p_obj )
{
- msg_Err( p_intf, "Module %s not found.", qtu( module ) );
- return;
+ msg_Warn( p_intf, "Module %s not found. You'll need to restart the filter to take the change into account.", qtu( module ) );
+ i_type = config_GetType( p_intf, qtu( option ) );
+ b_is_command = false;
+ }
+ else
+ {
+ i_type = var_Type( p_obj, qtu( option ) );
+ b_is_command = ( i_type & VLC_VAR_ISCOMMAND );
}
- int i_type = var_Type( p_obj, qtu( option ) );
- bool b_is_command = ( i_type & VLC_VAR_ISCOMMAND );
if( !b_is_command )
{
msg_Warn( p_intf, "Module %s's %s variable isn't a command. You'll need to restart the filter to take change into account.",
qtu( option ),
i_type );
- vlc_object_release( p_obj );
+ if( p_obj ) vlc_object_release( p_obj );
}
#if 0
ExtV4l2::~ExtV4l2()
{
- if( box )
- delete box;
+ delete box;
}
void ExtV4l2::showEvent( QShowEvent *event )
smallFont.setPointSize( smallFont.pointSize() - 3 );
ui.setupUi( this );
- presetsComboBox = ui.presetsCombo;
-
ui.preampLabel->setFont( smallFont );
- ui.preampSlider->setMaximum( 400 );
- for( int i = 0 ; i < NB_PRESETS ; i ++ )
- {
- ui.presetsCombo->addItem( qtr( preset_list_text[i] ),
- QVariant( i ) );
- }
- CONNECT( ui.presetsCombo, activated( int ), this, setPreset( int ) );
- BUTTONACT( ui.enableCheck, enable() );
- BUTTONACT( ui.eq2PassCheck, set2Pass() );
-
- CONNECT( ui.preampSlider, valueChanged( int ), this, setPreamp() );
+ /* Setup of presetsComboBox */
+ presetsComboBox = ui.presetsCombo;
+ CONNECT( presetsComboBox, currentIndexChanged( int ),
+ this, updateUISliderValues( int ) );
+ CONNECT( presetsComboBox, activated( int ), this, setCorePreset( int ) );
+ /* Add the sliders for the Bands */
QGridLayout *grid = new QGridLayout( ui.frame );
grid->setMargin( 0 );
for( int i = 0 ; i < BANDS ; i++ )
bands[i] = new QSlider( Qt::Vertical );
bands[i]->setMaximum( 400 );
bands[i]->setValue( 200 );
- CONNECT( bands[i], valueChanged( int ), this, setBand() );
+ CONNECT( bands[i], valueChanged( int ), this, setCoreBands() );
+
band_texts[i] = new QLabel( band_frequencies[i] + "\n0.0dB" );
band_texts[i]->setFont( smallFont );
+
grid->addWidget( bands[i], 0, i );
grid->addWidget( band_texts[i], 1, i );
}
- /* Write down initial values */
- aout_instance_t *p_aout = ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
- char *psz_af;
- char *psz_bands;
+ /* Add the listed presets */
+ for( int i = 0 ; i < NB_PRESETS ; i ++ )
+ {
+ presetsComboBox->addItem( qtr( preset_list_text[i] ),
+ QVariant( preset_list[i] ) );
+ }
+
+ /* Connects */
+ BUTTONACT( ui.enableCheck, enable() );
+ BUTTONACT( ui.eq2PassCheck, set2Pass() );
+ CONNECT( ui.preampSlider, valueChanged( int ), this, setPreamp() );
+
+ /* Do the update from the value of the core */
+ updateUIFromCore();
+}
+
+Equalizer::~Equalizer()
+{
+}
+
+void Equalizer::clean()
+{
+ enable();
+}
+/* Write down initial values */
+void Equalizer::updateUIFromCore()
+{
+ char *psz_af, *psz_pres;
float f_preamp;
+ int i_preset;
+
+ aout_instance_t *p_aout = THEMIM->getAout();
if( p_aout )
{
psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
+ psz_pres = var_GetString( p_aout, "equalizer-preset" );
if( var_GetBool( p_aout, "equalizer-2pass" ) )
ui.eq2PassCheck->setChecked( true );
- psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
f_preamp = var_GetFloat( p_aout, "equalizer-preamp" );
+ i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
vlc_object_release( p_aout );
}
else
{
psz_af = config_GetPsz( p_intf, "audio-filter" );
+ psz_pres = config_GetPsz( p_intf, "equalizer-preset" );
if( config_GetInt( p_intf, "equalizer-2pass" ) )
ui.eq2PassCheck->setChecked( true );
- psz_bands = config_GetPsz( p_intf, "equalizer-bands" );
f_preamp = config_GetFloat( p_intf, "equalizer-preamp" );
+ i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
}
if( psz_af && strstr( psz_af, "equalizer" ) != NULL )
ui.enableCheck->setChecked( true );
- free( psz_af );
enable( ui.enableCheck->isChecked() );
- setValues( psz_bands, f_preamp );
-}
+ presetsComboBox->setCurrentIndex( i_preset );
-Equalizer::~Equalizer()
-{
+ free( psz_af );
+ free( psz_pres );
}
+/* Functin called when enableButton is toggled */
void Equalizer::enable()
{
bool en = ui.enableCheck->isChecked();
// en ? true : false );
// aout_EnableFilter( VLC_OBJECT( p_intf ), "vsurround",
// en ? true : false );
- enable( en );
+ enable( en );
+
+ if( presetsComboBox->currentIndex() < 0 )
+ presetsComboBox->setCurrentIndex( 0 );
+
}
void Equalizer::enable( bool en )
{
ui.eq2PassCheck->setEnabled( en );
- ui.presetsCombo->setEnabled( en );
+ presetsComboBox->setEnabled( en );
ui.presetLabel->setEnabled( en );
ui.preampLabel->setEnabled( en );
ui.preampSlider->setEnabled( en );
}
}
+/* Function called when the set2Pass button is activated */
void Equalizer::set2Pass()
{
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout= THEMIM->getAout();
bool b_2p = ui.eq2PassCheck->isChecked();
if( p_aout == NULL )
}
}
+/* Function called when the preamp slider is moved */
void Equalizer::setPreamp()
{
const float f = ( float )( ui.preampSlider->value() ) /10 - 20;
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = THEMIM->getAout();
- ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f, 'f', 1 ) + qtr( "dB" ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f, 'f', 1 )
+ + qtr( "dB" ) );
if( p_aout )
{
- delCallbacks( p_aout );
+ //delCallbacks( p_aout );
var_SetFloat( p_aout, "equalizer-preamp", f );
- addCallbacks( p_aout );
+ //addCallbacks( p_aout );
vlc_object_release( p_aout );
}
config_PutFloat( p_intf, "equalizer-preamp", f );
}
-void Equalizer::setBand()
+void Equalizer::setCoreBands()
{
/**\todo smoothing */
QString values;
for( int i = 0; i < BANDS; i++ )
{
- const float f_val = (float)( bands[i]->value() ) / 10 - 20;
+ const float f_val = (float)( bands[i]->value() ) / 10 - 20;
QString val = QString("%1").arg( f_val, 5, 'f', 1 );
band_texts[i]->setText( band_frequencies[i] + "\n" + val + "dB" );
}
const char *psz_values = values.toAscii().constData();
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = THEMIM->getAout();
if( p_aout )
{
- delCallbacks( p_aout );
+ //delCallbacks( p_aout );
var_SetString( p_aout, "equalizer-bands", psz_values );
- addCallbacks( p_aout );
+ //addCallbacks( p_aout );
vlc_object_release( p_aout );
}
}
-void Equalizer::setValues( char *psz_bands, float f_preamp )
+
+void Equalizer::updateUISliderValues( int i_preset )
{
- char *p = psz_bands;
+ if( i_preset < 0 ) return;
+
+ char *p = createValuesFromPreset( i_preset );
+ char *psz = p;
+ float f_preamp = eqz_preset_10b[i_preset]->f_preamp;
+
if ( p )
{
for( int i = 0; i < BANDS; i++ )
{
- const float f = strtof( p, &p );
+ const float f = us_strtod(p, &p );
bands[i]->setValue( (int)( ( f + 20 ) * 10 ) );
- band_texts[i]->setText( band_frequencies[i] + "\n" + QString("%1").arg( f, 5, 'f', 1 ) + "dB" );
+ band_texts[i]->setText( band_frequencies[i] + "\n"
+ + QString("%1").arg( f, 5, 'f', 1 ) + "dB" );
if( p == NULL || *p == '\0' )
break;
p++;
if( *p == '\0' )
break;
}
+ free( psz );
}
ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
- ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" )
+ + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
}
-void Equalizer::setPreset( int preset )
+char * Equalizer::createValuesFromPreset( int i_preset )
{
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
-
+ char *psz_values;
QString values;
+
+ /* Create the QString in Qt */
for( int i = 0 ; i< BANDS ;i++ )
- values += QString( " %1" ).arg( eqz_preset_10b[preset]->f_amp[i] );
+ values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] );
+
+ /* Convert it to char * */
+ if( !asprintf( &psz_values, "%s", values.toAscii().constData() ) )
+ return NULL;
- /* XXX Only needed because of setValues */
- char psz_values[256];
- snprintf( psz_values, sizeof(psz_values), "%s", values.toAscii().constData() );
+ return psz_values;
+}
+
+void Equalizer::setCorePreset( int i_preset )
+{
+ char *psz_values = createValuesFromPreset( i_preset );
+ if( !psz_values ) return ;
+ aout_instance_t *p_aout= THEMIM->getAout();
if( p_aout )
{
delCallbacks( p_aout );
+ var_SetString( p_aout , "equalizer-preset" , preset_list[i_preset] );
+
var_SetString( p_aout, "equalizer-bands", psz_values );
var_SetFloat( p_aout, "equalizer-preamp",
- eqz_preset_10b[preset]->f_preamp );
+ eqz_preset_10b[i_preset]->f_preamp );
addCallbacks( p_aout );
vlc_object_release( p_aout );
}
config_PutPsz( p_intf, "equalizer-bands", psz_values );
+ config_PutPsz( p_intf, "equalizer-preset", preset_list[i_preset] );
config_PutFloat( p_intf, "equalizer-preamp",
- eqz_preset_10b[preset]->f_preamp );
-
- setValues( psz_values, eqz_preset_10b[preset]->f_preamp );
+ eqz_preset_10b[i_preset]->f_preamp );
}
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
{
char *psz_preset = newval.psz_string;
Equalizer *eq = ( Equalizer * )p_data;
- eq->presetsComboBox->setCurrentIndex( eq->presetsComboBox->findText( qfu( psz_preset ) ) );
+ int i_preset = eq->presetsComboBox->findData( QVariant( psz_preset ) );
+ eq->presetsComboBox->setCurrentIndex( i_preset );
return VLC_SUCCESS;
}
**********************************************************************/
static const char *psz_control_names[] =
{
- "Roomsize", "Width" , "Wet", "Dry", "Damp"
+ "spatializer-roomsize", "spatializer-width",
+ "spatializer-wet", "spatializer-dry", "spatializer-damp"
};
Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) :
QGridLayout *layout = new QGridLayout( this );
layout->setMargin( 0 );
- enableCheck = new QCheckBox( qfu( "Enable spatializer" ) );
+ enableCheck = new QCheckBox( qtr( "Enable spatializer" ) );
layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL );
for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
BUTTONACT( enableCheck, enable() );
/* Write down initial values */
- aout_instance_t *p_aout = ( aout_instance_t * )
- vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = THEMIM->getAout();
char *psz_af;
if( p_aout )
void Spatializer::setValues( float *controlVars )
{
- aout_instance_t *p_aout= ( aout_instance_t * )
- vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ aout_instance_t *p_aout = THEMIM->getAout();
for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
{
QToolButton *updateButton;
+ b_userAction = true;
+
QGridLayout *mainLayout = new QGridLayout( this );
/* AV sync */
AVSpin = new QDoubleSpinBox;
AVSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
AVSpin->setDecimals( 3 );
- AVSpin->setMinimum( -100 );
- AVSpin->setMaximum( 100 );
+ AVSpin->setMinimum( -100.0 );
+ AVSpin->setMaximum( 100.0 );
AVSpin->setSingleStep( 0.1 );
AVSpin->setToolTip( qtr( "A positive value means that\n"
"the audio is ahead of the video" ) );
- AVSpin->setSuffix( "s" );
+ AVSpin->setSuffix( " s" );
AVLayout->addWidget( AVSpin, 0, 2, 1, 1 );
mainLayout->addWidget( AVBox, 1, 0, 1, 5 );
subsSpin = new QDoubleSpinBox;
subsSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
subsSpin->setDecimals( 3 );
- subsSpin->setMinimum( -100 );
- subsSpin->setMaximum( 100 );
+ subsSpin->setMinimum( -100.0 );
+ subsSpin->setMaximum( 100.0 );
subsSpin->setSingleStep( 0.1 );
subsSpin->setToolTip( qtr( "A positive value means that\n"
"the subtitles are ahead of the video" ) );
- subsSpin->setSuffix( "s" );
+ subsSpin->setSuffix( " s" );
subsLayout->addWidget( subsSpin, 0, 2, 1, 1 );
subSpeedSpin->setMinimum( 1 );
subSpeedSpin->setMaximum( 100 );
subSpeedSpin->setSingleStep( 0.2 );
+ subSpeedSpin->setSuffix( " fps" );
subsLayout->addWidget( subSpeedSpin, 1, 2, 1, 1 );
mainLayout->addWidget( subsBox, 2, 0, 2, 5 );
updateButton = new QToolButton;
updateButton->setAutoRaise( true );
- updateButton->setText( "u" );
- updateButton->setToolTip( qtr( "Force update of this dialog's values" ) );
mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
CONNECT( subSpeedSpin, valueChanged ( double ),
this, adjustSubsSpeed( double ) );
- BUTTONACT( updateButton, update() );
+
+ CONNECT( THEMIM->getIM(), synchroChanged(), this, update() );
+ BUTTON_SET_ACT_I( updateButton, "", update,
+ qtr( "Force update of this dialog's values" ), update() );
/* Set it */
update();
}
+void SyncControls::clean()
+{
+ b_userAction = false;
+ AVSpin->setValue( 0.0 );
+ subsSpin->setValue( 0.0 );
+ subSpeedSpin->setValue( 1.0 );
+ b_userAction = true;
+}
+
void SyncControls::update()
{
+ b_userAction = false;
+
int64_t i_delay;
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" );
+ AVSpin->setValue( ( (double)i_delay ) / 1000000 );
+ i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" );
subsSpin->setValue( ( (double)i_delay ) / 1000000 );
subSpeedSpin->setValue( var_GetFloat( THEMIM->getInput(), "sub-fps" ) );
}
+ b_userAction = true;
}
void SyncControls::advanceAudio( double f_advance )
{
- if( THEMIM->getInput() )
+ if( THEMIM->getInput() && b_userAction )
{
- int64_t i_delay = var_GetTime( THEMIM->getInput(), "audio-delay" );
- i_delay += f_advance * 1000000;
+ int64_t 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() )
+ if( THEMIM->getInput() && b_userAction )
{
- int64_t i_delay = var_GetTime( THEMIM->getInput(), "spu-delay" );
- i_delay += f_advance * 1000000;
+ int64_t i_delay = f_advance * 1000000;
var_SetTime( THEMIM->getInput(), "spu-delay", i_delay );
- msg_Dbg( p_intf, "I am advancing subtitles %d", f_advance );
}
}
void SyncControls::adjustSubsSpeed( double f_fps )
{
- if( THEMIM->getInput() )
+ if( THEMIM->getInput() && b_userAction )
{
var_SetFloat( THEMIM->getInput(), "sub-fps", f_fps );
}
projects / vlc / blobdiff