Using Audio_dynamic's volume_ when announced does not work for
span dynamics: only in stop_translation_timestep the actual
volume is rendered and filled-in.
Also, make using note-velocity vs midi dynamics switchable. Currently
it it always on, as it is mandatory when using the default
midiChannelMapping = 'instrument (as we need different volume settings
in voices that share a channel) and probably preferrable in all
other cases too.
}
Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
}
Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
+ : pitch_ (p)
+ , length_mom_ (m)
+ , transposing_ (transposing)
+ , dynamic_ (0)
+ , tied_ (0)
+ , tie_event_ (tie_event)
- pitch_ = p;
- length_mom_ = m;
- tied_ = 0;
- transposing_ = transposing;
- tie_event_ = tie_event;
- volume_ = 0;
}
Audio_dynamic::Audio_dynamic ()
}
Audio_dynamic::Audio_dynamic ()
+ : volume_ (-1)
+ , silent_ (false)
}
Audio_span_dynamic::Audio_span_dynamic ()
}
Audio_span_dynamic::Audio_span_dynamic ()
announce_element (info);
}
announce_element (info);
}
if (span_dynamic_)
span_dynamic_->add_absolute (absolute_);
if (span_dynamic_)
span_dynamic_->add_absolute (absolute_);
Audio_dynamic ();
Real volume_;
Audio_dynamic ();
Real volume_;
};
class Audio_span_dynamic : public Audio_element
};
class Audio_span_dynamic : public Audio_element
Pitch pitch_;
Moment length_mom_;
Pitch transposing_;
Pitch pitch_;
Moment length_mom_;
Pitch transposing_;
+ Audio_dynamic* dynamic_;
Audio_note *tied_;
bool tie_event_;
Audio_note *tied_;
bool tie_event_;
{
string delta_string = int2midi_varint_string (delta_ticks_);
string midi_string = midi_->to_string ();
{
string delta_string = int2midi_varint_string (delta_ticks_);
string midi_string = midi_->to_string ();
- assert (midi_string.length ());
+ if (midi_string.empty ())
+ return "";
return delta_string + midi_string;
}
/****************************************************************
return delta_string + midi_string;
}
/****************************************************************
Midi_note::Midi_note (Audio_note *a)
: Midi_channel_item (a)
, audio_ (a)
Midi_note::Midi_note (Audio_note *a)
: Midi_channel_item (a)
, audio_ (a)
- , dynamic_byte_ (a->volume_ > 0 ? Byte (a->volume_ * 0x7f) : Byte (0x5a))
+ , dynamic_byte_ (a->dynamic_ && a->dynamic_->volume_ > 0
+ ? Byte (a->dynamic_->volume_ * 0x7f) : Byte (0x5a))
string
Midi_dynamic::to_string () const
{
string
Midi_dynamic::to_string () const
{
- if (audio_->volume_ < 0)
+ if (audio_->volume_ < 0 || audio_->silent_)
return "";
Byte status_byte = (char) (0xB0 + channel_);
return "";
Byte status_byte = (char) (0xB0 + channel_);
int get_channel (string instrument);
Audio_staff* get_audio_staff (string voice);
Audio_staff* new_audio_staff (string voice);
int get_channel (string instrument);
Audio_staff* get_audio_staff (string voice);
Audio_staff* new_audio_staff (string voice);
- Real get_dynamic (string voice);
+ Audio_dynamic* get_dynamic (string voice);
string instrument_string_;
int channel_;
string instrument_string_;
int channel_;
Audio_tempo *tempo_;
map<string, Audio_staff*> staff_map_;
map<string, int> channel_map_;
Audio_tempo *tempo_;
map<string, Audio_staff*> staff_map_;
map<string, int> channel_map_;
- map<string, Real> dynamic_map_;
+ map<string, Audio_dynamic*> dynamic_map_;
static map<string, int> static_channel_map_;
static int channel_count_;
};
static map<string, int> static_channel_map_;
static int channel_count_;
};
return new_audio_staff (voice);
}
return new_audio_staff (voice);
}
Staff_performer::get_dynamic (string voice)
{
Staff_performer::get_dynamic (string voice)
{
- map<string, Real>::const_iterator i = dynamic_map_.find (voice);
+ map<string, Audio_dynamic*>::const_iterator i = dynamic_map_.find (voice);
if (i != dynamic_map_.end ())
return i->second;
return 0;
if (i != dynamic_map_.end ())
return i->second;
return 0;
}
Audio_staff* audio_staff = get_audio_staff (voice);
ai->channel_ = channel_;
}
Audio_staff* audio_staff = get_audio_staff (voice);
ai->channel_ = channel_;
- // Output volume as velocity and disable Midi_dynamic output
- if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (inf.elem_))
+ bool encode_dynamics_as_velocity_ = true;
+ if (encode_dynamics_as_velocity_)
- dynamic_map_[voice] = d->volume_;
- d->volume_ = -1;
+ if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (inf.elem_))
+ {
+ dynamic_map_[voice] = d;
+ // Output volume as velocity: must disable Midi_dynamic output
+ d->silent_ = true;
+ }
+ if (Audio_dynamic *d = get_dynamic (voice))
+ if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
+ n->dynamic_ = d;
- if (Real d = get_dynamic (voice))
- if (Audio_note *n = dynamic_cast<Audio_note *> (inf.elem_))
- n->volume_ = d;
audio_staff->add_audio_item (ai);
}
}
audio_staff->add_audio_item (ai);
}
}