[prev in list] [next in list] [prev in thread] [next in thread]
List: lilypond-devel
Subject: Issue 4947: Link notes to dynamics in Dynamic_performer rather than Staff_performer. (issue 30426004
From: nine.fierce.ballads () gmail ! com
Date: 2016-07-30 19:37:42
Message-ID: 001a114f86e42f2a400538df80b9 () google ! com
[Download RAW message or body]
Reviewers: ht,
Description:
Link notes to dynamics in Dynamic_performer rather than Staff_performer.
This makes dynamics in different voices independent of each other.
This was mentioned in https://codereview.appspot.com/302930043/ .
I doubt that the two new regression tests are very valuable. If it
hadn't been for the previous implementation, I probably would not have
thought to create them. Please vote on whether I should include or omit
them when it comes time to push.
Please review this at https://codereview.appspot.com/304260043/
Affected files (+55, -38 lines):
A input/regression/midi/dynamic-voices-sequential.ly
A input/regression/midi/dynamic-voices-simultaneous.ly
M lily/dynamic-performer.cc
M lily/staff-performer.cc
Index: input/regression/midi/dynamic-voices-sequential.ly
diff --git a/input/regression/midi/dynamic-voices-sequential.ly
b/input/regression/midi/dynamic-voices-sequential.ly
new file mode 100644
index
0000000000000000000000000000000000000000..2d25b2d696f3a411f0fc8e6324dc4f5c834719b3
--- /dev/null
+++ b/input/regression/midi/dynamic-voices-sequential.ly
@@ -0,0 +1,15 @@
+\version "2.19.47"
+
+\header {
+ texidoc="The MIDI performer operates in Voice context by default,
+ so dynamics in different voices are independent."
+}
+
+\score {
+ \new Staff {
+ \new Voice = "A" c'2\p
+ \new Voice = "A" c'2 % default dynamic expected
+ }
+
+ \midi {}
+}
Index: input/regression/midi/dynamic-voices-simultaneous.ly
diff --git a/input/regression/midi/dynamic-voices-simultaneous.ly
b/input/regression/midi/dynamic-voices-simultaneous.ly
new file mode 100644
index
0000000000000000000000000000000000000000..091dd689891d46425840f7e528178bdd42a50929
--- /dev/null
+++ b/input/regression/midi/dynamic-voices-simultaneous.ly
@@ -0,0 +1,15 @@
+\version "2.19.47"
+
+\header {
+ texidoc="The MIDI performer operates in Voice context by default,
+ so dynamics in different voices are independent."
+}
+
+\score {
+ \new Staff <<
+ \new Voice = "A" e'2\p
+ \new Voice = "A" c'2 % default dynamic expected
+ >>
+
+ \midi {}
+}
Index: lily/dynamic-performer.cc
diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index
857b3590dc1a143e29ec813c71bb1fa523129c2f..23b7d43bfd4b104974691877bb08dbf71125daa3
100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -30,6 +30,7 @@ class Dynamic_performer : public Performer
public:
TRANSLATOR_DECLARATIONS (Dynamic_performer);
protected:
+ virtual void acknowledge_audio_element (Audio_element_info info);
virtual void finalize ();
void stop_translation_timestep ();
void process_music ();
@@ -111,6 +112,7 @@ private:
};
private:
+ vector<Audio_note *> notes_;
Stream_event *script_event_;
Drul_array<Stream_event *> span_events_;
Direction next_grow_dir_;
@@ -131,6 +133,16 @@ Dynamic_performer::Dynamic_performer ()
= span_events_[RIGHT] = 0;
}
+void
+Dynamic_performer::acknowledge_audio_element (Audio_element_info inf)
+{
+ // Keep track of the notes played in this translation time step so that
they
+ // can be pointed to the current dynamic in stop_translation_timestep.
+ if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_)) {
+ notes_.push_back (n);
+ }
+}
+
bool
Dynamic_performer::drive_state_machine (Direction next_grow_dir)
{
@@ -429,6 +441,19 @@ Dynamic_performer::process_music ()
void
Dynamic_performer::stop_translation_timestep ()
{
+ // link notes to the current dynamic
+ if (!open_span_.dynamic_)
+ programming_error("no current dynamic");
+ else
+ {
+ for (vector<Audio_note *>::const_iterator ni = notes_.begin ();
+ ni != notes_.end (); ++ni)
+ {
+ (*ni)->dynamic_ = open_span_.dynamic_;
+ }
+ }
+ notes_.clear ();
+
script_event_ = 0;
span_events_[LEFT]
= span_events_[RIGHT] = 0;
Index: lily/staff-performer.cc
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index
d413a46835b8694fc1c9af157de340fb35059a88..592c6a7e016f4fd82e6be3d998318625dfb4fd42
100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -55,7 +55,6 @@ private:
int get_channel (const string &instrument);
Audio_staff *get_audio_staff (const string &voice);
Audio_staff *new_audio_staff (const string &voice);
- Audio_span_dynamic *get_dynamic (const string &voice);
class Midi_control_initializer : public Midi_control_change_announcer
{
@@ -79,10 +78,8 @@ private:
Audio_text *instrument_name_;
Audio_text *name_;
Audio_tempo *tempo_;
- map<string, deque<Audio_note *> > note_map_;
map<string, Audio_staff *> staff_map_;
map<string, int> channel_map_;
- map<string, Audio_span_dynamic *> dynamic_map_;
// Would prefer to have the following two items be
// members of the containing class Performance,
// so they can be reset for each new midi file output.
@@ -178,15 +175,6 @@ Staff_performer::get_audio_staff (const string &voice)
return new_audio_staff (voice);
}
-Audio_span_dynamic *
-Staff_performer::get_dynamic (const string &voice)
-{
- map<string, Audio_span_dynamic *>::const_iterator i = dynamic_map_.find
(voice);
- if (i != dynamic_map_.end ())
- return i->second;
- return 0;
-}
-
void
Staff_performer::process_music ()
{
@@ -220,21 +208,6 @@ Staff_performer::stop_translation_timestep ()
tempo_ = 0;
instrument_name_ = 0;
instrument_ = 0;
- // For each voice with a note played in the current translation time
step,
- // check if the voice has a dynamic registered: if yes, apply the dynamic
- // to every note played in the voice in the current translation time
step.
- for (map<string, deque<Audio_note *> >::iterator vi = note_map_.begin ();
- vi != note_map_.end (); ++vi)
- {
- Audio_span_dynamic *d = get_dynamic (vi->first);
- if (d)
- {
- for (deque<Audio_note *>::iterator ni = vi->second.begin ();
- ni != vi->second.end (); ++ni)
- (*ni)->dynamic_ = d;
- }
- }
- note_map_.clear ();
}
void
@@ -331,19 +304,8 @@ Staff_performer::acknowledge_audio_element
(Audio_element_info inf)
if (Audio_item *ai = dynamic_cast<Audio_item *> (inf.elem_))
{
ai->channel_ = channel_;
- if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
- {
- // Keep track of the notes played in the current voice in this
- // translation time step (for adjusting their dynamics later in
- // stop_translation_timestep).
- note_map_[voice].push_back (n);
- }
audio_staff->add_audio_item (ai);
}
- else if (Audio_span_dynamic *d = dynamic_cast<Audio_span_dynamic *>
(inf.elem_))
- {
- dynamic_map_[voice] = d;
- }
}
Staff_performer::Midi_control_initializer::Midi_control_initializer
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic