Doc: Included/compile.itexi - CG 4.2 - Updated notes on reqs for compiling

[lilypond.git] / lily / midi-item.cc

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 4909217c4319c108cca8aba6b22ea9533e5c9b37..542e2b0df20ecbd94f3ce9240bb2207ec3e2f0a6 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 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
@@ -28,6 +28,9 @@
 #include "program-option.hh"
 #include "string-convert.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
+
+using std::string;
 
 #define PITCH_WHEEL_CENTER 0x2000
 #define PITCH_WHEEL_SEMITONE 0X1000
@@ -84,9 +87,8 @@ Midi_instrument::to_string () const
   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
@@ -193,7 +195,7 @@ Midi_time_signature::to_string () const
 Midi_note::Midi_note (Audio_note *a)
   : Midi_channel_item (a),
     audio_ (a),
-    dynamic_byte_ (min (max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0
+    dynamic_byte_ (std::min (std::max (Byte ((a->dynamic_ && a->dynamic_->volume_ >= 0
                                     ? a->dynamic_->volume_ * 0x7f : 0x5a)
                                    + a->extra_velocity_),
                              Byte (0)), Byte (0x7f)))
@@ -393,6 +395,7 @@ Midi_control_function_value_change::to_string () const
 
       {  8, 40 }, // balance
       { 10, 42 }, // pan position
+      { 11, 43 }, // expression
       { 91, -1 }, // reverb level (only coarse resolution available)
       { 93, -1 }  // chorus level (only coarse resolution available)
     };
@@ -425,5 +428,5 @@ Midi_control_function_value_change::to_string () const
 char const *
 Midi_item::name () const
 {
-  return this->class_name ();
+  return class_name ();
 }