diff options
| -rw-r--r-- | muse/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | muse/share/templates/synti.med | 987 | ||||
| -rw-r--r-- | muse/synti/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | muse/synti/deicsonze/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | muse/synti/fluid/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | muse/synti/fluidsynth/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | muse/synti/libsynti/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | muse/synti/organ/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | muse/synti/s1/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | muse/synti/vam/CMakeLists.txt | 2 |
10 files changed, 290 insertions, 723 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index 1ea31fd2..a5025368 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -20,7 +20,7 @@ project(muse) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1) -# set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) set(CMAKE_SKIP_RULE_DEPENDENCY TRUE) @@ -37,7 +37,7 @@ include ( ${PROJECT_SOURCE_DIR}/cmake/UsePkgConfig1.cmake ) option ( ENABLE_DSSI "enable Disposable Soft Synth Interface" ON) option ( ENABLE_VST "enable VST/win support" OFF) -option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON) +option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" OFF) # set(CMAKE_VERBOSE_MAKEFILE ON) set(QT_USE_QTXML TRUE) diff --git a/muse/share/templates/synti.med b/muse/share/templates/synti.med index d0dcc6d2..f9a811b5 100644 --- a/muse/share/templates/synti.med +++ b/muse/share/templates/synti.med @@ -1,765 +1,339 @@ <?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> - <extSync>0</extSync> - <genMTCSync>0</genMTCSync> - <genMCSync>0</genMCSync> - <genMMC>0</genMMC> - <acceptMTC>0</acceptMTC> - <acceptMMC>1</acceptMMC> - <acceptMC>1</acceptMC> - <bigtimeVisible>0</bigtimeVisible> - <arranger> - <info>0</info> - <split>298 296 </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> - <midiport idx="0"> - <instrument>organ-1</instrument> - <name>organ-1</name> - <record>0</record> - <channel idx="0"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="1"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="2"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="3"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="4"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="5"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="6"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="7"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="8"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="9"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="10"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="11"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="12"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="13"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="14"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - <channel idx="15"> - <controller>1</controller> - <controller>7</controller> - <controller>10</controller> - <controller>11</controller> - <controller>64</controller> - <controller>91</controller> - <controller>93</controller> - <controller>120</controller> - <controller>121</controller> - <controller>123</controller> - <controller>262144</controller> - <controller>262145</controller> - </channel> - </midiport> - <midiport idx="1"> - <instrument>fluid-1</instrument> - <name>fluid-1</name> - <record>0</record> - <channel idx="0"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="1"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="2"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="3"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="4"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="5"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="6"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="7"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="8"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="9"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="10"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="11"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="12"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="13"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="14"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="15"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - </midiport> - <midiport idx="2"> - <instrument>s1-1</instrument> - <name>s1-1</name> - <record>0</record> - <channel idx="0"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="1"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="2"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="3"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="4"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="5"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="6"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="7"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="8"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="9"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="10"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="11"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="12"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="13"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="14"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="15"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - </midiport> - <midiport idx="3"> - <instrument>vam-1</instrument> - <name>vam-1</name> - <record>0</record> - <channel idx="0"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="1"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="2"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="3"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="4"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="5"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="6"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="7"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="8"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="9"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="10"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="11"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="12"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="13"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="14"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - <channel idx="15"> - <controller>7</controller> - <controller>10</controller> - <controller>262145</controller> - </channel> - </midiport> - </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="169" g="181" b="223"></bgcolor> - <width>600</width> - <height>400</height> - </waveedit> - </configuration> + <txDeviceId>127</txDeviceId> + <rxDeviceId>127</rxDeviceId> + <mtctype>1</mtctype> + <mtcoffset> + 00:00:00:00:00 + </mtcoffset> + <extSync>0</extSync> + <genMTCSync>0</genMTCSync> + <genMCSync>0</genMCSync> + <genMMC>0</genMMC> + <acceptMTC>0</acceptMTC> + <acceptMMC>1</acceptMMC> + <acceptMC>1</acceptMC> + <bigtimeVisible>0</bigtimeVisible> + <transportVisible>0</transportVisible> + <geometryMain x="0" y="0" w="800" h="560" /> + <geometryTransport x="0" y="0" w="763" h="108" /> + <mixer1Visible>0</mixer1Visible> + <mixer2Visible>0</mixer2Visible> + </configuration> <song> - <automation>0</automation> + <comment></comment> <cpos>12288</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>18432</len> - <follow>1</follow> <miditrack> <name>Track 1</name> - <record>0</record> <mute>0</mute> - <solo>0</solo> - <off>0</off> - <channels>0</channels> - <height>20</height> - <locked>0</locked> - <device>0</device> - <channel>0</channel> - <inportMap>65535</inportMap> - <inchannelMap>65535</inchannelMap> - <locked>0</locked> + <height>31</height> <transposition>0</transposition> <velocity>0</velocity> <delay>0</delay> <len>100</len> <compression>100</compression> - <midiThru>1</midiThru> <part> <name>Track 1</name> - <poslen tick="0" len="18432" /> - <selected>1</selected> + <poslen tick="0" len="18432"/> + <selected>0</selected> <color>0</color> </part> </miditrack> <AudioOutput> <name>Out 1</name> - <record>0</record> <mute>0</mute> - <solo>0</solo> - <off>0</off> <channels>2</channels> - <height>20</height> - <locked>0</locked> - <selected>1</selected> - <mute>0</mute> - <solo>0</solo> + <controller id="0" name="Volume" cur="1.02164" 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> - <controller id="0" cur="1.021645"> - </controller> - <controller id="1" cur="0.000000"> - </controller> </AudioOutput> <SynthI> <name>fluid-1</name> - <record>0</record> <mute>0</mute> - <solo>0</solo> <off>1</off> <channels>2</channels> - <height>20</height> - <locked>124</locked> - <mute>0</mute> - <solo>0</solo> + <locked>1</locked> + <controller id="0" name="Volume" cur="1.41091" 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>1</off> - <controller id="0" cur="1.410912"> - </controller> - <controller id="1" cur="0.000000"> - </controller> <class>fluid</class> - <port>1</port> <guiVisible>0</guiVisible> - <midistate> - <event type="2" datalen="30"> - 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 - </event> - </midistate> </SynthI> <SynthI> <name>organ-1</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> + <selected>1</selected> + <controller id="0" name="Volume" cur="1.02164" type="2" min="-3.00927" max="0.301887" default="0"/> + <controller id="1" name="Pan" cur="-0.04" type="0" min="-1" max="1" default="0"/> + <height>31</height> <prefader>0</prefader> - <off>0</off> - <controller id="0" cur="1.021645"> - </controller> - <controller id="1" cur="-0.040000"> - </controller> <class>organ</class> - <port>0</port> <guiVisible>0</guiVisible> - <midistate> - <event type="2" datalen="136"> - 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 - </event> - </midistate> + <geometry x="0" y="0" w="1" h="1" /> </SynthI> <SynthI> <name>s1-1</name> - <record>0</record> <mute>0</mute> - <solo>0</solo> <off>1</off> <channels>1</channels> - <height>20</height> - <locked>11</locked> - <mute>0</mute> - <solo>0</solo> + <locked>1</locked> + <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>1</off> - <controller id="0" cur="0.000000"> - </controller> - <controller id="1" cur="0.000000"> - </controller> <class>s1</class> - <port>2</port> - <guiVisible>0</guiVisible> </SynthI> <SynthI> <name>vam-1</name> - <record>0</record> <mute>0</mute> - <solo>0</solo> <off>1</off> <channels>1</channels> - <height>20</height> - <locked>0</locked> - <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"/> + <height>31</height> <prefader>0</prefader> - <off>1</off> - <controller id="0" cur="0.000000"> - </controller> - <controller id="1" cur="0.000000"> - </controller> <class>vam</class> - <port>3</port> <guiVisible>0</guiVisible> + <geometry x="0" y="0" w="692" h="519" /> </SynthI> <Route> - <srcNode>1:Out 1</srcNode> - <dstNode>alsa_pcm:playback_1</dstNode> - </Route> - <Route> - <srcNode>2:Out 1</srcNode> - <dstNode>alsa_pcm:playback_2</dstNode> - </Route> - <Route> - <srcNode>fluid-1</srcNode> - <dstNode>Out 1</dstNode> + <srcNode type="SYNTIPORT">fluid-1</srcNode> + <dstNode type="TRACK">Out 1</dstNode> </Route> <Route> - <srcNode>organ-1</srcNode> - <dstNode>Out 1</dstNode> + <srcNode type="SYNTIPORT">organ-1</srcNode> + <dstNode type="TRACK">Out 1</dstNode> </Route> <Route> - <srcNode>s1-1</srcNode> - <dstNode>Out 1</dstNode> + <srcNode type="SYNTIPORT">s1-1</srcNode> + <dstNode type="TRACK">Out 1</dstNode> </Route> <Route> - <srcNode>vam-1</srcNode> - <dstNode>Out 1</dstNode> + <srcNode type="SYNTIPORT">vam-1</srcNode> + <dstNode type="TRACK">Out 1</dstNode> </Route> + <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> @@ -773,34 +347,7 @@ <denom>4</denom> </sig> </siglist> - <drummap> - </drummap> </song> <toplevels> - <audiomixer> - <topwin> - </topwin> - </audiomixer> - <part>0:0</part> - <pianoroll> - <midieditor> - <topwin> - </topwin> - <quant>96</quant> - <raster>96</raster> - </midieditor> - <splitter>255 </splitter> - <steprec>0</steprec> - <midiin>0</midiin> - <tool>1</tool> - <quantStrength>80</quantStrength> - <quantLimit>50</quantLimit> - <quantLen>0</quantLen> - <playEvents>0</playEvents> - <xpos>0</xpos> - <xmag>346</xmag> - <ypos>390</ypos> - <ymag>286</ymag> - </pianoroll> </toplevels> </muse> diff --git a/muse/synti/CMakeLists.txt b/muse/synti/CMakeLists.txt index 3d02797c..02babaf9 100644 --- a/muse/synti/CMakeLists.txt +++ b/muse/synti/CMakeLists.txt @@ -27,6 +27,12 @@ include_directories( ${PROJECT_SOURCE_DIR}/synti ) -subdirs(libsynti s1 organ fluid deicsonze fluidsynth simpledrums vam ) +set (SubDirs libsynti s1 organ deicsonze simpledrums vam ) + +if (ENABLE_FLUID) + set (SubDirs ${SubDirs} fluid fluidsynth ) +endif (ENABLE_FLUID) + +subdirs(${SubDirs}) diff --git a/muse/synti/deicsonze/CMakeLists.txt b/muse/synti/deicsonze/CMakeLists.txt index f14609d2..6edf37a2 100644 --- a/muse/synti/deicsonze/CMakeLists.txt +++ b/muse/synti/deicsonze/CMakeLists.txt @@ -29,6 +29,7 @@ add_library ( deicsonze SHARED ${deicsonze_mocs} ${deicsonze_uis} ) +target_link_libraries( deicsonze synti ) # - tell cmake to name target deicsonze.so instead of # libdeicsonze.so diff --git a/muse/synti/fluid/CMakeLists.txt b/muse/synti/fluid/CMakeLists.txt index b29015aa..9304564f 100644 --- a/muse/synti/fluid/CMakeLists.txt +++ b/muse/synti/fluid/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( fluid SHARED ${fluid_uis} ) +target_link_libraries( fluid synti ) + # - tell cmake to name target fluid.so instead of # libfluid.so # - use precompiled header files @@ -36,6 +38,7 @@ add_library ( fluid SHARED set_target_properties ( fluid PROPERTIES PREFIX "" COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h" + LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}" ) install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluid ) diff --git a/muse/synti/fluidsynth/CMakeLists.txt b/muse/synti/fluidsynth/CMakeLists.txt index 1b56396f..1dbe477f 100644 --- a/muse/synti/fluidsynth/CMakeLists.txt +++ b/muse/synti/fluidsynth/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( fluidsynth SHARED ${fluidsynth_uis} ) +target_link_libraries( fluidsynth synti ) + # - tell cmake to name target fluidsynth.so instead of # libfluidsynth.so # - use precompiled header files @@ -36,6 +38,7 @@ add_library ( fluidsynth SHARED set_target_properties ( fluidsynth PROPERTIES PREFIX "" COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all-pic.h" + LINK_FLAGS "-L${FLUID_LIBDIR} ${FLUID_LIB}" ) install_targets ( /lib/${MusE_INSTALL_NAME}/synthi/ fluidsynth ) diff --git a/muse/synti/libsynti/CMakeLists.txt b/muse/synti/libsynti/CMakeLists.txt index 922fe644..b6d98df6 100644 --- a/muse/synti/libsynti/CMakeLists.txt +++ b/muse/synti/libsynti/CMakeLists.txt @@ -19,6 +19,7 @@ #============================================================================= add_library(synti mess.cpp gui.cpp mono.cpp poly.cpp mpevent.cpp) + set_target_properties( synti PROPERTIES COMPILE_FLAGS "-include ${PROJECT_SOURCE_DIR}/all.h" ) diff --git a/muse/synti/organ/CMakeLists.txt b/muse/synti/organ/CMakeLists.txt index 26f10066..5be60520 100644 --- a/muse/synti/organ/CMakeLists.txt +++ b/muse/synti/organ/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( organ SHARED ${organ_uis} ) +target_link_libraries( organ synti ) + # - tell cmake to name target organ.so instead of # liborgan.so # - use precompiled header files diff --git a/muse/synti/s1/CMakeLists.txt b/muse/synti/s1/CMakeLists.txt index dfd1f19e..83428204 100644 --- a/muse/synti/s1/CMakeLists.txt +++ b/muse/synti/s1/CMakeLists.txt @@ -20,6 +20,8 @@ add_library ( s1 SHARED s1.cpp ) +target_link_libraries( s1 synti ) + # tell cmake to name target s1.so instead of # libs1.so # diff --git a/muse/synti/vam/CMakeLists.txt b/muse/synti/vam/CMakeLists.txt index 51c1b38a..2965d5d8 100644 --- a/muse/synti/vam/CMakeLists.txt +++ b/muse/synti/vam/CMakeLists.txt @@ -29,6 +29,8 @@ add_library ( vam SHARED ${vam_uis} ) +target_link_libraries( vam synti ) + # - tell cmake to name target vam.so instead of # libvam.so # - use precompiled header files |