X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=52efa5098c51d7d2665cdae964518c3e3364af8b;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=e2552b65a819fd50c9be45c4dd1e0f04b709e1d3;hpb=bb36bac02a64770871780231ecc709cb18b20932;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index e2552b65a8..52efa5098c 100644
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -1,33 +1,46 @@
-/*   
-  relative-music.cc --  implement Relative_octave_music
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "relative-music.hh"
-#include "debug.hh"
-
-Musical_pitch
-Relative_octave_music::to_relative_octave (Musical_pitch)
-{
-  return last_pitch_;
-}
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-Relative_octave_music::Relative_octave_music(Music*p,Musical_pitch def)
-  : Music_wrapper (p)
+#include "music.hh"
+#include "warn.hh"
+#include "program-option.hh"
+
+class Relative_octave_music
 {
-  last_pitch_ = element_l ()->to_relative_octave (def);
-}
+public:
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (no_relative_callback, (SCM, SCM));
+};
 
-void
-Relative_octave_music::do_print () const
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
+SCM
+Relative_octave_music::no_relative_callback (SCM /* music */,
+                                             SCM pitch)
 {
-  Music_wrapper::do_print ();
-  DEBUG_OUT << "default pitch: " << last_pitch_.str ();
+  return pitch;
 }
 
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+SCM
+Relative_octave_music::relative_callback (SCM /* music */,
+                                          SCM pitch)
+{
+  return pitch;
+}