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"
~Key_performer ();
protected:
- virtual bool try_music (Music* ev);
- virtual void create_audio_elements ();
- virtual void stop_translation_timestep ();
+ virtual bool try_music (Music *ev);
+ void process_music ();
+ void stop_translation_timestep ();
private:
- Event* key_ev_;
- Audio_key* audio_;
+ Music *key_ev_;
+ Audio_key *audio_;
};
Key_performer::Key_performer ()
}
void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
{
- if (key_ev_)
+ if (key_ev_)
{
SCM pitchlist = key_ev_->get_property ("pitch-alist");
SCM proc = ly_lily_module_constant ("alterations-in-key");
-
+
SCM acc = scm_call_1 (proc, pitchlist);
-
- Pitch key_do (0,
+
+ Pitch key_do (0,
scm_to_int (scm_caar (pitchlist)),
scm_to_int (scm_cdar (pitchlist)));
Pitch c_do (0, 0, 0);
-
+
SCM c_pitchlist
= ly_transpose_key_alist (pitchlist,
pitch_interval (key_do, c_do).smobbed_copy ());
/* 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)
+Key_performer::try_music (Music *ev)
{
- if (Event *kc = dynamic_cast <Event *> (ev))
- {
- if (key_ev_)
- warning (_ ("FIXME: key change merge"));
-
- key_ev_ = kc;
- return true;
- }
+ if (!key_ev_)
+ key_ev_ = ev;
- return false;
+ return true;
}
+#include "translator.icc"
+
ADD_TRANSLATOR (Key_performer,
- "", "",
- "key-change-event",
- "", "", "");
+ "", "",
+ "key-change-event",
+ "", "");