projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from 2.0-ongoing by hand, minus key binding editor
[ardour.git]
/
gtk2_ardour
/
crossfade_view.h
diff --git
a/gtk2_ardour/crossfade_view.h
b/gtk2_ardour/crossfade_view.h
index b4931c94c0b3f3ff5579d54262bccffaa566be6e..39ca8bf1c3e9ef31980a34b62df25d15a213f8fa 100644
(file)
--- a/
gtk2_ardour/crossfade_view.h
+++ b/
gtk2_ardour/crossfade_view.h
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#ifndef __gtk_ardour_crossfade_view_h__
*/
#ifndef __gtk_ardour_crossfade_view_h__
@@
-28,26
+27,26
@@
#include "time_axis_view_item.h"
#include "time_axis_view_item.h"
-class
Audio
TimeAxisView;
+class
Route
TimeAxisView;
class AudioRegionView;
struct CrossfadeView : public TimeAxisViewItem
{
CrossfadeView (ArdourCanvas::Group*,
class AudioRegionView;
struct CrossfadeView : public TimeAxisViewItem
{
CrossfadeView (ArdourCanvas::Group*,
-
Audio
TimeAxisView&,
-
ARDOUR::Crossfade&
,
+
Route
TimeAxisView&,
+
boost::shared_ptr<ARDOUR::Crossfade>
,
double initial_samples_per_unit,
Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
~CrossfadeView ();
double initial_samples_per_unit,
Gdk::Color& basic_color,
AudioRegionView& leftview,
AudioRegionView& rightview);
~CrossfadeView ();
- ARDOUR::Crossfade& crossfade; // ok, let 'em have it
+ boost::shared_ptr<ARDOUR::Crossfade> crossfade; // ok, let 'em have it
+
AudioRegionView& left_view; // and these too
AudioRegionView& right_view;
AudioRegionView& left_view; // and these too
AudioRegionView& right_view;
- std::string get_item_name();
- void set_height (double);
+ void set_y_position_and_height (double, double);
bool valid() const { return _valid; }
bool visible() const { return _visible; }
bool valid() const { return _valid; }
bool visible() const { return _visible; }
@@
-69,6
+68,8
@@
struct CrossfadeView : public TimeAxisViewItem
bool _visible;
double spu;
bool _visible;
double spu;
+ double _y_position;
+ double _height;
ArdourCanvas::Item *overlap_rect;
ArdourCanvas::Line *fade_in;
ArdourCanvas::Item *overlap_rect;
ArdourCanvas::Line *fade_in;
@@
-78,6
+79,7
@@
struct CrossfadeView : public TimeAxisViewItem
void crossfade_changed (ARDOUR::Change);
void active_changed ();
void redraw_curves ();
void crossfade_changed (ARDOUR::Change);
void active_changed ();
void redraw_curves ();
+ void color_handler ();
};
#endif /* __gtk_ardour_crossfade_view_h__ */
};
#endif /* __gtk_ardour_crossfade_view_h__ */