projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into cairocanvas
[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 3688f490625c5442f7231485b72c11f80b6858f7..5790080160bb24bc3fb6124f81db66e0def4bdf5 100644
(file)
--- a/
gtk2_ardour/audio_time_axis.h
+++ b/
gtk2_ardour/audio_time_axis.h
@@
-38,7
+38,6
@@
#include "enums.h"
#include "editing.h"
#include "route_time_axis.h"
#include "enums.h"
#include "editing.h"
#include "route_time_axis.h"
-#include "canvas.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-65,20
+64,17
@@
class AutomationTimeAxisView;
class AudioTimeAxisView : public RouteTimeAxisView
{
public:
class AudioTimeAxisView : public RouteTimeAxisView
{
public:
- AudioTimeAxisView (PublicEditor&, ARDOUR::Session*,
boost::shared_ptr<ARDOUR::Route>,
ArdourCanvas::Canvas& canvas);
+ AudioTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
virtual ~AudioTimeAxisView ();
virtual ~AudioTimeAxisView ();
+ void set_route (boost::shared_ptr<ARDOUR::Route>);
+
AudioStreamView* audio_view();
void set_show_waveforms_recording (bool yn);
AudioStreamView* audio_view();
void set_show_waveforms_recording (bool yn);
- void show_all_xfades (bool apply_to_selection = false);
- void hide_all_xfades (bool apply_to_selection = false);
- void hide_dependent_views (TimeAxisViewItem&);
- void reveal_dependent_views (TimeAxisViewItem&);
/* 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 hide ();
void enter_internal_edit_mode ();
void leave_internal_edit_mode ();
void enter_internal_edit_mode ();
void leave_internal_edit_mode ();
@@
-93,7
+89,6
@@
class AudioTimeAxisView : public RouteTimeAxisView
void route_active_changed ();
void route_active_changed ();
- void append_extra_display_menu_items ();
Gtk::Menu* build_mode_menu();
void build_automation_action_menu (bool);
Gtk::Menu* build_mode_menu();
void build_automation_action_menu (bool);
@@
-101,6
+96,8
@@
class AudioTimeAxisView : public RouteTimeAxisView
void show_existing_automation (bool apply_to_selection = false);
void hide_all_automation (bool apply_to_selection = false);
void show_existing_automation (bool apply_to_selection = false);
void hide_all_automation (bool apply_to_selection = false);
+ void hide ();
+
void gain_hidden ();
void pan_hidden ();
void gain_hidden ();
void pan_hidden ();
@@
-110,8
+107,6
@@
class AudioTimeAxisView : public RouteTimeAxisView
void update_gain_track_visibility ();
void update_pan_track_visibility ();
void update_gain_track_visibility ();
void update_pan_track_visibility ();
- void add_processor_to_subplugin_menu (boost::weak_ptr<ARDOUR::Processor>);
-
Gtk::CheckMenuItem* gain_automation_item;
std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
Gtk::CheckMenuItem* pan_automation_item;
Gtk::CheckMenuItem* gain_automation_item;
std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
Gtk::CheckMenuItem* pan_automation_item;