Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

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

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index 15771f9a135ca9f482bac84130301e1f9f7e2b43..eafb6ec8d023126d4882d7304beb8be60aabba7e 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #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"
@@ -17,7 +17,7 @@
 
 class Music_output
 {
-  DECLARE_SMOBS (Music_output, foo);
+  DECLARE_SMOBS (Music_output);
   DECLARE_CLASSNAME(Music_output);
 protected:
   Music_output ();
@@ -28,5 +28,6 @@ public:
 };
 
 DECLARE_UNSMOB (Music_output, music_output);
-
+Paper_score *unsmob_paper_score (SCM);
+Performance *unsmob_performance (SCM);
 #endif /* MUSIC_OUTPUT_HH */