release: 0.0.46.jcn1

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index b6a3f2cd839e2e54da79668ca8ddf5957a02cea2..88f7dee6df606dd0a60e2929f5a10cfc1477292e 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -27,7 +27,7 @@ Score::setup_music()
     *mlog << "\nSetting up music ..." << flush;
     if (last() == Moment(0)) {
        errorlevel_i_ |= 1;
-       error("Need to have music in a score.", defined_ch_C_);
+       input_.error("Need to have music in a score.");
     }
 
     for (iter_top(staffs_,i); i.ok(); i++) {
@@ -234,7 +234,6 @@ Score::Score()
     paper_p_ = 0;
     midi_p_ = 0;
     errorlevel_i_ = 0;
-    defined_ch_C_ = 0;
 }
 
 Score::~Score()
@@ -261,9 +260,9 @@ Score::paper_output()
     Tex_stream the_output(paper_p_->outfile);
     
     the_output << "% outputting Score, defined at: " <<
-       source_l_g->
-       sourcefile_l (defined_ch_C_)->file_line_no_str(defined_ch_C_) << "\n";
+       input_.location_str() << "\n";
     pscore_p_->output(the_output);
+    
 }
 
 void