From 4107f8e0eb8ab1bbf3737c5f87871a43f640b4dd Mon Sep 17 00:00:00 2001 From: Nil Geisweiller Date: Tue, 12 Dec 2006 19:27:06 +0000 Subject: see ChangeLog --- muse/ChangeLog | 3 + muse/muse/muse.cpp | 36 + muse/muse/muse.h | 2 + muse/muse/shortcuts.cpp | 12 +- muse/synti/deicsonze/SutulaBank.dei | 3414 +----------------------------- muse/synti/deicsonze/TODO | 2 + muse/synti/deicsonze/deicsonzeplugin.cpp | 1 - 7 files changed, 114 insertions(+), 3356 deletions(-) diff --git a/muse/ChangeLog b/muse/ChangeLog index 2673b782..9247b2d1 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,5 +1,8 @@ 12.12 (ws) - added possibility to define a new midicontroller + (ng) + - add save project as... (not sure it's complete yet?) + - take off the last redundent presets in deicsonze 10.12 (ng) - items in pianoroll play the right pitch (event.pitch + transpose) - items in pianoroll are displayed correctly according to Y zoom diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index fa37cec5..5a17ac40 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -555,6 +555,9 @@ MusE::MusE() fileSaveAction = getAction("save_project", this); connect(fileSaveAction, SIGNAL(triggered()), SLOT(save())); + fileSaveAsAction = getAction("save_project_as", this); + connect(fileSaveAsAction, SIGNAL(triggered()), SLOT(saveAs())); + pianoAction = getAction("open_pianoroll", this); connect(pianoAction, SIGNAL(triggered()), SLOT(startPianoroll())); @@ -617,6 +620,7 @@ MusE::MusE() menu_file->addMenu(openRecent); menu_file->addSeparator(); menu_file->addAction(fileSaveAction); + menu_file->addAction(fileSaveAsAction); a = getAction("save_as_template", this); connect(a, SIGNAL(triggered()), SLOT(saveAsTemplate())); menu_file->addAction(a); @@ -1307,6 +1311,38 @@ bool MusE::save() return true; } +//--------------------------------------------------------- +// saveAs +//--------------------------------------------------------- + +bool MusE::saveAs() + { + printf("SAVEAS\n"); + ProjectDialog projectDialog; + int rv = projectDialog.exec(); + if (rv == 0) + return false; + QString path = projectDialog.projectPath(); + if (path.isEmpty()) + return false; + + QDir pd(QDir::homePath() + "/" + config.projectPath + "/" + path); + QString header = tr("MusE: new project"); + if (!pd.exists()) { + if (!pd.mkdir(pd.path())) { + QString s(tr("Cannot create project folder <%1>")); + QMessageBox::critical(this, header, s.arg(pd.path())); + return false; + } + } + addProject(path); + song->setProjectPath(path); + QString name = song->projectName(); + setWindowTitle(QString("MusE: Song: ") + name); + return save(); + } + + //--------------------------------------------------------- // saveAsTemplate //--------------------------------------------------------- diff --git a/muse/muse/muse.h b/muse/muse/muse.h index 56d689df..5c1b5d93 100644 --- a/muse/muse/muse.h +++ b/muse/muse/muse.h @@ -68,6 +68,7 @@ class MusE : public QMainWindow // , public Ui::MuseBase Q_OBJECT QAction* fileSaveAction; + QAction* fileSaveAsAction; QAction* fileOpenAction; QAction* pianoAction; QAction* waveAction; @@ -259,6 +260,7 @@ class MusE : public QMainWindow // , public Ui::MuseBase void setTool(const QString&); void startEditor(Part*, int); bool save(); + bool saveAs(); public: MusE(); diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp index 0d47c339..7bdd0046 100644 --- a/muse/muse/shortcuts.cpp +++ b/muse/muse/shortcuts.cpp @@ -255,6 +255,16 @@ Shortcut MuseApplication::sc[] = { "You can also select the Save command from the Project menu."), ":/xpm/filesave.png" ), + Shortcut( + "save_project_as", + QT_TR_NOOP("File: Save as"), + ARRANG_SHRT + DEDIT_SHRT, + 0, + Qt::WindowShortcut, + QT_TR_NOOP("save project as..."), + QT_TR_NOOP("Click this button to save a new copy of the project.\n" + ), ":/xpm/filesave.png" + ), Shortcut( "save_as_template", QT_TR_NOOP("File: Save as Template"), @@ -325,7 +335,7 @@ Shortcut MuseApplication::sc[] = { "open_miditracker", QT_TR_NOOP("Open MidiTracker"), ARRANG_SHRT, - 0, + Qt::CTRL + Qt::Key_K, Qt::WindowShortcut, QT_TR_NOOP("MidiTracker"), QT_TR_NOOP("Start Midi Tracker"), diff --git a/muse/synti/deicsonze/SutulaBank.dei b/muse/synti/deicsonze/SutulaBank.dei index 6045c649..3a64e876 100644 --- a/muse/synti/deicsonze/SutulaBank.dei +++ b/muse/synti/deicsonze/SutulaBank.dei @@ -1,4 +1,4 @@ - + Sutula Bank @@ -170929,128 +170929,6 @@ 120 VAC 0 - - FIFTH - 4 - - TRIANGL - 28 - 17 - 2 - 0 - off - - - 4 - 0 - off - off - off - off - 7 - 3 - 3 - 7 - 0 - 1 - 1 - 2 - - - 1 - 13 - 5 - 1 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W5 - W1 - W1 - -2 - -2 - 1 - 1 - - 31 - 31 - 31 - 31 - 7 - 7 - 7 - 7 - 15 - 15 - 15 - 15 - 10 - 7 - 7 - 7 - 5 - 5 - 7 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 93 - 70 - 99 - 94 - - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 0 - - - 0 - POLY - 2 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - 120 VAC - 1 - FIFTH 5 @@ -171171,7 +171049,7 @@ 0 Amazon - 2 + 1 FIFTH @@ -171293,7 +171171,7 @@ 0 ArcoGlass* - 3 + 2 FIFTH @@ -171415,129 +171293,7 @@ 0 Aviary - 4 - - - FIFTH - 7 - - TRIANGL - 35 - 0 - 0 - 0 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0.87 - 8.48 - 0.87 - 9.89 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 12 - 31 - 12 - 31 - 15 - 31 - 31 - 31 - 15 - 15 - 15 - 15 - 6 - 11 - 13 - 31 - 5 - 1 - 7 - 15 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 80 - 47 - 72 - 0 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 10 - - - 0 - POLY - 2 - FULL - 0 - POR - 40 - 0 - 0 - 2 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Aviary - 5 + 3 FIFTH @@ -171659,7 +171415,7 @@ 0 BC1 GlassV - 6 + 4 FOURTH @@ -171781,7 +171537,7 @@ 0 Botl.Shff* - 7 + 5 FIFTH @@ -171903,7 +171659,7 @@ 0 Cairo * - 8 + 6 SEVENTH @@ -172025,7 +171781,7 @@ 0 Celestial - 9 + 7 FIFTH @@ -172147,129 +171903,7 @@ 0 ChimeStrig - 10 - - - FIFTH - 5 - - TRIANGL - 35 - 0 - 0 - 0 - off - - - 0 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 2 - - - 2 - 0.5 - 10 - 3 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 3 - 3 - -1 - 0 - - 15 - 31 - 31 - 31 - 31 - 31 - 9 - 9 - 15 - 15 - 8 - 8 - 0 - 0 - 4 - 4 - 4 - 3 - 4 - 3 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 94 - 94 - 91 - 87 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - ChimeStrig - 11 + 8 EIGHTH @@ -172391,129 +172025,7 @@ 0 Deep Space - 12 - - - EIGHTH - 0 - - TRIANGL - 42 - 72 - 1 - 75 - off - - - 0 - 1 - on - on - on - on - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 1 - 5 - 6 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 16 - 31 - 31 - 31 - 10 - 10 - 18 - 27 - 0 - 0 - 0 - 0 - 10 - 7 - 7 - 7 - 4 - 6 - 6 - 7 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 82 - 83 - 84 - - 0 - 2 - 0 - 0 - 0 - 0 - 0 - 10 - - - 0 - POLY - 2 - FULL - 0 - POR - 40 - 0 - 0 - 2 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Deep Space - 13 + 9 FIFTH @@ -172635,129 +172147,7 @@ 0 EleChamber - 14 - - - FIFTH - 3 - - TRIANGL - 33 - 35 - 9 - 0 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 1 - 0 - 1 - 0 - - - 2 - 2 - 2 - 2 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 2 - -3 - 3 - -1 - - 9 - 11 - 10 - 12 - 16 - 3 - 8 - 6 - 15 - 8 - 15 - 14 - 3 - 3 - 3 - 2 - 5 - 5 - 7 - 3 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 71 - 99 - 63 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 5 - FULL - 0 - POR - 99 - 0 - 0 - 99 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - EleChamber - 15 + 10 EIGHTH @@ -172879,129 +172269,7 @@ 0 Enc3rdKind - 16 - - - EIGHTH - 0 - - SQUARE - 20 - 79 - 30 - 2 - on - - - 1 - 1 - on - on - on - on - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 0.5 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 31 - 31 - 31 - 31 - 10 - 13 - 12 - 10 - 10 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 6 - 6 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 99 - 99 - 99 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Enc3rdKind - 17 + 11 FIFTH @@ -173123,7 +172391,7 @@ 0 Etherial - 18 + 12 FOURTH @@ -173245,7 +172513,7 @@ 6 Floot Base - 19 + 13 FIFTH @@ -173367,7 +172635,7 @@ 0 Full Ranks - 20 + 14 FIFTH @@ -173489,7 +172757,7 @@ 0 FuzzyPad - 21 + 15 EIGHTH @@ -173611,7 +172879,7 @@ 0 Gender Gam - 22 + 16 SEVENTH @@ -173733,129 +173001,7 @@ 0 GlassHarp1 - 23 - - - SEVENTH - 5 - - SHOLD - 99 - 0 - 0 - 0 - off - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0.5 - 4 - 0.5 - 6.92 - no - no - no - yes - 8 - 8 - 8 - 112 - - W1 - W2 - W1 - W1 - 1 - -1 - -1 - -1 - - 15 - 31 - 15 - 28 - 12 - 10 - 12 - 10 - 15 - 0 - 0 - 0 - 0 - 0 - 10 - 0 - 6 - 5 - 6 - 4 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 78 - 99 - 80 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 3 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - GlassHarp1 - 24 + 17 FIFTH @@ -173977,129 +173123,7 @@ 0 GlassHarp2 - 25 - - - FIFTH - 1 - - TRIANGL - 30 - 24 - 3 - 0 - off - - - 6 - 0 - off - off - off - off - 0 - 0 - 0 - 7 - 0 - 0 - 0 - 0 - - - 1 - 5 - 2 - 8 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - -3 - -3 - 0 - - 9 - 12 - 11 - 9 - 6 - 12 - 10 - 3 - 13 - 13 - 12 - 15 - 6 - 5 - 6 - 3 - 6 - 5 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 92 - 79 - 99 - 64 - - 2 - 2 - 1 - 1 - 0 - 64 - 39 - 0 - - - 0 - POLY - 7 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 1 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - GlassHarp2 - 26 + 18 SEVENTH @@ -174221,129 +173245,7 @@ 0 GlassHarp3 - 27 - - - SEVENTH - 5 - - SHOLD - 99 - 0 - 0 - 0 - off - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 5 - 15 - 5 - 14.43 - no - no - no - yes - 8 - 8 - 8 - 119 - - W3 - W3 - W1 - W1 - -3 - 2 - 3 - 0 - - 10 - 7 - 12 - 12 - 8 - 7 - 6 - 7 - 12 - 9 - 3 - 10 - 5 - 4 - 7 - 4 - 5 - 4 - 7 - 4 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 39 - 99 - 62 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - GlassHarp3 - 28 + 19 FIFTH @@ -174465,7 +173367,7 @@ 4 HarmoPad - 29 + 20 FIFTH @@ -174587,129 +173489,7 @@ 0 Impression - 30 - - - FIFTH - 2 - - TRIANGL - 32 - 59 - 2 - 0 - off - - - 0 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 2 - - - 0.5 - 0.5 - 0.5 - 0.5 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W2 - W2 - W1 - 0 - 0 - 0 - 0 - - 22 - 9 - 22 - 9 - 7 - 21 - 7 - 21 - 15 - 15 - 15 - 15 - 4 - 4 - 4 - 4 - 7 - 7 - 7 - 7 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 67 - 99 - 80 - - 0 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Impression - 31 + 21 FIFTH @@ -174831,129 +173611,7 @@ 0 Jump.....1 - 32 - - - FIFTH - 6 - - TRIANGL - 38 - 2 - 13 - 0 - off - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 1 - - - 1 - 2 - 1 - 1 - no - no - no - no - 8 - 8 - 8 - 8 - - W2 - W2 - W1 - W1 - -2 - 0 - 0 - 0 - - 21 - 18 - 21 - 18 - 12 - 4 - 3 - 3 - 14 - 14 - 14 - 14 - 3 - 1 - 2 - 1 - 9 - 4 - 9 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 77 - 99 - 84 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Jump.....1 - 33 + 22 FIFTH @@ -175075,129 +173733,7 @@ 0 Jump.....2 - 34 - - - FIFTH - 5 - - TRIANGL - 38 - 33 - 32 - 0 - off - - - 1 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 1 - - - 2 - 2 - 1 - 1 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W4 - W1 - W2 - 0 - 0 - 0 - 0 - - 31 - 31 - 31 - 18 - 22 - 22 - 22 - 3 - 12 - 12 - 14 - 14 - 0 - 24 - 0 - 7 - 9 - 9 - 9 - 9 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 99 - 99 - 87 - - 0 - 3 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Jump.....2 - 35 + 23 SEVENTH @@ -175319,7 +173855,7 @@ 0 KrstlChoir - 36 + 24 EIGHTH @@ -175441,7 +173977,7 @@ 0 KrystlPad1 - 37 + 25 FOURTH @@ -175563,7 +174099,7 @@ 0 MilkBottle - 38 + 26 FIFTH @@ -175685,129 +174221,7 @@ 0 Movement.1 - 39 - - - FIFTH - 4 - - SQUARE - 24 - 57 - 9 - 25 - on - - - 3 - 1 - on - on - on - on - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 1 - 8 - 14 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 2 - 1 - -1 - -3 - - 31 - 31 - 31 - 10 - 9 - 9 - 9 - 9 - 15 - 15 - 11 - 11 - 6 - 5 - 5 - 3 - 6 - 3 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 99 - 99 - 66 - - 0 - 0 - 1 - 2 - 0 - 0 - 0 - 0 - - - -24 - POLY - 0 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 50 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Movement.1 - 40 + 27 FIFTH @@ -175929,129 +174343,7 @@ 0 Movement.2 - 41 - - - FIFTH - 7 - - SHOLD - 37 - 0 - 0 - 39 - on - - - 3 - 1 - on - on - on - on - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 2 - 2 - 2 - 9 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 2 - -2 - -1 - -3 - - 31 - 31 - 31 - 11 - 9 - 9 - 9 - 9 - 15 - 15 - 14 - 14 - 0 - 0 - 1 - 0 - 6 - 3 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 83 - 99 - 62 - - 2 - 0 - 0 - 3 - 0 - 0 - 0 - 0 - - - -24 - POLY - 0 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 50 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Movement.2 - 42 + 28 FIFTH @@ -176173,7 +174465,7 @@ 0 Musicbox * - 43 + 29 EIGHTH @@ -176295,7 +174587,7 @@ 0 Obelisk - 44 + 30 FIFTH @@ -176417,129 +174709,7 @@ 0 Ornt E.T. - 45 - - - FIFTH - 5 - - TRIANGL - 72 - 42 - 10 - 39 - on - - - 3 - 1 - on - on - on - on - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 18.37 - 11 - 14 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 1 - 2 - - 31 - 31 - 31 - 31 - 4 - 5 - 3 - 3 - 4 - 4 - 4 - 4 - 0 - 0 - 0 - 0 - 6 - 6 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 71 - 93 - 80 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Ornt E.T. - 46 + 31 EIGHTH @@ -176661,129 +174831,7 @@ 0 Ornt Quest - 47 - - - EIGHTH - 7 - - TRIANGL - 21 - 0 - 21 - 35 - off - - - 1 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 4 - 8 - 25.95 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 31 - 18 - 10 - 9 - 6 - 31 - 31 - 8 - 15 - 15 - 15 - 5 - 3 - 14 - 9 - 31 - 15 - 15 - 15 - 9 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 97 - 99 - 94 - 99 - - 0 - 0 - 0 - 3 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Ornt Quest - 48 + 32 FIFTH @@ -176905,129 +174953,7 @@ 0 OrntFlight - 49 - - - FIFTH - 7 - - TRIANGL - 35 - 0 - 0 - 0 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 2 - 18.37 - 2 - 4 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 1 - -1 - -1 - - 19 - 31 - 18 - 18 - 3 - 19 - 2 - 6 - 13 - 10 - 0 - 0 - 21 - 29 - 0 - 0 - 9 - 9 - 4 - 4 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 93 - 99 - 99 - 70 - - 0 - 0 - 3 - 3 - 0 - 0 - 46 - 46 - - - -12 - POLY - 2 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 50 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - OrntFlight - 50 + 33 EIGHTH @@ -177149,251 +175075,7 @@ 0 OrntSound1 - 51 - - - EIGHTH - 6 - - TRIANGL - 56 - 68 - 0 - 63 - on - - - 1 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 2 - 3 - 3 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 3 - 0 - 0 - 0 - - 6 - 31 - 31 - 9 - 5 - 10 - 18 - 3 - 0 - 0 - 0 - 0 - 0 - 3 - 4 - 2 - 5 - 5 - 5 - 5 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 84 - 99 - 64 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 2 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 50 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - OrntSound1 - 52 - - - FIFTH - 6 - - SQUARE - 56 - 68 - 0 - 63 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 5 - 2 - 5 - 2 - - - 1 - 1 - 1 - 2 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 3 - 0 - 0 - 0 - - 22 - 9 - 22 - 9 - 6 - 13 - 15 - 3 - 12 - 12 - 12 - 12 - 1 - 3 - 4 - 9 - 7 - 2 - 5 - 4 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 84 - 99 - 64 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 2 - FULL - 0 - POR - 99 - 0 - 0 - 50 - 0 - 50 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - OrntSound2 - 53 + 34 FIFTH @@ -177417,10 +175099,10 @@ 0 0 0 - 0 - 0 - 0 - 0 + 5 + 2 + 5 + 2 1 @@ -177515,7 +175197,7 @@ 0 OrntSound2 - 54 + 35 SEVENTH @@ -177637,7 +175319,7 @@ 0 ParisDream - 55 + 36 FIFTH @@ -177759,129 +175441,7 @@ 0 PianoVoice - 56 - - - FIFTH - 7 - - TRIANGL - 35 - 0 - 14 - 0 - on - - - 3 - 1 - on - off - off - off - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 3 - - - 1 - 2 - 1 - 10 - no - no - no - no - 8 - 8 - 8 - 8 - - W4 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 8 - 10 - 31 - 31 - 14 - 31 - 7 - 10 - 15 - 15 - 7 - 6 - 0 - 0 - 7 - 14 - 6 - 3 - 5 - 7 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 76 - 99 - 77 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 99 - - - 0 - POLY - 2 - FULL - 0 - POR - 40 - 0 - 0 - 2 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - PianoVoice - 57 + 37 FIFTH @@ -178003,7 +175563,7 @@ 0 PianoStrng - 58 + 38 FOURTH @@ -178125,7 +175685,7 @@ 0 PlasticHit - 59 + 39 FIFTH @@ -178247,129 +175807,7 @@ 0 Pno String - 60 - - - FIFTH - 5 - - TRIANGL - 33 - 35 - 15 - 0 - off - - - 1 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 3 - - - 2 - 2 - 1 - 14 - no - no - no - no - 8 - 8 - 8 - 8 - - W2 - W1 - W1 - W1 - 2 - -3 - 3 - -1 - - 9 - 24 - 31 - 31 - 16 - 3 - 8 - 7 - 15 - 8 - 7 - 7 - 3 - 3 - 6 - 7 - 5 - 5 - 6 - 5 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 94 - 88 - 99 - 67 - - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 5 - FULL - 0 - POR - 99 - 0 - 0 - 99 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Pno String - 61 + 40 SEVENTH @@ -178491,7 +175929,7 @@ 0 PnoClouds - 62 + 41 FOURTH @@ -178613,7 +176051,7 @@ 0 PopPercuss - 63 + 42 EIGHTH @@ -178735,7 +176173,7 @@ 0 Sawsy Pad1 - 64 + 43 EIGHTH @@ -178857,129 +176295,7 @@ 0 Solstice - 65 - - - EIGHTH - 0 - - TRIANGL - 35 - 19 - 0 - 0 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 8 - 6 - 5.65 - 5.65 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 3 - -3 - -3 - - 31 - 13 - 12 - 10 - 27 - 27 - 27 - 27 - 15 - 15 - 15 - 15 - 13 - 13 - 13 - 13 - 6 - 6 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 67 - 55 - 49 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -12 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Solstice - 66 + 44 FIFTH @@ -179101,7 +176417,7 @@ 0 SpoonChoir - 67 + 45 FIFTH @@ -179223,129 +176539,7 @@ 0 SpreadThin - 68 - - - FIFTH - 4 - - TRIANGL - 30 - 0 - 0 - 0 - off - - - 2 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 1 - - - 1 - 1 - 1 - 2 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 21 - 24 - 21 - 16 - 29 - 18 - 7 - 10 - 15 - 0 - 12 - 12 - 6 - 6 - 6 - 6 - 15 - 10 - 8 - 8 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 90 - 99 - 89 - - 0 - 1 - 1 - 1 - 0 - 0 - 0 - 0 - - - -24 - POLY - 5 - FULL - 0 - POR - 99 - 0 - 0 - 99 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - SpreadThin - 69 + 46 FIFTH @@ -179467,129 +176661,7 @@ 0 St Nick..1 - 70 - - - FIFTH - 7 - - TRIANGL - 27 - 40 - 16 - 0 - off - - - 2 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 1 - - - 2 - 14 - 0.5 - 0.5 - no - no - no - no - 8 - 8 - 8 - 8 - - W2 - W1 - W5 - W3 - 0 - 0 - 1 - -1 - - 31 - 31 - 12 - 31 - 12 - 31 - 12 - 0 - 15 - 15 - 15 - 15 - 6 - 12 - 6 - 0 - 5 - 5 - 5 - 1 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 83 - 99 - 76 - - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - St Nick..1 - 71 + 47 SEVENTH @@ -179711,129 +176783,7 @@ 0 St Nick..2 - 72 - - - SEVENTH - 6 - - TRIANGL - 34 - 40 - 43 - 0 - off - - - 1 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 3 - 1 - 1 - no - no - no - no - 8 - 8 - 8 - 8 - - W2 - W2 - W2 - W3 - 0 - 0 - 3 - -3 - - 25 - 25 - 12 - 31 - 12 - 31 - 12 - 0 - 15 - 15 - 15 - 15 - 6 - 12 - 6 - 0 - 5 - 5 - 5 - 1 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 99 - 90 - 76 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 40 - 0 - 0 - 50 - 0 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - St Nick..2 - 73 + 48 THIRD @@ -179955,129 +176905,7 @@ 0 StonedCycl - 74 - - - THIRD - 7 - - SHOLD - 99 - 99 - 6 - 0 - on - - - 5 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 1 - 0.5 - 2 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 3 - -3 - -3 - - 5 - 4 - 4 - 4 - 14 - 13 - 14 - 15 - 15 - 15 - 15 - 15 - 7 - 7 - 7 - 7 - 6 - 6 - 6 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 99 - 56 - 77 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - -24 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - StonedCycl - 75 + 49 EIGHTH @@ -180199,7 +177027,7 @@ 0 Texture * - 76 + 50 FIFTH @@ -180321,7 +177149,7 @@ 0 That Girl* - 77 + 51 FIFTH @@ -180443,129 +177271,7 @@ 0 Up We Go - 78 - - - FIFTH - 0 - - TRIANGL - 35 - 0 - 0 - 0 - on - - - 3 - 0 - off - off - off - off - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 1 - 1.73 - 4.24 - 1 - no - no - no - no - 8 - 8 - 8 - 8 - - W1 - W1 - W1 - W1 - 0 - 0 - 0 - 0 - - 31 - 31 - 27 - 31 - 9 - 15 - 3 - 18 - 13 - 14 - 14 - 14 - 15 - 12 - 1 - 12 - 6 - 4 - 2 - 6 - VOF - VOF - VOF - VOF - - - 99 - 99 - 99 - 50 - 50 - 50 - - 99 - 80 - 81 - 95 - - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - POLY - 4 - FULL - 0 - POR - 99 - 0 - 0 - 1 - 99 - 0 - 0 - 50 - 0 - 0 - 0 - 0 - 0 - 0 - - Up We Go - 79 + 52 FIFTH @@ -180687,7 +177393,7 @@ 5 WineGlass* - 80 + 53 FIFTH @@ -180809,7 +177515,7 @@ 0 WireWaves - 81 + 54 SEVENTH @@ -180931,7 +177637,7 @@ 0 XyloSynth - 82 + 55 diff --git a/muse/synti/deicsonze/TODO b/muse/synti/deicsonze/TODO index ba2303bd..8f7863ec 100644 --- a/muse/synti/deicsonze/TODO +++ b/muse/synti/deicsonze/TODO @@ -11,3 +11,5 @@ - Load BUMP preset - calibrate portamento and pitch envelope to fit real DX11 - make deicsonze loadable as standalone by mus +- add filter +- fix bug LFO adjute w.w.t. frequency and make delay better diff --git a/muse/synti/deicsonze/deicsonzeplugin.cpp b/muse/synti/deicsonze/deicsonzeplugin.cpp index 2823bd75..05b922d3 100644 --- a/muse/synti/deicsonze/deicsonzeplugin.cpp +++ b/muse/synti/deicsonze/deicsonzeplugin.cpp @@ -36,7 +36,6 @@ #include "awl/floatentry.h" #include "awl/slider.h" #include "awl/checkbox.h" -#include using Awl::FloatEntry; using Awl::Slider; -- cgit v1.2.3