From 4e1ca61b03bab50d5e71e6da433503ac3b4470c0 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Mon, 16 May 2011 11:34:53 +0000 Subject: fixed saving window state dialogs now also save and restore their state templates were updated and have now sane defaults for toolbars etc. --- muse2/muse/conf.cpp | 7 + muse2/muse/functions.cpp | 67 ++ muse2/muse/functions.h | 7 + muse2/muse/main.cpp | 3 +- muse2/muse/master/masteredit.cpp | 16 +- muse2/muse/master/masteredit.h | 1 + muse2/muse/midiedit/drumedit.cpp | 16 +- muse2/muse/midiedit/drumedit.h | 5 +- muse2/muse/midiedit/pianoroll.cpp | 15 +- muse2/muse/midiedit/pianoroll.h | 1 + muse2/muse/midiedit/scoreedit.cpp | 23 +- muse2/muse/midiedit/scoreedit.h | 2 + muse2/muse/waveedit/waveedit.cpp | 15 +- muse2/muse/waveedit/waveedit.h | 3 +- muse2/muse/widgets/deloverlaps.cpp | 35 + muse2/muse/widgets/deloverlaps.h | 4 + muse2/muse/widgets/gatetime.cpp | 43 + muse2/muse/widgets/gatetime.h | 5 + muse2/muse/widgets/move.cpp | 40 +- muse2/muse/widgets/move.h | 5 + muse2/muse/widgets/quantize.cpp | 51 +- muse2/muse/widgets/quantize.h | 5 + muse2/muse/widgets/remove.cpp | 36 +- muse2/muse/widgets/remove.h | 5 + muse2/muse/widgets/setlen.cpp | 39 +- muse2/muse/widgets/setlen.h | 5 + muse2/muse/widgets/transpose.cpp | 39 +- muse2/muse/widgets/transpose.h | 5 + muse2/muse/widgets/velocity.cpp | 42 + muse2/muse/widgets/velocity.h | 5 + muse2/share/templates/audio.med | 494 +++++++++-- muse2/share/templates/default.med | 332 +++++++- muse2/share/templates/midiGM.med | 274 +++++- muse2/share/templates/monorecord.med | 746 ++++++++-------- muse2/share/templates/synti.med | 1553 +++++++++++++++++++--------------- 35 files changed, 2728 insertions(+), 1216 deletions(-) diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index 2f391445..e7eef503 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -14,6 +14,7 @@ #include "transport.h" #include "icons.h" #include "globals.h" +#include "functions.h" #include "drumedit.h" #include "pianoroll.h" #include "scoreedit.h" @@ -891,6 +892,8 @@ void readConfiguration(Xml& xml, bool readOnlySequencer) MasterEdit::readConfiguration(xml); else if (tag == "waveedit") WaveEdit::readConfiguration(xml); + else if (tag == "dialogs") + read_function_dialog_config(xml); else if (tag == "shortcuts") readShortCuts(xml); else if (tag == "division") @@ -1360,6 +1363,8 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const ScoreEdit::write_configuration(level, xml); MasterEdit::writeConfiguration(level, xml); WaveEdit::writeConfiguration(level, xml); + + write_function_dialog_config(level, xml); writeShortCuts(level, xml); xml.etag(level, "configuration"); @@ -1475,6 +1480,8 @@ void MusE::writeConfiguration(int level, Xml& xml) const ScoreEdit::write_configuration(level, xml); MasterEdit::writeConfiguration(level, xml); WaveEdit::writeConfiguration(level, xml); + + write_function_dialog_config(level, xml); writeMidiTransforms(level, xml); writeMidiInputTransforms(level, xml); diff --git a/muse2/muse/functions.cpp b/muse2/muse/functions.cpp index 65369b98..e14f32b8 100644 --- a/muse2/muse/functions.cpp +++ b/muse2/muse/functions.cpp @@ -436,3 +436,70 @@ void delete_overlaps(const set& parts, int range) if (undo_started) song->endUndo(SC_EVENT_MODIFIED); } } + + + +void read_function_dialog_config(Xml& xml) +{ + if (erase_dialog==NULL) + { + cout << "ERROR: THIS SHOULD NEVER HAPPEN: read_function_dialog_config() called, but\n" + " dialogs are still uninitalized (NULL)!"<read_configuration(xml); + else if (tag == "mod_velo") + velocity_dialog->read_configuration(xml); + else if (tag == "quantize") + quantize_dialog->read_configuration(xml); + else if (tag == "erase") + erase_dialog->read_configuration(xml); + else if (tag == "del_overlaps") + del_overlaps_dialog->read_configuration(xml); + else if (tag == "setlen") + set_notelen_dialog->read_configuration(xml); + else if (tag == "move") + move_notes_dialog->read_configuration(xml); + else if (tag == "transpose") + transpose_dialog->read_configuration(xml); + else + xml.unknown("function_dialogs"); + break; + + case Xml::TagEnd: + if (tag == "dialogs") + return; + + default: + break; + } + } +} + +void write_function_dialog_config(int level, Xml& xml) +{ + xml.tag(level++, "dialogs"); + + gatetime_dialog->write_configuration(level, xml); + velocity_dialog->write_configuration(level, xml); + quantize_dialog->write_configuration(level, xml); + erase_dialog->write_configuration(level, xml); + del_overlaps_dialog->write_configuration(level, xml); + set_notelen_dialog->write_configuration(level, xml); + move_notes_dialog->write_configuration(level, xml); + transpose_dialog->write_configuration(level, xml); + + xml.tag(level, "/dialogs"); +} diff --git a/muse2/muse/functions.h b/muse2/muse/functions.h index afd5b559..14797a15 100644 --- a/muse2/muse/functions.h +++ b/muse2/muse/functions.h @@ -57,4 +57,11 @@ bool transpose_notes(const std::set& parts); bool erase_notes(const std::set& parts); bool delete_overlaps(const std::set& parts); + + +//functions for reading and writing default values +class Xml; +void read_function_dialog_config(Xml& xml); +void write_function_dialog_config(int level, Xml& xml); + #endif diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp index 6481f4cb..192c0bd3 100644 --- a/muse2/muse/main.cpp +++ b/muse2/muse/main.cpp @@ -254,6 +254,7 @@ int main(int argc, char* argv[]) QApplication::setColorSpec(QApplication::ManyColor); MuseApplication app(argc, argv); + init_function_dialogs(muse); initShortCuts(); readConfiguration(); @@ -471,8 +472,6 @@ int main(int argc, char* argv[]) muse = new MusE(argc, &argv[optind]); app.setMuse(muse); muse->setWindowIcon(*museIcon); - - init_function_dialogs(muse); // Added by Tim. p3.3.22 diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index fd7000dd..9053f3a8 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -427,11 +427,9 @@ void MasterEdit::setTempo(int val) void MasterEdit::resizeEvent(QResizeEvent* ev) { QWidget::resizeEvent(ev); - _widthInit = ev->size().width(); - _heightInit = ev->size().height(); + storeInitialState(); } - //--------------------------------------------------------- // focusOutEvent //--------------------------------------------------------- @@ -439,5 +437,17 @@ void MasterEdit::resizeEvent(QResizeEvent* ev) void MasterEdit::focusOutEvent(QFocusEvent* ev) { QWidget::focusOutEvent(ev); + storeInitialState(); + } + + +//--------------------------------------------------------- +// storeInitialState +//--------------------------------------------------------- + +void MasterEdit::storeInitialState() + { + _widthInit = width(); + _heightInit = height(); _toolbarInit=saveState(); } diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h index 5abcfc8d..59a5ab05 100644 --- a/muse2/muse/master/masteredit.h +++ b/muse2/muse/master/masteredit.h @@ -66,6 +66,7 @@ class MasterEdit : public MidiEditor { virtual void closeEvent(QCloseEvent*); virtual void resizeEvent(QResizeEvent*); virtual void focusOutEvent(QFocusEvent*); + void storeInitialState(); private slots: void _setRaster(int); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index b762d776..b5ff9447 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -1023,9 +1023,7 @@ void DrumEdit::newCanvasWidth(int w) void DrumEdit::resizeEvent(QResizeEvent* ev) { QWidget::resizeEvent(ev); - _widthInit = ev->size().width(); - _heightInit = ev->size().height(); - + storeInitialState(); //TODO: Make the dlist not expand/shrink, but the canvas instead } @@ -1036,9 +1034,21 @@ void DrumEdit::resizeEvent(QResizeEvent* ev) void DrumEdit::focusOutEvent(QFocusEvent* ev) { QWidget::focusOutEvent(ev); + storeInitialState(); + } + +//--------------------------------------------------------- +// storeInitialState +//--------------------------------------------------------- + +void DrumEdit::storeInitialState() + { + _widthInit = width(); + _heightInit = height(); _toolbarInit=saveState(); } + //--------------------------------------------------------- // configChanged //--------------------------------------------------------- diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h index ab6c6cb3..242ec963 100644 --- a/muse2/muse/midiedit/drumedit.h +++ b/muse2/muse/midiedit/drumedit.h @@ -84,9 +84,12 @@ class DrumEdit : public MidiEditor { virtual void closeEvent(QCloseEvent*); QWidget* genToolbar(QWidget* parent); + virtual void keyPressEvent(QKeyEvent*); + virtual void resizeEvent(QResizeEvent*); virtual void focusOutEvent(QFocusEvent*); - virtual void keyPressEvent(QKeyEvent*); + void storeInitialState(); + void setHeaderToolTips(); void setHeaderWhatsThis(); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index 02fe7f5d..2a2bad5b 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -1191,8 +1191,7 @@ void PianoRoll::setSpeaker(bool val) void PianoRoll::resizeEvent(QResizeEvent* ev) { QWidget::resizeEvent(ev); - _widthInit = ev->size().width(); - _heightInit = ev->size().height(); + storeInitialState(); } @@ -1203,6 +1202,18 @@ void PianoRoll::resizeEvent(QResizeEvent* ev) void PianoRoll::focusOutEvent(QFocusEvent* ev) { QWidget::focusOutEvent(ev); + storeInitialState(); + } + + +//--------------------------------------------------------- +// storeInitialState +//--------------------------------------------------------- + +void PianoRoll::storeInitialState() + { + _widthInit = width(); + _heightInit = height(); _toolbarInit=saveState(); } diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h index 6090e34f..e157db10 100644 --- a/muse2/muse/midiedit/pianoroll.h +++ b/muse2/muse/midiedit/pianoroll.h @@ -132,6 +132,7 @@ class PianoRoll : public MidiEditor { virtual void keyPressEvent(QKeyEvent*); virtual void resizeEvent(QResizeEvent*); virtual void focusOutEvent(QFocusEvent*); + void storeInitialState(); private slots: void setSelection(int, Event&, Part*); diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp index 31203396..0b4111cd 100644 --- a/muse2/muse/midiedit/scoreedit.cpp +++ b/muse2/muse/midiedit/scoreedit.cpp @@ -358,12 +358,6 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos) init_name(); } -void ScoreEdit::focusOutEvent(QFocusEvent* ev) -{ - default_toolbar_state=saveState(); - QMainWindow::focusOutEvent(ev); -} - void ScoreEdit::add_parts(PartList* pl, bool all_in_one) { score_canvas->add_staves(pl, all_in_one); @@ -470,8 +464,21 @@ void ScoreEdit::resizeEvent(QResizeEvent* ev) { QWidget::resizeEvent(ev); - width_init=ev->size().width(); - height_init=ev->size().height(); + store_initial_state(); +} + +void ScoreEdit::focusOutEvent(QFocusEvent* ev) +{ + QMainWindow::focusOutEvent(ev); + + store_initial_state(); +} + +void ScoreEdit::store_initial_state() +{ + width_init=width(); + height_init=height(); + default_toolbar_state=saveState(); } void ScoreEdit::menu_command(int cmd) diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h index cfe6f34e..91d399e6 100644 --- a/muse2/muse/midiedit/scoreedit.h +++ b/muse2/muse/midiedit/scoreedit.h @@ -75,6 +75,8 @@ class ScoreEdit : public TopWin virtual void resizeEvent(QResizeEvent*); virtual void focusOutEvent(QFocusEvent*); + void store_initial_state(); + void init_name(); QGridLayout* mainGrid; diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp index f2d936f4..99dfd5f1 100644 --- a/muse2/muse/waveedit/waveedit.cpp +++ b/muse2/muse/waveedit/waveedit.cpp @@ -443,8 +443,7 @@ void WaveEdit::readStatus(Xml& xml) void WaveEdit::resizeEvent(QResizeEvent* ev) { QWidget::resizeEvent(ev); - _widthInit = ev->size().width(); - _heightInit = ev->size().height(); + storeInitialState(); } //--------------------------------------------------------- @@ -454,6 +453,18 @@ void WaveEdit::resizeEvent(QResizeEvent* ev) void WaveEdit::focusOutEvent(QFocusEvent* ev) { QWidget::focusOutEvent(ev); + storeInitialState(); + } + + +//--------------------------------------------------------- +// storeInitialState +//--------------------------------------------------------- + +void WaveEdit::storeInitialState() + { + _widthInit = width(); + _heightInit = height(); _toolbarInit=saveState(); } diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h index 921b314c..5c06d37f 100644 --- a/muse2/muse/waveedit/waveedit.h +++ b/muse2/muse/waveedit/waveedit.h @@ -51,9 +51,10 @@ class WaveEdit : public MidiEditor { Q_OBJECT virtual void closeEvent(QCloseEvent*); - virtual void resizeEvent(QResizeEvent* ev); virtual void keyPressEvent(QKeyEvent*); + virtual void resizeEvent(QResizeEvent* ev); virtual void focusOutEvent(QFocusEvent*); + void storeInitialState(); QMenu* menuFunctions, *select, *menuGain; diff --git a/muse2/muse/widgets/deloverlaps.cpp b/muse2/muse/widgets/deloverlaps.cpp index ed4fab83..76103d74 100644 --- a/muse2/muse/widgets/deloverlaps.cpp +++ b/muse2/muse/widgets/deloverlaps.cpp @@ -7,6 +7,7 @@ #include #include "deloverlaps.h" +#include "xml.h" DelOverlaps::DelOverlaps(QWidget* parent) @@ -42,3 +43,37 @@ int DelOverlaps::exec() return QDialog::exec(); } +void DelOverlaps::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else + xml.unknown("DelOverlaps"); + break; + + case Xml::TagEnd: + if (tag == "del_overlaps") + return; + + default: + break; + } + } +} + +void DelOverlaps::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "del_overlaps"); + xml.intTag(level, "range", range); + xml.tag(level, "/del_overlaps"); +} diff --git a/muse2/muse/widgets/deloverlaps.h b/muse2/muse/widgets/deloverlaps.h index cb0cebe6..813192a6 100644 --- a/muse2/muse/widgets/deloverlaps.h +++ b/muse2/muse/widgets/deloverlaps.h @@ -11,6 +11,7 @@ #include "ui_deloverlapsbase.h" class QButtonGroup; +class Xml; class DelOverlaps : public QDialog, public Ui::DelOverlapsBase { @@ -27,6 +28,9 @@ class DelOverlaps : public QDialog, public Ui::DelOverlapsBase int range; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + public slots: int exec(); }; diff --git a/muse2/muse/widgets/gatetime.cpp b/muse2/muse/widgets/gatetime.cpp index c64411a0..9448ab1c 100644 --- a/muse2/muse/widgets/gatetime.cpp +++ b/muse2/muse/widgets/gatetime.cpp @@ -10,6 +10,7 @@ #include "gatetime.h" +#include "xml.h" #include "song.h" //--------------------------------------------------------- @@ -63,3 +64,45 @@ int GateTime::exec() return QDialog::exec(); } + + +void GateTime::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "rate") + rateVal=xml.parseInt(); + else if (tag == "offset") + offsetVal=xml.parseInt(); + else + xml.unknown("ModLen"); + break; + + case Xml::TagEnd: + if (tag == "mod_len") + return; + + default: + break; + } + } +} + +void GateTime::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "mod_len"); + xml.intTag(level, "range", range); + xml.intTag(level, "offset", offsetVal); + xml.intTag(level, "rate", rateVal); + xml.tag(level, "/mod_len"); +} diff --git a/muse2/muse/widgets/gatetime.h b/muse2/muse/widgets/gatetime.h index 5585d6ad..d2555872 100644 --- a/muse2/muse/widgets/gatetime.h +++ b/muse2/muse/widgets/gatetime.h @@ -12,6 +12,7 @@ class QButtonGroup; class QDialog; +class Xml; //--------------------------------------------------------- // GateTime @@ -34,6 +35,10 @@ class GateTime : public QDialog, public Ui::GateTimeBase { int rateVal; int offsetVal; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/move.cpp b/muse2/muse/widgets/move.cpp index 116325c3..2ce6cb05 100644 --- a/muse2/muse/widgets/move.cpp +++ b/muse2/muse/widgets/move.cpp @@ -7,7 +7,7 @@ #include #include "move.h" - +#include "xml.h" Move::Move(QWidget* parent) : QDialog(parent) @@ -44,3 +44,41 @@ int Move::exec() return QDialog::exec(); } + +void Move::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "amount") + amount=xml.parseInt(); + else + xml.unknown("Move"); + break; + + case Xml::TagEnd: + if (tag == "move") + return; + + default: + break; + } + } +} + +void Move::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "move"); + xml.intTag(level, "range", range); + xml.intTag(level, "amount", amount); + xml.tag(level, "/move"); +} diff --git a/muse2/muse/widgets/move.h b/muse2/muse/widgets/move.h index a69a72c5..4c90a922 100644 --- a/muse2/muse/widgets/move.h +++ b/muse2/muse/widgets/move.h @@ -11,6 +11,7 @@ #include "ui_movebase.h" class QButtonGroup; +class Xml; class Move : public QDialog, public Ui::MoveBase { @@ -28,6 +29,10 @@ class Move : public QDialog, public Ui::MoveBase int range; int amount; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/quantize.cpp b/muse2/muse/widgets/quantize.cpp index 734f3d5d..111087c2 100644 --- a/muse2/muse/widgets/quantize.cpp +++ b/muse2/muse/widgets/quantize.cpp @@ -7,7 +7,7 @@ #include #include "quantize.h" - +#include "xml.h" Quantize::Quantize(QWidget* parent) : QDialog(parent) @@ -52,3 +52,52 @@ int Quantize::exec() return QDialog::exec(); } +void Quantize::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "strength") + strength=xml.parseInt(); + else if (tag == "threshold") + threshold=xml.parseInt(); + else if (tag == "raster") + raster_power2=xml.parseInt(); + else if (tag == "swing") + swing=xml.parseInt(); + else if (tag == "quant_len") + quant_len=xml.parseInt(); + else + xml.unknown("Quantize"); + break; + + case Xml::TagEnd: + if (tag == "quantize") + return; + + default: + break; + } + } +} + +void Quantize::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "quantize"); + xml.intTag(level, "range", range); + xml.intTag(level, "strength", strength); + xml.intTag(level, "threshold", threshold); + xml.intTag(level, "raster", raster_power2); + xml.intTag(level, "swing", swing); + xml.intTag(level, "quant_len", quant_len); + xml.tag(level, "/quantize"); +} diff --git a/muse2/muse/widgets/quantize.h b/muse2/muse/widgets/quantize.h index 3f54bc09..399e2545 100644 --- a/muse2/muse/widgets/quantize.h +++ b/muse2/muse/widgets/quantize.h @@ -11,6 +11,7 @@ #include "ui_quantbase.h" class QButtonGroup; +class Xml; class Quantize : public QDialog, public Ui::QuantBase { @@ -32,6 +33,10 @@ class Quantize : public QDialog, public Ui::QuantBase int swing; bool quant_len; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/remove.cpp b/muse2/muse/widgets/remove.cpp index cb75aa21..5ad272ab 100644 --- a/muse2/muse/widgets/remove.cpp +++ b/muse2/muse/widgets/remove.cpp @@ -7,7 +7,7 @@ #include #include "remove.h" - +#include "xml.h" Remove::Remove(QWidget* parent) : QDialog(parent) @@ -42,3 +42,37 @@ int Remove::exec() return QDialog::exec(); } +void Remove::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else + xml.unknown("Erase"); + break; + + case Xml::TagEnd: + if (tag == "erase") + return; + + default: + break; + } + } +} + +void Remove::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "erase"); + xml.intTag(level, "range", range); + xml.tag(level, "/erase"); +} diff --git a/muse2/muse/widgets/remove.h b/muse2/muse/widgets/remove.h index 7b749142..5615ed42 100644 --- a/muse2/muse/widgets/remove.h +++ b/muse2/muse/widgets/remove.h @@ -11,6 +11,7 @@ #include "ui_removebase.h" class QButtonGroup; +class Xml; class Remove : public QDialog, public Ui::RemoveBase { @@ -27,6 +28,10 @@ class Remove : public QDialog, public Ui::RemoveBase int range; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/setlen.cpp b/muse2/muse/widgets/setlen.cpp index a1de875a..024cdd35 100644 --- a/muse2/muse/widgets/setlen.cpp +++ b/muse2/muse/widgets/setlen.cpp @@ -7,7 +7,7 @@ #include #include "setlen.h" - +#include "xml.h" Setlen::Setlen(QWidget* parent) : QDialog(parent) @@ -44,3 +44,40 @@ int Setlen::exec() return QDialog::exec(); } +void Setlen::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "len") + len=xml.parseInt(); + else + xml.unknown("SetLen"); + break; + + case Xml::TagEnd: + if (tag == "setlen") + return; + + default: + break; + } + } +} + +void Setlen::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "setlen"); + xml.intTag(level, "range", range); + xml.intTag(level, "len", len); + xml.tag(level, "/setlen"); +} diff --git a/muse2/muse/widgets/setlen.h b/muse2/muse/widgets/setlen.h index 7dc54eb6..ad66a38b 100644 --- a/muse2/muse/widgets/setlen.h +++ b/muse2/muse/widgets/setlen.h @@ -11,6 +11,7 @@ #include "ui_setlenbase.h" class QButtonGroup; +class Xml; class Setlen : public QDialog, public Ui::SetlenBase { @@ -28,6 +29,10 @@ class Setlen : public QDialog, public Ui::SetlenBase int range; int len; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/transpose.cpp b/muse2/muse/widgets/transpose.cpp index 66411829..b10c1249 100644 --- a/muse2/muse/widgets/transpose.cpp +++ b/muse2/muse/widgets/transpose.cpp @@ -7,7 +7,7 @@ #include #include "transpose.h" - +#include "xml.h" Transpose::Transpose(QWidget* parent) : QDialog(parent) @@ -44,3 +44,40 @@ int Transpose::exec() return QDialog::exec(); } +void Transpose::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "amount") + amount=xml.parseInt(); + else + xml.unknown("Transpose"); + break; + + case Xml::TagEnd: + if (tag == "transpose") + return; + + default: + break; + } + } +} + +void Transpose::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "transpose"); + xml.intTag(level, "range", range); + xml.intTag(level, "amount", amount); + xml.tag(level, "/transpose"); +} diff --git a/muse2/muse/widgets/transpose.h b/muse2/muse/widgets/transpose.h index 1ade8766..97dd443e 100644 --- a/muse2/muse/widgets/transpose.h +++ b/muse2/muse/widgets/transpose.h @@ -11,6 +11,7 @@ #include "ui_transposebase.h" class QButtonGroup; +class Xml; class Transpose : public QDialog, public Ui::TransposeBase { @@ -28,6 +29,10 @@ class Transpose : public QDialog, public Ui::TransposeBase int range; int amount; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/muse/widgets/velocity.cpp b/muse2/muse/widgets/velocity.cpp index ad9bbfe4..ec625489 100644 --- a/muse2/muse/widgets/velocity.cpp +++ b/muse2/muse/widgets/velocity.cpp @@ -7,6 +7,7 @@ #include #include "velocity.h" +#include "xml.h" //--------------------------------------------------------- // Velocity @@ -58,3 +59,44 @@ int Velocity::exec() return QDialog::exec(); } + +void Velocity::read_configuration(Xml& xml) +{ + for (;;) + { + Xml::Token token = xml.parse(); + if (token == Xml::Error || token == Xml::End) + break; + + const QString& tag = xml.s1(); + switch (token) + { + case Xml::TagStart: + if (tag == "range") + range=xml.parseInt(); + else if (tag == "rate") + rateVal=xml.parseInt(); + else if (tag == "offset") + offsetVal=xml.parseInt(); + else + xml.unknown("ModVelo"); + break; + + case Xml::TagEnd: + if (tag == "mod_velo") + return; + + default: + break; + } + } +} + +void Velocity::write_configuration(int level, Xml& xml) +{ + xml.tag(level++, "mod_velo"); + xml.intTag(level, "range", range); + xml.intTag(level, "offset", offsetVal); + xml.intTag(level, "rate", rateVal); + xml.tag(level, "/mod_velo"); +} diff --git a/muse2/muse/widgets/velocity.h b/muse2/muse/widgets/velocity.h index 448b3e5b..cbea4e22 100644 --- a/muse2/muse/widgets/velocity.h +++ b/muse2/muse/widgets/velocity.h @@ -11,6 +11,7 @@ #include "ui_velocitybase.h" class QButtonGroup; +class Xml; //--------------------------------------------------------- // Velocity @@ -32,6 +33,10 @@ class Velocity : public QDialog, public Ui::VelocityBase { int rateVal; int offsetVal; + void read_configuration(Xml& xml); + void write_configuration(int level, Xml& xml); + + public slots: int exec(); }; diff --git a/muse2/share/templates/audio.med b/muse2/share/templates/audio.med index 9b8e1d93..14cd9c47 100644 --- a/muse2/share/templates/audio.med +++ b/muse2/share/templates/audio.med @@ -9,27 +9,31 @@ 0 0 0 - 127 - 127 - 1 - -1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 00:00:00:00:00 + 1 + 1 + 1 0 - 0 - 0 - 0 - 0 - 1 - 1 0 0 - 0 + 0 + + + 0 + 0 1 - 298 764 + 298 298 -
7 6 5 4 3 2 1 0
+
7 6 5 4 3 2 1 0 8
0 266 @@ -44,50 +48,323 @@ 70 9 0 - 1 - 1 + 0 + 0 4 4 0 0 1 0 + 0.5 0 28 31 33 29 + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 96 96 - 600 - 400 - 50 - 300 + 883 + 465 + 126 + 753 + 000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000 - 96 96 - 80 - 50 - 0 - 0 - 600 - 400 + 879 + 467 0 + 000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000 + + 880 + 466 + 000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000 + 0 + 875 + 464 + 000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000 - - 600 - 400 + + 883 + 466 + 000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000 + + + 1 + 0 + 100 + + + 1 + 0 + 100 + + + 1 + 90 + 0 + 3 + 0 + 1 + + + 1 + + + 1 + + + 1 + 384 + + + 1 + 0 + + + 1 + 0 + + + + 1 0 0 0 @@ -105,6 +382,7 @@ 0 0 1 + 44100 Track 1 0 @@ -115,16 +393,18 @@ 20 0 1 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, - + + 0 0, + + @@ -136,16 +416,18 @@ 1 20 1 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, + + + 0 0, - + @@ -157,16 +439,18 @@ 1 20 0 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, - + + 0 0, + + @@ -178,16 +462,18 @@ 1 20 0 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, + + + 0 0, - + @@ -199,16 +485,18 @@ 1 20 1 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, - + + 0 0, + + @@ -220,16 +508,18 @@ 1 20 0 - 0 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, + + + 0 0, - + @@ -241,14 +531,16 @@ 2 20 1 - 0 - 0 0 - 0 + 0 1 - + + 0 0, + + + 0 0, - + @@ -260,14 +552,16 @@ 2 20 1 - 0 - 0 0 - 0 + 0 1 - + + 0 0, - + + 0 0, + + @@ -279,16 +573,18 @@ 2 20 1 - 1 - 0 0 - 0 + 0 1 - 0 - 0 - + 0 + 0 + + 0 0, + + + 0 0, - + @@ -300,14 +596,16 @@ 2 20 1 - 0 - 0 0 - 0 + 0 1 - + + 0 0, - + + 0 0, + + @@ -323,7 +621,15 @@ 4 + + + 0 + 1 + + + + diff --git a/muse2/share/templates/default.med b/muse2/share/templates/default.med index c0270b3a..8772f759 100644 --- a/muse2/share/templates/default.med +++ b/muse2/share/templates/default.med @@ -9,6 +9,13 @@ 0 0 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 00:00:00:00:00 1 @@ -18,11 +25,13 @@ 0 0 0 + + 0 0 1 - 418 751 + 418 456
8 7 6 5 4 3 2 1 0
@@ -54,38 +63,308 @@ 31 33 29 + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 96 96 - 600 - 400 - 50 - 300 - 0 + 883 + 465 + 126 + 753 + 000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000 - 96 96 - 80 - 50 - 0 - 0 - 600 - 400 + 879 + 467 0 + 000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000 + + 880 + 466 + 000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000 + 0 + 875 + 464 + 000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000 - 600 - 400 + 883 + 466 + 000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000 + + + 1 + 0 + 100 + + + 1 + 0 + 100 + + + 1 + 90 + 0 + 3 + 0 + 1 + + + 1 + + + 1 + + + 1 + 384 + + + 1 + 0 + + + 1 + 0 + + + 1 1 0 0 @@ -103,6 +382,7 @@ 0 0 1 + 44100 Out 1 0 @@ -116,24 +396,16 @@ 0 0 0 - + 0 1, - + 0 0, - + 0 0, - - - - - - - - 0 @@ -147,6 +419,12 @@ 4 + + + 0 + 1 + + diff --git a/muse2/share/templates/midiGM.med b/muse2/share/templates/midiGM.med index 1314effb..bbc04498 100644 --- a/muse2/share/templates/midiGM.med +++ b/muse2/share/templates/midiGM.med @@ -9,27 +9,31 @@ 0 0 0 - 127 - 127 - 1 - -1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 00:00:00:00:00 + 1 + 1 + 1 0 - 0 - 0 - 0 - 0 - 1 - 1 0 0 - 0 + 0 + + + 0 + 0 1 - 298 764 + 298 298 -
7 6 5 4 3 2 1 0
+
7 6 5 4 3 2 1 0 8
0 266 @@ -44,14 +48,15 @@ 70 9 0 - 1 - 1 + 0 + 0 4 4 0 0 1 0 + 0.5 0 28 @@ -59,7 +64,7 @@ 33 29 - GM + 1 0 @@ -67,6 +72,12 @@ 0 + + + + + + 0 @@ -78,6 +89,12 @@ 0 + + + + + + 0 @@ -89,6 +106,12 @@ 0 + + + + + + 0 @@ -100,6 +123,12 @@ 0 + + + + + + 0 @@ -111,6 +140,12 @@ 0 + + + + + + 0 @@ -122,6 +157,12 @@ 0 + + + + + + 0 @@ -133,6 +174,12 @@ 0 + + + + + + 0 @@ -144,6 +191,12 @@ 0 + + + + + + 0 @@ -155,6 +208,12 @@ 0 + + + + + + 0 @@ -166,6 +225,12 @@ 0 + + + + + + 0 @@ -177,6 +242,12 @@ 0 + + + + + + 0 @@ -188,6 +259,12 @@ 0 + + + + + + 0 @@ -199,6 +276,12 @@ 0 + + + + + + 0 @@ -210,6 +293,12 @@ 0 + + + + + + 0 @@ -221,6 +310,12 @@ 0 + + + + + + 0 @@ -232,6 +327,12 @@ 0 + + + + + + 0 @@ -239,34 +340,79 @@ - 96 96 - 600 - 400 - 50 - 300 + 883 + 465 + 126 + 753 + 000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000 - 96 96 - 80 - 50 - 0 - 0 - 600 - 400 + 879 + 467 0 + 000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000 + + 880 + 466 + 000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000 + 0 + 875 + 464 + 000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000 - - 600 - 400 + + 883 + 466 + 000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000 + + + 1 + 0 + 100 + + + 1 + 0 + 100 + + + 1 + 90 + 0 + 3 + 0 + 1 + + + 1 + + + 1 + + + 1 + 384 + + + 1 + 0 + + + 1 + 0 + + + + 1 0 0 0 @@ -282,8 +428,9 @@ 0 0 0 - 0 + 6144 1 + 44100 Track 1 0 @@ -296,9 +443,8 @@ 1 0 0 - 65535 - 65535 0 + 1 0 0 0 @@ -317,9 +463,8 @@ 0 0 0 - 65535 - 65535 0 + 1 0 0 0 @@ -338,9 +483,8 @@ 0 0 0 - 65535 - 65535 0 + 1 0 0 0 @@ -359,9 +503,8 @@ 0 0 0 - 65535 - 65535 0 + 1 0 0 0 @@ -380,9 +523,8 @@ 0 0 9 - 65535 - 65535 0 + 1 0 0 0 @@ -390,6 +532,46 @@ 100 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 @@ -403,7 +585,15 @@ 4 + + + 0 + 1 + + + + diff --git a/muse2/share/templates/monorecord.med b/muse2/share/templates/monorecord.med index 8ba68625..fc8b324c 100644 --- a/muse2/share/templates/monorecord.med +++ b/muse2/share/templates/monorecord.med @@ -1,322 +1,370 @@ - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 127 - 127 - 1 - -1 - 1 - 00:00:00:00:00 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - - - 0 - - 0 - 298 296 - -
7 6 5 4 3 2 1 0
-
- 0 - 266 - 0 -
- - - 2 - 63 - 127 - 63 - 70 - 9 - 0 - 1 - 1 - 4 - 4 - 0 - 0 - 1 - 0 - - 0 - 28 - 31 - 33 - 29 - - GM - TASCAM US-X2Y Port 0 - 1 - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - - - 96 - 96 - 600 - 400 - 50 - 300 - - - 96 - 96 - 80 - 50 - 0 - 0 - 600 - 400 - 0 - - - 0 - - - - 600 - 400 - -
+ 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 00:00:00:00:00 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + + + 0 + 0 + + 0 + 298 298 + +
7 6 5 4 3 2 1 0 8
+
+ 0 + 266 + 0 +
+ + + 2 + 63 + 127 + 63 + 70 + 9 + 0 + 0 + 0 + 4 + 4 + 0 + 0 + 1 + 0 + 0.5 + + 0 + 28 + 31 + 33 + 29 + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 96 + 883 + 465 + 126 + 753 + 000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000 + + + 96 + 879 + 467 + 0 + 000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000 + + + 880 + 466 + 000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000 + + + 0 + 875 + 464 + 000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000 + + + + 883 + 466 + 000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000 + + + + 1 + 0 + 100 + + + 1 + 0 + 100 + + + 1 + 90 + 0 + 3 + 0 + 1 + + + 1 + + + 1 + + + 1 + 384 + + + 1 + 0 + + + 1 + 0 + + + + + 1 0 0 0 @@ -334,6 +382,7 @@ 0 0 1 + 44100 Track 1 1 @@ -343,15 +392,16 @@ 1 20 0 - 0 - 0 0 - 0 - 0.000000 - 0.000000 - + 0 + 0 + + 0 1.02164, + + + 0 0, - + @@ -364,15 +414,16 @@ 20 1 1 - 0 - 0 0 - 0 - 0.000000 - 0.000000 - + 0 + 0 + + 0 1.02164, + + + 0 0, - + @@ -384,26 +435,25 @@ 1 20 1 - 0 - 0 0 - 0 - + 0 + 0 + + 0 1.30152, + + + 0 0, - + - alsa_pcm:capture_1 - 1:Input 1 + + - Input 1 - Out 1 - - - Input 1 - Track 1 + + @@ -418,15 +468,15 @@ 4 + + + 0 + 1 + + - - - - - -
diff --git a/muse2/share/templates/synti.med b/muse2/share/templates/synti.med index b5ad8908..1a14a9ce 100644 --- a/muse2/share/templates/synti.med +++ b/muse2/share/templates/synti.med @@ -1,577 +1,773 @@ - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 127 - 127 - 1 - -1 - 1 - 00:00:00:00:00 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - - - 0 - - 0 - 298 296 - -
7 6 5 4 3 2 1 0
-
- 0 - 266 - 0 -
- - - 2 - 63 - 127 - 63 - 70 - 9 - 0 - 1 - 1 - 4 - 4 - 0 - 0 - 1 - 0 - - 0 - 28 - 31 - 33 - 29 - - organ-1 - organ-1 - 0 - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - 1 - 7 - 10 - 11 - 64 - 91 - 93 - 120 - 121 - 123 - 262144 - 262145 - - - - fluid-1 - fluid-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - s1-1 - s1-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - vam-1 - vam-1 - 0 - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - 7 - 10 - 262145 - - - - - 96 - 96 - 600 - 400 - 50 - 300 - - - 96 - 96 - 80 - 50 - 0 - 0 - 600 - 400 - 0 - - - 0 - - - - 600 - 400 - -
+ 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 00:00:00:00:00 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + + + 0 + 0 + + 0 + 298 298 + +
7 6 5 4 3 2 1 0 8
+
+ 0 + 266 + 0 +
+ + + 2 + 63 + 127 + 63 + 70 + 9 + 0 + 0 + 0 + 4 + 4 + 0 + 0 + 1 + 0 + 0.5 + + 0 + 28 + 31 + 33 + 29 + + 1 + organ-1 + organ-1 + 2 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + fluid-1 + fluid-1 + 2 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + General Midi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vam-1 + vam-1 + 2 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 96 + 883 + 465 + 126 + 753 + 000000ff00000000fd00000000000003730000015c00000004000000040000000800000008fc00000004000000020000000400000014004400720075006d00200074006f006f006c00730100000000000000d1000000000000000000000014004500640069007400200054006f006f006c007301000000d1000000c8000000000000000000000012007400720061006e00730070006f0072007401000001990000018400000000000000000000000a00700061006e00690063010000031dffffffff00000000000000000000000200000000000000020000000100000012004e006f0074006500200049006e0066006f0100000000ffffffff000000000000000000000002000000020000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000083ffffffff0000000000000000 + + + 96 + 879 + 467 + 0 + 000000ff00000000fd000000000000036f0000017800000004000000040000000800000008fc00000006000000020000000000000002000000000000000200000000000000020000000000000002000000030000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000091ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000103ffffffff00000000000000000000000200000003000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c007301000000000000024c000000000000000000000012007400720061006e00730070006f00720074010000024c000000fc00000000000000000000000a00700061006e006900630100000348ffffffff0000000000000000 + + + 880 + 466 + 000000ff00000000fd00000000000003700000018500000004000000040000000800000008fc0000000200000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff000000000000000000000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000099ffffffff000000000000000000000002000000030000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000000000024a000000000000000000000012007400720061006e00730070006f00720074010000024a000000fc00000000000000000000000a00700061006e0069006301000003460000011f0000000000000000 + + + 0 + 875 + 464 + 000000ff00000000fd000000000000036b000001a400000004000000040000000800000008fc000000010000000200000004ffffffff0100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000040ffffffff0000000000000000ffffffff0100000099ffffffff0000000000000000ffffffff01000000faffffffff0000000000000000 + + + + 883 + 466 + 000000ff00000000fd0000000000000373000001a100000004000000040000000800000008fc0000000200000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000400000023b000000000000000000000012007400720061006e00730070006f00720074010000027b0000003900000000000000000000000200000000 + + + + 1 + 0 + 100 + + + 1 + 0 + 100 + + + 1 + 90 + 0 + 3 + 0 + 1 + + + 1 + + + 1 + + + 1 + 384 + + + 1 + 0 + + + 1 + 0 + + + + + 1 0 12288 0 @@ -589,6 +785,7 @@ 0 18432 1 + 44100 Track 1 0 @@ -600,15 +797,14 @@ 0 0 0 - 65535 - 65535 0 + 1 0 0 0 100 100 - 1 + 1 Track 1 @@ -626,13 +822,16 @@ 20 0 1 - 0 - 0 0 - 0 - + 0 + 0 + + 0 1.02164, - + + 0 0, + + @@ -643,24 +842,23 @@ 1 2 20 - 124 - 0 - 0 + 1 0 - 1 - + 0 + 0 + + 0 1.41091, + + + 0 0, - + fluid + 1 - 0 - - - 7c 00 01 2f 68 6f 6d 65 2f 77 73 2f 73 66 6f 6e - 74 2f 46 6c 75 69 64 52 33 2e 53 46 32 00 - - + 0 + organ-1 @@ -671,52 +869,33 @@ 1 20 0 - 0 - 0 0 - 0 - + 0 + 0 + + 0 1.02164, + + + 0 -0.04, - + organ + 0 - 0 + 0 + + - - 00 00 03 00 ff 3f 00 00 01 00 03 00 ff 3f 00 00 - 02 00 03 00 ff 3f 00 00 03 00 03 00 ff 3f 00 00 - 04 00 03 00 ff 3f 00 00 05 00 03 00 ff 3f 00 00 - 06 00 03 00 a2 00 00 00 07 00 03 00 00 00 00 00 - 08 00 03 00 ff 3f 00 00 09 00 03 00 fe 1f 00 00 - 0a 00 03 00 a2 00 00 00 0b 00 03 00 00 00 00 00 - 0c 00 03 00 ff 3f 00 00 0d 00 03 00 fe 1f 00 00 - 0e 00 03 00 01 00 00 00 0f 00 03 00 01 00 00 00 - 10 00 03 00 01 00 00 00 + + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 14 00 00 00 14 00 00 00 + 00 00 00 00 14 00 00 00 0a 00 00 00 0a 00 00 00 + 00 00 00 00 0a 00 00 00 01 00 00 00 01 00 00 00 + 01 00 00 00 00 00 00 00 - - s1-1 - 0 - 0 - 0 - 1 - 1 - 20 - 11 - 0 - 0 - 0 - 1 - - - - - s1 - 2 - 0 - vam-1 0 @@ -726,41 +905,79 @@ 1 20 0 - 0 - 0 0 - 1 - + 0 + 0 + + 0 0, + + + 0 0, - + vam + 3 - 0 + 0 + + + + + 00 20 00 00 00 20 00 00 01 00 00 00 01 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + fe 3e 00 00 fe 3e 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 ff 3f 00 00 + 00 00 00 00 00 00 00 00 00 00 00 00 7a 3a 00 00 + 00 20 00 00 00 20 00 00 00 00 00 00 00 00 00 00 + + - - 1:Out 1 - alsa_pcm:playback_1 + + + + + + + + + + + + + + + - - 2:Out 1 - alsa_pcm:playback_2 + + + - - fluid-1 - Out 1 + + + - - organ-1 - Out 1 + + + - - s1-1 - Out 1 + + + - - vam-1 - Out 1 + + + + + + + + + + + @@ -775,35 +992,15 @@ 4 + + + 0 + 1 + + - - - - - - 0:0 - - - - - 96 - 96 - - 255 - 0 - 0 - 1 - 80 - 50 - 0 - 0 - 0 - 346 - 390 - 286 -
-- cgit v1.2.3