resolve merge

[lilypond.git] / lily / include / performance.hh

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 2553131f10aa29d89455dcd16f4eb75e9714daae..9612fb8aedd6c301639b6e12c21a15533352790d 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -1,7 +1,20 @@
 /*
-  performance.hh -- declare Performance
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2011 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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PERFORMANCE_HH
@@ -14,7 +27,7 @@
 class Performance : public Music_output
 {
 public:
-  Performance ();
+  Performance (bool ports=false);
   ~Performance ();
   DECLARE_CLASSNAME(Performance);
 
@@ -30,6 +43,7 @@ public:
   vector<Audio_staff*> audio_staffs_;
   vector<Audio_element*> audio_elements_;
   Output_def *midi_;
+  bool ports_;
 };
 
 #endif /* PERFORMANCE_HH */