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

- fixed bug: piano roll was still recording when not in record mode

Browse Source 
- use the key L to cycle through playback modes. (this is consistent with FL Studio)


git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1994 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Andrew Kelley
2009-02-03 01:29:40 +00:00
parent 3341f3d711
commit 879b50aaa1
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2009-02-02 Andrew Kelley <superjoe30/at/gmail/dot/com>
* include/main_window.h:
* src/gui/main_window.cpp:
- fixed bug: piano roll was still recording when not in record
mode
- use the key L to cycle through playback modes. (this is
consistent with FL Studio)
2009-02-01 Andrew Kelley <superjoe30/at/gmail/dot/com>
* include/piano_roll.h:

5
include/main_window.h
View File

@@ -224,11 +224,14 @@ private slots:
void playbackSongClicked( bool );
void playbackBBClicked( bool );
void playbackPianoRollClicked( bool );
void spacePressed( void );
void shortcutSpacePressed( void );
void shortcutLPressed( void );
void play( void );
void record( void );
void playAndRecord( void );
void stop( void );
signals:
void periodicUpdate( void );

45
src/gui/main_window.cpp
View File

@@ -682,7 +682,7 @@ void mainWindow::finalize( void )
new toolButton(
embed::getIconPixmap( "stop" ),
tr( "Stop playing whatever is playing" ),
engine::getSong(),
this,
SLOT( stop() ),
btns );
@@ -752,8 +752,11 @@ void mainWindow::finalize( void )
m_radpSong->click();
// global keyboard shortcuts
QShortcut * space = new QShortcut(QKeySequence(Qt::Key_Space), this);
connect(space, SIGNAL(activated()), SLOT(spacePressed()));
QShortcut * qs_space = new QShortcut(QKeySequence(Qt::Key_Space), this);
connect(qs_space, SIGNAL(activated()), SLOT(shortcutSpacePressed()));
QShortcut * qs_L = new QShortcut(QKeySequence(Qt::Key_L), this);
connect(qs_L, SIGNAL(activated()), SLOT(shortcutLPressed()));
// setup-dialog opened before?
if( !configManager::inst()->value( "app", "configured" ).toInt() )
@@ -1212,11 +1215,28 @@ void mainWindow::keyPressEvent( QKeyEvent * _ke )
}
}
void mainWindow::spacePressed( void )
void mainWindow::shortcutSpacePressed( void )
{
play();
}
void mainWindow::shortcutLPressed( void )
{
// cycle through global playback mode
if( m_playbackMode == PPM_BB )
{
m_radpPianoRoll->click();
}
else if( m_playbackMode == PPM_PianoRoll )
{
m_radpSong->click();
}
else
{
m_radpBB->click();
}
}
void mainWindow::play( void )
{
if( m_playbackMode == PPM_BB )
@@ -1233,6 +1253,23 @@ void mainWindow::play( void )
}
}
void mainWindow::stop( void )
{
if( m_playbackMode == PPM_BB )
{
engine::getBBEditor()->stop();
}
else if( m_playbackMode == PPM_PianoRoll )
{
engine::getPianoRoll()->stop();
}
else
{
engine::getSongEditor()->stop();
}
}
void mainWindow::record( void )
{
if( m_playbackMode == PPM_BB )