X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=4fcd3f6fa69cd024e4acdc26120905e3041b99fa;hb=98b5d41f6eee82aa7cb9da7dbfafdd35872830bd;hp=93d932b8d5494a0a3483eaa9e66991572ef52030;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git diff --git a/lily/key-performer.cc b/lily/key-performer.cc index 93d932b8d5..4fcd3f6fa6 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2014 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,26 +62,26 @@ Key_performer::process_music () SCM acc = scm_call_1 (proc, pitchlist); Pitch key_do (0, - scm_to_int (scm_caar (pitchlist)), - ly_scm2rational (scm_cdar (pitchlist))); + scm_to_int (scm_caar (pitchlist)), + ly_scm2rational (scm_cdar (pitchlist))); - Pitch c_do (0, 0, 0); + Pitch c_do; SCM c_pitchlist - = ly_transpose_key_alist (pitchlist, - pitch_interval (key_do, c_do).smobbed_copy ()); + = ly_transpose_key_alist (pitchlist, + pitch_interval (key_do, c_do).smobbed_copy ()); /* MIDI keys are too limited for lilypond scales. - We check for minor scale and assume major otherwise. */ + We check for minor scale and assume major otherwise. */ SCM third = scm_assoc (scm_from_int (2), - c_pitchlist); + c_pitchlist); bool minor = (scm_is_pair (third) - && scm_is_number (scm_cdr (third)) - && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION); + && scm_is_number (scm_cdr (third)) + && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION); audio_ = new Audio_key (scm_to_int (acc), - !minor); + !minor); Audio_element_info info (audio_, key_ev_); announce_element (info); @@ -107,15 +107,15 @@ Key_performer::listen_key_change (Stream_event *ev) } ADD_TRANSLATOR (Key_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + );