LEFT | RIGHT |
(no file at all) | |
1 /* | 1 /* |
2 This file is part of LilyPond, the GNU music typesetter. | 2 This file is part of LilyPond, the GNU music typesetter. |
3 | 3 |
4 Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org> | 4 Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org> |
5 | 5 |
6 LilyPond is free software: you can redistribute it and/or modify | 6 LilyPond is free software: you can redistribute it and/or modify |
7 it under the terms of the GNU General Public License as published by | 7 it under the terms of the GNU General Public License as published by |
8 the Free Software Foundation, either version 3 of the License, or | 8 the Free Software Foundation, either version 3 of the License, or |
9 (at your option) any later version. | 9 (at your option) any later version. |
10 | 10 |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 | 238 |
239 instrument_string_ = ly_scm2string (minstr); | 239 instrument_string_ = ly_scm2string (minstr); |
240 | 240 |
241 return instrument_string_; | 241 return instrument_string_; |
242 } | 242 } |
243 | 243 |
244 int | 244 int |
245 Staff_performer::get_channel (string instrument) | 245 Staff_performer::get_channel (string instrument) |
246 { | 246 { |
247 SCM channel_mapping = get_property ("midiChannelMapping"); | 247 SCM channel_mapping = get_property ("midiChannelMapping"); |
248 map<string, int>& channel_map | 248 map<string, int> &channel_map |
249 = (channel_mapping != ly_symbol2scm ("instrument")) | 249 = (channel_mapping != ly_symbol2scm ("instrument")) |
250 ? channel_map_ | 250 ? channel_map_ |
251 : static_channel_map_; | 251 : static_channel_map_; |
252 | 252 |
253 if (channel_mapping == ly_symbol2scm ("staff") | 253 if (channel_mapping == ly_symbol2scm ("staff") |
254 && channel_ >= 0) | 254 && channel_ >= 0) |
255 return channel_; | 255 return channel_; |
256 | 256 |
257 map<string, int>::const_iterator i = channel_map.find (instrument); | 257 map<string, int>::const_iterator i = channel_map.find (instrument); |
258 if (i != channel_map.end ()) | 258 if (i != channel_map.end ()) |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 dynamic_map_[voice] = d; | 320 dynamic_map_[voice] = d; |
321 // Output volume as velocity: must disable Midi_dynamic output | 321 // Output volume as velocity: must disable Midi_dynamic output |
322 d->silent_ = true; | 322 d->silent_ = true; |
323 } | 323 } |
324 } | 324 } |
325 Audio_staff *audio_staff = get_audio_staff (voice); | 325 Audio_staff *audio_staff = get_audio_staff (voice); |
326 audio_staff->add_audio_item (ai); | 326 audio_staff->add_audio_item (ai); |
327 } | 327 } |
328 } | 328 } |
329 | 329 |
LEFT | RIGHT |