Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / performance.cc

diff --git a/lily/performance.cc b/lily/performance.cc
index ed74df07b46ec88ec74d594dc39a2aa29f823335..4e19544d41823b6e21a5e0003d0a6616641a4745 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -1,125 +1,97 @@
 /*
-  audio-score.cc -- implement Performance
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <time.h>
-#include "debug.hh"
-#include "string.hh"
-#include "string-convert.hh"
-#include "main.hh"
-#include "midi-def.hh"
-#include "midi-item.hh"
-#include "midi-stream.hh"
+#include "performance.hh"
+
+#include <ctime>
+using namespace std;
+
 #include "audio-column.hh"
 #include "audio-staff.hh"
-#include "performance.hh"
+#include "file-name.hh"
+#include "international.hh"
+#include "lily-version.hh"
+#include "main.hh"
+#include "midi-chunk.hh"
+#include "midi-stream.hh"
 #include "score.hh"
+#include "string-convert.hh"
+#include "warn.hh"
 
-Performance::Performance ()
+Performance::Performance (bool ports)
+  : midi_ (0),
+    ports_ (ports)
 {
-  midi_l_ =0;
 }
 
-void
-Performance::add (Audio_column* p)
+Performance::~Performance ()
 {
-  p->performance_l_ = this;
-  audio_column_p_list_.bottom().add (p);
+  junk_pointers (audio_elements_);
 }
 
 void
-Performance::output (Midi_stream& midi_stream_r)
+Performance::output (Midi_stream &midi_stream) const
 {
-  int tracks_i = audio_staff_l_list_.size() + 1;
-  // ugh
-  int clocks_per_4_i = 384;
-  midi_stream_r << Midi_header (1, tracks_i, clocks_per_4_i);
-  output_header_track (midi_stream_r);
-  int n = 1;
-  for (PCursor<Audio_staff*> i (audio_staff_l_list_); i.ok(); i++)
-    i->output (midi_stream_r, n++);
+  int tracks_ = audio_staffs_.size ();
+
+  midi_stream.write (Midi_header (1, tracks_, 384));
+  debug_output (_ ("Track...") + " ", false);
+
+  for (vsize i = 0; i < audio_staffs_.size (); i++)
+    {
+      Audio_staff *s = audio_staffs_[i];
+      debug_output ("[" + to_string (i), true);
+      s->output (midi_stream, i, ports_);
+      debug_output ("]", false);
+    }
 }
 
 void
-Performance::output_header_track (Midi_stream& midi_stream_r)
+Performance::add_element (Audio_element *p)
 {
-  Midi_track midi_track;
-  
-  time_t t = time (0);
-
-  // perhaps multiple text events?
-  String str = String ("Creator: ") + get_version_str() + "\n";
-
-  Midi_text creator (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &creator);
-
-  str = "Automatically generated at ";
-  str += ctime (&t);
-  str = str.left_str (str.length_i() - 1);
-  str += "\n";
-  Midi_text generate (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &generate);
-
-  str = "from musical definition: ";
-
-  str += origin_str_;
-  Midi_text from (Midi_text::TEXT, str);
-  midi_track.add (Moment (0), &from);
-
-  Midi_text track_name (Midi_text::TRACK_NAME, "Track " 
-                       + String_convert::i2dec_str (0, 0, '0'));
-  midi_track.add (Moment (0), &track_name);
-
-  Midi_tempo tempo (midi_l_->get_tempo_i (Moment (1, 4)));
-  midi_track.add (Moment (0), &tempo);
-
-  midi_stream_r  << midi_track;
+  audio_elements_.push_back (p);
 }
 
 void
-Performance::add_staff (Audio_staff* l)
+Performance::write_output (string out) const
 {
-  audio_staff_l_list_.bottom().add (l);
-}
+  if (out == "-")
+    out = "lelie.midi";
 
-void
-Performance::add (Audio_element *p)
-{
-  audio_elem_p_list_.bottom().add (p);
-}
+  /* Maybe a bit crude, but we had this before */
+  File_name file_name (out);
+  out = file_name.to_string ();
 
-void
-Performance::print() const
-{    
-#ifndef NPRINT
-  DOUT << "Performance { ";
-  DOUT << "Items: ";
-  for (PCursor<Audio_element*> i (audio_elem_p_list_.top ()); i.ok (); i++)
-    i->print ();
-  
-  DOUT << "\ncolumns: ";
-  for (PCursor<Audio_column*> i (audio_column_p_list_); i.ok(); i++)
-    i->print();
-  DOUT << "}\n";
-#endif 
+  Midi_stream midi_stream (out);
+  message (_f ("MIDI output to `%s'...", out));
+
+  output (midi_stream);
+  progress_indication ("\n");
 }
 
 void
-Performance::process()
+Performance::process ()
 {
-  print ();
-  
-  String out=midi_l_->outfile_str_;
-  if (out.empty_b ())
-    out = default_out_str_ + ".midi";
-
-  Midi_stream midi_stream (out);
-  *mlog << "MIDI output to " << out<< " ..." << endl;    
+}
 
-  output (midi_stream);
-  *mlog << endl;
+Performance *
+unsmob_performance (SCM x)
+{
+  return dynamic_cast<Performance *> (unsmob_music_output (x));
 }