Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / music-output.cc

diff --git a/lily/music-output.cc b/lily/music-output.cc
index e03d1a6b146faccd8d47143283fb560514d253ca..9e8cc9ff9a5bcf3353588f0996afabdf73ded7ee 100644 (file)
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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
@@ -19,7 +19,6 @@
 
 #include "music-output.hh"
 
-#include "ly-smobs.icc"
 
 Music_output::Music_output ()
 {
@@ -40,25 +39,20 @@ 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 s, SCM p, scm_print_state*)
+Music_output::print_smob (SCM p, scm_print_state *) const
 {
-  Music_output *sc = (Music_output *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<", p);
-  scm_puts (sc->class_name (), p);
+  scm_puts (class_name (), p);
   scm_puts (">", p);
 
   return 1;