/*****************************************************************************
- * Controller_widget.cpp : Controller Widget for the controllers
+ * controller_widget.cpp : Controller Widget for the controllers
****************************************************************************
* Copyright (C) 2006-2008 the VideoLAN team
* $Id$
#include "input_manager.hpp" /* Get notification of Volume Change */
#include "util/input_slider.hpp" /* SoundSlider */
-#include <vlc_aout.h> /* Volume functions */
+#include <math.h>
+#include <vlc_aout_intf.h> /* Volume functions */
#include <QLabel>
#include <QHBoxLayout>
-#include <QSpinBox>
#include <QMenu>
#include <QWidgetAction>
#include <QMouseEvent>
SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
bool b_shiny, bool b_special )
- : QWidget( _parent ), b_my_volume( false ),
- p_intf( _p_intf)
+ : QWidget( _parent ), p_intf( _p_intf),
+ b_is_muted( false ), b_ignore_valuechanged( false )
{
/* We need a layout for this widget */
QHBoxLayout *layout = new QHBoxLayout( this );
{
volumeMenu = NULL; subLayout = NULL;
volumeControlWidget = NULL;
+
+ /* And add the label */
+ layout->addWidget( volMuteLabel, 0, Qt::AlignBottom );
}
else
{
volumeControlWidget = new QFrame;
subLayout = new QVBoxLayout( volumeControlWidget );
- subLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+ subLayout->setContentsMargins( 4, 4, 4, 4 );
volumeMenu = new QMenu( this );
QWidgetAction *widgetAction = new QWidgetAction( volumeControlWidget );
widgetAction->setDefaultWidget( volumeControlWidget );
volumeMenu->addAction( widgetAction );
- }
- /* And add the label */
- layout->addWidget( volMuteLabel );
+ /* And add the label */
+ layout->addWidget( volMuteLabel );
+ }
/* Slider creation: shiny or clean */
if( b_shiny )
{
volumeSlider = new SoundSlider( this,
config_GetInt( p_intf, "volume-step" ),
- config_GetInt( p_intf, "qt-volume-complete" ),
- config_GetPsz( p_intf, "qt-slider-colours" ) );
+ false,
+ var_InheritString( p_intf, "qt-slider-colours" ) );
}
else
{
volumeSlider = new QSlider( NULL );
+ volumeSlider->setAttribute( Qt::WA_MacSmallSize);
volumeSlider->setOrientation( b_special ? Qt::Vertical
: Qt::Horizontal );
- volumeSlider->setMaximum( config_GetInt( p_intf, "qt-volume-complete" )
- ? 400 : 200 );
- }
- if( volumeSlider->orientation() == Qt::Horizontal )
- {
- volumeSlider->setMaximumSize( QSize( 200, 40 ) );
- volumeSlider->setMinimumSize( QSize( 85, 30 ) );
+ volumeSlider->setMaximum( 200 );
}
volumeSlider->setFocusPolicy( Qt::NoFocus );
layout->addWidget( volumeSlider, 0, Qt::AlignBottom );
/* Set the volume from the config */
- volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) *
- VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
-
- /* Force the update at build time in order to have a muted icon if needed */
- updateVolume( volumeSlider->value() );
+ libUpdateVolume();
+ /* Sync mute status */
+ if( aout_MuteGet( THEPL ) > 0 )
+ updateMuteStatus( true );
/* Volume control connection */
- CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
- CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) );
+ volumeSlider->setTracking( true );
+ CONNECT( volumeSlider, valueChanged( int ), this, valueChangedFilter( int ) );
+ CONNECT( this, valueReallyChanged( int ), this, userUpdateVolume( int ) );
+ CONNECT( THEMIM, volumeChanged( void ), this, libUpdateVolume( void ) );
+ CONNECT( THEMIM, soundMuteChanged( bool ), this, updateMuteStatus( bool ) );
}
SoundWidget::~SoundWidget()
delete volumeControlWidget;
}
-void SoundWidget::updateVolume( int i_sliderVolume )
+void SoundWidget::refreshLabels()
{
- if( !b_my_volume )
- {
- int i_res = i_sliderVolume * (AOUT_VOLUME_MAX / 2) / VOLUME_MAX;
- aout_VolumeSet( p_intf, i_res );
- }
- if( i_sliderVolume == 0 )
+ int i_sliderVolume = volumeSlider->value();
+
+ if( b_is_muted )
{
volMuteLabel->setPixmap( QPixmap(":/toolbar/volume-muted" ) );
- volMuteLabel->setToolTip( qtr( "Unmute" ) );
+ volMuteLabel->setToolTip(qfu(vlc_pgettext("Tooltip|Unmute", "Unmute")));
return;
}
else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
volMuteLabel->setPixmap( QPixmap( ":/toolbar/volume-high" ) );
else volMuteLabel->setPixmap( QPixmap( ":/toolbar/volume-medium" ) );
- volMuteLabel->setToolTip( qtr( "Mute" ) );
+ volMuteLabel->setToolTip( qfu(vlc_pgettext("Tooltip|Mute", "Mute")) );
+}
+
+/* volumeSlider changed value event slot */
+void SoundWidget::userUpdateVolume( int i_sliderVolume )
+{
+ /* Only if volume is set by user action on slider */
+ setMuted( false );
+ playlist_t *p_playlist = pl_Get( p_intf );
+ aout_VolumeSet( p_playlist, i_sliderVolume / 100.f );
+ refreshLabels();
}
-void SoundWidget::updateVolume()
+/* libvlc changed value event slot */
+void SoundWidget::libUpdateVolume()
{
/* Audio part */
- audio_volume_t i_volume;
- aout_VolumeGet( p_intf, &i_volume );
- i_volume = ( ( i_volume + 1 ) * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2);
- int i_gauge = volumeSlider->value();
- b_my_volume = false;
- if( i_volume - i_gauge > 1 || i_gauge - i_volume > 1 )
+ playlist_t *p_playlist = pl_Get( p_intf );
+ long i_volume = lroundf(aout_VolumeGet( p_playlist ) * 100.f);
+
+ if ( i_volume - volumeSlider->value() != 0 )
{
- b_my_volume = true;
+ b_ignore_valuechanged = true;
volumeSlider->setValue( i_volume );
- b_my_volume = false;
+ b_ignore_valuechanged = false;
}
+ refreshLabels();
+}
+
+void SoundWidget::valueChangedFilter( int i_val )
+{
+ /* valueChanged is also emitted when the lib setValue() */
+ if ( !b_ignore_valuechanged ) emit valueReallyChanged( i_val );
+}
+
+/* libvlc mute/unmute event slot */
+void SoundWidget::updateMuteStatus( bool mute )
+{
+ b_is_muted = mute;
+
+ SoundSlider *soundSlider = qobject_cast<SoundSlider *>(volumeSlider);
+ if( soundSlider )
+ soundSlider->setMuted( mute );
+ refreshLabels();
}
void SoundWidget::showVolumeMenu( QPoint pos )
{
+ volumeMenu->setFixedHeight( volumeMenu->sizeHint().height() );
volumeMenu->exec( QCursor::pos() - pos - QPoint( 0, volumeMenu->height()/2 )
+ QPoint( width(), height() /2) );
}
+void SoundWidget::setMuted( bool mute )
+{
+ b_is_muted = mute;
+ playlist_t *p_playlist = pl_Get( p_intf );
+ aout_MuteSet( VLC_OBJECT(p_playlist), mute );
+}
+
bool SoundWidget::eventFilter( QObject *obj, QEvent *e )
{
VLC_UNUSED( obj );
- if (e->type() == QEvent::MouseButtonPress )
+ if( e->type() == QEvent::MouseButtonPress )
{
- if( volumeSlider->orientation() == Qt::Vertical )
- {
- QMouseEvent *event = static_cast<QMouseEvent*>(e);
- showVolumeMenu( event->pos() );
- }
- else
+ QMouseEvent *event = static_cast<QMouseEvent*>(e);
+ if( event->button() == Qt::LeftButton )
{
- aout_ToggleMute( p_intf, NULL );
+ if( volumeSlider->orientation() == Qt::Vertical )
+ {
+ showVolumeMenu( event->pos() );
+ }
+ else
+ {
+ setMuted( !b_is_muted );
+ }
+ e->accept();
+ return true;
}
- e->accept();
- return true;
- }
- else
- {
- e->ignore();
- return false;
}
+ e->ignore();
+ return false;
}
/**
* Play Button
**/
-void PlayButton::updateButton( bool b_playing )
+void PlayButton::updateButtonIcons( bool b_playing )
{
setIcon( b_playing ? QIcon( ":/toolbar/pause_b" ) : QIcon( ":/toolbar/play_b" ) );
setToolTip( b_playing ? qtr( "Pause the playback" )
: qtr( I_PLAY_TOOLTIP ) );
}
-void AtoB_Button::setIcons( bool timeA, bool timeB )
+void AtoB_Button::updateButtonIcons( bool timeA, bool timeB )
{
if( !timeA && !timeB)
{
}
}
+void LoopButton::updateButtonIcons( int value )
+{
+ setChecked( value != NORMAL );
+ setIcon( ( value == REPEAT_ONE ) ? QIcon( ":/buttons/playlist/repeat_one" )
+ : QIcon( ":/buttons/playlist/repeat_all" ) );
+}
+
+void AspectRatioComboBox::updateRatios()
+{
+ /* Clear the list before updating */
+ clear();
+ vlc_value_t val_list, text_list;
+ vout_thread_t* p_vout = THEMIM->getVout();
+
+ /* Disable if there is no vout */
+ if( p_vout == NULL )
+ {
+ addItem( qtr("Aspect Ratio") );
+ setDisabled( true );
+ return;
+ }
+
+ var_Change( p_vout, "aspect-ratio", VLC_VAR_GETLIST, &val_list, &text_list );
+ for( int i = 0; i < val_list.p_list->i_count; i++ )
+ addItem( qfu( text_list.p_list->p_values[i].psz_string ),
+ QString( val_list.p_list->p_values[i].psz_string ) );
+ setEnabled( true );
+ var_FreeList( &val_list, &text_list );
+ vlc_object_release( p_vout );
+}
+
+void AspectRatioComboBox::updateAspectRatio( int x )
+{
+ vout_thread_t* p_vout = THEMIM->getVout();
+ if( p_vout && x >= 0 )
+ {
+ var_SetString( p_vout, "aspect-ratio", qtu( itemData(x).toString() ) );
+ }
+ if( p_vout )
+ vlc_object_release( p_vout );
+}
projects / vlc / blobdiff