lilypond-0.0.17

diff --git a/hdr/inputcommand.hh b/hdr/inputcommand.hh
index 0f32a34d488028585e82d483b1ab26ff368f9205..47882a23748b2b9cf626b0b490511c4e737c508a 100644 (file)
--- a/hdr/inputcommand.hh
+++ b/hdr/inputcommand.hh
@@ -11,8 +11,6 @@
 #include "vray.hh"
 
 struct Input_command {
-    Real when;
-    
     /// analogous to argv[]
     svec<Scalar> args;
     void print()const;
@@ -28,11 +26,6 @@ Input_command *get_reset_command();
 Input_command *get_partial_command(Real u);
 Input_command* get_skip_command( int,Real);
 Input_command* get_grouping_command( svec<int>);
-
-void
-interpret_meter(Input_command *c, int &beats_per_meas, int& one_beat,
-               Real& whole_per_measure);
-
-Input_command *get_bar_command(Real );
+Input_command *get_bar_command( );
 #endif // INPUTCOMMAND_HH
 

diff --git a/src/inputcommand.cc b/src/inputcommand.cc
index 938fc3e01a04cf1edad1a49969c5090ca0a1f0f3..1c48eea52a9c1b02b73e610918785de2f864e97f 100644 (file)
--- a/src/inputcommand.cc
+++ b/src/inputcommand.cc
@@ -4,17 +4,15 @@
 
 Input_command::Input_command()
 {
-    when = -1;
 }
 
-Input_command::Input_command(Real w)
+Input_command::Input_command(Real )
 {
-    when =w;
 }
 
 Input_command::operator Command()
 {
-    Command c(when);
+    Command c;
     if (!args.sz())
        return c;
     
@@ -92,10 +90,10 @@ get_meterchange_command(int n, int m)
 }
 
 Input_command *
-get_bar_command(Real w)
+get_bar_command()
 {
     Input_command*c = new Input_command;
-    c->when = w;
+
     c->args.add( "BAR");
     c->args.add( "|");
 
@@ -118,7 +116,7 @@ get_skip_command(int n, Real m)
 void
 Input_command::print()const
 {
-    mtor << "{ at " << when;
+    mtor << "{ ";
     if (args.sz()) {
        mtor<< " args: ";
        for (int i = 0; i<args.sz(); i++)