From 4037f98441c64473f7ab0353d16e88abf09adcac Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Tue, 4 Mar 2008 00:55:46 +0000 Subject: [PATCH] fixed KEY_PRESSURE-events when changing volume of a note, improved painting of volume-lines git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.3@762 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 6 ++++++ configure.in | 4 ++-- src/core/piano_roll.cpp | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f28fd0afc..0ebf9e3c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Tobias Doerffel + + * src/core/piano_roll.cpp: + - fixed KEY_PRESSURE-events when changing volume of a note + - improved painting of volume-lines + 2008-02-11 Tobias Doerffel * plugins/audio_file_processor/audio_file_processor.cpp: diff --git a/configure.in b/configure.in index 3b95bac09..9e593b388 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.3.1-svn20080105, lmms-devel/at/lists/dot/sf/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.3.1-svn20080105) +AC_INIT(lmms, 0.3.1-svn20080303, lmms-devel/at/lists/dot/sf/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.3.1-svn20080303) AM_CONFIG_HEADER(config.h) diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp index 3349ad4f8..f5d26b4f1 100644 --- a/src/core/piano_roll.cpp +++ b/src/core/piano_roll.cpp @@ -987,6 +987,12 @@ void pianoRoll::updatePaintPixmap( QPixmap & _p ) ( *it )->getVolume() / 2, x + WHITE_KEY_WIDTH + 1, height() - PR_BOTTOM_MARGIN ); + p.drawLine( x + WHITE_KEY_WIDTH-1, + height() - PR_BOTTOM_MARGIN - + ( *it )->getVolume() / 2+2, + x + WHITE_KEY_WIDTH + 4, + height() - PR_BOTTOM_MARGIN - + ( *it )->getVolume() / 2+2 ); if( ( *it )->hasDetuningInfo() ) { @@ -1610,7 +1616,7 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me ) m_currentNote->setVolume( vol ); m_pattern->update(); m_pattern->getInstrumentTrack()->processInEvent( - midiEvent( KEY_PRESSURE, 0, key_num, + midiEvent( KEY_PRESSURE, 0, m_lastKey, vol * 127 / 100 ), midiTime() ); }