Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / include / score.hh

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 2e1724a35d695ebe553d96471b24b1bd9da505f6..bcd967cda108991715b6bb21b6ad8a6aec0b0860 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -12,26 +12,28 @@
 #include "lily-proto.hh"
 
 #include "input.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "string.hh"
 
-class Score : public Input
+class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
   SCM music_;
-
+  SCM input_location_;
 public:
-  Link_array<Output_def> defs_;
-  String user_key_;
+  Input *origin() const;
+ 
+  vector<Output_def*> defs_;
+  string user_key_;
   SCM header_;
   bool error_found_;
 
   Score ();
   Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
   
   SCM get_music () const;
   void add_output_def (Output_def *def);
@@ -41,7 +43,6 @@ public:
 
 DECLARE_UNSMOB (Score, score);
 
-void default_rendering (SCM, SCM, SCM, SCM, SCM, SCM);
 SCM ly_render_output (SCM, SCM);
 SCM ly_run_translator (SCM, SCM, SCM);