1 --- ardour-2.0.3/gtk2_ardour/automation_selectable.h.orig 2007-05-10 13:30:27.000000000 +0200
2 +++ ardour-2.0.3/gtk2_ardour/automation_selectable.h 2007-07-15 00:19:56.345439649 +0200
3 @@ -31,17 +31,17 @@ struct AutomationSelectable : public Sel
10 AutomationSelectable (nframes_t s, nframes_t e, double l, double h, TimeAxisView& atv)
11 - : start (s), end (e), low_fract (l), high_fract (h), track (atv) {}
12 + : start (s), end (e), low_fract (l), high_fract (h), track (&atv) {}
14 bool operator== (const AutomationSelectable& other) {
15 return start == other.start &&
17 low_fract == other.low_fract &&
18 high_fract == other.high_fract &&
19 - &track == &other.track;
20 + track == other.track;
24 --- ardour-2.0.3/gtk2_ardour/automation_time_axis.cc.orig 2007-05-10 13:30:27.000000000 +0200
25 +++ ardour-2.0.3/gtk2_ardour/automation_time_axis.cc 2007-07-15 00:33:26.261213756 +0200
26 @@ -554,7 +554,7 @@ AutomationTimeAxisView::reset_objects_on
28 for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
30 - if (&(*i).track != this) {
31 + if ((*i).track != this) {
35 @@ -585,7 +585,7 @@ AutomationTimeAxisView::cut_copy_clear_o
37 for (PointSelection::iterator i = selection.begin(); i != selection.end(); ++i) {
39 - if (&(*i).track != this) {
40 + if ((*i).track != this) {
44 --- ardour-2.0.3/gtk2_ardour/automation_line.cc.orig 2007-05-10 13:30:27.000000000 +0200
45 +++ ardour-2.0.3/gtk2_ardour/automation_line.cc 2007-07-15 00:36:48.307644484 +0200
46 @@ -1102,7 +1102,7 @@ AutomationLine::set_selected_points (Poi
48 for (PointSelection::iterator r = points.begin(); r != points.end(); ++r) {
50 - if (&(*r).track != &trackview) {
51 + if ((*r).track != &trackview) {
55 --- ardour-2.0.3/gtk2_ardour/editor_ops.cc.orig 2007-05-10 13:30:27.000000000 +0200
56 +++ ardour-2.0.3/gtk2_ardour/editor_ops.cc 2007-07-16 18:04:44.325467660 +0200
57 @@ -2715,7 +2715,7 @@ Editor::cut_copy_points (CutCopyOp op)
59 for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
61 - AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>(&(*i).track);
62 + AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>((*i).track);
65 atv->cut_copy_clear_objects (selection->points, op);
66 @@ -3082,7 +3082,7 @@ Editor::reset_point_selection ()
68 for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) {
70 - AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>(&(*i).track);
71 + AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*>((*i).track);
74 atv->reset_objects (selection->points);
75 --- ardour-2.0.3/gtk2_ardour/imageframe_view.cc.orig 2007-05-10 13:30:27.000000000 +0200
76 +++ ardour-2.0.3/gtk2_ardour/imageframe_view.cc 2007-07-16 19:37:00.088932841 +0200
82 +#include <libart_lgpl/art_misc.h>
86 #include <gtkmm2ext/gtk_ui.h>