Permalink
Browse files

Two minor updates:

- MidiSoundbank class that lets you set which soundbank file to use to generate audio files.
- Escape text in lilypond files.
  • Loading branch information...
1 parent dda0811 commit 5e2fe4ede4415e03c12a7a54dfdafafd81a6e358 @myronmarston committed Oct 29, 2008
Showing with 2,533 additions and 1,583 deletions.
  1. +191 −222 FractalComposer/build/cobertura-report/com.myronmarston.music.AudioFileCreator.html
  2. +9 −9 FractalComposer/build/cobertura-report/com.myronmarston.music.Dynamic.html
  3. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.GermIsEmptyException.html
  4. +115 −91 FractalComposer/build/cobertura-report/com.myronmarston.music.Instrument.html
  5. +40 −40 FractalComposer/build/cobertura-report/com.myronmarston.music.MidiNote.html
  6. +250 −0 FractalComposer/build/cobertura-report/com.myronmarston.music.MidiSoundbank.html
  7. +114 −114 FractalComposer/build/cobertura-report/com.myronmarston.music.Note.html
  8. +64 −64 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteList.html
  9. +112 −89 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteName.html
  10. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.NoteStringParseException.html
  11. +83 −83 FractalComposer/build/cobertura-report/com.myronmarston.music.OutputManager.html
  12. +19 −19 FractalComposer/build/cobertura-report/com.myronmarston.music.Tempo.html
  13. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.AbstractNotationElement.html
  14. +20 −20 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Clef.html
  15. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.GuidoRunException.html
  16. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.LilypondRunException.html
  17. +10 −10 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationDynamic.html
  18. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationElement.html
  19. +42 −42 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationElementList.html
  20. +50 −50 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.NotationNote.html
  21. +67 −67 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Part.html
  22. +26 −26 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.PartSection.html
  23. +191 −182 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Piece.html
  24. +50 −50 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.SheetMusicCreator.html
  25. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.notation.Tuplet.html
  26. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.AbstractDiatonicScale.html
  27. +4 −4 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.ChromaticScale.html
  28. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.DorianScale.html
  29. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.HarmonicMinorScale.html
  30. +1 −1 ...alComposer/build/cobertura-report/com.myronmarston.music.scales.InvalidKeySignatureException.html
  31. +6 −6 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.KeySignature.html
  32. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.LocrianScale.html
  33. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.LydianScale.html
  34. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorPentatonicScale.html
  35. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MajorScale.html
  36. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MinorPentatonicScale.html
  37. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.MixolydianScale.html
  38. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.NaturalMinorScale.html
  39. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.PhrygianScale.html
  40. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Scale.html
  41. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.scales.Tonality.html
  42. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.AbstractVoiceOrSection.html
  43. +1 −1 ...mposer/build/cobertura-report/com.myronmarston.music.settings.AbstractVoiceOrSectionSettings.html
  44. +27 −27 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.FractalPiece.html
  45. +1 −1 ...omposer/build/cobertura-report/com.myronmarston.music.settings.InvalidTimeSignatureException.html
  46. +1 −1 ...ser/build/cobertura-report/com.myronmarston.music.settings.NonPositiveTimeSignatureException.html
  47. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Section.html
  48. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SectionSettings.html
  49. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.SelfSimilaritySettings.html
  50. +8 −8 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.TimeSignature.html
  51. +1 −1 ...bertura-report/com.myronmarston.music.settings.TimeSignatureDenominatorNotAPowerOf2Exception.html
  52. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.Voice.html
  53. +8 −8 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceOrSectionList.html
  54. +2 −2 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSection.html
  55. +3 −3 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionHashMap.html
  56. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionHashMapKey.html
  57. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSectionList.html
  58. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.settings.VoiceSettings.html
  59. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.InversionTransformer.html
  60. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.OctaveTransformer.html
  61. +1 −1 ...talComposer/build/cobertura-report/com.myronmarston.music.transformers.RetrogradeTransformer.html
  62. +1 −1 ...poser/build/cobertura-report/com.myronmarston.music.transformers.RhythmicDurationTransformer.html
  63. +1 −1 ...omposer/build/cobertura-report/com.myronmarston.music.transformers.SelfSimilarityTransformer.html
  64. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.Transformer.html
  65. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.TransposeTransformer.html
  66. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.music.transformers.VolumeTransformer.html
  67. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.AbstractPublisher.html
  68. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.ClassHelper.html
  69. +47 −47 FractalComposer/build/cobertura-report/com.myronmarston.util.FileHelper.html
  70. +73 −73 FractalComposer/build/cobertura-report/com.myronmarston.util.Fraction.html
  71. +15 −15 FractalComposer/build/cobertura-report/com.myronmarston.util.MathHelper.html
  72. +12 −12 FractalComposer/build/cobertura-report/com.myronmarston.util.ProcessRunner.html
  73. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.Publisher.html
  74. +1 −1 FractalComposer/build/cobertura-report/com.myronmarston.util.Subscriber.html
  75. +30 −30 FractalComposer/build/cobertura-report/com.myronmarston.util.ThreadedInputStreamRedirector.html
  76. +5 −2 FractalComposer/build/cobertura-report/frame-sourcefiles-com.myronmarston.music.html
  77. +1 −1 FractalComposer/build/cobertura-report/frame-sourcefiles-com.myronmarston.music.notation.html
  78. +6 −3 FractalComposer/build/cobertura-report/frame-sourcefiles.html
  79. +8 −6 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.html
  80. +4 −4 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.notation.html
  81. +1 −1 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.scales.html
  82. +1 −1 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.settings.html
  83. +1 −1 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.music.transformers.html
  84. +1 −1 FractalComposer/build/cobertura-report/frame-summary-com.myronmarston.util.html
  85. +4 −4 FractalComposer/build/cobertura-report/frame-summary.html
  86. +2 −0 FractalComposer/dist/javadoc/allclasses-frame.html
  87. +2 −0 FractalComposer/dist/javadoc/allclasses-noframe.html
  88. +30 −42 FractalComposer/dist/javadoc/com/myronmarston/music/AudioFileCreator.html
  89. +23 −1 FractalComposer/dist/javadoc/com/myronmarston/music/Instrument.html
  90. +2 −2 FractalComposer/dist/javadoc/com/myronmarston/music/MidiNote.html
  91. +291 −0 FractalComposer/dist/javadoc/com/myronmarston/music/MidiSoundbank.html
  92. +2 −2 FractalComposer/dist/javadoc/com/myronmarston/music/Note.html
  93. +179 −0 FractalComposer/dist/javadoc/com/myronmarston/music/class-use/MidiSoundbank.html
  94. +2 −2 FractalComposer/dist/javadoc/com/myronmarston/music/notation/package-tree.html
  95. +2 −0 FractalComposer/dist/javadoc/com/myronmarston/music/package-frame.html
  96. +4 −0 FractalComposer/dist/javadoc/com/myronmarston/music/package-summary.html
  97. +2 −2 FractalComposer/dist/javadoc/com/myronmarston/music/package-tree.html
  98. +6 −0 FractalComposer/dist/javadoc/com/myronmarston/music/package-use.html
  99. +3 −0 FractalComposer/dist/javadoc/index-files/index-10.html
  100. +1 −1 FractalComposer/dist/javadoc/index-files/index-11.html
  101. +0 −3 FractalComposer/dist/javadoc/index-files/index-16.html
  102. +6 −0 FractalComposer/dist/javadoc/index-files/index-17.html
  103. +9 −0 FractalComposer/dist/javadoc/index-files/index-6.html
  104. +1 −1 FractalComposer/dist/javadoc/overview-tree.html
  105. +5 −24 FractalComposer/src/com/myronmarston/music/AudioFileCreator.java
  106. +18 −3 FractalComposer/src/com/myronmarston/music/Instrument.java
  107. +136 −0 FractalComposer/src/com/myronmarston/music/MidiSoundbank.java
  108. +10 −4 FractalComposer/src/com/myronmarston/music/notation/Piece.java
  109. +19 −0 FractalComposer/test/com/myronmarston/music/OutputManagerTest.java
  110. +0 −1 FractalComposer/test/com/myronmarston/music/notation/PieceTest.java

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -69,7 +69,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> * @author Myron</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;26</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;3661</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic { </pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;27</td> <td class="nbHitsCovered">&nbsp;3673</td> <td class="src"><pre class="src">&nbsp;<span class="keyword">public</span> enum Dynamic { </pre></td></tr>
<tr> <td class="numLine">&nbsp;28</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="comment">// Be sure to update the regex below if you add or remove enum values.</span></pre></td></tr>
<tr> <td class="numLineCover">&nbsp;29</td> <td class="nbHitsCovered">&nbsp;29</td> <td class="src"><pre class="src">&nbsp; PPP(1),</pre></td></tr>
@@ -124,7 +124,7 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;60</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">int</span> getMidiVolume() {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;61</td> <td class="nbHitsCovered">&nbsp;789</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;61</td> <td class="nbHitsCovered">&nbsp;791</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> <span class="keyword">this</span>.midiVolume;</pre></td></tr>
<tr> <td class="numLine">&nbsp;62</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;63</td> <td class="nbHits">&nbsp;</td>
@@ -160,9 +160,9 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;79</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">private</span> <span class="keyword">static</span> Dynamic getDynamicForDynamicLevel(<span class="keyword">int</span> dynamicLevel) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;80</td> <td class="nbHitsCovered">&nbsp;3495</td> <td class="src"><pre class="src">&nbsp; Dynamic d = Dynamic.values()[dynamicLevel - 1];</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;3495</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 81: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">assert</span> d.dynamicLevel == dynamicLevel : d;</a></span></pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;82</td> <td class="nbHitsCovered">&nbsp;3495</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> d;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;80</td> <td class="nbHitsCovered">&nbsp;3507</td> <td class="src"><pre class="src">&nbsp; Dynamic d = Dynamic.values()[dynamicLevel - 1];</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;81</td> <td class="nbHitsUncovered"><a title="Line 81: Conditional coverage 50% (2/4) [each condition: 50%, 50%].">&nbsp;3507</a></td> <td class="src"><pre class="src"><span class="srcUncovered">&nbsp;<a title="Line 81: Conditional coverage 50% (2/4) [each condition: 50%, 50%]."> <span class="keyword">assert</span> d.dynamicLevel == dynamicLevel : d;</a></span></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;82</td> <td class="nbHitsCovered">&nbsp;3507</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> d;</pre></td></tr>
<tr> <td class="numLine">&nbsp;83</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;84</td> <td class="nbHits">&nbsp;</td>
@@ -183,11 +183,11 @@
<td class="src"><pre class="src">&nbsp;<span class="comment"> */</span></pre></td></tr>
<tr> <td class="numLine">&nbsp;92</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; <span class="keyword">public</span> <span class="keyword">static</span> Dynamic getDynamicForMidiVolume(<span class="keyword">int</span> midiVolume) {</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (4/4) [each condition: 100%, 100%].">&nbsp;3529</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 93: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (midiVolume &lt;= MidiNote.MIN_VELOCITY || midiVolume &gt; MidiNote.MAX_VELOCITY) <span class="keyword">return</span> <span class="keyword">null</span>;</a></pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;93</td> <td class="nbHitsCovered"><a title="Line 93: Conditional coverage 100% (4/4) [each condition: 100%, 100%].">&nbsp;3541</a></td> <td class="src"><pre class="src">&nbsp;<a title="Line 93: Conditional coverage 100% (4/4) [each condition: 100%, 100%]."> <span class="keyword">if</span> (midiVolume &lt;= MidiNote.MIN_VELOCITY || midiVolume &gt; MidiNote.MAX_VELOCITY) <span class="keyword">return</span> <span class="keyword">null</span>;</a></pre></td></tr>
<tr> <td class="numLine">&nbsp;94</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; </pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;95</td> <td class="nbHitsCovered">&nbsp;3495</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">int</span> dynamicLevel = (midiVolume - (MIDI_VOLUME_PER_LEVEL + ADDITIONAL_OFFSET)) / MIDI_VOLUME_PER_LEVEL + 1;</pre></td></tr>
-<tr> <td class="numLineCover">&nbsp;96</td> <td class="nbHitsCovered">&nbsp;3495</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> getDynamicForDynamicLevel(dynamicLevel);</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;95</td> <td class="nbHitsCovered">&nbsp;3507</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">int</span> dynamicLevel = (midiVolume - (MIDI_VOLUME_PER_LEVEL + ADDITIONAL_OFFSET)) / MIDI_VOLUME_PER_LEVEL + 1;</pre></td></tr>
+<tr> <td class="numLineCover">&nbsp;96</td> <td class="nbHitsCovered">&nbsp;3507</td> <td class="src"><pre class="src">&nbsp; <span class="keyword">return</span> getDynamicForDynamicLevel(dynamicLevel);</pre></td></tr>
<tr> <td class="numLine">&nbsp;97</td> <td class="nbHits">&nbsp;</td>
<td class="src"><pre class="src">&nbsp; }</pre></td></tr>
<tr> <td class="numLine">&nbsp;98</td> <td class="nbHits">&nbsp;</td>
@@ -225,6 +225,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 9/25/08 9:13 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 10/28/08 8:48 PM.</div>
</body>
</html>
@@ -89,6 +89,6 @@
<td class="src"><pre class="src">&nbsp;}</pre></td></tr>
</table>
-<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 9/25/08 9:13 PM.</div>
+<div class="footer">Report generated by <a href="http://cobertura.sourceforge.net/" target="_top">Cobertura</a> 1.9 on 10/28/08 8:48 PM.</div>
</body>
</html>
Oops, something went wrong.

0 comments on commit 5e2fe4e

Please sign in to comment.