MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=108
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
VIRTUAL_COPY_CONS (Translator);
protected:
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void acknowledge_element (Score_element_info);
+ virtual void process_acknowledged ();
virtual void do_pre_move_processing ();
private:
state_ = UNISILENCE;
}
+
void
-A2_engraver::do_process_music ()
+A2_engraver::deprecated_process_music ()
{
if (!to_boolean (get_property ("combineParts")))
return ;
}
}
+void
+A2_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
void
A2_engraver::do_pre_move_processing ()
{
virtual void do_post_move_processing ();
virtual void do_removal_processing ();
virtual void acknowledge_element (Score_element_info);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void process_acknowledged ();
private:
void begin_beam ();
}
void
-Auto_beam_engraver::do_process_music ()
+Auto_beam_engraver::deprecated_process_music ()
{
consider_end_and_begin (shortest_mom_);
}
void
Auto_beam_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
if (stem_l_arr_p_)
{
Moment now = now_mom ();
protected:
virtual void do_creation_processing ();
virtual void do_removal_processing ();
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing();
+ virtual void process_acknowledged ();
private:
void typeset_bar ();
/*
Bar_engraver should come *after* any engravers that expect bars to
- modify whichBar in do_process_music () be typeset
+ modify whichBar in deprecated_process_music () be typeset
*/
void
-Bar_engraver::do_process_music()
+Bar_engraver::deprecated_process_music()
{
SCM b =get_property ("whichBar");
if (gh_string_p (b))
}
}
+void
+Bar_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
void
Bar_engraver::typeset_bar ()
{
virtual void do_pre_move_processing ();
virtual void acknowledge_element (Score_element_info);
virtual void do_creation_processing ();
+ virtual void process_acknowledged ();
void create_items();
- void do_process_music ();
+ void deprecated_process_music ();
public:
VIRTUAL_COPY_CONS(Translator);
Bar_number_engraver();
};
void
-Bar_number_engraver::do_process_music ()
+Bar_number_engraver::deprecated_process_music ()
{
// todo include (&&!time->cadenza_b_ )
SCM bn = get_property("currentBarNumber");
}
}
+void
+Bar_number_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+
ADD_THIS_TRANSLATOR(Bar_number_engraver);
Bar_number_engraver::Bar_number_engraver ()
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
virtual void do_removal_processing ();
+ virtual void process_acknowledged ();
virtual void acknowledge_element (Score_element_info);
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
public:
Beam_engraver ();
VIRTUAL_COPY_CONS (Translator);
void
-Beam_engraver::do_process_music ()
+Beam_engraver::deprecated_process_music ()
{
if (reqs_drul_[STOP])
{
announce_element (beam_p_, reqs_drul_[START]);
}
+ reqs_drul_[STOP] = 0;
+ reqs_drul_[START] = 0;
}
void
}
}
+void
+Beam_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+
void
Beam_engraver::acknowledge_element (Score_element_info info)
{
protected:
virtual bool do_try_music (Music *req_l);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing();
virtual void do_post_move_processing();
}
void
-Breathing_sign_engraver::do_process_music()
+Breathing_sign_engraver::deprecated_process_music()
{
- if(breathing_sign_req_l_)
+ if(breathing_sign_req_l_ && ! breathing_sign_p_)
{
SCM b = get_property ("BreathingSign");
breathing_sign_p_ = new Item (b);
protected:
virtual void do_pre_move_processing ();
virtual void acknowledge_element (Score_element_info i);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual bool do_try_music (Music *);
private:
}
/* Uh, if we do acknowledge_element, shouldn't we postpone
- do_process_music until do_process_acknowlegded?
+ deprecated_process_music until do_process_acknowlegded?
Sigh, I can *never* remember how this works, can't we
possibly-please just number these functions:
post_move1
do_try_music2
- do_process_music3 (or is it acknowledge_element3 ?)
+ deprecated_process_music3 (or is it acknowledge_element3 ?)
acknowledge_element4
do_pre_move9
}
void
-Chord_name_engraver::do_process_music ()
+Chord_name_engraver::deprecated_process_music ()
{
if (!chord_name_p_ && gh_car (chord_) != SCM_EOL)
{
protected:
virtual void do_removal_processing();
- virtual void do_process_music();
+ void deprecated_process_music();
virtual bool do_try_music (Music*);
virtual void acknowledge_element (Score_element_info);
virtual void do_pre_move_processing();
virtual void do_post_move_processing();
+ virtual void process_acknowledged ();
};
Chord_tremolo_engraver::Chord_tremolo_engraver()
}
void
-Chord_tremolo_engraver::do_process_music ()
+Chord_tremolo_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Chord_tremolo_engraver::deprecated_process_music ()
{
if (repeat_ && !beam_p_)
{
Direction octave_dir_;
protected:
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_creation_processing ();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
virtual void acknowledge_element (Score_element_info);
private:
void
Clef_engraver::acknowledge_element (Score_element_info info)
{
+ deprecated_process_music ();
Item * item =dynamic_cast <Item *> (info.elem_l_);
if (item)
{
}
void
-Clef_engraver::do_process_music ()
+Clef_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Clef_engraver::deprecated_process_music ()
{
SCM glyph = get_property ("clefGlyph");
SCM clefpos = get_property ("clefPosition");
SCM octavation = get_property ("clefOctavation");
-
- if (scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
+
+ if (clefpos == SCM_EOL
+ || scm_equal_p (glyph, prev_glyph_) == SCM_BOOL_F
|| scm_equal_p (clefpos, prev_cpos_) == SCM_BOOL_F
|| scm_equal_p (octavation, prev_octavation_) == SCM_BOOL_F)
{
Custos_engraver();
virtual void do_post_move_processing();
virtual void acknowledge_element(Score_element_info);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void process_acknowledged ();
virtual void do_pre_move_processing ();
virtual void do_removal_processing ();
TODO check if this works with forced bar lines?
*/
void
-Custos_engraver::do_process_music ()
+Custos_engraver::deprecated_process_music ()
{
if (gh_string_p (get_property( "whichBar")))
custos_permitted = true;
void
Custos_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
+
if (custos_permitted)
{
for (int i = pitches_.size (); i--;)
virtual void do_removal_processing ();
virtual void acknowledge_element (Score_element_info);
virtual bool do_try_music (Music *req_l);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
+ virtual void process_acknowledged ();
virtual void do_post_move_processing ();
};
}
void
-Dynamic_engraver::do_process_music ()
+Dynamic_engraver::deprecated_process_music ()
{
if (accepted_spanreqs_drul_[START] || accepted_spanreqs_drul_[STOP] || script_req_l_)
announce_element (cresc_p_, accepted_spanreqs_drul_[START]);
}
}
+ script_req_l_ = 0;
+ accepted_spanreqs_drul_[START] = 0;
+ accepted_spanreqs_drul_[STOP] = 0;
}
void
typeset_all ();
}
+void
+Dynamic_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
void
Dynamic_engraver::do_removal_processing ()
{
protected:
virtual bool do_try_music (Music* req_l);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
+ virtual void process_acknowledged ();
private:
Music* script_req_l_;
void
-Dynamic_performer::do_process_music ()
+Dynamic_performer::deprecated_process_music ()
{
if (script_req_l_)
{
}
}
+void
+Dynamic_performer::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
void
Dynamic_performer::do_pre_move_processing ()
{
Translator * t = unsmob_translator (gh_car (p));
dynamic_cast<Engraver_group_engraver*> (t)->do_announces ();
}
-
- while (announce_info_arr_.size ())
+
+ // debug
+ int i = 0;
+ do
{
+ i++;
for (int j =0; j < announce_info_arr_.size(); j++)
{
Score_element_info info = announce_info_arr_[j];
-
+
+ if (i > 10)
+ printf ("elt: %s\n",
+ announce_info_arr_[j].elem_l_->name ().ch_C ());
for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
{
Translator * t = unsmob_translator (gh_car (p));
eng->process_acknowledged ();
}
}
+ while (announce_info_arr_.size ());
}
protected:
virtual void acknowledge_element (Score_element_info);
virtual void do_removal_processing();
- virtual void do_process_music();
+ void deprecated_process_music();
virtual bool do_try_music (Music*);
virtual void do_pre_move_processing();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
private:
};
}
void
-Extender_engraver::do_process_music ()
+Extender_engraver::process_acknowledged ()
{
- if (req_l_)
+ deprecated_process_music ();
+}
+
+void
+Extender_engraver::deprecated_process_music ()
+{
+ if (req_l_ && ! extender_p_)
{
if (!last_lyric_l_)
{
Grace_engraver_group::process ()
{
calling_self_b_ = true;
- process_music ();
- do_announces();
+ //process_music ();
+ announces();
pre_move_processing();
check_removal();
calling_self_b_ = false;
Grace_performer_group::process ()
{
calling_self_b_ = true;
- process_music ();
- do_announces();
+ //process_music ();
+ announces();
pre_move_processing();
check_removal();
calling_self_b_ = false;
protected:
virtual void acknowledge_element (Score_element_info);
virtual void do_removal_processing();
- virtual void do_process_music();
+ void deprecated_process_music();
virtual bool do_try_music (Music*);
virtual void do_pre_move_processing();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
private:
};
}
void
-Hyphen_engraver::do_process_music ()
+Hyphen_engraver::process_acknowledged ()
{
- if (req_l_)
+ deprecated_process_music ();
+}
+
+void
+Hyphen_engraver::deprecated_process_music ()
+{
+ if (req_l_ &&! hyphen_p_)
{
if (!last_lyric_l_)
{
protected:
virtual bool do_try_music (Music* req_l);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
private:
protected:
virtual void do_pre_move_processing();
virtual bool do_try_music (Music*);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_post_move_processing ();
public:
Lyric_engraver ();
protected:
virtual bool do_try_music (Music* req_l);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing ();
private:
Note_performer();
protected:
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual bool do_try_music (Music *req_l) ;
virtual void do_pre_move_processing ();
virtual void play_element (Audio_element* p);
virtual void do_removal_processing ();
virtual void do_creation_processing ();
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
private:
protected:
virtual bool do_try_music (Music* req_l);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing ();
private:
virtual void do_pre_move_processing ();
virtual void acknowledge_element (Audio_element_info);
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void process_acknowledged ();
};
protected:
virtual void do_creation_processing ();
virtual bool do_try_music (Music *req_l);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing();
virtual void do_post_move_processing();
bool try_music_on_nongroup_children (Music *m);
- virtual void do_process_music ();
+ void deprecated_process_music ();
+ virtual void do_announces ();
virtual void do_add_processing ();
virtual bool do_try_music (Music* req_l);
virtual void do_pre_move_processing();
void add_processing ();
void creation_processing ();
void process_music();
+ void announces();
void post_move_processing();
void removal_processing();
/**
virtual bool do_try_music (Music *req_l);
virtual void do_pre_move_processing();
virtual void do_post_move_processing();
- virtual void do_process_music () ;
+ void deprecated_process_music () ;
+ virtual void do_announces () ;
virtual void do_creation_processing() ;
virtual void do_removal_processing();
};
virtual void do_creation_processing();
virtual void do_removal_processing ();
virtual bool do_try_music (Music *req_l);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing();
virtual void do_post_move_processing();
+ virtual void process_acknowledged ();
virtual void acknowledge_element (Score_element_info);
};
}
void
-Key_engraver::do_process_music ()
+Key_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Key_engraver::deprecated_process_music ()
{
if (keyreq_l_ || old_accs_ != get_property ("keySignature"))
{
}
void
-Key_performer::do_process_music ()
+Key_performer::deprecated_process_music ()
{
if (key_req_l_ &&
gh_list_p (key_req_l_->get_mus_property ("pitch-alist")))
Item *key_item_p_;
protected:
VIRTUAL_COPY_CONS(Translator);
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void acknowledge_element (Score_element_info);
virtual void do_pre_move_processing();
virtual void do_creation_processing ();
void
Local_key_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
+
if (!key_item_p_ && mel_l_arr_.size())
{
SCM localsig = get_property ("localKeySignature");
ugh. repeated deep_copy generates lots of garbage.
*/
void
-Local_key_engraver::do_process_music()
+Local_key_engraver::deprecated_process_music()
{
SCM smp = get_property ("measurePosition");
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
}
void
-Lyric_engraver::do_process_music()
+Lyric_engraver::deprecated_process_music()
{
if (req_l_)
{
text_p_->translate_axis (0.66, X_AXIS);
announce_element (text_p_, req_l_);
+ req_l_ = 0;
}
}
void
-Lyric_performer::do_process_music ()
+Lyric_performer::deprecated_process_music ()
{
// FIXME: won't work with fancy lyrics
if (lreq_arr_.size ()
virtual void acknowledge_element (Score_element_info);
void create_items(Request*);
virtual bool do_try_music (Music *req_l);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_post_move_processing ();
virtual void do_creation_processing ();
+ virtual void process_acknowledged ();
private:
Mark_req * mark_req_l_;
}
void
-Mark_engraver::do_process_music ()
+Mark_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Mark_engraver::deprecated_process_music ()
{
if (mark_req_l_)
{
protected:
virtual void acknowledge_element (Score_element_info i);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual bool do_try_music (Music*);
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
virtual void do_removal_processing ();
+ virtual void process_acknowledged ();
+
private:
Span_req * new_req_l_;
Span_req * busy_span_req_l_;
return false;
}
+void
+Multi_measure_rest_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
void
-Multi_measure_rest_engraver::do_process_music ()
+Multi_measure_rest_engraver::deprecated_process_music ()
{
if (new_req_l_ && stop_req_l_)
stop_req_l_ = 0;
protected:
virtual void do_post_move_processing ();
virtual bool do_try_music (Music *req_l) ;
- virtual void do_process_music();
+ virtual void process_acknowledged ();
+ virtual void acknowledge_element (Score_element_info) ;
+ void deprecated_process_music();
virtual void do_pre_move_processing();
};
}
void
-Note_heads_engraver::do_process_music()
+Note_heads_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Note_heads_engraver::acknowledge_element (Score_element_info)
+{
+ //deprecated_process_music ();
+}
+
+void
+Note_heads_engraver::deprecated_process_music()
{
if (note_p_arr_.size ())
return ;
Link_array<Note_req> req_l_arr_;
Link_array<Item> texts_;
virtual bool do_try_music (Music*m);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
};
void
-Note_name_engraver::do_process_music ()
+Note_name_engraver::deprecated_process_music ()
{
+ if (texts_.size ())
+ return;
String s ;
for (int i=0; i < req_l_arr_.size (); i++)
{
void
-Note_performer::do_process_music ()
+Note_performer::deprecated_process_music ()
{
if (note_req_l_arr_.size ())
{
#include "performer-group-performer.hh"
+#include "audio-element.hh"
#include "debug.hh"
dynamic_cast<Performer_group_performer*> (t)->do_announces ();
}
- while (announce_info_arr_.size ())
- {
- for (int j =0; j < announce_info_arr_.size(); j++)
- {
- Audio_element_info info = announce_info_arr_[j];
-
+ // debug
+ int i = 0;
+ do
+ {
+ i++;
+ for (int j =0; j < announce_info_arr_.size(); j++)
+ {
+ Audio_element_info info = announce_info_arr_[j];
+
+ if (i > 10)
+ {
+ printf ("elt: %s\n",
+ classname (announce_info_arr_[j].elem_l_));
+ announce_info_arr_.clear ();
+ }
+
for (SCM p = simple_trans_list_; gh_pair_p (p); p = gh_cdr (p))
{
Translator * t = unsmob_translator (gh_car (p));
eng->process_acknowledged ();
}
}
+ while (announce_info_arr_.size ());
}
protected:
virtual void do_creation_processing ();
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
virtual void acknowledge_element (Score_element_info);
+ virtual void process_acknowledged ();
private:
struct Pedal_info
void
Piano_pedal_engraver::acknowledge_element (Score_element_info info)
{
- for (Pedal_info*p = info_list_; p->name_; p ++)
+ for (Pedal_info*p = info_list_; p && p->name_; p ++)
{
if (p->item_p_)
{
}
void
-Piano_pedal_engraver::do_process_music ()
+Piano_pedal_engraver::process_acknowledged ()
{
- for (Pedal_info*p = info_list_; p->name_; p ++)
+ deprecated_process_music ();
+}
+
+void
+Piano_pedal_engraver::deprecated_process_music ()
+{
+ for (Pedal_info*p = info_list_; p && p->name_; p ++)
{
+ if (p->item_p_)
+ continue;
SCM s = SCM_EOL;
if (p->req_l_drul_[STOP] && p->req_l_drul_[START])
{
protected:
virtual void do_creation_processing ();
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
}
void
-Piano_pedal_performer::do_process_music ()
+Piano_pedal_performer::deprecated_process_music ()
{
- for (Pedal_info*p = info_alist_; p->name_; p ++)
+ for (Pedal_info*p = info_alist_; p && p->name_; p ++)
{
if (p->req_l_drul_[STOP])
void
Piano_pedal_performer::do_post_move_processing ()
{
- for (Pedal_info*p = info_alist_; p->name_; p ++)
+ for (Pedal_info*p = info_alist_; p && p->name_; p ++)
{
p->req_l_drul_[STOP] = 0;
p->req_l_drul_[START] = 0;
void
Property_engraver::acknowledge_element (Score_element_info i)
{
+ /////////
+ return;
SCM ifs = i.elem_l_->get_elt_property ("interfaces");
SCM props;
for (; gh_pair_p (ifs); ifs = gh_cdr (ifs))
Repeat_acknowledge_engraver();
virtual void do_post_move_processing ();
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_creation_processing ();
};
}
void
-Repeat_acknowledge_engraver::do_process_music ()
+Repeat_acknowledge_engraver::deprecated_process_music ()
{
/*
At the start of a piece, we don't print any repeat bars.
virtual bool do_try_music (Music *);
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
- virtual void do_process_music ();
+ void deprecated_process_music ();
public:
VIRTUAL_COPY_CONS(Translator);
}
void
-Rest_engraver::do_process_music ()
+Rest_engraver::deprecated_process_music ()
{
if (rest_req_l_ && !rest_p_)
{
void
Score_engraver::process()
{
- process_music();
- do_announces();
+ //process_music();
+ announces();
pre_move_processing();
check_removal();
}
void
Score_engraver::do_announces()
{
- while (announce_info_arr_.size())
+ ////// do
Engraver_group_engraver::do_announces();
+ //////while (announce_info_arr_.size());
}
void
Score_performer::process()
{
- process_music();
- do_announces ();
+ //process_music();
+ announces ();
pre_move_processing();
check_removal();
}
Script_engraver();
protected:
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
virtual void acknowledge_element (Score_element_info);
};
}
void
-Script_engraver::do_process_music()
+Script_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Script_engraver::deprecated_process_music()
{
for (int i=0; i < script_req_l_arr_.size(); i++)
{
announce_element (p, l);
}
+ script_req_l_arr_.clear ();
}
void
protected:
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void acknowledge_element (Score_element_info);
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
virtual void do_removal_processing ();
+ virtual void process_acknowledged ();
public:
VIRTUAL_COPY_CONS (Translator);
return false;
}
+void
+Slur_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
void
Slur_engraver::set_melisma (bool m)
{
}
void
-Slur_engraver::do_process_music ()
+Slur_engraver::deprecated_process_music ()
{
Link_array<Score_element> start_slur_l_arr;
for (int i=0; i< new_slur_req_l_arr_.size (); i++)
}
for (int i=0; i < start_slur_l_arr.size (); i++)
slur_l_stack_.push (start_slur_l_arr[i]);
+ new_slur_req_l_arr_.clear ();
}
void
virtual bool do_try_music (Music*);
virtual void acknowledge_element (Audio_element_info);
virtual void process_acknowledged ();
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
}
void
-Span_dynamic_performer::do_process_music ()
+Span_dynamic_performer::deprecated_process_music ()
{
if (span_start_req_l_ || span_req_l_drul_[START])
{
void
Span_dynamic_performer::process_acknowledged ()
{
+ deprecated_process_music ();
if (span_req_l_drul_[STOP])
{
finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
{
dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
}
+ span_start_req_l_ = 0;
+ span_req_l_drul_[START] = 0;
+ span_req_l_drul_[STOP] = 0;
}
void
}
void
-Staff_performer::do_process_music ()
+Staff_performer::deprecated_process_music ()
{
String str = new_instrument_str ();
if (str.length_i ())
instrument_p_ = new Audio_instrument (str);
announce_element (Audio_element_info (instrument_p_, 0));
}
- Performer_group_performer::do_process_music ();
+ Performer_group_performer::deprecated_process_music ();
}
void
void
Staff_symbol_engraver::acknowledge_element (Score_element_info s)
{
- s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm ());
- s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
+ ////// assert (span_p_);
+ ////// ik weet 't zo onderhand echt niet meer
+ ///// if (!span_p_)
+ ///// do_creation_processing ();
+ if (!span_p_)
+ {
+ status_ = VIRGIN;
+ creation_processing ();
+ }
+ s.elem_l_->set_elt_property ("staff-symbol", span_p_->self_scm ());
+ s.elem_l_->add_dependency (span_p_); // UGH. UGH. UGH
}
void
-Tempo_performer::do_process_music ()
+Tempo_performer::deprecated_process_music ()
{
if (tempo_req_l_)
{
virtual bool do_try_music (Music* m);
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
- virtual void do_process_music ();
+ virtual void process_acknowledged ();
+ void deprecated_process_music ();
virtual void acknowledge_element (Score_element_info);
};
}
void
-Text_engraver::do_process_music ()
+Text_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
+}
+
+void
+Text_engraver::deprecated_process_music ()
+{
+ if (texts_.size ())
+ return;
for (int i=0; i < reqs_.size (); i++)
{
Text_script_req * r = reqs_[i];
virtual void do_removal_processing ();
virtual void acknowledge_element (Score_element_info);
virtual bool do_try_music (Music *);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
private:
Spanner *span_;
}
void
-Text_spanner_engraver::do_process_music ()
+Text_spanner_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
+}
+
+void
+Text_spanner_engraver::deprecated_process_music ()
+{
+ /////
if (req_drul_[STOP])
{
if (!span_)
virtual void do_pre_move_processing ();
virtual void acknowledge_element (Score_element_info);
virtual bool do_try_music (Music*);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void process_acknowledged ();
void typeset_tie (Score_element*);
public:
}
void
-Tie_engraver::do_process_music ()
+Tie_engraver::deprecated_process_music ()
{
+}
+
+void
+Tie_engraver::process_acknowledged ()
+{
+ if (tie_p_arr_.size ())
+ return;
+
if (req_l_)
{
Moment now = now_mom ();
&& past_notes_pq_.front ().end_ == now)
stopped_heads_.push (past_notes_pq_.get ());
}
-}
-
-void
-Tie_engraver::process_acknowledged ()
-{
if (req_l_)
{
now_heads_.sort (CHead_melodic_tuple::pitch_compare);
}
void
-Tie_performer::do_process_music ()
+Tie_performer::deprecated_process_music ()
{
if (req_l_)
{
void
Tie_performer::process_acknowledged ()
{
+ deprecated_process_music ();
if (req_l_)
{
now_notes_.sort (CNote_melodic_tuple::pitch_compare);
*/
class Time_signature_engraver : public Engraver {
protected:
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing();
public:
VIRTUAL_COPY_CONS(Translator);
}
void
-Time_signature_engraver::do_process_music()
+Time_signature_engraver::deprecated_process_music()
{
/*
not rigorously safe, since the value might get GC'd and
protected:
- virtual void do_process_music();
+ void deprecated_process_music();
virtual void do_pre_move_processing ();
SCM prev_fraction_;
void
-Time_signature_performer::do_process_music ()
+Time_signature_performer::deprecated_process_music ()
{
SCM fr = get_property ("timeSignatureFraction");
if (gh_pair_p (fr)
}
void
-Timing_translator::do_process_music()
+Timing_translator::deprecated_process_music()
{
if (check_ && measure_position ())
{
}
void
-Translator_group::do_process_music ()
+Translator_group::deprecated_process_music ()
{
+ assert (0);
each (&Translator::process_music);
}
+void
+Translator_group::do_announces ()
+{
+ each (&Translator::announces);
+}
+
void
Translator_group::do_creation_processing ()
{
return do_try_music (r);
}
+
void
Translator::process_music ()
{
+ assert (0);
if (status_ < PROCESSED_REQS)
post_move_processing ();
else if (status_ >= PROCESSED_REQS)
return;
status_ = PROCESSED_REQS;
- do_process_music ();
+ deprecated_process_music ();
+}
+
+//////////
+static int te_vroeg = 0;
+void
+Translator::announces ()
+{
+ #if 0
+ if (te_vroeg && te_vroeg < 2)
+ {
+ do_creation_processing ();
+ te_vroeg++;
+ }
+ #endif
+ if (status_ < PROCESSED_REQS)
+ post_move_processing ();
+ else if (status_ >= PROCESSED_REQS)
+ return;
+
+ status_ = PROCESSED_REQS;
+ do_announces ();
}
+
void
Translator::pre_move_processing ()
{
}
void
-Translator::do_process_music ()
+Translator::deprecated_process_music ()
+{
+}
+
+void
+Translator::do_announces ()
{
}
+////////////
void
Translator::do_creation_processing ()
{
+ te_vroeg++;
}
void
virtual void do_removal_processing ();
virtual void acknowledge_element (Score_element_info);
virtual bool do_try_music (Music*r);
- virtual void do_process_music ();
+ void deprecated_process_music ();
virtual void do_post_move_processing ();
+ virtual void process_acknowledged ();
};
bool
}
void
-Tuplet_engraver::do_process_music ()
+Tuplet_engraver::process_acknowledged ()
+{
+ deprecated_process_music ();
+}
+
+void
+Tuplet_engraver::deprecated_process_music ()
{
SCM v = get_property ("tupletInvisible");
if (to_boolean (v))
virtual void acknowledge_element (Score_element_info);
virtual void do_removal_processing ();
virtual void do_pre_move_processing ();
- virtual void do_process_music ();
-
+ void deprecated_process_music ();
+ virtual void process_acknowledged ();
+
Moment started_mom_;
Spanner * volta_span_p_;
Spanner* end_volta_span_p_;
}
void
-Volta_engraver::do_process_music ()
+Volta_engraver::process_acknowledged ()
{
+ deprecated_process_music ();
+}
+
+void
+Volta_engraver::deprecated_process_music ()
+{
+ if (volta_span_p_)
+ return;
SCM cs = get_property ("repeatCommands");
SCM str = SCM_EOL;