X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelative-octave-music.cc;h=2f31e20a223c3a2d854557df7dd6f1289aa99dd8;hb=3e6aec8297fe0d4f9adc4c2e3802bcb2135c81c0;hp=db24b85fc0d12ca57025970b346d675d8c40db20;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index db24b85fc0..2f31e20a22 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 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--2012 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/>.
+*/
+
+#include "music.hh"
+#include "warn.hh"
+#include "program-option.hh"
+
+class Relative_octave_music
+{
+public:
+  DECLARE_SCHEME_CALLBACK (relative_callback, (SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (no_relative_callback, (SCM, SCM));
+};
 
-Relative_octave_music::Relative_octave_music(Music*p,Musical_pitch def)
-  : Music_wrapper (p)
+MAKE_SCHEME_CALLBACK (Relative_octave_music, no_relative_callback, 2)
+SCM
+Relative_octave_music::no_relative_callback (SCM /* music */,
+                                             SCM pitch)
 {
-  last_pitch_ = element_p_->to_relative_octave (def);
+  return pitch;
 }
 
-void
-Relative_octave_music::do_print () const
+MAKE_SCHEME_CALLBACK (Relative_octave_music, relative_callback, 2)
+SCM
+Relative_octave_music::relative_callback (SCM /* music */,
+                                          SCM pitch)
 {
-  Music_wrapper::do_print ();
-  DOUT << "default pitch: " << last_pitch_.str ();
+  return pitch;
 }
 
-IMPLEMENT_IS_TYPE_B1 (Relative_octave_music, Music_wrapper);