/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2014 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
Moment::as_scheme () const
{
return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
- scm_from_int64 (main_part_.num ()),
- scm_from_int64 (main_part_.den ()),
- scm_from_int64 (grace_part_.num ()),
- scm_from_int64 (grace_part_.den ()));
+ scm_from_int64 (main_part_.num ()),
+ scm_from_int64 (main_part_.den ()),
+ scm_from_int64 (grace_part_.num ()),
+ scm_from_int64 (grace_part_.den ()));
}
SCM
Moment::equal_p (SCM a, SCM b)
{
- Moment *m1 = unsmob_moment (a);
- Moment *m2 = unsmob_moment (b);
+ Moment *m1 = Moment::unsmob (a);
+ Moment *m2 = Moment::unsmob (b);
return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
}
return main_part_ || grace_part_;
}
-Rational
-Moment::main_part () const
-{
- return main_part_;
-}
-
-Rational
-Moment::grace_part () const
-{
- return grace_part_;
-}
-
void
Moment::set_infinite (int k)
{
Moment
robust_scm2moment (SCM m, Moment d)
{
- Moment *p = unsmob_moment (m);
+ Moment *p = Moment::unsmob (m);
if (!p)
return d;
else
bool
moment_less (SCM a, SCM b)
{
- return *unsmob_moment (a) < *unsmob_moment (b);
+ return *Moment::unsmob (a) < *Moment::unsmob (b);
}
+