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

Use Editor superclass in AutomationEditor

Browse Source 
Split AutomationEditor -> AutomationEditor + AutomationEditorWindow
This commit is contained in:
Lukas W
2014-12-07 12:48:49 +01:00
parent c6ee614012
commit 02006f9855
8 changed files with 533 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Engine.cpp
View File

@@ -56,7 +56,7 @@ MainWindow * Engine::s_mainWindow = NULL;
BBTrackContainer * Engine::s_bbTrackContainer = NULL;
Song * Engine::s_song = NULL;
SongEditor* Engine::s_songEditor = NULL;
AutomationEditor * Engine::s_automationEditor = NULL;
AutomationEditorWindow * Engine::s_automationEditor = NULL;
BBEditor * Engine::s_bbEditor = NULL;
PianoRoll* Engine::s_pianoRoll = NULL;
ProjectNotes * Engine::s_projectNotes = NULL;
@@ -99,7 +99,7 @@ void Engine::init( const bool _has_gui )
s_projectNotes = new ProjectNotes;
s_bbEditor = new BBEditor( s_bbTrackContainer );
s_pianoRoll = new PianoRoll;
s_automationEditor = new AutomationEditor;
s_automationEditor = new AutomationEditorWindow;
s_mainWindow->finalize();
}

6
src/core/Song.cpp
View File

@@ -958,9 +958,9 @@ void Song::loadProject( const QString & _file_name )
{
Engine::pianoRoll()->restoreState( node.toElement() );
}
else if( node.nodeName() == Engine::automationEditor()->nodeName() )
else if( node.nodeName() == Engine::automationEditor()->m_editor->nodeName() )
{
Engine::automationEditor()->restoreState( node.toElement() );
Engine::automationEditor()->m_editor->restoreState( node.toElement() );
}
else if( node.nodeName() == Engine::getProjectNotes()->nodeName() )
{
@@ -1027,7 +1027,7 @@ bool Song::saveProjectFile( const QString & _filename )
{
Engine::getControllerRackView()->saveState( dataFile, dataFile.content() );
Engine::pianoRoll()->saveState( dataFile, dataFile.content() );
Engine::automationEditor()->saveState( dataFile, dataFile.content() );
Engine::automationEditor()->m_editor->saveState( dataFile, dataFile.content() );
Engine::getProjectNotes()->SerializingObject::saveState( dataFile, dataFile.content() );
m_playPos[Mode_PlaySong].m_timeLine->saveState( dataFile, dataFile.content() );
}

941
src/gui/AutomationEditor.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/gui/AutomationPatternView.cpp
View File

@@ -125,7 +125,7 @@ void AutomationPatternView::disconnectObject( QAction * _a )
//If automation editor is opened, update its display after disconnection
if( Engine::automationEditor() )
{
Engine::automationEditor()->updateAfterPatternChange();
Engine::automationEditor()->m_editor->updateAfterPatternChange();
}
//if there is no more connection connected to the AutomationPattern

8
src/gui/Editor.cpp
View File

@@ -30,13 +30,13 @@
#include <QToolBar>
void Editor::setPlaying(bool playing)
void Editor::setPauseIcon(bool displayPauseIcon)
{
// If we're playing, show a pause icon
if (playing)
m_playButton->setIcon(embed::getIconPixmap("play"));
else
if (displayPauseIcon)
m_playButton->setIcon(embed::getIconPixmap("pause"));
else
m_playButton->setIcon(embed::getIconPixmap("play"));
}
Editor::Editor(bool record) :