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

Rename bbTrack, trackContentObject and friends

Browse Source
This commit is contained in:
Lukas W
2014-11-26 10:53:47 +01:00
parent 95798da9d0
commit 6d4a6ed9cd
32 changed files with 375 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/HydrogenImport/HydrogenImport.cpp
View File

@@ -15,7 +15,7 @@
#include "Note.h"
#include "Pattern.h"
#include "Track.h"
#include "bb_track.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
#include "Instrument.h"
@@ -305,8 +305,8 @@ bool HydrogenImport::readSong()
patternId = ( QDomNode ) patternId.nextSiblingElement( "patternID" );
int i = pattern_id[patId]+song_num_tracks;
Track *t = ( bbTrack * ) s->tracks().at( i );
trackContentObject *tco = t->createTCO( pos );
Track *t = ( BBTrack * ) s->tracks().at( i );
TrackContentObject *tco = t->createTCO( pos );
tco->movePosition( pos );

8
plugins/flp_import/FlpImport.cpp
View File

@@ -33,7 +33,7 @@
#include "NotePlayHandle.h"
#include "AutomationPattern.h"
#include "basic_filters.h"
#include "bb_track.h"
#include "BBTrack.h"
#include "BBTrackContainer.h"
#include "ComboBox.h"
#include "ConfigManager.h"
@@ -1434,13 +1434,13 @@ else
int cur_progress = 0;
// create BB tracks
QList<bbTrack *> bb_tracks;
QList<BBTrack *> bb_tracks;
QList<InstrumentTrack *> i_tracks;
while( Engine::getBBTrackContainer()->numOfBBs() <= p.maxPatterns )
{
const int cur_pat = bb_tracks.size();
bbTrack * bbt = dynamic_cast<bbTrack *>(
BBTrack * bbt = dynamic_cast<BBTrack *>(
Track::create( Track::BBTrack, Engine::getSong() ) );
if( p.patternNames.contains( cur_pat ) )
{
@@ -1752,7 +1752,7 @@ p->putValue( jt->pos, value, false );
{
continue;
}
trackContentObject * tco = bb_tracks[it->pattern]->createTCO( MidiTime() );
TrackContentObject * tco = bb_tracks[it->pattern]->createTCO( MidiTime() );
tco->movePosition( it->position );
if( it->length != DefaultTicksPerTact )
{