X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-output.hh;h=eafb6ec8d023126d4882d7304beb8be60aabba7e;hb=5cbc1cb630693b9a2493765e5629e06607f544d3;hp=9b4a046493cd77dc4dd254545219fab0d9071dc6;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 9b4a046493..eafb6ec8d0 100644
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -3,33 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#ifndef MUSIC_OUTPUT_HH
+#define MUSIC_OUTPUT_HH
 
-#ifndef Music_output_HH
-#define Music_output_HH
-
-#include "string.hh"
+#include "std-string.hh"
 #include "lily-proto.hh"
+#include "protected-scm.hh"
+#include "smobs.hh"
+#include "virtual-methods.hh"
 
-/**
-  Output something that was defined in a lilypond file. 
- */
-class Music_output 
+class Music_output
 {
-public:
-  Scope * header_l_;
-  String default_out_str_;
-  String origin_str_;
-  int errorlevel_i_;
+  DECLARE_SMOBS (Music_output);
+  DECLARE_CLASSNAME(Music_output);
+protected:
+  Music_output ();
 
-  virtual void process() {} 
-  virtual ~Music_output (){}
-  Music_output() 
-  {
-    errorlevel_i_ = 0;
-  }
-       
+public:
+  virtual void derived_mark () const;
+  virtual void process ();
 };
-#endif // Music_output_HH
+
+DECLARE_UNSMOB (Music_output, music_output);
+Paper_score *unsmob_paper_score (SCM);
+Performance *unsmob_performance (SCM);
+#endif /* MUSIC_OUTPUT_HH */