/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
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 "string-convert.hh"
#include "warn.hh"
-#include "ly-smobs.icc"
+#include <cmath>
Pitch::Pitch (int o, int n, Rational a)
{
if (n)
return n;
if (a)
- return a > (Rational)0;
+ return a > (Rational)0 ? 1 : -1;
return 0;
}
int
Pitch::rounded_semitone_pitch () const
{
- return int (double (tone_pitch () * Rational (2)));
+ return int (floor (double (tone_pitch () * Rational (2) + Rational (1, 2))));
}
int
Pitch::rounded_quartertone_pitch () const
{
- return int (double (tone_pitch () * Rational (4)));
+ return int (floor (double (tone_pitch () * Rational (4) + Rational (1, 2))));
}
void
notename_ = notename;
}
-IMPLEMENT_TYPE_P (Pitch, "ly:pitch?");
+const char * const Pitch::type_p_name_ = "ly:pitch?";
+
SCM
-Pitch::mark_smob (SCM x)
+Pitch::mark_smob () const
{
- Pitch *p = (Pitch *) SCM_CELL_WORD_1 (x);
- return p->scale_->self_scm ();
+ return scale_->self_scm ();
}
-IMPLEMENT_SIMPLE_SMOBS (Pitch);
int
-Pitch::print_smob (SCM s, SCM port, scm_print_state *)
+Pitch::print_smob (SCM port, scm_print_state *) const
{
- Pitch *r = (Pitch *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Pitch ", port);
- scm_display (ly_string2scm (r->to_string ()), port);
+ scm_display (ly_string2scm (to_string ()), port);
scm_puts (" >", port);
return 1;
}
SCM
Pitch::equal_p (SCM a, SCM b)
{
- Pitch *p = (Pitch *) SCM_CELL_WORD_1 (a);
- Pitch *q = (Pitch *) SCM_CELL_WORD_1 (b);
+ Pitch *p = unsmob<Pitch> (a);
+ Pitch *q = unsmob<Pitch> (b);
bool eq = p->notename_ == q->notename_
&& p->octave_ == q->octave_
SCM
Pitch::less_p (SCM p1, SCM p2)
{
- Pitch *a = unsmob_pitch (p1);
- Pitch *b = unsmob_pitch (p2);
+ Pitch *a = unsmob<Pitch> (p1);
+ Pitch *b = unsmob<Pitch> (p2);
if (compare (*a, *b) < 0)
return SCM_BOOL_T;