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 822fbcadf002f216d96d85c713a71e0625672a59..5790080160bb24bc3fb6124f81db66e0def4bdf5 100644
(file)
--- a/
gtk2_ardour/audio_time_axis.h
+++ b/
gtk2_ardour/audio_time_axis.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2000-2006 Paul Davis
+ Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-31,17
+31,16
@@
#include <gtkmm2ext/selector.h>
#include <list>
#include <gtkmm2ext/selector.h>
#include <list>
-#include
<ardour/types.h>
+#include
"ardour/types.h"
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
#include "ardour_dialog.h"
#include "route_ui.h"
#include "enums.h"
+#include "editing.h"
#include "route_time_axis.h"
#include "route_time_axis.h"
-#include "canvas.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
- class AudioDiskstream;
class RouteGroup;
class IOProcessor;
class Processor;
class RouteGroup;
class IOProcessor;
class Processor;
@@
-65,55
+64,51
@@
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();
AudioStreamView* audio_view();
- void set_show_waveforms (bool yn);
void set_show_waveforms_recording (bool yn);
void set_show_waveforms_recording (bool yn);
- void show_all_xfades ();
- void hide_all_xfades ();
- void hide_dependent_views (TimeAxisViewItem&);
- void reveal_dependent_views (TimeAxisViewItem&);
- void set_layer_display (LayerDisplay d);
-
+
/* 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 create_automation_child (ARDOUR::Parameter param, bool show);
-
+
+ void enter_internal_edit_mode ();
+ void leave_internal_edit_mode ();
+
+ void create_automation_child (const Evoral::Parameter& param, bool show);
+
+ void first_idle ();
+
private:
friend class AudioStreamView;
friend class AudioRegionView;
private:
friend class AudioStreamView;
friend class AudioRegionView;
-
+
void route_active_changed ();
void route_active_changed ();
- void append_extra_display_menu_items ();
Gtk::Menu* build_mode_menu();
Gtk::Menu* build_mode_menu();
-
- void toggle_show_waveforms ();
- void set_waveform_shape (WaveformShape);
- void toggle_waveforms ();
- void set_waveform_scale (WaveformScale);
+ void build_automation_action_menu (bool);
- void show_all_automation ();
- void show_existing_automation ();
- void hide_all_automation ();
+ void show_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 ();
- void
update_pans (bool show=
true);
+ void
ensure_pan_views (bool show =
true);
void update_control_names ();
void update_control_names ();
- Gtk::CheckMenuItem* waveform_item;
- Gtk::RadioMenuItem* traditional_item;
- Gtk::RadioMenuItem* rectified_item;
- Gtk::RadioMenuItem* linearscale_item;
- Gtk::RadioMenuItem* logscale_item;
+ void update_gain_track_visibility ();
+ void update_pan_track_visibility ();
+
Gtk::CheckMenuItem* gain_automation_item;
Gtk::CheckMenuItem* gain_automation_item;
+ std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
Gtk::CheckMenuItem* pan_automation_item;
};
Gtk::CheckMenuItem* pan_automation_item;
};