Commit 1d288ae6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: cosmetics

parent 546624cc
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <QLabel> #include <QLabel>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QSpinBox>
#include <QMenu> #include <QMenu>
#include <QWidgetAction> #include <QWidgetAction>
#include <QMouseEvent> #include <QMouseEvent>
...@@ -164,8 +163,8 @@ void SoundWidget::libUpdateVolume() ...@@ -164,8 +163,8 @@ void SoundWidget::libUpdateVolume()
i_volume = aout_VolumeGet( p_playlist ); i_volume = aout_VolumeGet( p_playlist );
i_volume = ( ( i_volume + 1 ) * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2); i_volume = ( ( i_volume + 1 ) * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2);
int i_gauge = volumeSlider->value();
if ( i_volume - i_gauge != 0 ) if ( i_volume - volumeSlider->value() != 0 )
{ {
b_ignore_valuechanged = true; b_ignore_valuechanged = true;
volumeSlider->setValue( i_volume ); volumeSlider->setValue( i_volume );
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
#include "qt4.hpp" #include "qt4.hpp"
#include <QWidget> #include <QWidget>
#include <QFrame>
#include <QToolButton> #include <QToolButton>
class QLabel; class QLabel;
class QFrame;
class QSpinBox; class QSpinBox;
class QAbstractSlider; class QAbstractSlider;
...@@ -78,13 +78,16 @@ public: ...@@ -78,13 +78,16 @@ public:
virtual ~SoundWidget(); virtual ~SoundWidget();
void setMuted( bool ); void setMuted( bool );
protected:
virtual bool eventFilter( QObject *obj, QEvent *e );
private: private:
intf_thread_t *p_intf; intf_thread_t *p_intf;
QLabel *volMuteLabel; QLabel *volMuteLabel;
QAbstractSlider *volumeSlider; QAbstractSlider *volumeSlider;
QFrame *volumeControlWidget; QFrame *volumeControlWidget;
QMenu *volumeMenu; QMenu *volumeMenu;
virtual bool eventFilter( QObject *obj, QEvent *e );
bool b_is_muted; bool b_is_muted;
bool b_ignore_valuechanged; bool b_ignore_valuechanged;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment