source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
*/
-#include "music-sequence.hh"
#include "audio-item.hh"
+#include "music-sequence.hh"
#include "performer.hh"
+#include "stream-event.hh"
#include "warn.hh"
+#include "translator.icc"
+
class Key_performer : public Performer
{
public:
~Key_performer ();
protected:
- virtual bool try_music (Music *ev);
- virtual void create_audio_elements ();
- virtual void stop_translation_timestep ();
+ void process_music ();
+ void stop_translation_timestep ();
+ DECLARE_TRANSLATOR_LISTENER (key_change);
private:
- Event *key_ev_;
+ Stream_event *key_ev_;
Audio_key *audio_;
};
}
void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
{
if (key_ev_)
{
/* MIDI keys are too limited for lilypond scales.
We check for minor scale and assume major otherwise. */
- SCM minor = scm_c_eval_string ("minor");
+
+ SCM third = scm_assoc (scm_from_int (2),
+ c_pitchlist);
+ bool minor = (scm_is_pair (third)
+ && scm_is_integer (scm_cdr (third))
+ && scm_to_int (scm_cdr (third)) == FLAT);
+
audio_ = new Audio_key (scm_to_int (acc),
- SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+ !minor);
Audio_element_info info (audio_, key_ev_);
announce_element (info);
}
}
-bool
-Key_performer::try_music (Music *ev)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
{
- if (Event *kc = dynamic_cast<Event *> (ev))
- {
- if (key_ev_)
- warning (_ ("FIXME: key change merge"));
-
- key_ev_ = kc;
- return true;
- }
-
- return false;
+ if (!key_ev_)
+ key_ev_ = ev;
}
ADD_TRANSLATOR (Key_performer,
"", "",
"key-change-event",
- "", "", "");
+ "", "");