* lily/*.cc, lily/include/*.hh: eliminate dummy arguments from

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

diff --git a/lily/include/score.hh b/lily/include/score.hh
index 004e251dd9c78a5b310f74e4563772156b2c5111..039e1d236a300b299c3ac4011d647def43fd453b 100644 (file)
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -17,13 +17,15 @@
 #include "virtual-methods.hh"
 #include "std-string.hh"
 
-class Score : public Input
+class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
   SCM music_;
-
+  SCM input_location_;
 public:
+  Input *origin() const;
+ 
   vector<Output_def*> defs_;
   string user_key_;
   SCM header_;
@@ -32,6 +34,7 @@ public:
   Score ();
   Score (Score const &);
 
+  VIRTUAL_COPY_CONSTRUCTOR (Score, Score);
   
   SCM get_music () const;
   void add_output_def (Output_def *def);