projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #1637 (needs merging to 2.0.1 branch); remove debug printf
[ardour.git]
/
gtk2_ardour
/
crossfade_view.h
diff --git
a/gtk2_ardour/crossfade_view.h
b/gtk2_ardour/crossfade_view.h
index 4438a1bdbc7ed24d7a204526a03df10edc9bb062..556d8c80c59ac7b793391fc824d69e8cb638a95a 100644
(file)
--- a/
gtk2_ardour/crossfade_view.h
+++ b/
gtk2_ardour/crossfade_view.h
@@
-15,39
+15,37
@@
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__
#define __gtk_ardour_crossfade_view_h__
#include <vector>
*/
#ifndef __gtk_ardour_crossfade_view_h__
#define __gtk_ardour_crossfade_view_h__
#include <vector>
-#include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <libgnomecanvasmm.h>
#include <sigc++/signal.h>
#include <ardour/crossfade.h>
#include "time_axis_view_item.h"
#include <sigc++/signal.h>
#include <ardour/crossfade.h>
#include "time_axis_view_item.h"
-class
Audio
TimeAxisView;
+class
Route
TimeAxisView;
class AudioRegionView;
struct CrossfadeView : public TimeAxisViewItem
{
class AudioRegionView;
struct CrossfadeView : public TimeAxisViewItem
{
- CrossfadeView (
GnomeCanvas
Group*,
-
Audio
TimeAxisView&,
-
ARDOUR::Crossfade&
,
+ CrossfadeView (
ArdourCanvas::
Group*,
+
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);
bool valid() const { return _valid; }
void set_height (double);
bool valid() const { return _valid; }
@@
-71,10
+69,10
@@
struct CrossfadeView : public TimeAxisViewItem
double spu;
double spu;
-
GnomeCanvas
Item *overlap_rect;
-
GnomeCanvasItem
*fade_in;
-
GnomeCanvasItem
*fade_out;
-
GnomeCanvas
Item *active_button;
+
ArdourCanvas::
Item *overlap_rect;
+
ArdourCanvas::Line
*fade_in;
+
ArdourCanvas::Line
*fade_out;
+
ArdourCanvas::
Item *active_button;
void crossfade_changed (ARDOUR::Change);
void active_changed ();
void crossfade_changed (ARDOUR::Change);
void active_changed ();