#include "pbd/memento_command.h"
#include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/selector.h"
-#include "gtkmm2ext/bindable_button.h"
#include "gtkmm2ext/utils.h"
+#include "widgets/ardour_button.h"
+
#include "ardour/event_type_map.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
-#include "ardour_button.h"
-#include "ardour_ui.h"
#include "audio_time_axis.h"
#include "automation_line.h"
#include "enums.h"
#include "automation_time_axis.h"
#include "keyboard.h"
#include "playlist_selector.h"
-#include "prompter.h"
#include "public_editor.h"
#include "audio_region_view.h"
#include "audio_streamview.h"
#include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
+using namespace ArdourWidgets;
using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtk;
using namespace Editing;
AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
- : AxisView(sess)
+ : SessionHandlePtr (sess)
, RouteTimeAxisView(ed, sess, canvas)
{
}
create_automation_child (GainAutomation, false);
}
+ if (automation_child (TrimAutomation) == 0) {
+ create_automation_child (TrimAutomation, false);
+ }
+
/* if set_state above didn't create a mute automation child, we need to make one */
if (automation_child (MuteAutomation) == 0) {
create_automation_child (MuteAutomation, false);
if (_route->panner_shell()) {
_route->panner_shell()->Changed.connect (*this, invalidator (*this),
- boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context());
+ boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context());
}
/* map current state of the route */
AutomationTracks::iterator existing = _automation_tracks.find (param);
if (existing != _automation_tracks.end()) {
-
+
/* automation track created because we had existing data for
* the processor, but visibility may need to be controlled
* since it will have been set visible by default.
*/
existing->second->set_marked_for_display (show);
-
+
if (!no_redraw) {
request_redraw ();
}
create_gain_automation_child (param, show);
+ } else if (param.type() == TrimAutomation) {
+
+ create_trim_automation_child (param, show);
+
} else if (param.type() == PanWidthAutomation ||
- param.type() == PanElevationAutomation ||
- param.type() == PanAzimuthAutomation) {
+ param.type() == PanElevationAutomation ||
+ param.type() == PanAzimuthAutomation) {
ensure_pan_views (show);
} else if (param.type() == MuteAutomation) {
create_mute_automation_child (param, show);
-
+
} else {
error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg;
}
}
- if (get_selected()) {
+ if (selected()) {
controls_ebox.set_name (controls_base_selected_name);
time_axis_frame.set_name (controls_base_selected_name);
} else {