X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscale.cc;h=a5afd41daee5f86fd466e4ac0af98c52fa641e95;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=516969f28798c3f459c6856d50e430d0e6a71dfa;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git

diff --git a/lily/scale.cc b/lily/scale.cc
index 516969f287..a5afd41dae 100644
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2006--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
       2007--2008 Rune Zedeler
       2008       Joe Neeman <joeneeman@gmail.com>
 
@@ -21,7 +21,6 @@
 
 #include "scale.hh"
 
-#include "ly-smobs.icc"
 
 /*
   todo: put string <-> pitch here too.
@@ -75,9 +74,9 @@ Scale *default_global_scale = 0;
 
 LY_DEFINE (ly_set_default_scale, "ly:set-default-scale",
            1, 0, 0, (SCM scale),
-           "Set the global default scale. This determines the tuning of"
+           "Set the global default scale.  This determines the tuning of"
            " pitches with no accidentals or key signatures.  The first"
-           " pitch is C. Alterations are calculated relative to this"
+           " pitch is C.  Alterations are calculated relative to this"
            " scale.  The number of pitches in this scale determines the"
            " number of scale steps that make up an octave.  Usually the"
            " 7-note major scale.")
@@ -134,20 +133,7 @@ Scale::normalize_step (int step) const
   return ret;
 }
 
-int
-Scale::print_smob (SCM /* x */,
-                   SCM port,
-                   scm_print_state *)
-{
-  scm_puts ("#<Scale>", port);
-  return 1;
-}
 
-SCM
-Scale::mark_smob (SCM)
-{
-  return SCM_UNSPECIFIED;
-}
 
 Scale::Scale (vector<Rational> const &tones)
 {
@@ -157,6 +143,7 @@ Scale::Scale (vector<Rational> const &tones)
 }
 
 Scale::Scale (Scale const &src)
+  : Smob<Scale> ()
 {
   step_tones_ = src.step_tones_;
   smobify_self ();
@@ -165,6 +152,3 @@ Scale::Scale (Scale const &src)
 Scale::~Scale ()
 {
 }
-
-IMPLEMENT_SMOBS (Scale);
-IMPLEMENT_DEFAULT_EQUAL_P (Scale);