X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=3a1232d2a268034c7a2494257d42c102ea75d4e0;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b1659e2fbb19e3bc5ebbec68cb1f368f89947dbe;hpb=00b9619cea1020f6773f23df8764ef85ee2912bf;p=lilypond.git diff --git a/lily/score.cc b/lily/score.cc index b1659e2fbb..3a1232d2a2 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,15 +72,8 @@ Score::mark_smob () return music_; } -int -Score::print_smob (SCM, SCM p, scm_print_state *) -{ - scm_puts ("#", p); - - return 1; -} - Score::Score (Score const &s) + : Smob () { header_ = SCM_EOL; music_ = SCM_EOL; @@ -162,7 +155,7 @@ Score::book_rendering (Output_def *layoutbook, void Score::set_music (SCM music) { - if (Music::unsmob (music_)) + if (Music::is_smob (music_)) { Music::unsmob (music)->origin ()->error (_ ("already have music in score")); Music::unsmob (music_)->origin ()->error (_ ("this is the previous music"));