From 49506696a9ec088678ee501a588b1e5ed3ecc4ab Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Mon, 5 Jun 2006 18:06:20 +0000 Subject: [PATCH] added knob id git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@145 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/knob.h | 7 +++++-- include/volume_knob.h | 2 +- src/widgets/knob.cpp | 10 ++++++++-- src/widgets/volume_knob.cpp | 6 ++++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/knob.h b/include/knob.h index 8e7d6ff1d..e4568026d 100644 --- a/include/knob.h +++ b/include/knob.h @@ -64,7 +64,8 @@ class knob : public QWidget, public automatableObject Q_OBJECT public: knob( int _knob_num, QWidget * _parent, const QString & _name, - engine * _engine ); + engine * _engine, + const int _knob_id = 0 ); virtual ~knob(); @@ -97,10 +98,11 @@ public slots: signals: void valueChanged( float value ); + void idKnobChanged( int id ); void sliderPressed( void ); void sliderReleased( void ); void sliderMoved( float value ); - + protected: virtual void contextMenuEvent( QContextMenuEvent * _me ); @@ -156,6 +158,7 @@ protected: float m_initValue; + const int m_knobId; } ; diff --git a/include/volume_knob.h b/include/volume_knob.h index 62dcd35ad..f0b3047fb 100644 --- a/include/volume_knob.h +++ b/include/volume_knob.h @@ -44,7 +44,7 @@ class volumeKnob: public knob Q_OBJECT public: volumeKnob( int _knob_num, QWidget * _parent, const QString & _name, - engine * _engine ); + engine * _engine, const int _knob_id = 0 ); ~volumeKnob(); public slots: diff --git a/src/widgets/knob.cpp b/src/widgets/knob.cpp index dc8e2a003..ff8989c87 100644 --- a/src/widgets/knob.cpp +++ b/src/widgets/knob.cpp @@ -86,7 +86,8 @@ textFloat * knob::s_textFloat = NULL; knob::knob( int _knob_num, QWidget * _parent, const QString & _name, - engine * _engine ) : + engine * _engine, + const int _knob_id ) : QWidget( _parent #ifndef QT4 , _name.ascii() @@ -100,7 +101,8 @@ knob::knob( int _knob_num, QWidget * _parent, const QString & _name, m_hintTextBeforeValue( "" ), m_hintTextAfterValue( "" ), m_label( "" ), - m_initValue( 0.0f ) + m_initValue( 0.0f ), + m_knobId( _knob_id ) { if( s_textFloat == NULL ) { @@ -246,6 +248,7 @@ void knob::valueChange( void ) recalcAngle(); update(); emit valueChanged( value() ); + emit idKnobChanged( m_knobId ); } @@ -458,6 +461,7 @@ void knob::mouseMoveEvent( QMouseEvent * _me ) { setPosition( _me->pos() ); emit sliderMoved( value() ); + emit idKnobChanged( m_knobId ); if( !configManager::inst()->value( "knobs", "classicalusability").toInt() ) { @@ -572,6 +576,7 @@ void knob::wheelEvent( QWheelEvent * _we ) s_textFloat->setVisibilityTimeOut( 1000 ); emit sliderMoved( value() ); + emit idKnobChanged( m_knobId ); } @@ -580,6 +585,7 @@ void knob::wheelEvent( QWheelEvent * _we ) void knob::buttonReleased( void ) { emit valueChanged( value() ); + emit idKnobChanged( m_knobId ); } diff --git a/src/widgets/volume_knob.cpp b/src/widgets/volume_knob.cpp index dc36d15fa..3c459da56 100644 --- a/src/widgets/volume_knob.cpp +++ b/src/widgets/volume_knob.cpp @@ -48,8 +48,8 @@ volumeKnob::volumeKnob( int _knob_num, QWidget * _parent, const QString & _name, - engine * _engine ): - knob( _knob_num, _parent, _name, _engine ) + engine * _engine, const int _knob_id ): + knob( _knob_num, _parent, _name, _engine, _knob_id ) { } @@ -129,6 +129,7 @@ void volumeKnob::mouseMoveEvent( QMouseEvent * _me ) { setPosition( _me->pos() ); emit sliderMoved( value() ); + emit idKnobChanged( m_knobId ); if( !configManager::inst()->value( "knobs", "classicalusability").toInt() ) { @@ -180,6 +181,7 @@ void volumeKnob::wheelEvent( QWheelEvent * _we ) s_textFloat->setVisibilityTimeOut( 1000 ); emit sliderMoved( value() ); + emit idKnobChanged( m_knobId ); }