projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging from trunk
[ardour.git]
/
gtk2_ardour
/
route_ui.h
diff --git
a/gtk2_ardour/route_ui.h
b/gtk2_ardour/route_ui.h
index b7a5b059f02b337cdf501984aee8f3be24575ca5..69c9b7f5a9ac92f0788e2f4183fb028517774c99 100644
(file)
--- a/
gtk2_ardour/route_ui.h
+++ b/
gtk2_ardour/route_ui.h
@@
-50,7
+50,7
@@
class RouteUI : public virtual AxisView
virtual ~RouteUI();
bool is_audio_track() const;
virtual ~RouteUI();
bool is_audio_track() const;
- ARDOUR::
DiskS
tream* get_diskstream() const;
+ ARDOUR::
AudioDisks
tream* get_diskstream() const;
ARDOUR::Route& route() const { return _route; }
ARDOUR::AudioTrack* audio_track() const;
ARDOUR::Route& route() const { return _route; }
ARDOUR::AudioTrack* audio_track() const;
@@
-116,7
+116,7
@@
class RouteUI : public virtual AxisView
sigc::connection blink_connection;
sigc::connection blink_connection;
- void rec_enable_button_blink (bool onoff, ARDOUR::
DiskS
tream *, Gtk::Widget *w);
+ void rec_enable_button_blink (bool onoff, ARDOUR::
AudioDisks
tream *, Gtk::Widget *w);
void remove_this_route ();
static gint idle_remove_this_route (RouteUI *);
void remove_this_route ();
static gint idle_remove_this_route (RouteUI *);