hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Revert Correct Priorty of fade button

Browse Source 
reverted changes made in  #1527
copied from Github diff

Fixes #1932
This commit is contained in:
Dave French
2015-07-20 00:36:01 +01:00
parent 620b3d9ef1
commit ac7aa69ad1
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/InstrumentTrack.h
View File

@@ -206,13 +206,13 @@ public:
return &m_effectChannelModel;
}
void setIndicator( FadeButton *fb );
signals:
void instrumentChanged();
void midiNoteOn( const Note& );
void midiNoteOff( const Note& );
void nameChanged();
void newNote();
protected:
@@ -255,8 +255,6 @@ private:
IntModel m_effectChannelModel;
BoolModel m_useMasterPitchModel;
FadeButton *m_fb;
Instrument * m_instrument;
InstrumentSoundShaping m_soundShaping;

15
src/tracks/InstrumentTrack.cpp
View File

@@ -51,7 +51,6 @@
#include "EffectRackView.h"
#include "embed.h"
#include "Engine.h"
#include "FadeButton.h"
#include "FileBrowser.h"
#include "FxMixer.h"
#include "FxMixerView.h"
@@ -116,7 +115,6 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) :
m_pitchRangeModel( 1, 1, 24, this, tr( "Pitch range" ) ),
m_effectChannelModel( 0, 0, 0, this, tr( "FX channel" ) ),
m_useMasterPitchModel( true, this, tr( "Master Pitch") ),
m_fb( NULL ),
m_instrument( NULL ),
m_soundShaping( this ),
m_arpeggio( this ),
@@ -391,7 +389,7 @@ void InstrumentTrack::processOutEvent( const MidiEvent& event, const MidiTime& t
}
m_midiNotesMutex.unlock();
if( m_fb ) { m_fb->activate(); }
emit newNote();
break;
case MidiNoteOff:
@@ -573,12 +571,6 @@ void InstrumentTrack::removeMidiPortNode( DataFile & _dataFile )
n.item( 0 ).parentNode().removeChild( n.item( 0 ) );
}
void InstrumentTrack::setIndicator(FadeButton *fb)
{
m_fb = fb;
}
@@ -930,7 +922,8 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
this, SLOT( activityIndicatorPressed() ) );
connect( m_activityIndicator, SIGNAL( released() ),
this, SLOT( activityIndicatorReleased() ) );
_it->setIndicator( m_activityIndicator );
connect( _it, SIGNAL( newNote() ),
m_activityIndicator, SLOT( activate() ) );
connect( &_it->m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteChanged() ) );
setModel( _it );
@@ -1779,4 +1772,4 @@ void InstrumentTrackWindow::viewNextInstrument()
void InstrumentTrackWindow::viewPrevInstrument()
{
viewInstrumentInDirection(-1);
}
}