projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged with trunk R708
[ardour.git]
/
gtk2_ardour
/
route_time_axis.h
diff --git
a/gtk2_ardour/route_time_axis.h
b/gtk2_ardour/route_time_axis.h
index e63253af24060760da9fdbb337ad9d3548d3878a..a75851b8a8419b23185184a11ea679e73cc66a4a 100644
(file)
--- a/
gtk2_ardour/route_time_axis.h
+++ b/
gtk2_ardour/route_time_axis.h
@@
-63,7
+63,7
@@
class TimeSelection;
class RouteTimeAxisView : public RouteUI, public TimeAxisView
{
public:
class RouteTimeAxisView : public RouteUI, public TimeAxisView
{
public:
- RouteTimeAxisView (PublicEditor&, ARDOUR::Session&,
ARDOUR::Route&
, ArdourCanvas::Canvas& canvas);
+ RouteTimeAxisView (PublicEditor&, ARDOUR::Session&,
boost::shared_ptr<ARDOUR::Route>
, ArdourCanvas::Canvas& canvas);
virtual ~RouteTimeAxisView ();
void show_selection (TimeSelection&);
virtual ~RouteTimeAxisView ();
void show_selection (TimeSelection&);
@@
-101,7
+101,7
@@
class RouteTimeAxisView : public RouteUI, public TimeAxisView
void use_copy_playlist (bool prompt);
void clear_playlist ();
void use_copy_playlist (bool prompt);
void clear_playlist ();
- //private:
+ //private:
(FIXME)
friend class StreamView;
StreamView *_view;
friend class StreamView;
StreamView *_view;