/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "midi-item.hh"
+#include "audio-column.hh"
#include "duration.hh"
#include "international.hh"
+#include "libc-extension.hh"
#include "main.hh"
#include "midi-stream.hh"
#include "misc.hh"
#include "program-option.hh"
#include "string-convert.hh"
#include "warn.hh"
+#include "lily-imports.hh"
#define PITCH_WHEEL_CENTER 0x2000
#define PITCH_WHEEL_SEMITONE 0X1000
return i->str_.length () ? new Midi_instrument (i) : 0;
else if (Audio_note *i = dynamic_cast<Audio_note *> (a))
return new Midi_note (i);
- else if (Audio_dynamic *i = dynamic_cast<Audio_dynamic *> (a))
- return new Midi_dynamic (i);
else if (Audio_piano_pedal *i = dynamic_cast<Audio_piano_pedal *> (a))
return new Midi_piano_pedal (i);
else if (Audio_tempo *i = dynamic_cast<Audio_tempo *> (a))
return new Midi_time_signature (i);
else if (Audio_text *i = dynamic_cast<Audio_text *> (a))
return new Midi_text (i);
+ else if (Audio_control_change *i = dynamic_cast<Audio_control_change *> (a))
+ return new Midi_control_change (i);
else
assert (0);
Byte program_byte = 0;
bool found = false;
- SCM proc = ly_lily_module_constant ("midi-program");
- SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ()));
- found = (program != SCM_BOOL_F);
+ SCM program = Lily::midi_program (ly_symbol2scm (audio_->str_.c_str ()));
+ found = (scm_is_true (program));
if (found)
program_byte = (Byte) scm_to_int (program);
else
{
}
+Midi_control_change::Midi_control_change (Audio_control_change *ai)
+ : Midi_channel_item (ai),
+ audio_ (ai)
+{
+}
+
Midi_item::~Midi_item ()
{
}
+Midi_channel_item::~Midi_channel_item ()
+{
+}
+
+Midi_control_change::~Midi_control_change ()
+{
+}
+
string
int2midi_varint_string (int i)
{
Midi_note::Midi_note (Audio_note *a)
: Midi_channel_item (a),
audio_ (a),
- dynamic_byte_ (a->dynamic_ && a->dynamic_->volume_ >= 0
- ? Byte (a->dynamic_->volume_ * 0x7f) : Byte (0x5a))
+ dynamic_byte_ (min (max (Byte ((a->dynamic_
+ ? a->dynamic_->get_volume (a->audio_column_->when ()) * 0x7f : 0x5a)
+ + a->extra_velocity_),
+ Byte (0)), Byte (0x7f)))
{
}
return str;
}
-Midi_dynamic::Midi_dynamic (Audio_dynamic *a)
- : Midi_channel_item (a),
- audio_ (a)
-{
-}
-
-string
-Midi_dynamic::to_string () const
-{
- Byte status_byte = (char) (0xB0 + channel_);
- string str = ::to_string ((char)status_byte);
-
- /*
- Main volume controller (per channel):
- 07 MSB
- 27 LSB
- */
- static Real const full_scale = 127;
-
- int volume = (int) (audio_->volume_ * full_scale);
- if (volume <= 0)
- volume = 1;
- if (volume > full_scale)
- volume = (int)full_scale;
-
- int const volume_default = 100;
- if (audio_->volume_ < 0 || audio_->silent_)
- volume = volume_default;
-
- str += ::to_string ((char)0x07);
- str += ::to_string ((char)volume);
- return str;
-}
-
Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal *a)
: Midi_channel_item (a),
audio_ (a)
return str;
}
+string
+Midi_control_change::to_string () const
+{
+ Byte status_byte = (char) (0xB0 + channel_);
+ string str = ::to_string ((char)status_byte);
+ str += ::to_string ((char) (audio_->control_));
+ str += ::to_string ((char) (audio_->value_));
+ return str;
+}
+
char const *
Midi_item::name () const
{
- return this->class_name ();
+ return class_name ();
}