X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fperformer.cc;h=0f8b2e14b1d9b2bdfb78a018a1294907413f0fab;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=8cf1c972f7118ae5b16d350cb4c5a26580688f9d;hpb=f1346920f64c571a1475d3ded295b9637560c6bc;p=lilypond.git

diff --git a/lily/performer.cc b/lily/performer.cc
index 8cf1c972f7..0f8b2e14b1 100644
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -1,51 +1,50 @@
 /*
-  performer.cc -- implement Performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-               Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  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.
 
-#include "performer-group-performer.hh"
-#include "debug.hh"
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-void 
-Performer::play_element (Audio_element* p) 
-{ 
-  daddy_perf_l ()->play_element (p); 
-}
-
-int
-Performer::get_tempo_i() const
-{
-  return daddy_perf_l ()->get_tempo_i();
-}
+#include "context.hh"
+#include "performer.hh"
+#include "performer-group.hh"
+#include "warn.hh"
 
-Performer_group_performer*
-Performer::daddy_perf_l () const
+Performer_group *
+Performer::get_daddy_performer () const
 {
-  return (daddy_trans_l_) 
-    ?dynamic_cast<Performer_group_performer *> (daddy_trans_l_)
-    : 0;
+  return
+    dynamic_cast<Performer_group *> (get_daddy_translator ());
 }
 
 void
-Performer::acknowledge_element (Audio_element_info)
+Performer::acknowledge_audio_element (Audio_element_info)
 {
 }
 
 void
-Performer::process_acknowledged ()
+Performer::create_audio_elements ()
 {
 }
 
-
 void
 Performer::announce_element (Audio_element_info i)
 {
-  if (!i.origin_trans_l_)
-    i.origin_trans_l_= this;
-  daddy_perf_l()->announce_element (i);
+  if (!i.origin_trans_)
+    i.origin_trans_ = this;
+
+  get_daddy_performer ()->announce_element (i);
 }