diff options
| -rw-r--r-- | muse/ChangeLog | 3 | ||||
| -rw-r--r-- | muse/doc/man/en/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | muse/muse/muse.cpp | 14 | ||||
| -rw-r--r-- | muse/muse/templatedialog.cpp | 78 | ||||
| -rw-r--r-- | muse/muse/templatedialog.h | 2 | ||||
| -rw-r--r-- | muse/share/templates/audio.med | 518 | ||||
| -rw-r--r-- | muse/share/templates/monorecord.med | 8 | 
7 files changed, 357 insertions, 268 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog index 1031a547..7a9303ed 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,3 +1,6 @@ +18.5 (ws) +      * added "Muse templates" and "User templates" to template list +        in template dialog  15.5 (rj)        * Fixed hardcoded refs to qt in CMakeLists.txt  11.5 (ws) diff --git a/muse/doc/man/en/CMakeLists.txt b/muse/doc/man/en/CMakeLists.txt index 639c8ccf..a5bc1a8b 100644 --- a/muse/doc/man/en/CMakeLists.txt +++ b/muse/doc/man/en/CMakeLists.txt @@ -36,7 +36,7 @@ add_custom_target ( man-en ALL        )  install_files ( /share/${MusE_INSTALL_NAME}/doc/ .pdf  -   ${CMAKE_CURRENT_SOURCE_DIR}/man-en.pdf ) +   ${CMAKE_CURRENT_BINARY_DIR}/man-en.pdf )  set (extraClean man-en.log man-en.tmp man-en.tuo man-en.tui     man-en-mpgraph.mp mpgraph.mp ) diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index ad197e1b..4be5f45d 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -1138,19 +1138,23 @@ void MusE::loadProject1(const QString& path)        else {              TemplateDialog templateDialog;              if (templateDialog.exec() == 1) { -                  QString path = templateDialog.templatePath(); -                  if (!path.isEmpty()) { -                        QFile f(path); +                  s  = templateDialog.templatePath(); +                  if (!s.isEmpty()) { +                        QFile f(s);                          if (f.open(QIODevice::ReadOnly)) {                                rv = song->read(&f);                                f.close();                                } +                        else { +                              QString msg(tr("Cannot open template file\n%1")); +                              QMessageBox::critical(this, header, msg.arg(s)); +                              }                          }                    }              }        if (!rv) { -            QMessageBox::critical(this, QString("MusE"), -               tr("File read error")); +            QString msg(tr("File <%1> read error")); +            QMessageBox::critical(this, header, msg.arg(s));              }        tr_id->setChecked(config.transportVisible); diff --git a/muse/muse/templatedialog.cpp b/muse/muse/templatedialog.cpp index dc5efce5..1cb7436d 100644 --- a/muse/muse/templatedialog.cpp +++ b/muse/muse/templatedialog.cpp @@ -26,14 +26,14 @@  //  // entry types for templateTree tree widget:  // -enum { DIR_TYPE, TEMPLATE_TYPE }; +enum { DIR_TYPE, LOCAL_TEMPLATE_TYPE, GLOBAL_TEMPLATE_TYPE};  //---------------------------------------------------------  //   processSubdir  //---------------------------------------------------------  void TemplateDialog::processSubdir(QTreeWidgetItem* item, const QString& p,  -   const QString& subdir) +   const QString& subdir, int type)        {        QDir pd(p + "/" + subdir);        pd.setFilter(QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot); @@ -43,12 +43,11 @@ void TemplateDialog::processSubdir(QTreeWidgetItem* item, const QString& p,              QTreeWidgetItem* pi;              if (s.isDir()) {                    pi = new QTreeWidgetItem(item, DIR_TYPE); -                  pi->setIcon(0, style()->standardIcon(QStyle::SP_FileIcon));                    itemCollapsed(pi); -                  processSubdir(pi, pd.absolutePath(), s.fileName()); +                  processSubdir(pi, pd.absolutePath(), s.fileName(), type);                    }              else { -                  pi = new QTreeWidgetItem(item, TEMPLATE_TYPE); +                  pi = new QTreeWidgetItem(item, type);                    pi->setIcon(0, style()->standardIcon(QStyle::SP_FileIcon));                    }              pi->setText(0, s.fileName()); @@ -66,25 +65,26 @@ TemplateDialog::TemplateDialog(QWidget* parent)        templateTree->setSelectionBehavior(QAbstractItemView::SelectRows);        templateTree->setSelectionMode(QAbstractItemView::SingleSelection); -      QDir pd(QDir::homePath() + "/" + config.templatePath); -      pd.setFilter(QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot); -      pd.setNameFilters(QStringList("*.med")); -      QFileInfoList el = pd.entryInfoList(); -      foreach (QFileInfo s, el) { -            QTreeWidgetItem* pi; +      // +      //    add global templates to list +      // +      QTreeWidgetItem* pi; +      pi = new QTreeWidgetItem(templateTree, DIR_TYPE); +      templateTree->setItemExpanded(pi, true); +      itemExpanded(pi); +      pi->setText(0, tr("MusE presets")); +      processSubdir(pi, museGlobalShare, "templates", GLOBAL_TEMPLATE_TYPE); + +      // +      //    add local templates to list +      // +      pi = new QTreeWidgetItem(templateTree, DIR_TYPE); +      pi->setIcon(0, style()->standardIcon(QStyle::SP_FileIcon)); +      templateTree->setItemExpanded(pi, true); +      itemExpanded(pi); +      pi->setText(0, tr("User presets")); +      processSubdir(pi, QDir::homePath() + "/" + config.templatePath, ".", LOCAL_TEMPLATE_TYPE); -            if (s.isDir()) { -                  pi = new QTreeWidgetItem(templateTree, DIR_TYPE); -                  pi->setIcon(0, style()->standardIcon(QStyle::SP_FileIcon)); -                  itemCollapsed(pi); -                  processSubdir(pi, pd.absolutePath(), s.fileName()); -                  } -            else { -                  pi = new QTreeWidgetItem(templateTree, TEMPLATE_TYPE); -                  pi->setIcon(0, style()->standardIcon(QStyle::SP_FileIcon)); -                  } -            pi->setText(0, s.fileName()); -            }        connect(templateTree,            SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),            SLOT(currentChanged(QTreeWidgetItem*, QTreeWidgetItem*))); @@ -132,10 +132,11 @@ QString TemplateDialog::itemPath(QTreeWidgetItem* item) const              dirComponent.prepend(ti->text(0));              ti = ti->parent();              } while (ti); -      foreach (QString s, dirComponent) { +      size_t n = dirComponent.size(); +      for (size_t i = 1; i < n; ++i) {              if (!path.isEmpty())                    path += "/"; -            path += s; +            path += dirComponent[i];              }        return path;        } @@ -146,7 +147,12 @@ QString TemplateDialog::itemPath(QTreeWidgetItem* item) const  void TemplateDialog::currentChanged(QTreeWidgetItem* item, QTreeWidgetItem*)        { -      bool enable = (item != 0) && (item->type() == TEMPLATE_TYPE); +      bool enable = (item != 0) &&  +        ( +            (item->type() == LOCAL_TEMPLATE_TYPE) +            || +            (item->type() == GLOBAL_TEMPLATE_TYPE) +         );        createdDate->setEnabled(enable);        modifiedDate->setEnabled(enable);        comment->setEnabled(enable); @@ -155,11 +161,15 @@ void TemplateDialog::currentChanged(QTreeWidgetItem* item, QTreeWidgetItem*)        if (!enable)              return; -      QString pd(QDir::homePath() + "/" + config.templatePath + "/"); +      QString pd; +      if (item->type() == LOCAL_TEMPLATE_TYPE) +            pd = QDir::homePath() + "/" + config.templatePath; +      else +            pd =  museGlobalShare + "/" + "templates";        pd += "/" + itemPath(item); -      QFileInfo pf(pd + "/" + item->text(0) + ".med"); +      QFileInfo pf(pd);        createdDate->setDateTime(pf.created());        modifiedDate->setDateTime(pf.lastModified()); @@ -216,8 +226,13 @@ QString TemplateDialog::templatePath() const        {        QTreeWidgetItem* item = templateTree->currentItem();        QString s; -      if (item) -            s = itemPath(item); +      if (item) { +            if (item->type() == LOCAL_TEMPLATE_TYPE) +                  s = QDir::homePath() + "/" + config.templatePath; +            else +                  s =  museGlobalShare + "/" + "templates"; +            s += "/" + itemPath(item); +            }        return s;        } @@ -227,7 +242,8 @@ QString TemplateDialog::templatePath() const  void TemplateDialog::itemDoubleClicked(QTreeWidgetItem* item, int)        { -      if (item->type() == TEMPLATE_TYPE) +      if ((item->type() == LOCAL_TEMPLATE_TYPE) || +         (item->type() == GLOBAL_TEMPLATE_TYPE))              accept();              } diff --git a/muse/muse/templatedialog.h b/muse/muse/templatedialog.h index 108163d1..d9fd5db9 100644 --- a/muse/muse/templatedialog.h +++ b/muse/muse/templatedialog.h @@ -31,7 +31,7 @@ class TemplateDialog : public QDialog, public Ui_TemplateDialogBase {        Q_OBJECT        void processSubdir(QTreeWidgetItem*, const QString&,  -         const QString&); +         const QString&, int);        QString itemPath(QTreeWidgetItem*) const; diff --git a/muse/share/templates/audio.med b/muse/share/templates/audio.med index 208313ff..e35752d8 100644 --- a/muse/share/templates/audio.med +++ b/muse/share/templates/audio.med @@ -1,20 +1,12 @@  <?xml version="1.0"?> -<muse version="2.0"> +<muse version="2.1">    <configuration> -    <midiInputDevice>0</midiInputDevice> -    <midiInputChannel>0</midiInputChannel> -    <midiRecordType>0</midiRecordType> -    <midiThruType>0</midiThruType> -    <midiFilterCtrl1>0</midiFilterCtrl1> -    <midiFilterCtrl2>0</midiFilterCtrl2> -    <midiFilterCtrl3>0</midiFilterCtrl3> -    <midiFilterCtrl4>0</midiFilterCtrl4>      <txDeviceId>127</txDeviceId>      <rxDeviceId>127</rxDeviceId> -    <txSyncPort>1</txSyncPort> -    <rxSyncPort>-1</rxSyncPort>      <mtctype>1</mtctype> -    <mtcoffset>00:00:00:00:00</mtcoffset> +    <mtcoffset> +      00:00:00:00:00 +      </mtcoffset>      <extSync>0</extSync>      <genMTCSync>0</genMTCSync>      <genMCSync>0</genMCSync> @@ -24,292 +16,366 @@      <acceptMC>1</acceptMC>      <bigtimeVisible>0</bigtimeVisible>      <transportVisible>0</transportVisible> -    <mixerVisible>0</mixerVisible> -    <arranger> -      <info>1</info> -      <split>298 764 </split> -      <list> -        <header> 7 6 5 4 3 2 1 0 </header> -        </list> -      <xpos>0</xpos> -      <xmag>266</xmag> -      <ypos>1</ypos> -      </arranger> -    <sequencer> -      <metronom> -        <premeasures>2</premeasures> -        <measurepitch>63</measurepitch> -        <measurevelo>127</measurevelo> -        <beatpitch>63</beatpitch> -        <beatvelo>70</beatvelo> -        <channel>9</channel> -        <port>0</port> -        <precountEnable>1</precountEnable> -        <fromMastertrack>1</fromMastertrack> -        <signatureZ>4</signatureZ> -        <signatureN>4</signatureN> -        <prerecord>0</prerecord> -        <preroll>0</preroll> -        <midiClickEnable>1</midiClickEnable> -        <audioClickEnable>0</audioClickEnable> -        </metronom> -      <rcEnable>0</rcEnable> -      <rcStop>28</rcStop> -      <rcRecord>31</rcRecord> -      <rcGotoLeft>33</rcGotoLeft> -      <rcPlay>29</rcPlay> -      </sequencer> -    <drumedit> -      <quant>96</quant> -      <raster>96</raster> -      <width>600</width> -      <height>400</height> -      <dlistwidth>50</dlistwidth> -      <dcanvaswidth>300</dcanvaswidth> -      </drumedit> -    <pianoroll> -      <quant>96</quant> -      <raster>96</raster> -      <quantStrength>80</quantStrength> -      <quantLimit>50</quantLimit> -      <quantLen>0</quantLen> -      <to>0</to> -      <width>600</width> -      <height>400</height> -      <colormode>0</colormode> -      </pianoroll> -    <masteredit> -      <raster>0</raster> -      </masteredit> -    <waveedit> -      <bgcolor r="0" g="0" b="0"></bgcolor> -      <width>600</width> -      <height>400</height> -      </waveedit> +    <geometryMain x="668" y="0" w="800" h="663" /> +    <geometryTransport x="0" y="0" w="763" h="108" /> +    <mixer1Visible>1</mixer1Visible> +    <mixer2Visible>0</mixer2Visible> +    <mixer1> +      <geometry x="4" y="22" w="660" h="660" /> +      <showMidiTracks>0</showMidiTracks> +      <showOutputTracks>1</showOutputTracks> +      <showWaveTracks>1</showWaveTracks> +      <showGroupTracks>1</showGroupTracks> +      <showInputTracks>1</showInputTracks> +      <showAuxTracks>1</showAuxTracks> +      <showSyntiTracks>1</showSyntiTracks> +      <showMidiInPorts>1</showMidiInPorts> +      <showMidiOutPorts>1</showMidiOutPorts> +      <showMidiChannels>1</showMidiChannels> +      </mixer1>      </configuration>    <song> -    <automation>0</automation> +    <comment></comment>      <cpos>0</cpos>      <rpos>0</rpos>      <lpos>0</lpos>      <master>1</master> -    <loop>0</loop> -    <punchin>0</punchin> -    <punchout>0</punchout> -    <record>0</record> -    <solo>0</solo> -    <type>0</type> -    <recmode>0</recmode> -    <cycle>0</cycle> -    <click>0</click> -    <quantize>0</quantize>      <len>0</len> -    <follow>1</follow>      <wavetrack>        <name>Track 1</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height> -      <locked>0</locked> +      <autoRead>0</autoRead>        <selected>1</selected> -      <mute>0</mute> -      <solo>0</solo> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </wavetrack>      <wavetrack>        <name>Track 2</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height>        <locked>1</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </wavetrack>      <wavetrack>        <name>Track 3</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height> -      <locked>0</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </wavetrack>      <wavetrack>        <name>Track 4</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height> -      <locked>0</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </wavetrack>      <AudioGroup>        <name>Group 1</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height>        <locked>1</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioGroup>      <AudioGroup>        <name>Group 2</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>1</channels> -      <height>20</height> -      <locked>0</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioGroup>      <AudioAux>        <name>Aux 1</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>2</channels> -      <height>20</height>        <locked>1</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioAux>      <AudioAux>        <name>Aux 2</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>2</channels> -      <height>20</height>        <locked>1</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioAux>      <AudioInput>        <name>Input 1</name> -      <record>0</record>        <mute>1</mute> -      <solo>0</solo> -      <off>0</off>        <channels>2</channels> -      <height>20</height>        <locked>1</locked> -      <mute>1</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="0" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <controller id="3" name="AuxSend-1" cur="0" type="0" min="0" max="1" default="0"/> +      <controller id="4" name="AuxSend-2" cur="0" type="0" min="0" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <auxSend idx=0>0</auxSend> -      <auxSend idx=1>0</auxSend> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioInput>      <AudioOutput>        <name>Out 1</name> -      <record>0</record>        <mute>0</mute> -      <solo>0</solo> -      <off>0</off>        <channels>2</channels> -      <height>20</height>        <locked>1</locked> -      <mute>0</mute> -      <solo>0</solo> +      <autoRead>0</autoRead> +      <controller id="0" name="Volume" cur="1" type="2" min="-3.00927" max="0.301887" default="0"/> +      <controller id="1" name="Pan" cur="0" type="0" min="-1" max="1" default="0"/> +      <height>31</height>        <prefader>0</prefader> -      <off>0</off> -      <automation>1</automation> -      <controller id="0" cur="0"> -        </controller> -      <controller id="1" cur="0"> -        </controller>        </AudioOutput> +    <arranger> +      <TrackConf type="0"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="4"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="1"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="2"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="3"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="4"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          <element id="8"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="4"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="5"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="2"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <TrackConf type="6"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="4"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          <element id="8"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        <group> +          <element id="7"/> +          </group> +        </TrackConf> +      <TrackConf type="7"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        <group> +          <element id="10"/> +          </group> +        </TrackConf> +      <TrackConf type="8"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        </TrackConf> +      <TrackConf type="9"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="9"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        <group> +          <element id="11"/> +          </group> +        </TrackConf> +      <TrackConf type="10"> +        <group> +          </group> +        <group> +          <element id="0"/> +          </group> +        <group> +          <element id="1"/> +          <element id="3"/> +          </group> +        <group> +          <element id="5"/> +          <element id="6"/> +          </group> +        </TrackConf> +      <info>0</info> +      <strip>1</strip> +      <hmag>0.04</hmag> +      <vmag>1</vmag> +      <hpos>0</hpos> +      <vpos>0</vpos> +      <splitter> +        <size>144</size> +        <size>578</size> +        </splitter> +      </arranger>      <tempolist fix="500000">        <tempo at="21474837">          <tick>0</tick> @@ -323,7 +389,7 @@          <denom>4</denom>          </sig>        </siglist> -    <drummap> -      </drummap>      </song> +  <toplevels> +    </toplevels>    </muse> diff --git a/muse/share/templates/monorecord.med b/muse/share/templates/monorecord.med index 0ee96c59..5b9c57a0 100644 --- a/muse/share/templates/monorecord.med +++ b/muse/share/templates/monorecord.med @@ -345,8 +345,8 @@        <solo>0</solo>        <prefader>0</prefader>        <off>0</off> -      <auxSend idx=0>0.000000</auxSend> -      <auxSend idx=1>0.000000</auxSend> +      <auxSend idx="0">0.000000</auxSend> +      <auxSend idx="1">0.000000</auxSend>        <controller id="0" cur="1.021645">          </controller>        <controller id="1" cur="0.000000"> @@ -366,8 +366,8 @@        <solo>0</solo>        <prefader>0</prefader>        <off>0</off> -      <auxSend idx=0>0.000000</auxSend> -      <auxSend idx=1>0.000000</auxSend> +      <auxSend idx="0">0.000000</auxSend> +      <auxSend idx="1">0.000000</auxSend>        <controller id="0" cur="1.021645">          </controller>        <controller id="1" cur="0.000000">  | 
