X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusic-output.hh;h=37437fbcac98f6f627f9b156cb15038a1a667448;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=19723a0c454dd82c8ee339fba890f09eec429287;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 19723a0c45..37437fbcac 100644
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -1,35 +1,46 @@
 /*
-  music-output.hh -- declare Music_output
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.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/>.
+*/
 
-#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 Smob<Music_output>
 {
 public:
-  Scope * header_l_;
-  String default_out_str_;
-  String origin_str_;
-  int errorlevel_i_;
-
-  virtual void process () {} 
-  virtual ~Music_output (){}
-  Music_output () 
-  {
-    errorlevel_i_ = 0;
-  }
-       
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static const char type_p_name_[];
+  virtual ~Music_output ();
+private:
+  DECLARE_CLASSNAME (Music_output);
+protected:
+  Music_output ();
+
+public:
+  virtual void derived_mark () const;
+  virtual void process ();
 };
-#endif // Music_output_HH
+
+#endif /* MUSIC_OUTPUT_HH */