*/
+#include "context.hh"
#include "engraver-group-engraver.hh"
#include "protected-scm.hh"
class Recording_group_engraver : public Engraver_group_engraver
{
public:
- TRANSLATOR_DECLARATIONS(Recording_group_engraver);
+ TRANSLATOR_DECLARATIONS (Recording_group_engraver);
virtual bool try_music (Music *m);
- virtual void start_translation_timestep ();
+ void add_music (SCM, SCM);
virtual void stop_translation_timestep ();
virtual void finalize ();
virtual void initialize ();
- Protected_scm accumulator_;
+ virtual void derived_mark () const;
+ SCM now_events_;
+ SCM accumulator_;
};
+void
+Recording_group_engraver::derived_mark () const
+{
+ Engraver_group_engraver::derived_mark();
+ scm_gc_mark (now_events_);
+ scm_gc_mark (accumulator_);
+}
+
void
Recording_group_engraver::initialize ()
{
Engraver_group_engraver::initialize ();
- accumulator_ = gh_cons (SCM_EOL, SCM_EOL);
}
-Recording_group_engraver::Recording_group_engraver()
+Recording_group_engraver::Recording_group_engraver ()
{
+ accumulator_ = SCM_EOL;
+ now_events_ = SCM_EOL;
}
void
-Recording_group_engraver::start_translation_timestep ()
+Recording_group_engraver::add_music (SCM music, SCM success)
{
- Engraver_group_engraver::start_translation_timestep();
-
- scm_set_car_x (accumulator_, gh_cons (now_mom ().smobbed_copy (), SCM_EOL));
+ now_events_ = scm_cons (scm_cons (music, success), now_events_);
}
+
void
Recording_group_engraver::stop_translation_timestep ()
{
- Engraver_group_engraver::stop_translation_timestep();
- scm_set_cdr_x (accumulator_, gh_cons (gh_car (accumulator_), gh_cdr (accumulator_)));
+ Engraver_group_engraver::stop_translation_timestep ();
- scm_set_car_x (accumulator_, SCM_EOL);
+ accumulator_ = scm_acons (scm_cons (now_mom ().smobbed_copy (),
+ get_property ("instrumentTransposition")),
+ now_events_,
+ accumulator_);
+ now_events_ = SCM_EOL;
}
void
Engraver_group_engraver::finalize ();
SCM proc = get_property ("recordEventSequence");
- if (gh_procedure_p (proc))
- scm_call_2 (proc, self_scm(), gh_cdr (accumulator_));
-
- accumulator_ = SCM_EOL;
+ if (ly_c_procedure_p (proc))
+ scm_call_2 (proc, context ()->self_scm (), scm_cdr (accumulator_));
}
bool
{
bool retval = Translator_group::try_music (m);
- SCM seq = gh_cdar (accumulator_);
- seq = gh_cons (gh_cons (m->self_scm(), gh_bool2scm (retval)),
- seq);
-
- scm_set_cdr_x (gh_car (accumulator_), seq);
-
+ add_music (m->self_scm (), ly_bool2scm (retval));
return retval;
}
-ENTER_DESCRIPTION(Recording_group_engraver,
+ADD_TRANSLATOR (Recording_group_engraver,
"Engraver_group_engraver that records all music events "
"for this context. Calls the procedure "
"in @code{recordEventSequence} when finished.",