Preferences/Config changes for image-surface settings

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 1f1189f62a36ca654aec12a3df16a55884b2e6e7..30ebd662a7bbb2bf3f8cd68e4f5d21a63de8052c 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -1,21 +1,26 @@
 /*
-    Copyright (C) 2004 Paul Davis
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2005-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2005 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2006-2015 Tim Mayberry <mojofunk@gmail.com>
+ * Copyright (C) 2008-2014 David Robillard <d@drobilla.net>
+ * Copyright (C) 2009-2011 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2015-2017 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2016-2017 Nick Mainsbridge <mainsbridge@gmail.com>
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_gtk_ghost_region_h__
 #define __ardour_gtk_ghost_region_h__
@@ -24,7 +29,7 @@
 #include <boost/unordered_map.hpp>
 #include "pbd/signals.h"
 
-namespace ArdourCanvas {
+namespace ArdourWaveView {
        class WaveView;
 }
 
@@ -76,7 +81,7 @@ public:
        void set_height();
        void set_colors();
 
-       std::vector<ArdourCanvas::WaveView*> waves;
+       std::vector<ArdourWaveView::WaveView*> waves;
 };
 
 class MidiGhostRegion : public GhostRegion {
@@ -122,12 +127,12 @@ public:
 
 private:
        ArdourCanvas::Container* _note_group;
-       ArdourCanvas::Color _outline;
+       Gtkmm2ext::Color _outline;
        ArdourCanvas::Rectangle* _tmp_rect;
        ArdourCanvas::Polygon* _tmp_poly;
 
        MidiRegionView& parent_mrv;
-       typedef Evoral::Note<Evoral::Beats> NoteType;
+       typedef Evoral::Note<Temporal::Beats> NoteType;
        MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
 
        typedef boost::unordered_map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;