lilypond-0.0.16

diff --git a/hdr/inputcommand.hh b/hdr/inputcommand.hh
index 21aeaeacb486309abd72ac58c9cff65afc042293..0f32a34d488028585e82d483b1ab26ff368f9205 100644 (file)
--- a/hdr/inputcommand.hh
+++ b/hdr/inputcommand.hh
@@ -22,7 +22,7 @@ struct Input_command {
 };
 
 Input_command* get_meterchange_command( int,int);
-Input_command* get_key_interpret_command(svec<String>);
+Input_command* get_key_interpret_command(svec<int >);
 Input_command* get_clef_interpret_command(String w);
 Input_command *get_reset_command();
 Input_command *get_partial_command(Real u);

diff --git a/hdr/parseconstruct.hh b/hdr/parseconstruct.hh
index ab50c15a1b8ff517d99cefbc0fd07ae8ef185b3b..f0d8a4ba380e862daa9001c7c8ad8baf4182de95 100644 (file)
--- a/hdr/parseconstruct.hh
+++ b/hdr/parseconstruct.hh
@@ -1,11 +1,24 @@
-#include "proto.hh"
+/*
+  parseconstruct.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
 
-void set_default_duration(String);
-void set_default_pitch(String);
+#ifndef PARSECONSTRUCT_HH
+#define PARSECONSTRUCT_HH
+
+#include "proto.hh"
+void set_default_duration(int *);
+void get_default_duration(int *);
+void set_default_octave(String);
 Staff * get_new_rhythmstaff();
-Voice_element * get_note_element(String,String);
-Voice_element* get_rest_element(String,String);
+Voice_element * get_note_element(String,int * ,int *);
+Voice_element* get_rest_element(String,int *);
 Staff * get_new_melodicstaff();
 void add_requests( Voice_element*v, svec<Request*>&req);
 Request* get_request(char);
 
+
+
+#endif // PARSECONSTRUCT_HH
+

diff --git a/src/inputcommand.cc b/src/inputcommand.cc
index 121271e4f0daecaa56da60e5686b3a95e86dba77..938fc3e01a04cf1edad1a49969c5090ca0a1f0f3 100644 (file)
--- a/src/inputcommand.cc
+++ b/src/inputcommand.cc
@@ -61,13 +61,13 @@ get_grouping_command(svec<int>a )
 }
 
 Input_command*
-get_key_interpret_command(svec<String>a ) 
+get_key_interpret_command(svec<int >a ) 
 {
     Input_command*c = new Input_command;
     c->args.add("KEY");
-    for (int i=0; i < a.sz(); i ++)
+    for (int i=0; i < a.sz(); i ++) {
        c->args.add(a[i]);
-    
+    }
     return c;
 }