diff options
| author | Florian Jung <flo@windfisch.org> | 2012-01-06 15:37:19 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-01-06 15:37:19 +0000 |
| commit | bcc4a8edf89457a6e0f15c14970202ca7c05b6e0 (patch) | |
| tree | 6a2d4dd707475ee9bfc7c9e62307c11c70f4e4f7 /muse2/muse/app.h | |
| parent | eec7d9eb4d38a8f7bdbdb9d6301990a8574b3936 (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/app.h')
| -rw-r--r-- | muse2/muse/app.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/muse2/muse/app.h b/muse2/muse/app.h index 5dad1ff5..2e62db1a 100644 --- a/muse2/muse/app.h +++ b/muse2/muse/app.h @@ -211,12 +211,8 @@ class MusE : public QMainWindow MidiTransformerDialog* midiTransformerDialog; QMenu* openRecent; - //QTimer* hackishSongOpenTimer; - //QString hackishSongOpenFilename; - //bool hackishSongOpenUseTemplate; - bool readMidi(FILE*); - void read(MusECore::Xml& xml, bool skipConfig, bool isTemplate); + void read(MusECore::Xml& xml, bool doReadMidiPorts, bool isTemplate); void processTrack(MusECore::MidiTrack* track); void write(MusECore::Xml& xml) const; @@ -235,7 +231,7 @@ class MusE : public QMainWindow MusECore::PartList* getMidiPartsToEdit(); MusECore::Part* readPart(MusECore::Xml& xml); bool checkRegionNotNull(); - void loadProjectFile1(const QString&, bool songTemplate, bool loadAll); + void loadProjectFile1(const QString&, bool songTemplate, bool doReadMidiPorts); void writeGlobalConfiguration(int level, MusECore::Xml&) const; void writeConfiguration(int level, MusECore::Xml&) const; void updateConfiguration(); @@ -336,7 +332,7 @@ class MusE : public QMainWindow void bounceToFile(MusECore::AudioOutput* ao = 0); void closeEvent(QCloseEvent*e); void loadProjectFile(const QString&); - void loadProjectFile(const QString&, bool songTemplate, bool loadAll); + void loadProjectFile(const QString&, bool songTemplate, bool doReadMidiPorts); void toplevelDeleting(MusEGui::TopWin* tl); void loadTheme(const QString&); void loadStyleSheetFile(const QString&); |