projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct new track/bus/VCA dialog text
[ardour.git]
/
gtk2_ardour
/
audio_time_axis.h
diff --git
a/gtk2_ardour/audio_time_axis.h
b/gtk2_ardour/audio_time_axis.h
index 5790080160bb24bc3fb6124f81db66e0def4bdf5..52c1a3d151e670fab1c09cd91b01409ee905ed40 100644
(file)
--- a/
gtk2_ardour/audio_time_axis.h
+++ b/
gtk2_ardour/audio_time_axis.h
@@
-28,7
+28,6
@@
#include <gtkmm/radiomenuitem.h>
#include <gtkmm/checkmenuitem.h>
#include <gtkmm/radiomenuitem.h>
#include <gtkmm/checkmenuitem.h>
-#include <gtkmm2ext/selector.h>
#include <list>
#include "ardour/types.h"
#include <list>
#include "ardour/types.h"
@@
-63,9
+62,9
@@
class AutomationTimeAxisView;
class AudioTimeAxisView : public RouteTimeAxisView
{
class AudioTimeAxisView : public RouteTimeAxisView
{
-
public:
- AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
- virtual ~AudioTimeAxisView ();
+public:
+ AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
+ virtual ~AudioTimeAxisView ();
void set_route (boost::shared_ptr<ARDOUR::Route>);
void set_route (boost::shared_ptr<ARDOUR::Route>);
@@
-76,14
+75,11
@@
class AudioTimeAxisView : public RouteTimeAxisView
/* Overridden from parent to store display state */
guint32 show_at (double y, int& nth, Gtk::VBox *parent);
/* Overridden from parent to store display state */
guint32 show_at (double y, int& nth, Gtk::VBox *parent);
- void enter_internal_edit_mode ();
- void leave_internal_edit_mode ();
-
void create_automation_child (const Evoral::Parameter& param, bool show);
void first_idle ();
void create_automation_child (const Evoral::Parameter& param, bool show);
void first_idle ();
-
private:
+private:
friend class AudioStreamView;
friend class AudioRegionView;
friend class AudioStreamView;
friend class AudioRegionView;
@@
-98,18
+94,7
@@
class AudioTimeAxisView : public RouteTimeAxisView
void hide ();
void hide ();
- void gain_hidden ();
- void pan_hidden ();
-
- void ensure_pan_views (bool show = true);
void update_control_names ();
void update_control_names ();
-
- void update_gain_track_visibility ();
- void update_pan_track_visibility ();
-
- Gtk::CheckMenuItem* gain_automation_item;
- std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
- Gtk::CheckMenuItem* pan_automation_item;
};
#endif /* __ardour_audio_time_axis_h__ */
};
#endif /* __ardour_audio_time_axis_h__ */