X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-output.cc;h=9e8cc9ff9a5bcf3353588f0996afabdf73ded7ee;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=5330e864eb3bdf93924d07df564bc50f413a6a12;hpb=e904008e0f0b56f7cacd330a72c2b56ec6906a93;p=lilypond.git

diff --git a/lily/music-output.cc b/lily/music-output.cc
index 5330e864eb..9e8cc9ff9a 100644
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -1,14 +1,24 @@
-/* 
-  music-output.cc --  implement Music_output
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--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/>.
 */
 
-#include "music-output.hh" 
-#include "ly-smobs.icc"
+#include "music-output.hh"
+
 
 Music_output::Music_output ()
 {
@@ -22,31 +32,28 @@ Music_output::process ()
 
 Music_output::~Music_output ()
 {
-  
 }
-  
+
 void
 Music_output::derived_mark () const
 {
 }
 
-IMPLEMENT_SMOBS (Music_output);
-IMPLEMENT_DEFAULT_EQUAL_P (Music_output);
-IMPLEMENT_TYPE_P (Music_output, "ly:music-output?");
+const char * const Music_output::type_p_name_ = "ly:music-output?";
 
 SCM
-Music_output::mark_smob (SCM s)
+Music_output::mark_smob () const
 {
-  Music_output *sc = (Music_output *) SCM_CELL_WORD_1 (s);
-
-  sc->derived_mark ();
+  derived_mark ();
   return SCM_EOL;
 }
 
 int
-Music_output::print_smob (SCM, SCM p, scm_print_state*)
+Music_output::print_smob (SCM p, scm_print_state *) const
 {
-  scm_puts ("#<Music_output>", p);
+  scm_puts ("#<", p);
+  scm_puts (class_name (), p);
+  scm_puts (">", p);
 
   return 1;
 }