#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 <iostream>
-#include <string.h>
#if 0
class ConfClickHandler : public QObject
SETUP_VFILTER_OPTION( wallRowsSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( wallColsSpin, valueChanged( int ) )
+ SETUP_VFILTER( panoramix )
+ SETUP_VFILTER_OPTION( panoramixRowsSpin, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( panoramixColsSpin, valueChanged( int ) )
+
+
SETUP_VFILTER( erase )
SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() )
SETUP_VFILTER_OPTION( eraseYSpin, valueChanged( int ) )
#undef SETUP_VFILTER
#undef SETUP_VFILTER_OPTION
+
+ CONNECT( ui.cropTopPx, valueChanged( int ), this, cropChange() );
+ CONNECT( ui.cropBotPx, valueChanged( int ), this, cropChange() );
+ CONNECT( ui.cropLeftPx, valueChanged( int ), this, cropChange() );
+ CONNECT( ui.cropRightPx, valueChanged( int ), this, cropChange() );
+ CONNECT( ui.topBotCropSync, toggled( bool ),
+ ui.cropBotPx, setDisabled( bool ) );
+ CONNECT( ui.leftRightCropSync, toggled( bool ),
+ ui.cropRightPx, setDisabled( bool ) );
}
ExtVideo::~ExtVideo()
{
}
-void ExtVideo::ChangeVFiltersString( char *psz_name, vlc_bool_t b_add )
+void ExtVideo::cropChange()
+{
+ p_vout = ( vout_thread_t * )vlc_object_find( p_intf,
+ VLC_OBJECT_VOUT, FIND_CHILD );
+ 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() );
+ }
+}
+
+void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add )
{
- vout_thread_t *p_vout;
char *psz_parser, *psz_string;
const char *psz_filter_type;
else if( lineedit )
{
char str[30];
- sprintf( str, "%06X", val.i_int );
+ snprintf( str, sizeof(str), "%06X", val.i_int );
lineedit->setText( str );
}
else if( combobox ) combobox->setCurrentIndex(
}
if( p_obj )
{
- msg_Dbg( p_intf, "Found v4l2 instance" );
vlc_value_t val, text, name;
int i_ret = var_Change( p_obj, "controls", VLC_VAR_GETCHOICES,
&val, &text );
msg_Dbg( p_intf, "Couldn't find v4l2 instance" );
ui.help->show();
}
-
}
void ExtV4l2::ValueChange( bool value )
{
bool en = ui.enableCheck->isChecked();
aout_EnableFilter( VLC_OBJECT( p_intf ), "equalizer",
- en ? VLC_TRUE : VLC_FALSE );
+ en ? true : false );
// aout_EnableFilter( VLC_OBJECT( p_intf ), "upmixer",
-// en ? VLC_TRUE : VLC_FALSE );
+// en ? true : false );
// aout_EnableFilter( VLC_OBJECT( p_intf ), "vsurround",
-// en ? VLC_TRUE : VLC_FALSE );
+// en ? true : false );
enable( en );
}
void Equalizer::enable( bool en )
{
ui.eq2PassCheck->setEnabled( en );
+ ui.presetsCombo->setEnabled( en );
+ ui.presetLabel->setEnabled( en );
ui.preampLabel->setEnabled( en );
ui.preampSlider->setEnabled( en );
for( int i = 0 ; i< BANDS; i++ )
{
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
- vlc_bool_t b_2p = ui.eq2PassCheck->isChecked();
+ bool b_2p = ui.eq2PassCheck->isChecked();
if( p_aout == NULL )
config_PutInt( p_intf, "equalizer-2pass", b_2p );
config_PutInt( p_intf, "equalizer-2pass", b_2p );
for( int i = 0; i < p_aout->i_nb_inputs; i++ )
{
- p_aout->pp_inputs[i]->b_restart = VLC_TRUE;
+ p_aout->pp_inputs[i]->b_restart = true;
}
vlc_object_release( p_aout );
}
void Equalizer::setPreamp()
{
- float f= ( float )( ui.preampSlider->value() ) /10 - 20;
- char psz_val[5];
+ 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 );
- sprintf( psz_val, "%.1f", f );
- ui.preampLabel->setText( qtr( "Preamp\n" ) + psz_val + qtr( "dB" ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f, 'f', 1 ) + qtr( "dB" ) );
if( p_aout )
{
delCallbacks( p_aout );
void Equalizer::setBand()
{
- char psz_values[102]; memset( psz_values, 0, 102 );
-
/**\todo smoothing */
- for( int i = 0 ; i< BANDS ; i++ )
+ QString values;
+ for( int i = 0; i < BANDS; i++ )
{
- char psz_val[5];
- float f_val = ( float )( bands[i]->value() ) / 10 - 20 ;
- sprintf( psz_values, "%s %f", psz_values, f_val );
- sprintf( psz_val, "% 5.1f", f_val );
- band_texts[i]->setText( band_frequencies[i] + "\n" + psz_val + "dB" );
+ 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" );
+ values += " " + val;
}
+ 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 );
if( p_aout )
char *p = psz_bands;
if ( p )
{
- for( int i = 0; i < 10; i++ )
+ for( int i = 0; i < BANDS; i++ )
{
- char psz_val[5];
- float f = strtof( p, &p );
- int i_val= ( int )( ( f + 20 ) * 10 );
- bands[i]->setValue( i_val );
- sprintf( psz_val, "% 5.1f", f );
- band_texts[i]->setText( band_frequencies[i] + "\n" + psz_val +
- "dB" );
- if( p == NULL || *p == '\0' ) break;
+ const float f = strtof( 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" );
+ if( p == NULL || *p == '\0' )
+ break;
p++;
- if( *p == '\0' ) break;
+ if( *p == '\0' )
+ break;
}
}
- char psz_val[5];
- int i_val = ( int )( ( f_preamp + 20 ) * 10 );
- sprintf( psz_val, "%.1f", f_preamp );
- ui.preampSlider->setValue( i_val );
- ui.preampLabel->setText( qtr( "Preamp\n" ) + psz_val + qtr( "dB" ) );
+ ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" ) + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
}
void Equalizer::setPreset( int preset )
aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
VLC_OBJECT_AOUT, FIND_ANYWHERE );
- char psz_values[102]; memset( psz_values, 0, 102 );
- for( int i = 0 ; i< 10 ;i++ )
- sprintf( psz_values, "%s %.1f", psz_values,
- eqz_preset_10b[preset]->f_amp[i] );
+ QString values;
+ for( int i = 0 ; i< BANDS ;i++ )
+ values += QString( " %1" ).arg( eqz_preset_10b[preset]->f_amp[i] );
+
+ /* XXX Only needed because of setValues */
+ char psz_values[256];
+ snprintf( psz_values, sizeof(psz_values), "%s", values.toAscii().constData() );
if( p_aout )
{
{
bool en = enableCheck->isChecked();
aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer",
- en ? VLC_TRUE : VLC_FALSE );
+ en ? true : false );
enable( en );
}
void Spatializer::setValues( float *controlVars )
{
- char psz_val[5];
- char var_name[5];
aout_instance_t *p_aout= ( aout_instance_t * )
vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
{
- float f= ( float )( spatCtrl[i]->value() );
- sprintf( psz_val, "%.1f", f );
- ctrl_readout[i]->setText( psz_val );
+ float f = (float)( spatCtrl[i]->value() );
+ ctrl_readout[i]->setText( QString::number( f, 'f', 1 ) );
}
if( p_aout )
{
QWidget( _parent ) , p_intf( _p_intf )
{
QGroupBox *AVBox, *subsBox;
- QToolButton *moinsAV, *plusAV;
+ QToolButton *moinsAV, *plusAV;
QToolButton *moinssubs, *plussubs;
+ QToolButton *moinssubSpeed, *plussubSpeed;
- int64_t i_delay;
+ QToolButton *updateButton;
- QVBoxLayout *vboxLayout = new QVBoxLayout( this );
+ QGridLayout *mainLayout = new QGridLayout( this );
+ /* AV sync */
AVBox = new QGroupBox( qtr( "Audio/Video" ) );
- QGridLayout *gridLayout = new QGridLayout( AVBox );
+ QGridLayout *AVLayout = new QGridLayout( AVBox );
moinsAV = new QToolButton;
moinsAV->setToolButtonStyle( Qt::ToolButtonTextOnly );
moinsAV->setAutoRaise( true );
moinsAV->setText( "-" );
- gridLayout->addWidget( moinsAV, 1, 0, 1, 1 );
+ AVLayout->addWidget( moinsAV, 0, 1, 1, 1 );
plusAV = new QToolButton;
plusAV->setToolButtonStyle( Qt::ToolButtonTextOnly );
plusAV->setAutoRaise( true );
plusAV->setText( "+" );
- gridLayout->addWidget( plusAV, 1, 2, 1, 1 );
+ AVLayout->addWidget( plusAV, 0, 3, 1, 1 );
QLabel *AVLabel = new QLabel;
- AVLabel->setText( qtr( "Advance of audio over video" ) );
- gridLayout->addWidget( AVLabel, 0, 0, 1, 3 );
+ AVLabel->setText( qtr( "Advance of audio over video:" ) );
+ AVLayout->addWidget( AVLabel, 0, 0, 1, 1 );
AVSpin = new QDoubleSpinBox;
AVSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
AVSpin->setToolTip( qtr( "A positive value means that\n"
"the audio is ahead of the video" ) );
AVSpin->setSuffix( "s" );
- gridLayout->addWidget( AVSpin, 1, 1, 1, 1 );
- vboxLayout->addWidget( AVBox );
+ AVLayout->addWidget( AVSpin, 0, 2, 1, 1 );
+ mainLayout->addWidget( AVBox, 1, 0, 1, 5 );
+ /* Subs */
subsBox = new QGroupBox( qtr( "Subtitles/Video" ) );
QGridLayout *subsLayout = new QGridLayout( subsBox );
moinssubs->setToolButtonStyle( Qt::ToolButtonTextOnly );
moinssubs->setAutoRaise( true );
moinssubs->setText( "-" );
- subsLayout->addWidget( moinssubs, 1, 0, 1, 1 );
+ subsLayout->addWidget( moinssubs, 0, 1, 1, 1 );
plussubs = new QToolButton;
plussubs->setToolButtonStyle( Qt::ToolButtonTextOnly );
plussubs->setAutoRaise( true );
plussubs->setText( "+" );
- subsLayout->addWidget( plussubs, 1, 2, 1, 1 );
+ subsLayout->addWidget( plussubs, 0, 3, 1, 1 );
QLabel *subsLabel = new QLabel;
- subsLabel->setText( qtr( "Advance of subtitles over video" ) );
- subsLayout->addWidget( subsLabel, 0, 0, 1, 3 );
+ subsLabel->setText( qtr( "Advance of subtitles over video:" ) );
+ subsLayout->addWidget( subsLabel, 0, 0, 1, 1 );
subsSpin = new QDoubleSpinBox;
subsSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
subsSpin->setToolTip( qtr( "A positive value means that\n"
"the subtitles are ahead of the video" ) );
subsSpin->setSuffix( "s" );
- subsLayout->addWidget( subsSpin, 1, 1, 1, 1 );
- vboxLayout->addWidget( subsBox );
+ subsLayout->addWidget( subsSpin, 0, 2, 1, 1 );
+
+
+ moinssubSpeed = new QToolButton;
+ moinssubSpeed->setToolButtonStyle( Qt::ToolButtonTextOnly );
+ moinssubSpeed->setAutoRaise( true );
+ moinssubSpeed->setText( "-" );
+ subsLayout->addWidget( moinssubSpeed, 1, 1, 1, 1 );
+
+ plussubSpeed = new QToolButton;
+ plussubSpeed->setToolButtonStyle( Qt::ToolButtonTextOnly );
+ plussubSpeed->setAutoRaise( true );
+ plussubSpeed->setText( "+" );
+ subsLayout->addWidget( plussubSpeed, 1, 3, 1, 1 );
+
+ QLabel *subSpeedLabel = new QLabel;
+ subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) );
+ subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 );
+
+ subSpeedSpin = new QDoubleSpinBox;
+ subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
+ subSpeedSpin->setDecimals( 3 );
+ subSpeedSpin->setMinimum( 1 );
+ subSpeedSpin->setMaximum( 100 );
+ subSpeedSpin->setSingleStep( 0.2 );
+ 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 );
+
/* Various Connects */
CONNECT( moinsAV, clicked(), AVSpin, stepDown () );
CONNECT( plusAV, clicked(), AVSpin, stepUp () );
CONNECT( moinssubs, clicked(), subsSpin, stepDown () );
CONNECT( plussubs, clicked(), subsSpin, stepUp () );
+ CONNECT( moinssubSpeed, clicked(), subSpeedSpin, stepDown () );
+ CONNECT( plussubSpeed, clicked(), subSpeedSpin, stepUp () );
CONNECT( AVSpin, valueChanged ( double ), this, advanceAudio( double ) ) ;
CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
+ CONNECT( subSpeedSpin, valueChanged ( double ),
+ this, adjustSubsSpeed( double ) );
+ BUTTONACT( updateButton, update() );
/* Set it */
+ update();
+}
+
+void SyncControls::update()
+{
+ 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" );
subsSpin->setValue( ( (double)i_delay ) / 1000000 );
+ subSpeedSpin->setValue( var_GetFloat( THEMIM->getInput(), "sub-fps" ) );
}
}
}
}
+void SyncControls::adjustSubsSpeed( double f_fps )
+{
+ if( THEMIM->getInput() )
+ {
+ var_SetFloat( THEMIM->getInput(), "sub-fps", f_fps );
+ }
+}
+
/**********************************************************************
* Video filters / Adjust
**********************************************************************/
projects / vlc / blobdiff