summaryrefslogtreecommitdiff
path: root/gtk2_ardour/crossfade_view.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-04 00:32:52 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-04 00:32:52 -0400
commitaaea166135ace01709f7e0be64f40be80f4107ec (patch)
tree0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/crossfade_view.h
parent1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff)
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/crossfade_view.h')
-rw-r--r--gtk2_ardour/crossfade_view.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h
index af33cb7296..33cd04de11 100644
--- a/gtk2_ardour/crossfade_view.h
+++ b/gtk2_ardour/crossfade_view.h
@@ -21,7 +21,6 @@
#define __gtk_ardour_crossfade_view_h__
#include <vector>
-#include <libgnomecanvasmm.h>
#include "pbd/signals.h"
#include "ardour/crossfade.h"
@@ -30,13 +29,17 @@
class RouteTimeAxisView;
class AudioRegionView;
+namespace ArdourCanvas {
+ class PolyLine;
+}
+
class CrossfadeView : public TimeAxisViewItem
{
public:
CrossfadeView (ArdourCanvas::Group*,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::Crossfade>,
- double initial_samples_per_unit,
+ double initial_frames_per_pixel,
Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
@@ -70,8 +73,8 @@ private:
bool _all_in_view;
double _child_height;
- ArdourCanvas::Line *fade_in;
- ArdourCanvas::Line *fade_out;
+ ArdourCanvas::PolyLine *fade_in;
+ ArdourCanvas::PolyLine *fade_out;
void crossfade_changed (const PBD::PropertyChange&);
void crossfade_fades_changed ();