(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);
void process_music ();
void stop_translation_timestep ();
+ DECLARE_TRANSLATOR_LISTENER (key_change);
private:
- Music *key_ev_;
+ Stream_event *key_ev_;
Audio_key *audio_;
};
Pitch key_do (0,
scm_to_int (scm_caar (pitchlist)),
- scm_to_int (scm_cdar (pitchlist)));
+ ly_scm2rational (scm_cdar (pitchlist)));
Pitch c_do (0, 0, 0);
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);
+ && scm_is_number (scm_cdr (third))
+ && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
audio_ = new Audio_key (scm_to_int (acc),
!minor);
{
if (audio_)
{
- play_element (audio_);
audio_ = 0;
}
}
-bool
-Key_performer::try_music (Music *ev)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
{
if (!key_ev_)
key_ev_ = ev;
-
- return true;
}
-#include "translator.icc"
-
ADD_TRANSLATOR (Key_performer,
- "", "",
- "key-change-event",
- "", "");
+ "",
+ "",
+ "",
+ "");