#include <QGridLayout>
#include <QSignalMapper>
#include <QComboBox>
+#include <QTimer>
+#include <QFileDialog>
#include "components/extended_panels.hpp"
#include "dialogs/preferences.hpp"
#include "qt4.hpp"
#include "input_manager.hpp"
+#include "util/qt_dirs.hpp"
#include "../../audio_filter/equalizer_presets.h"
#include <vlc_aout.h>
#include <vlc_charset.h> /* us_strtod */
+static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char *psz_name, bool b_add );
+
#if 0
class ConfClickHandler : public QObject
{
QObject( _parent ), p_intf( _p_intf )
{
ui.setupUi( _parent );
- p_vout = NULL;
#define SETUP_VFILTER( widget ) \
{ \
SETUP_VFILTER( extract )
SETUP_VFILTER_OPTION( extractComponentText, textChanged( const QString& ) )
+ SETUP_VFILTER( posterize )
+ SETUP_VFILTER_OPTION( posterizeLevelSpin, valueChanged( int ) )
+
SETUP_VFILTER( colorthres )
SETUP_VFILTER_OPTION( colorthresColorText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( colorthresSaturationthresSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( colorthresSimilaritythresSlider, valueChanged( int ) )
+ SETUP_VFILTER( sepia )
+ SETUP_VFILTER_OPTION( sepiaIntensitySpin, valueChanged( int ) )
+
SETUP_VFILTER( invert )
SETUP_VFILTER( gradient )
SETUP_VFILTER( motiondetect )
- SETUP_VFILTER( noise )
+// SETUP_VFILTER( noise )
SETUP_VFILTER( psychedelic )
SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() )
SETUP_VFILTER_OPTION( eraseYSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( eraseXSpin, valueChanged( int ) )
+ BUTTONACT( ui.eraseBrowseBtn, browseEraseFile() );
SETUP_VFILTER( marq )
SETUP_VFILTER_OPTION( marqMarqueeText, textChanged( const QString& ) )
SETUP_VFILTER_OPTION( logoYSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) )
+ BUTTONACT( ui.logoBrowseBtn, browseLogo() );
+
+ SETUP_VFILTER( gradfun )
+ SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) )
+
+ SETUP_VFILTER( grain )
+ SETUP_VFILTER_OPTION( grainVarianceSlider, valueChanged( int ) )
if( module_exists( "atmo" ) )
{
if( ui.leftRightCropSync->isChecked() )
ui.cropRightPx->setValue( ui.cropLeftPx->value() );
- p_vout = THEMIM->getVout();
+ vout_thread_t *p_vout = THEMIM->getVout();
if( p_vout )
{
var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() );
ui.cropRightPx->setValue( 0 );
}
-void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
+static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char *psz_name, bool b_add )
{
char *psz_parser, *psz_string;
const char *psz_filter_type;
- /* FIXME temporary hack */
- const char *psz_module_name = psz_name;
- if( !strcmp( psz_name, "wall" ) ||
- !strcmp( psz_name, "panoramix" ) ||
- !strcmp( psz_name, "clone" ) )
- psz_module_name = "video_filter_wrapper";
-
- module_t *p_obj = module_find( psz_module_name );
+ module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
return;
}
- if( module_provides( p_obj, "video filter" ) )
+ if( module_provides( p_obj, "video splitter" ) )
{
- psz_filter_type = "vout-filter";
+ psz_filter_type = "video-splitter";
}
else if( module_provides( p_obj, "video filter2" ) )
{
psz_filter_type = "video-filter";
}
+ else if( module_provides( p_obj, "sub source" ) )
+ {
+ psz_filter_type = "sub-source";
+ }
else if( module_provides( p_obj, "sub filter" ) )
{
psz_filter_type = "sub-filter";
config_PutPsz( p_intf, psz_filter_type, psz_string );
/* Try to set on the fly */
- p_vout = THEMIM->getVout();
- if( p_vout )
+ if( !strcmp( psz_filter_type, "video-splitter" ) )
{
- var_SetString( p_vout, psz_filter_type, psz_string );
- vlc_object_release( p_vout );
+ playlist_t *p_playlist = pl_Get( p_intf );
+ var_SetString( p_playlist, psz_filter_type, psz_string );
+ }
+ else
+ {
+ vout_thread_t *p_vout = THEMIM->getVout();
+ if( p_vout )
+ {
+ var_SetString( p_vout, psz_filter_type, psz_string );
+ vlc_object_release( p_vout );
+ }
}
free( psz_string );
QCheckBox *checkbox = qobject_cast<QCheckBox*>( sender() );
QGroupBox *groupbox = qobject_cast<QGroupBox*>( sender() );
- ChangeVFiltersString( qtu( module ),
+ ChangeVFiltersString( p_intf, qtu( module ),
checkbox ? checkbox->isChecked()
: groupbox->isChecked() );
}
+void ExtVideo::browseLogo()
+{
+ QString file = QFileDialog::getOpenFileName( NULL, qtr( "Logo filenames" ),
+ p_intf->p_sys->filepath, "Images (*.png *.jpg);;All (*)" );
+ ui.logoFileText->setText( toNativeSeparators( file ) );
+}
+
+void ExtVideo::browseEraseFile()
+{
+ QString file = QFileDialog::getOpenFileName( NULL, qtr( "Image mask" ),
+ p_intf->p_sys->filepath, "Images (*.png *.jpg);;All (*)" );
+ ui.eraseMaskText->setText( toNativeSeparators( file ) );
+}
+
void ExtVideo::initComboBoxItems( QObject *widget )
{
QComboBox *combobox = qobject_cast<QComboBox*>( widget );
else
{
i_type = var_Type( p_obj, qtu( option ) );
+ if( i_type == 0 )
+ i_type = config_GetType( p_intf, qtu( option ) );
b_is_command = ( i_type & VLC_VAR_ISCOMMAND );
}
**********************************************************************/
ExtV4l2::ExtV4l2( intf_thread_t *_p_intf, QWidget *_parent )
- : QWidget( _parent ), p_intf( _p_intf )
+ : QWidget( _parent ), p_intf( _p_intf ), box( NULL )
{
- ui.setupUi( this );
-
- BUTTONACT( ui.refresh, Refresh() );
-
- box = NULL;
+ QVBoxLayout *layout = new QVBoxLayout( this );
+ help = new QLabel( qtr("No v4l2 instance found.\n"
+ "Please check that the device has been opened with VLC and is playing.\n\n"
+ "Controls will automatically appear here.")
+ , this );
+ help->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+ layout->addWidget( help );
+ setLayout( layout );
}
void ExtV4l2::showEvent( QShowEvent *event )
void ExtV4l2::Refresh( void )
{
- vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE );
- ui.help->hide();
+ vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
+ help->hide();
if( box )
{
- ui.vboxLayout->removeWidget( box );
+ layout()->removeWidget( box );
delete box;
box = NULL;
}
if( i_ret < 0 )
{
msg_Err( p_intf, "Oops, v4l2 object doesn't have a 'controls' variable." );
- ui.help->show();
+ help->show();
vlc_object_release( p_obj );
return;
}
box = new QGroupBox( this );
- ui.vboxLayout->addWidget( box );
+ layout()->addWidget( box );
QVBoxLayout *layout = new QVBoxLayout( box );
box->setLayout( layout );
{
case VLC_VAR_INTEGER:
{
- QLabel *label = new QLabel( psz_label, box );
+ QLabel *label = new QLabel( qtr( psz_label ), box );
QHBoxLayout *hlayout = new QHBoxLayout();
hlayout->addWidget( label );
int i_val = var_GetInteger( p_obj, psz_var );
if( i_type & VLC_VAR_HASCHOICE )
{
QComboBox *combobox = new QComboBox( box );
- combobox->setObjectName( psz_var );
+ combobox->setObjectName( qtr( psz_var ) );
vlc_value_t val2, text2;
var_Change( p_obj, psz_var, VLC_VAR_GETCHOICES,
else
{
QSlider *slider = new QSlider( box );
- slider->setObjectName( psz_var );
+ slider->setObjectName( qtr( psz_var ) );
slider->setOrientation( Qt::Horizontal );
vlc_value_t val2;
var_Change( p_obj, psz_var, VLC_VAR_GETMIN,
}
case VLC_VAR_BOOL:
{
- QCheckBox *button = new QCheckBox( psz_label, box );
- button->setObjectName( psz_var );
+ QCheckBox *button = new QCheckBox( qtr( psz_label ), box );
+ button->setObjectName( qtr( psz_var ) );
button->setChecked( var_GetBool( p_obj, psz_var ) );
CONNECT( button, clicked( bool ), this,
{
if( i_type & VLC_VAR_ISCOMMAND )
{
- QPushButton *button = new QPushButton( psz_label, box );
- button->setObjectName( psz_var );
+ QPushButton *button = new QPushButton( qtr( psz_label ), box );
+ button->setObjectName( qtr( psz_var ) );
CONNECT( button, clicked( bool ), this,
ValueChange( bool ) );
}
else
{
- QLabel *label = new QLabel( psz_label, box );
+ QLabel *label = new QLabel( qtr( psz_label ), box );
layout->addWidget( label );
}
break;
else
{
msg_Dbg( p_intf, "Couldn't find v4l2 instance" );
- ui.help->show();
+ help->show();
+ if ( isVisible() )
+ QTimer::singleShot( 2000, this, SLOT(Refresh()) );
}
}
void ExtV4l2::ValueChange( int value )
{
QObject *s = sender();
- vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( p_intf, "v4l2", FIND_ANYWHERE );
+ vlc_object_t *p_obj = (vlc_object_t*)vlc_object_find_name( pl_Get(p_intf), "v4l2", FIND_CHILD );
if( p_obj )
{
char *psz_var = strdup( qtu( s->objectName() ) );
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_cmd ); VLC_UNUSED( oldval );
+
char *psz_preset = newval.psz_string;
Equalizer *eq = ( Equalizer * )p_data;
int i_preset = eq->presetsComboBox->findData( QVariant( psz_preset ) );
: QWidget( _parent ) , p_intf( _p_intf )
{
QFont smallFont = QApplication::font();
- smallFont.setPointSize( smallFont.pointSize() - 3 );
+ smallFont.setPointSize( smallFont.pointSize() - 2 );
QGridLayout *layout = new QGridLayout( this );
- layout->setMargin( 0 );
enableCheck = new QCheckBox( qtr( "Enable dynamic range compressor" ) );
layout->addWidget( enableCheck, 0, 0, 1, NUM_CP_CTRL );
free( psz_af );
enable( enableCheck->isChecked() );
updateSliders( controlVars );
- setValues( controlVars );
+ setValues();
}
void Compressor::enable()
void Compressor::setInitValues()
{
- setValues( controlVars );
+ setValues();
}
-void Compressor::setValues( float * controlVars )
+void Compressor::setValues()
{
aout_instance_t *p_aout = THEMIM->getAout();
: QWidget( _parent ) , p_intf( _p_intf )
{
QFont smallFont = QApplication::font();
- smallFont.setPointSize( smallFont.pointSize() - 3 );
+ smallFont.setPointSize( smallFont.pointSize() - 2 );
QGridLayout *layout = new QGridLayout( this );
- layout->setMargin( 0 );
enableCheck = new QCheckBox( qtr( "Enable spatializer" ) );
layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL );
enableCheck->setChecked( true );
free( psz_af );
enable( enableCheck->isChecked() );
- setValues( controlVars );
+ setValues();
}
void Spatializer::enable()
}
void Spatializer::setInitValues()
{
- setValues( controlVars );
+ setValues();
}
-void Spatializer::setValues( float *controlVars )
+void Spatializer::setValues()
{
aout_instance_t *p_aout = THEMIM->getAout();
}
void Spatializer::delCallbacks( aout_instance_t *p_aout )
{
+ VLC_UNUSED( p_aout );
// var_DelCallback( p_aout, "Spatializer-bands", EqzCallback, this );
// var_DelCallback( p_aout, "Spatializer-preamp", EqzCallback, this );
}
void Spatializer::addCallbacks( aout_instance_t *p_aout )
{
+ VLC_UNUSED( p_aout );
// var_AddCallback( p_aout, "Spatializer-bands", EqzCallback, this );
// var_AddCallback( p_aout, "Spatializer-preamp", EqzCallback, this );
}
#include <QToolButton>
#include <QGridLayout>
+#define SUBSDELAY_CFG_MODE "subsdelay-mode"
+#define SUBSDELAY_CFG_FACTOR "subsdelay-factor"
+#define SUBSDELAY_MODE_ABSOLUTE 0
+#define SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY 1
+#define SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT 2
+
SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
QWidget( _parent ) , p_intf( _p_intf )
{
QToolButton *moinsAV, *plusAV;
QToolButton *moinssubs, *plussubs;
QToolButton *moinssubSpeed, *plussubSpeed;
+ QToolButton *moinssubDuration, *plussubDuration;
QToolButton *updateButton;
subSpeedSpin->setSuffix( " fps" );
subsLayout->addWidget( subSpeedSpin, 1, 2, 1, 1 );
+ moinssubDuration = new QToolButton;
+ moinssubDuration->setToolButtonStyle( Qt::ToolButtonTextOnly );
+ moinssubDuration->setAutoRaise( true );
+ moinssubDuration->setText( "-" );
+ subsLayout->addWidget( moinssubDuration, 2, 1, 1, 1 );
+
+ plussubDuration = new QToolButton;
+ plussubDuration->setToolButtonStyle( Qt::ToolButtonTextOnly );
+ plussubDuration->setAutoRaise( true );
+ plussubDuration->setText( "+" );
+ subsLayout->addWidget( plussubDuration, 2, 3, 1, 1 );
+
+ QLabel *subDurationLabel = new QLabel;
+ subDurationLabel->setText( qtr( "Subtitles duration factor:" ) );
+ subsLayout->addWidget( subDurationLabel, 2, 0, 1, 1 );
+
+ subDurationSpin = new QDoubleSpinBox;
+ subDurationSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
+ subDurationSpin->setDecimals( 3 );
+ subDurationSpin->setMinimum( 0 );
+ subDurationSpin->setMaximum( 20 );
+ subDurationSpin->setSingleStep( 0.2 );
+ subsLayout->addWidget( subDurationSpin, 2, 2, 1, 1 );
+
mainLayout->addWidget( subsBox, 2, 0, 2, 5 );
updateButton = new QToolButton;
CONNECT( plussubs, clicked(), subsSpin, stepUp () );
CONNECT( moinssubSpeed, clicked(), subSpeedSpin, stepDown () );
CONNECT( plussubSpeed, clicked(), subSpeedSpin, stepUp () );
+ CONNECT( moinssubDuration, clicked(), subDurationSpin, stepDown () );
+ CONNECT( plussubDuration, clicked(), subDurationSpin, stepUp () );
CONNECT( AVSpin, valueChanged ( double ), this, advanceAudio( double ) ) ;
CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
CONNECT( subSpeedSpin, valueChanged ( double ),
this, adjustSubsSpeed( double ) );
+ CONNECT( subDurationSpin, valueChanged ( double ),
+ this, adjustSubsDuration( double ) );
CONNECT( THEMIM->getIM(), synchroChanged(), this, update() );
BUTTON_SET_ACT_I( updateButton, "", update,
/* Set it */
update();
+ updateSubsDuration();
+}
+
+SyncControls::~SyncControls()
+{
+ subsdelayClean();
}
void SyncControls::clean()
AVSpin->setValue( 0.0 );
subsSpin->setValue( 0.0 );
subSpeedSpin->setValue( 1.0 );
+ subsdelayClean();
+ updateSubsDuration();
b_userAction = true;
}
}
}
+void SyncControls::adjustSubsDuration( double f_factor )
+{
+ if( THEMIM->getInput() && b_userAction )
+ {
+ subsdelaySetFactor( f_factor );
+ ChangeVFiltersString( p_intf, "subsdelay", f_factor > 0 );
+ }
+}
+
+void SyncControls::updateSubsDuration()
+{
+ int i_mode = var_InheritInteger( p_intf, SUBSDELAY_CFG_MODE );
+
+ switch (i_mode)
+ {
+ default:
+ case SUBSDELAY_MODE_ABSOLUTE:
+ subDurationSpin->setToolTip( qtr( "Extend subtitles duration by this value.\n"
+ "Set 0 to disable." ) );
+ subDurationSpin->setSuffix( " s" );
+ break;
+ case SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY:
+ subDurationSpin->setToolTip( qtr( "Multiply subtitles duration by this value.\n"
+ "Set 0 to disable." ) );
+ subDurationSpin->setSuffix( "" );
+ break;
+ case SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT:
+ subDurationSpin->setToolTip( qtr( "Recalculate subtitles duration according\n"
+ "to their content and this value.\n"
+ "Set 0 to disable." ) );
+ subDurationSpin->setSuffix( "" );
+ break;
+ }
+
+ subDurationSpin->setValue( var_InheritFloat( p_intf, SUBSDELAY_CFG_FACTOR ) );
+}
+
+void SyncControls::subsdelayClean()
+{
+ /* Remove subsdelay filter */
+ ChangeVFiltersString( p_intf, "subsdelay", false );
+}
+
+void SyncControls::subsdelaySetFactor( double f_factor )
+{
+ /* Set the factor in the preferences */
+ config_PutFloat( p_intf, SUBSDELAY_CFG_FACTOR, f_factor );
+
+ /* Try to find an instance of subsdelay, and set its factor */
+ vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_find_name( p_intf->p_libvlc, "subsdelay", FIND_CHILD );
+ if( p_obj )
+ {
+ var_SetFloat( p_obj, SUBSDELAY_CFG_FACTOR, f_factor );
+ vlc_object_release( p_obj );
+ }
+}
+
+
/**********************************************************************
* Video filters / Adjust
**********************************************************************/
projects / vlc / blobdiff