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

BbTrack: replaced static numOfBBTrack() by proper index() method

Browse Source
This commit is contained in:
Tobias Doerffel
2014-03-30 12:23:10 +02:00
parent ebc11f8558
commit e924888eb6
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/bb_track.h
View File

@@ -58,6 +58,8 @@ public:
return qRgb( 128, 182, 175 );
}
int bbTrackIndex();
virtual trackContentObjectView * createView( trackView * _tv );
private:
@@ -122,9 +124,13 @@ public:
virtual void loadTrackSpecificSettings( const QDomElement & _this );
static bbTrack * findBBTrack( int _bb_num );
static int numOfBBTrack( track * _track );
static void swapBBTracks( track * _track1, track * _track2 );
int index()
{
return s_infoMap[this];
}
bool automationDisabled( track * _track )
{
return( m_disabledTracks.contains( _track ) );

3
src/core/song.cpp
View File

@@ -666,8 +666,7 @@ void song::addBBTrack()
{
engine::mixer()->lock();
track * t = track::create( track::BBTrack, this );
engine::getBBTrackContainer()->setCurrentBB(
bbTrack::numOfBBTrack( t ) );
engine::getBBTrackContainer()->setCurrentBB( dynamic_cast<bbTrack *>( t )->index() );
engine::mixer()->unlock();
}

29
src/tracks/bb_track.cpp
View File

@@ -50,8 +50,7 @@ bbTCO::bbTCO( track * _track, unsigned int _color ) :
trackContentObject( _track ),
m_color( _color > 0 ? _color : defaultColor() )
{
tact_t t = engine::getBBTrackContainer()->lengthOfBB(
bbTrack::numOfBBTrack( getTrack() ) );
tact_t t = engine::getBBTrackContainer()->lengthOfBB( bbTrackIndex() );
if( t > 0 )
{
saveJournallingState( false );
@@ -110,6 +109,12 @@ void bbTCO::loadSettings( const QDomElement & _this )
int bbTCO::bbTrackIndex()
{
return dynamic_cast<bbTrack *>( getTrack() )->index();
}
trackContentObjectView * bbTCO::createView( trackView * _tv )
{
@@ -190,8 +195,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
lingrad.setColorAt( 1, col.light( 70 ) );
p.fillRect( rect(), lingrad );
tact_t t = engine::getBBTrackContainer()->lengthOfBB(
bbTrack::numOfBBTrack( m_bbTCO->getTrack() ) );
tact_t t = engine::getBBTrackContainer()->lengthOfBB( m_bbTCO->bbTrackIndex() );
if( m_bbTCO->length() > MidiTime::ticksPerTact() && t > 0 )
{
for( int x = static_cast<int>( t * pixelsPerTact() );
@@ -230,7 +234,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
void bbTCOView::openInBBEditor()
{
engine::getBBTrackContainer()->setCurrentBB( bbTrack::numOfBBTrack( m_bbTCO->getTrack() ) );
engine::getBBTrackContainer()->setCurrentBB( m_bbTCO->bbTrackIndex() );
engine::mainWindow()->toggleBBEditorWin( true );
}
@@ -504,18 +508,6 @@ bbTrack * bbTrack::findBBTrack( int _bb_num )
int bbTrack::numOfBBTrack( track * _track )
{
if( dynamic_cast<bbTrack *>( _track ) != NULL )
{
return s_infoMap[dynamic_cast<bbTrack *>( _track )];
}
return 0;
}
void bbTrack::swapBBTracks( track * _track1, track * _track2 )
{
bbTrack * t1 = dynamic_cast<bbTrack *>( _track1 );
@@ -577,8 +569,7 @@ bool bbTrackView::close()
void bbTrackView::clickedTrackLabel()
{
engine::getBBTrackContainer()->setCurrentBB(
bbTrack::numOfBBTrack( m_bbTrack ) );
engine::getBBTrackContainer()->setCurrentBB( m_bbTrack->index() );
engine::getBBEditor()->show();
/* foreach( bbTrackView * tv,
trackContainerView()->findChildren<bbTrackView *>() )