/*****************************************************************************
* 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.
*****************************************************************************/
+
+#define __STDC_FORMAT_MACROS 1
+
#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_modules.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 )
SETUP_VFILTER_OPTION( logoFileText, editingFinished() )
SETUP_VFILTER_OPTION( logoYSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) )
- SETUP_VFILTER_OPTION( logoTransparencySlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) )
+
+ if( module_exists( "atmo" ) )
+ {
+ SETUP_VFILTER( atmo )
+ SETUP_VFILTER_OPTION( atmoEdgeweightningSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoBrightnessSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoDarknesslimitSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoMeanlengthSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoMeanthresholdSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoPercentnewSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoFiltermodeCombo, currentIndexChanged( int ) )
+ SETUP_VFILTER_OPTION( atmoShowdotsCheck, stateChanged( int ) )
+ }
+ else
+ {
+ _parent->removeTab( _parent->indexOf( ui.tab_atmo ) );
+ }
#undef SETUP_VFILTER
#undef SETUP_VFILTER_OPTION
CONNECT( ui.cropBotPx, valueChanged( int ), this, cropChange() );
CONNECT( ui.cropLeftPx, valueChanged( int ), this, cropChange() );
CONNECT( ui.cropRightPx, valueChanged( int ), this, cropChange() );
+ CONNECT( ui.leftRightCropSync, toggled ( bool ), this, cropChange() );
+ CONNECT( ui.topBotCropSync, toggled ( bool ), this, cropChange() );
CONNECT( ui.topBotCropSync, toggled( bool ),
ui.cropBotPx, setDisabled( bool ) );
CONNECT( ui.leftRightCropSync, toggled( bool ),
void ExtVideo::cropChange()
{
- p_vout = ( vout_thread_t * )vlc_object_find( p_intf,
- VLC_OBJECT_VOUT, FIND_CHILD );
+ if( ui.topBotCropSync->isChecked() )
+ ui.cropBotPx->setValue( ui.cropTopPx->value() );
+ if( ui.leftRightCropSync->isChecked() )
+ ui.cropRightPx->setValue( ui.cropLeftPx->value() );
+
+ 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 );
+ /* 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 );
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 filter" ) )
{
- psz_filter_type = "video-filter";
+ psz_filter_type = "vout-filter";
}
- else if( module_IsCapable( p_obj, "video filter" ) )
+ else if( module_provides( p_obj, "video filter2" ) )
{
- psz_filter_type = "vout-filter";
+ psz_filter_type = "video-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" ) )
- var_SetString( p_vout->p_spu, psz_filter_type, psz_string );
- else
- var_SetString( p_vout, psz_filter_type, psz_string );
+ var_SetString( p_vout, psz_filter_type, psz_string );
vlc_object_release( p_vout );
}
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() );
{
QComboBox *combobox = qobject_cast<QComboBox*>( widget );
if( !combobox ) return;
+
QString option = OptionFromWidgetName( widget );
module_config_t *p_item = config_FindConfig( VLC_OBJECT( p_intf ),
qtu( option ) );
{
if( i_type == CONFIG_ITEM_INTEGER
|| i_type == CONFIG_ITEM_BOOL )
- combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+ combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
p_item->pi_list[i_index] );
else if( i_type == CONFIG_ITEM_STRING )
- combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+ combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
p_item->ppsz_list[i_index] );
}
}
"Module instance %s not found, looking in config values.",
qtu( module ) );
#endif
- i_type = config_GetType( p_intf, qtu( option ) ) & 0xf0;
+ i_type = config_GetType( p_intf, qtu( option ) ) & VLC_VAR_CLASS;
switch( i_type )
{
case VLC_VAR_INTEGER:
}
else
{
- i_type = var_Type( p_obj, qtu( option ) ) & 0xf0;
+ i_type = var_Type( p_obj, qtu( option ) ) & VLC_VAR_CLASS;
var_Get( p_obj, qtu( option ), &val );
vlc_object_release( p_obj );
}
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( lineedit )
{
char str[30];
- snprintf( str, sizeof(str), "%06X", val.i_int );
+ snprintf( str, sizeof(str), "%06"PRIX64, val.i_int );
lineedit->setText( str );
}
else if( combobox ) combobox->setCurrentIndex(
- combobox->findData( val.i_int ) );
+ combobox->findData( qlonglong(val.i_int) ) );
else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
}
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__ );
free( val.psz_string );
}
else
- msg_Err( p_intf,
- "Module %s's %s variable is of an unsupported type ( %d )",
- qtu( module ),
- qtu( option ),
- i_type );
+ if( p_obj )
+ msg_Err( p_intf,
+ "Module %s's %s variable is of an unsupported type ( %d )",
+ qtu( module ),
+ qtu( option ),
+ i_type );
}
void ExtVideo::updateFilterOptions()
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.",
QLineEdit *lineedit = qobject_cast<QLineEdit*> ( sender() );
QComboBox *combobox = qobject_cast<QComboBox*> ( sender() );
- i_type &= 0xf0;
+ i_type &= VLC_VAR_CLASS;
if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
{
int i_int = 0;
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 )
const char *psz_var = text.p_list->p_values[i].psz_string;
var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &name, NULL );
const char *psz_label = name.psz_string;
- msg_Dbg( p_intf, "v4l2 control \"%x\": %s (%s)",
+ msg_Dbg( p_intf, "v4l2 control \"%"PRIx64"\": %s (%s)",
val.p_list->p_values[i].i_int, psz_var, name.psz_string );
int i_type = var_Type( p_obj, psz_var );
{
combobox->addItem(
text2.p_list->p_values[j].psz_string,
- val2.p_list->p_values[j].i_int );
+ qlonglong( val2.p_list->p_values[j].i_int) );
if( i_val == val2.p_list->p_values[j].i_int )
combobox->setCurrentIndex( j );
}
- var_Change( p_obj, psz_var, VLC_VAR_FREELIST,
- &val2, &text2 );
+ var_FreeList( &val2, &text2 );
CONNECT( combobox, currentIndexChanged( int ), this,
ValueChange( int ) );
}
free( name.psz_string );
}
- var_Change( p_obj, "controls", VLC_VAR_FREELIST, &val, &text );
+ var_FreeList( &val, &text );
vlc_object_release( p_obj );
}
else
var_SetBool( p_obj, psz_var, value );
break;
case VLC_VAR_VOID:
- var_SetVoid( p_obj, psz_var );
+ var_TriggerCallback( p_obj, psz_var );
break;
}
free( psz_var );
Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) :
QWidget( _parent ) , p_intf( _p_intf )
{
- QFont smallFont = QApplication::font( static_cast<QWidget*>( 0 ) );
+ QFont smallFont = QApplication::font();
smallFont.setPointSize( smallFont.pointSize() - 3 );
ui.setupUi( this );
/* 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 */
updateUIFromCore();
}
-Equalizer::~Equalizer()
-{
-}
-
/* Write down initial values */
void Equalizer::updateUIFromCore()
{
- char *psz_af;//, *psz_bands; Don't use it ?
+ char *psz_af, *psz_pres, *psz_bands;
float f_preamp;
int i_preset;
- 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 )
{
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(
- var_GetString( p_aout, "equalizer-preset" ) ) );
+ psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
+ 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(
- config_GetPsz( p_intf, "equalizer-preset" ) ) );
+ psz_bands = config_GetPsz( p_intf, "equalizer-bands" );
+ i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
}
if( psz_af && strstr( psz_af, "equalizer" ) != NULL )
ui.enableCheck->setChecked( true );
presetsComboBox->setCurrentIndex( i_preset );
+ ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+
+ if( psz_bands && strlen( psz_bands ) > 1 )
+ {
+ char *psz_bands_orig = psz_bands;
+ for( int i = 0; i < BANDS; i++ )
+ {
+ const float f = us_strtod(psz_bands, &psz_bands );
+ bands[i]->setValue( (int)( ( f + 20 ) * 10 ) );
+ if( psz_bands == NULL || *psz_bands == '\0' ) break;
+ psz_bands++;
+ if( *psz_bands == '\0' ) break;
+ }
+ free( psz_bands_orig );
+ }
+ else free( psz_bands );
+
free( psz_af );
+ free( psz_pres );
}
/* Functin called when enableButton is toggled */
void Equalizer::enable()
{
bool en = ui.enableCheck->isChecked();
- aout_EnableFilter( VLC_OBJECT( p_intf ), "equalizer",
- en ? true : false );
-// aout_EnableFilter( VLC_OBJECT( p_intf ), "upmixer",
-// en ? true : false );
-// aout_EnableFilter( VLC_OBJECT( p_intf ), "vsurround",
-// en ? true : false );
+ aout_EnableFilter( THEPL, "equalizer", en );
+// aout_EnableFilter( THEPL, "upmixer", en );
+// aout_EnableFilter( THEPL, "vsurround", en );
enable( en );
if( presetsComboBox->currentIndex() < 0 )
/* 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 )
- config_PutInt( p_intf, "equalizer-2pass", b_2p );
- else
+ if( p_aout )
{
var_SetBool( p_aout, "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 = true;
- }
vlc_object_release( p_aout );
}
+ config_PutInt( p_intf, "equalizer-2pass", b_2p );
}
/* 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" ) );
}
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 );
}
}
-void Equalizer::updateUISliderValues( int i_preset )
-{
- 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 = 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" );
- 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" ) );
-}
-
char * Equalizer::createValuesFromPreset( int i_preset )
{
- char *psz_values;
QString values;
/* Create the QString in Qt */
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;
-
- return psz_values;
+ return strdup( values.toAscii().constData() );
}
void Equalizer::setCorePreset( int i_preset )
{
+ if( i_preset < 0 )
+ return;
+
+ /* Update pre-amplification in the UI */
+ float f_preamp = eqz_preset_10b[i_preset]->f_preamp;
+ ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+ ui.preampLabel->setText( qtr( "Preamp\n" )
+ + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
+
char *psz_values = createValuesFromPreset( i_preset );
if( !psz_values ) return ;
- aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
- VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ char *p = psz_values;
+ for( int i = 0; i < BANDS && *p; i++ )
+ {
+ 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" );
+ if( *p )
+ p++; /* skip separator */
+ }
+
+ /* Apply presets to audio output */
+ 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[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[i_preset]->f_preamp );
+ free( psz_values );
}
static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
* Audio filters
**********************************************************************/
+/**********************************************************************
+ * Dynamic range compressor
+ **********************************************************************/
+
+typedef struct
+{
+ const char *psz_name;
+ const char *psz_descs;
+ const char *psz_units;
+ const float f_min; // min
+ const float f_max; // max
+ const float f_value; // value
+ const float f_resolution; // resolution
+} comp_controls_t;
+
+static const comp_controls_t comp_controls[] =
+{
+ { "compressor-rms-peak", _("RMS/peak"), "", 0.0f, 1.0f, 0.00f, 0.001f },
+ { "compressor-attack", _("Attack"), _(" ms"), 1.5f, 400.0f, 25.00f, 0.100f },
+ { "compressor-release", _("Release"), _(" ms"), 2.0f, 800.0f, 100.00f, 0.100f },
+ { "compressor-threshold", _("Threshold"), _(" dB"), -30.0f, 0.0f, -11.00f, 0.010f },
+ { "compressor-ratio", _("Ratio"), ":1", 1.0f, 20.0f, 8.00f, 0.010f },
+ { "compressor-knee", _("Knee\nradius"), _(" dB"), 1.0f, 10.0f, 2.50f, 0.010f },
+ { "compressor-makeup-gain", _("Makeup\ngain"), _(" dB"), 0.0f, 24.0f, 7.00f, 0.010f },
+};
+
+Compressor::Compressor( intf_thread_t *_p_intf, QWidget *_parent )
+ : QWidget( _parent ) , p_intf( _p_intf )
+{
+ QFont smallFont = QApplication::font();
+ smallFont.setPointSize( smallFont.pointSize() - 3 );
+
+ 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 );
+
+ for( int i = 0 ; i < NUM_CP_CTRL ; i++ )
+ {
+ const int i_min = (int)( comp_controls[i].f_min
+ / comp_controls[i].f_resolution );
+ const int i_max = (int)( comp_controls[i].f_max
+ / comp_controls[i].f_resolution );
+ const int i_val = (int)( comp_controls[i].f_value
+ / comp_controls[i].f_resolution );
+
+ compCtrl[i] = new QSlider( Qt::Vertical );
+ compCtrl[i]->setMinimum( i_min );
+ compCtrl[i]->setMaximum( i_max );
+ compCtrl[i]->setValue( i_val );
+
+ oldControlVars[i] = comp_controls[i].f_value;
+
+ CONNECT( compCtrl[i], valueChanged( int ), this, setInitValues() );
+
+ ctrl_texts[i] = new QLabel( qtr( comp_controls[i].psz_descs ) + "\n" );
+ ctrl_texts[i]->setFont( smallFont );
+ ctrl_texts[i]->setAlignment( Qt::AlignHCenter );
+
+ ctrl_readout[i] = new QLabel;
+ ctrl_readout[i]->setFont( smallFont );
+ ctrl_readout[i]->setAlignment( Qt::AlignHCenter );
+
+ layout->addWidget( compCtrl[i], 1, i, Qt::AlignHCenter );
+ layout->addWidget( ctrl_readout[i], 2, i, Qt::AlignHCenter );
+ layout->addWidget( ctrl_texts[i], 3, i, Qt::AlignHCenter );
+ }
+
+ BUTTONACT( enableCheck, enable() );
+
+ /* Write down initial values */
+ aout_instance_t *p_aout = THEMIM->getAout();
+ char *psz_af;
+
+ if( p_aout )
+ {
+ psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
+ for( int i = 0; i < NUM_CP_CTRL; i++ )
+ {
+ controlVars[i] = var_GetFloat( p_aout,
+ comp_controls[i].psz_name );
+ }
+ vlc_object_release( p_aout );
+ }
+ else
+ {
+ psz_af = config_GetPsz( p_intf, "audio-filter" );
+ for( int i = 0; i < NUM_CP_CTRL; i++ )
+ {
+ controlVars[i] = config_GetFloat( p_intf,
+ comp_controls[i].psz_name );
+ }
+ }
+ if( psz_af && strstr( psz_af, "compressor" ) != NULL )
+ {
+ enableCheck->setChecked( true );
+ }
+ free( psz_af );
+ enable( enableCheck->isChecked() );
+ updateSliders( controlVars );
+ setValues( controlVars );
+}
+
+void Compressor::enable()
+{
+ bool en = enableCheck->isChecked();
+ aout_EnableFilter( THEPL, "compressor", en );
+ enable( en );
+}
+
+void Compressor::enable( bool en )
+{
+ for( int i = 0 ; i < NUM_CP_CTRL ; i++ )
+ {
+ compCtrl[i]->setEnabled( en );
+ ctrl_texts[i]->setEnabled( en );
+ ctrl_readout[i]->setEnabled( en );
+ }
+}
+
+void Compressor::updateSliders( float * controlVars )
+{
+ for( int i = 0 ; i < NUM_CP_CTRL ; i++ )
+ {
+ if( oldControlVars[i] != controlVars[i] )
+ {
+ compCtrl[i]->setValue(
+ (int)( controlVars[i] / comp_controls[i].f_resolution ) );
+ }
+ }
+}
+
+void Compressor::setInitValues()
+{
+ setValues( controlVars );
+}
+
+void Compressor::setValues( float * controlVars )
+{
+ aout_instance_t *p_aout = THEMIM->getAout();
+
+ for( int i = 0 ; i < NUM_CP_CTRL ; i++ )
+ {
+ float f = (float)( compCtrl[i]->value() ) * ( comp_controls[i].f_resolution );
+ ctrl_readout[i]->setText( QString::number( f, 'f', 1 )
+ + qtr( comp_controls[i].psz_units ) );
+ if( oldControlVars[i] != f )
+ {
+ if( p_aout )
+ {
+ var_SetFloat( p_aout, comp_controls[i].psz_name, f );
+ }
+ config_PutFloat( p_intf, comp_controls[i].psz_name, f );
+ oldControlVars[i] = f;
+ }
+ }
+ if( p_aout )
+ {
+ vlc_object_release( p_aout );
+ }
+}
+
/**********************************************************************
* Spatializer
**********************************************************************/
-static const char *psz_control_names[] =
+typedef struct
+{
+ const char *psz_name;
+ const char *psz_desc;
+} spat_controls_t;
+
+static const spat_controls_t spat_controls[] =
{
- "Roomsize", "Width" , "Wet", "Dry", "Damp"
+ { "spatializer-roomsize", _("Size") },
+ { "spatializer-width", _("Width") },
+ { "spatializer-wet", _("Wet") },
+ { "spatializer-dry", _("Dry") },
+ { "spatializer-damp", _("Damp") },
};
-Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) :
- QWidget( _parent ) , p_intf( _p_intf )
+Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
+ : QWidget( _parent ) , p_intf( _p_intf )
{
- QFont smallFont = QApplication::font( static_cast<QWidget*>( 0 ) );
+ QFont smallFont = QApplication::font();
smallFont.setPointSize( smallFont.pointSize() - 3 );
QGridLayout *layout = new QGridLayout( this );
spatCtrl[i]->setValue( 0 );
spatCtrl[i]->setMinimum( -10 );
}
+
oldControlVars[i] = spatCtrl[i]->value();
+
CONNECT( spatCtrl[i], valueChanged( int ), this, setInitValues() );
- ctrl_texts[i] = new QLabel( qfu( psz_control_names[i] ) + "\n" );
+
+ ctrl_texts[i] = new QLabel( qtr( spat_controls[i].psz_desc ) + "\n" );
ctrl_texts[i]->setFont( smallFont );
- ctrl_readout[i] = new QLabel( "" );
+
+ ctrl_readout[i] = new QLabel;
ctrl_readout[i]->setFont( smallFont );
- layout->addWidget( spatCtrl[i], 1, i );
- layout->addWidget( ctrl_readout[i], 2, i );
- layout->addWidget( ctrl_texts[i], 3, i );
+
+ layout->addWidget( spatCtrl[i], 1, i, Qt::AlignHCenter );
+ layout->addWidget( ctrl_readout[i], 2, i, Qt::AlignHCenter );
+ layout->addWidget( ctrl_texts[i], 3, i, Qt::AlignHCenter );
}
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 )
psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
for( int i = 0; i < NUM_SP_CTRL ; i++ )
{
- controlVars[i] = var_GetFloat( p_aout, psz_control_names[i] );
+ controlVars[i] = var_GetFloat( p_aout, spat_controls[i].psz_name );
}
vlc_object_release( p_aout );
}
psz_af = config_GetPsz( p_intf, "audio-filter" );
for( int i = 0; i < NUM_SP_CTRL ; i++ )
{
- controlVars[i] = config_GetFloat( p_intf, psz_control_names[i] );
+ controlVars[i] = config_GetFloat( p_intf, spat_controls[i].psz_name );
}
}
if( psz_af && strstr( psz_af, "spatializer" ) != NULL )
setValues( controlVars );
}
-Spatializer::~Spatializer()
-{
-}
-
void Spatializer::enable()
{
bool en = enableCheck->isChecked();
- aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer",
- en ? true : false );
+ aout_EnableFilter( THEPL, "spatializer", en );
enable( en );
}
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++ )
{
{
if( oldControlVars[i] != spatCtrl[i]->value() )
{
- var_SetFloat( p_aout, psz_control_names[i],
+ var_SetFloat( p_aout, spat_controls[i].psz_name,
( float )spatCtrl[i]->value() );
- config_PutFloat( p_intf, psz_control_names[i],
+ config_PutFloat( p_intf, spat_controls[i].psz_name,
( float ) spatCtrl[i]->value() );
oldControlVars[i] = ( float ) spatCtrl[i]->value();
}
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( -600.0 );
+ AVSpin->setMaximum( 600.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( -600.0 );
+ subsSpin->setMaximum( 600.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 );
QLabel *subSpeedLabel = new QLabel;
subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) );
- subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 );
+ subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 );
subSpeedSpin = new QDoubleSpinBox;
subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
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 );
CONNECT( subsSpin, valueChanged ( double ), this, advanceSubs( double ) ) ;
CONNECT( subSpeedSpin, valueChanged ( double ),
this, adjustSubsSpeed( double ) );
+
+ CONNECT( THEMIM->getIM(), synchroChanged(), this, update() );
BUTTON_SET_ACT_I( updateButton, "", update,
qtr( "Force update of this dialog's values" ), update() );
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