projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't explicitly store Auditioner -> Monitor connections.
[ardour.git]
/
gtk2_ardour
/
crossfade_view.h
diff --git
a/gtk2_ardour/crossfade_view.h
b/gtk2_ardour/crossfade_view.h
index 75544f50a9520f6fff6c6fa88fbb36304e25a375..a042611cc9172d45caad943087e5c7140afcbd15 100644
(file)
--- a/
gtk2_ardour/crossfade_view.h
+++ b/
gtk2_ardour/crossfade_view.h
@@
-21,7
+21,6
@@
#define __gtk_ardour_crossfade_view_h__
#include <vector>
#define __gtk_ardour_crossfade_view_h__
#include <vector>
-#include <libgnomecanvasmm.h>
#include "pbd/signals.h"
#include "ardour/crossfade.h"
#include "pbd/signals.h"
#include "ardour/crossfade.h"
@@
-30,13
+29,17
@@
class RouteTimeAxisView;
class AudioRegionView;
class RouteTimeAxisView;
class AudioRegionView;
+namespace ArdourCanvas {
+ class PolyLine;
+}
+
class CrossfadeView : public TimeAxisViewItem
{
public:
class CrossfadeView : public TimeAxisViewItem
{
public:
- CrossfadeView (ArdourCanvas::
Group
*,
+ CrossfadeView (ArdourCanvas::
Container
*,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::Crossfade>,
RouteTimeAxisView&,
boost::shared_ptr<ARDOUR::Crossfade>,
- double initial_samples_per_
unit
,
+ double initial_samples_per_
pixel
,
Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
@@
-48,7
+51,7
@@
public:
AudioRegionView& left_view; // and these too
AudioRegionView& right_view;
AudioRegionView& left_view; // and these too
AudioRegionView& right_view;
- void set_height
(
double);
+ void set_height
s (double,
double);
bool valid() const { return _valid; }
bool visible() const { return _visible; }
bool valid() const { return _valid; }
bool visible() const { return _visible; }
@@
-56,8
+59,6
@@
public:
static PBD::Signal1<void,CrossfadeView*> CatchDeletion;
static PBD::Signal1<void,CrossfadeView*> CatchDeletion;
- AudioRegionView& upper_regionview () const;
-
void fake_hide ();
void hide ();
void show ();
void fake_hide ();
void hide ();
void show ();
@@
-70,10
+71,10
@@
private:
bool _valid;
bool _visible;
bool _all_in_view;
bool _valid;
bool _visible;
bool _all_in_view;
+ double _child_height;
- ArdourCanvas::Line *fade_in;
- ArdourCanvas::Line *fade_out;
- ArdourCanvas::Item *active_button;
+ ArdourCanvas::PolyLine *fade_in;
+ ArdourCanvas::PolyLine *fade_out;
void crossfade_changed (const PBD::PropertyChange&);
void crossfade_fades_changed ();
void crossfade_changed (const PBD::PropertyChange&);
void crossfade_fades_changed ();