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

renamed muted() to isMuted() and other coding-style fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1067 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-03 16:03:59 +00:00
parent df203dd51e
commit a3aa3f9a4d
8 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@@ -1,5 +1,31 @@
2008-06-03 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/vibed/nine_button_selector.cpp:
* plugins/live_tool/live_tool.cpp:
* include/note_play_handle.h:
* include/track_container.h:
* include/track.h:
* src/tracks/bb_track.cpp:
* src/tracks/instrument_track.cpp:
* src/tracks/pattern.cpp:
* src/core/sample_play_handle.cpp:
* src/core/track.cpp:
renamed muted() to isMuted() and other coding-style fixes
* src/gui/widgets/automatable_slider.cpp:
* src/gui/widgets/lcd_spinbox.cpp:
* src/gui/widgets/automatable_button.cpp:
use automatableModelView::addDefaultActions()
* src/gui/widgets/tooltip.cpp:
re-enabled tooltips
* include/track.h:
* include/track_container.h:
* src/core/track.cpp:
* data/themes/default/led_red.png:
added fully-functional solo-button
* include/automation_editor.h:
* src/gui/automation_editor.cpp:
fixed broken automation-drawing for floatModels

2
include/note_play_handle.h
View File

@@ -221,7 +221,7 @@ public:
bool bbTrackMuted( void )
{
return( m_bbTrack && m_bbTrack->muted() );
return( m_bbTrack && m_bbTrack->isMuted() );
}
void setBBTrack( bbTrack * _bb_track )
{

2
plugins/live_tool/live_tool.cpp
View File

@@ -200,7 +200,7 @@ void liveToolView::toggleInstrument( int _n )
if( _n < engine::getBBTrackContainer()->tracks().count() )
{
track * t = engine::getBBTrackContainer()->tracks().at( _n );
t->setMuted( !t->muted() );
t->setMuted( !t->isMuted() );
}
}

1
plugins/vibed/nine_button_selector.cpp
View File

@@ -232,7 +232,6 @@ void nineButtonSelector::button8Clicked( void )
void nineButtonSelector::modelChanged( void )
{
printf("Model Changed %d", model()->value());
updateButton( model()->value() );
}

4
src/core/sample_play_handle.cpp
View File

@@ -126,8 +126,8 @@ void samplePlayHandle::play( bool /* _try_parallelizing */,
}
const fpp_t frames = engine::getMixer()->framesPerPeriod();
if( !( m_track && m_track->muted() )
&& !( m_bbTrack && m_bbTrack->muted() ) )
if( !( m_track && m_track->isMuted() )
&& !( m_bbTrack && m_bbTrack->isMuted() ) )
{
stereoVolumeVector v = { { m_volumeModel->value(),
m_volumeModel->value() } };

10
src/tracks/bb_track.cpp
View File

@@ -89,7 +89,7 @@ void bbTCO::saveSettings( QDomDocument & _doc, QDomElement & _this )
_this.setAttribute( "pos", startPosition() );
}
_this.setAttribute( "len", length() );
_this.setAttribute( "muted", muted() );
_this.setAttribute( "muted", isMuted() );
_this.setAttribute( "color", m_color );
}
@@ -104,7 +104,7 @@ void bbTCO::loadSettings( const QDomElement & _this )
movePosition( _this.attribute( "pos" ).toInt() );
}
changeLength( _this.attribute( "len" ).toInt() );
if( _this.attribute( "muted" ).toInt() != muted() )
if( _this.attribute( "muted" ).toInt() != isMuted() )
{
toggleMute();
}
@@ -180,7 +180,7 @@ void bbTCOView::mouseDoubleClickEvent( QMouseEvent * )
void bbTCOView::paintEvent( QPaintEvent * )
{
QColor col( m_bbTCO->m_color );
if( m_bbTCO->getTrack()->muted() || m_bbTCO->muted() )
if( m_bbTCO->getTrack()->isMuted() || m_bbTCO->isMuted() )
{
col = QColor( 160, 160, 160 );
}
@@ -218,7 +218,7 @@ void bbTCOView::paintEvent( QPaintEvent * )
p.setPen( QColor( 0, 0, 0 ) );
p.drawText( 2, p.fontMetrics().height() - 1, m_bbTCO->m_name );
if( m_bbTCO->muted() )
if( m_bbTCO->isMuted() )
{
p.drawPixmap( 3, p.fontMetrics().height() + 1,
embed::getIconPixmap( "muted", 16, 16 ) );
@@ -374,7 +374,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames,
for( QList<trackContentObject *>::iterator it = tcos.begin();
it != tcos.end(); ++it )
{
if( !( *it )->muted() &&
if( !( *it )->isMuted() &&
( *it )->startPosition() >= lastPosition )
{
lastPosition = ( *it )->startPosition();

4
src/tracks/instrument_track.cpp
View File

@@ -175,7 +175,7 @@ void instrumentTrack::processAudioBuffer( sampleFrame * _buf,
notePlayHandle * _n )
{
// we must not play the sound if this instrumentTrack is muted...
if( muted() || ( _n && _n->bbTrackMuted() ) )
if( isMuted() || ( _n && _n->bbTrackMuted() ) )
{
return;
}
@@ -548,7 +548,7 @@ bool FASTCALL instrumentTrack::play( const midiTime & _start,
{
pattern * p = dynamic_cast<pattern *>( *it );
// everything which is not a pattern or muted won't be played
if( p == NULL || ( *it )->muted() )
if( p == NULL || ( *it )->isMuted() )
{
continue;
}

14
src/tracks/pattern.cpp
View File

@@ -338,7 +338,7 @@ void pattern::saveSettings( QDomDocument & _doc, QDomElement & _this )
_this.setAttribute( "pos", startPosition() );
}
_this.setAttribute( "len", length() );
_this.setAttribute( "muted", muted() );
_this.setAttribute( "muted", isMuted() );
_this.setAttribute( "steps", m_steps );
_this.setAttribute( "frozen", m_frozenPattern != NULL );
@@ -368,7 +368,7 @@ void pattern::loadSettings( const QDomElement & _this )
movePosition( _this.attribute( "pos" ).toInt() );
}
changeLength( midiTime( _this.attribute( "len" ).toInt() ) );
if( _this.attribute( "muted" ).toInt() != muted() )
if( _this.attribute( "muted" ).toInt() != isMuted() )
{
toggleMute();
}
@@ -932,7 +932,7 @@ void patternView::constructContextMenu( QMenu * _cm )
_cm->addSeparator();
bool freeze_separator = FALSE;
if( !( m_pat->m_instrumentTrack->muted() || m_pat->muted() ) )
if( !( m_pat->m_instrumentTrack->isMuted() || m_pat->isMuted() ) )
{
_cm->addAction( embed::getIconPixmap( "freeze" ),
m_pat->m_frozenPattern ? tr( "Refreeze" ) :
@@ -1195,8 +1195,8 @@ void patternView::paintEvent( QPaintEvent * )
height() - 2 *
TCO_BORDER_WIDTH );
}*/
if( m_pat->getTrack()->muted() ||
m_pat->muted() )
if( m_pat->getTrack()->isMuted() ||
m_pat->isMuted() )
{
p.setPen( QColor( 160, 160, 160 ) );
}
@@ -1294,7 +1294,7 @@ void patternView::paintEvent( QPaintEvent * )
}
p.setFont( pointSize<7>( p.font() ) );
if( m_pat->muted() || m_pat->getTrack()->muted() )
if( m_pat->isMuted() || m_pat->getTrack()->isMuted() )
{
p.setPen( QColor( 192, 192, 192 ) );
}
@@ -1308,7 +1308,7 @@ void patternView::paintEvent( QPaintEvent * )
p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );
}
if( m_pat->muted() )
if( m_pat->isMuted() )
{
p.drawPixmap( 3, p.fontMetrics().height() + 1,
embed::getIconPixmap( "muted", 16, 16 ) );