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

stable backport:

Browse Source 
* added missing slot declaration for abortFreeze(), fixes lockup when freezing pattern (closes #2530320)
* update patternView after freezing
* fixed drawing of frozen pattern



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2042 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2009-02-13 23:36:32 +00:00
parent e5dddeffb0
commit c5d01d5e0d
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,5 +1,12 @@
2009-02-13 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* include/pattern.h:
* src/tracks/pattern.cpp:
- added missing slot declaration for abortFreeze(), fixes lockup when
freezing pattern (closes #2530320)
- update patternView after freezing
- fixed drawing of frozen pattern
* include/sample_buffer.h:
* src/core/sample_buffer.cpp:
- when resampling whole sampleBuffer, set end_of_input = 1 in

5
include/pattern.h
View File

@@ -2,7 +2,7 @@
* pattern.h - declaration of class pattern, which contains all informations
* about a pattern
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -139,13 +139,12 @@ protected:
void ensureBeatNotes( void );
void updateBBTrack( void );
void abortFreeze( void );
protected slots:
void clear( void );
void freeze( void );
void unfreeze( void );
void abortFreeze( void );
void changeTimeSignature( void );

6
src/tracks/pattern.cpp
View File

@@ -3,7 +3,7 @@
/*
* pattern.cpp - implementation of class pattern which holds notes
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2007 Danny McRae <khjklujn/at/yahoo.com>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -731,6 +731,7 @@ patternFreezeThread::patternFreezeThread( pattern * _pattern ) :
patternFreezeThread::~patternFreezeThread()
{
m_pattern->dataChanged();
}
@@ -1310,8 +1311,9 @@ void patternView::paintEvent( QPaintEvent * )
}
else if( m_pat->m_frozenPattern != NULL )
{
p.setBrush( QBrush() );
p.setPen( QColor( 0, 224, 255 ) );
p.drawRect( 0, 0, width(), height() - 1 );
p.drawRect( 0, 0, width()-1, height() - 1 );
p.drawPixmap( 3, height() - s_frozen->height() - 4, *s_frozen );
}