source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "pitch.hh"
-#include "warn.hh"
+
#include "main.hh"
+#include "string-convert.hh"
+#include "warn.hh"
#include "ly-smobs.icc"
char const *accname[] = {"eses", "eseh", "es", "eh", "",
"ih", "is", "isih", "isis"};
-String
+string
Pitch::to_string () const
{
int n = (notename_ + 2) % 7;
- String s = ::to_string (char (n + 'a'));
+ string s = ::to_string (char (n + 'a'));
if (alteration_)
- s += String (accname[alteration_ - DOUBLE_FLAT]);
+ s += string (accname[alteration_ - DOUBLE_FLAT]);
if (octave_ >= 0)
{
{
Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Pitch ", port);
- scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+ scm_display (scm_makfrom0str (r->to_string ().c_str ()), port);
scm_puts (" >", port);
return 1;
}