Imported Upstream version 2.19.45

[lilypond.git] / lily / include / music-output.hh

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index cda3118be4cca94ea3b230f5ce6701559136c243..208c01a831e9f2f2920dd5b1407e15aed4a76668 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -26,9 +26,14 @@
 #include "smobs.hh"
 #include "virtual-methods.hh"
 
-class Music_output
+class Music_output : public Smob<Music_output>
 {
-  DECLARE_SMOBS (Music_output);
+public:
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
+  virtual ~Music_output ();
+private:
   DECLARE_CLASSNAME (Music_output);
 protected:
   Music_output ();
@@ -38,7 +43,4 @@ public:
   virtual void process ();
 };
 
-DECLARE_UNSMOB (Music_output, music_output);
-Paper_score *unsmob_paper_score (SCM);
-Performance *unsmob_performance (SCM);
 #endif /* MUSIC_OUTPUT_HH */