mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-23 15:18:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable-1.1'

Browse Source 
Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp
This commit is contained in:
Tobias Doerffel committed 2014-09-30 22:53:24 +02:00
2 parents 606879421b 0055fe13b1
commit f2876ea650
55 files changed
+183 -178
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/tracks/InstrumentTrack.cpp
+4 -4
View File
@@ -68,7 +68,7 @@
#include "MixHelpers.h"
#include "DataFile.h"
#include "NotePlayHandle.h"
#include "pattern.h"
#include "Pattern.h"
#include "PluginView.h"
#include "SamplePlayHandle.h"
#include "song.h"
@@ -514,7 +514,7 @@ void InstrumentTrack::setName( const QString & _new_name )
// which have the same name as the instrument-track
for( int i = 0; i < numOfTCOs(); ++i )
{
pattern * p = dynamic_cast<pattern *>( getTCO( i ) );
Pattern* p = dynamic_cast<Pattern*>( getTCO( i ) );
if( ( p != NULL && p->name() == name() ) || p->name() == "" )
{
p->setName( _new_name );
@@ -630,7 +630,7 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
for( tcoVector::Iterator it = tcos.begin(); it != tcos.end(); ++it )
{
pattern * p = dynamic_cast<pattern *>( *it );
Pattern* p = dynamic_cast<Pattern*>( *it );
// everything which is not a pattern or muted won't be played
if( p == NULL || ( *it )->isMuted() )
{
@@ -695,7 +695,7 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames,
trackContentObject * InstrumentTrack::createTCO( const MidiTime & )
{
return new pattern( this );
return new Pattern( this );
}