* lily/drum-note-performer.cc: new file: perform drum notes.

* VERSION (PACKAGE_NAME): release 2.1.19.

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 17fd15d29f08e39b2c8ed9c38e7ea73c06c4c0bd..f6bb7151a9c25b28a80ed9722a4c2e564e73778a 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -24,6 +24,7 @@ be constructed in @code{LyricsVoice}.
 are now constructed at @code{Voice} level.
 
 @item  Harmonic notes can now be entered as
+
 @example
    <c' g''\harmonic>
 @end example

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index a0bdc84ebac123a211631c24a49130d204958668..aa53ce929a4e7c762fab3403dc5551250ff30bc8 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2733,6 +2733,16 @@ Internals: @internalsref{RepeatSlash}, @internalsref{PercentRepeat},
 @node Rhythmic music
 @section Rhythmic music
 
+
+@menu
+* Percussion staves::           
+* Percussion MIDI output::      
+@end menu
+
+
+@node Showing melody rhythms
+@subsection Showing melody rhythms
+
 Sometimes you might want to show only the rhythm of a melody.  This
 can be done with the rhythmic staff. All pitches of notes on such a
 staff are squashed, and the staff itself has a single line:
@@ -2751,11 +2761,6 @@ Internals: @internalsref{RhythmicStaff}.
 Examples: @inputfileref{input/regression,rhythmic-staff.ly}.
 
 
-@menu
-* Percussion staves::           
-* Percussion MIDI output::      
-@end menu
-
 @node Percussion staves
 @subsection Percussion staves
 @cindex percussion
@@ -2943,53 +2948,16 @@ down = \drums { bd4 sn bd toml8 toml }
 
 Init files: @file{ly/drumpitch-init.ly}
 
+Internals: @internalsref{DrumStaff}, @internalsref{DrumVoice} 
+
 @refbugs
 
 Short polyphonic notation, @code{<< @dots{} \\ @dots{} >>}, does not
 work for @internalsref{DrumVoices}.
 
-
-
-@node Percussion MIDI output
-@subsection Percussion MIDI output
-
-@ignore
-
-In order to produce correct MIDI output you need to produce two score
-blocks---one for the paper and one for the MIDI output.  To use the
-percussion channel you set the property @code{instrument} to
-@code{'drums}. Because the drum-pitches themselves are similar to the
-general MIDI pitches all you have to do is to insert the voices with
-none of the scheme functions to get the correct MIDI output:
-
-@example
-\score @{    
-    \apply #(drums->paper 'mydrums) \context Staff <<
-        \clef percussion
-        @{ \up @}  \\
-        @{ \down @}
-    >>
-    \paper@{@}
-@}
-\score @{    
-    \context Staff <<
-        \property Staff.instrument = #'drums
-        \up \down
-    >>
-    \midi@{@}
-@}
-@end example
-
 Because general MIDI does not contain rimshots the sidestick is used
 for this purpose instead.
 
-
-@end ignore
-
-@refbugs
-
-MIDI output for drums is temporarily broken.
-
 @node Piano music
 @section Piano music
 

diff --git a/VERSION b/VERSION
index 135f37eea51d8a099cd778d1e412623faa78d7d4..8241cb053edca54cd24204e4bf73b9fa06b7e2f9 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
 PATCH_LEVEL=19
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
new file mode 100644 (file)
index 0000000..6532e48
--- /dev/null
+++ b/lily/drum-note-performer.cc
@@ -0,0 +1,136 @@
+/*
+  note-performer.cc -- implement Drum_note_performer
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+ */
+
+#include "performer.hh"
+#include "event.hh"
+#include "audio-item.hh"
+#include "audio-column.hh"
+#include "global-translator.hh"
+#include "warn.hh"
+
+class Drum_note_performer : public Performer {
+public:
+  TRANSLATOR_DECLARATIONS(Drum_note_performer);
+  
+protected:
+  virtual bool try_music (Music *ev) ;
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+  Global_translator* get_global_translator ();
+private:
+  Link_array<Music> note_evs_;
+  Link_array<Audio_note> notes_;
+  Link_array<Audio_note> delayeds_;
+};
+
+void 
+Drum_note_performer::create_audio_elements ()
+{
+  SCM tab =0;
+  if (!tab) tab = get_property ("drumPitchTable");
+  
+  while (note_evs_.size ())
+    {
+      Music* n = note_evs_.pop ();
+      SCM sym = n->get_mus_property ("drum-type");
+      SCM defn = SCM_EOL;
+
+      if (gh_symbol_p (sym)
+         &&  (scm_hash_table_p (tab) == SCM_BOOL_T))
+       defn = scm_hashq_ref (tab, sym, SCM_EOL);
+      
+      if (Pitch * pit = unsmob_pitch (defn))
+       {
+         Audio_note* p = new Audio_note (*pit,  n->get_length (), 0);
+         Audio_element_info info (p, n);
+         announce_element (info);
+         notes_.push (p);
+       }
+    }
+  
+  note_evs_.clear ();
+}
+
+Global_translator*
+Drum_note_performer::get_global_translator ()
+{
+  Translator *t = this;
+  Global_translator *global =0;
+  do
+    {
+      t = t->daddy_trans_ ;
+      global = dynamic_cast<Global_translator*> (t);
+    }
+  while (!global);
+
+  return global;
+}
+
+
+void
+Drum_note_performer::stop_translation_timestep ()
+{
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  Global_translator* global = get_global_translator ();
+  for (int i=0; i < notes_.size (); i++)
+    {
+      Audio_note* n = notes_[i];
+      Moment m= n->delayed_until_mom_;
+      if (m.to_bool ())
+       {
+         global->add_moment_to_process (m);
+         delayeds_.push (n);
+         notes_[i] = 0;
+         notes_.del (i);
+         i--;
+       }
+    }
+
+  Moment now = now_mom ();
+  for (int i=0; i < notes_.size (); i++)
+    {
+      play_element (notes_[i]);
+    }
+  notes_.clear ();
+  note_evs_.clear ();
+  for (int i=0; i < delayeds_.size (); i++)
+    {
+      Audio_note* n = delayeds_[i];
+      if (n->delayed_until_mom_ <= now)
+       {
+         play_element (n);
+         delayeds_[i] = 0;
+         delayeds_.del (i);
+         i--;
+       }
+    }
+}
+ 
+bool
+Drum_note_performer::try_music (Music* ev)
+{
+  if (ev->is_mus_type ("note-event"))
+    {
+      note_evs_.push (ev);
+      return true;
+    }
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+  
+  return false;
+}
+
+ENTER_DESCRIPTION(Drum_note_performer,
+                 "Play drum notes.","",
+                 "note-event busy-playing-event","","","");
+
+Drum_note_performer::Drum_note_performer()
+{
+}