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

Merge pull request #1030 from LMMS/stable-1.1

Browse Source 
sync
This commit is contained in:
Vesa V
2014-07-26 16:28:01 +03:00
parent 1934879109 04a3806e23
commit 07a0f46c82
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/SampleBuffer.cpp
View File

@@ -915,7 +915,7 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
const int h = _dr.height();
const int yb = h / 2 + _dr.y();
const float y_space = h*0.25f;
const float y_space = h*0.5f;
const int nb_frames = focus_on_range ? _to_frame - _from_frame : m_frames;
if( nb_frames < 60000 )
@@ -1381,7 +1381,7 @@ void SampleBuffer::setEndFrame( const f_cnt_t _e )
void SampleBuffer::setAmplification( float _a )
{
m_amplification = _a;
update( true );
emit sampleUpdated();
}

2
src/gui/MainWindow.cpp
View File

@@ -286,7 +286,7 @@ void MainWindow::finalize()
edit_menu->addAction( embed::getIconPixmap( "edit_redo" ),
tr( "Redo" ),
this, SLOT( redo() ),
Qt::CTRL + Qt::Key_R );
Qt::CTRL + Qt::Key_Y );
edit_menu->addSeparator();
edit_menu->addAction( embed::getIconPixmap( "setup_general" ),
tr( "Settings" ),