#include "item_counts.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
const string & nom,
const string & nomparent
)
- : AxisView (s)
+ : SessionHandlePtr (s)
, TimeAxisView (s, e, &parent, canvas)
, _route (r)
, _control (c)
, _parameter (p)
, _base_rect (new ArdourCanvas::Rectangle (_canvas_display))
, _view (show_regions ? new AutomationStreamView (*this) : 0)
- , auto_button (X_("")) /* force addition of a label */
+ , auto_dropdown ()
, _show_regions (show_regions)
{
//concatenate plugin name and param name into the tooltip
? "midi automation track fill"
: "audio automation track fill");
- automation_menu = 0;
auto_off_item = 0;
auto_touch_item = 0;
auto_write_item = 0;
_base_rect->lower_to_bottom();
}
+ using namespace Menu_Helpers;
+
+ auto_dropdown.AddMenuElem (MenuElem (S_("Automation|Manual"), sigc::bind (sigc::mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) ARDOUR::Off)));
+ auto_dropdown.AddMenuElem (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+ auto_dropdown.AddMenuElem (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+ auto_dropdown.AddMenuElem (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this,
+ &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+
+ /* XXX translators: use a string here that will be at least as long
+ as the longest automation label (see ::automation_state_changed()
+ below). be sure to include a descender.
+ */
+ auto_dropdown.set_sizing_text(_("Mgnual"));
+
hide_button.set_icon (ArdourIcon::CloseCross);
hide_button.set_tweaks(ArdourButton::TrackHeader);
- auto_button.set_name ("route button");
+ auto_dropdown.set_name ("route button");
hide_button.set_name ("route button");
- auto_button.unset_flags (Gtk::CAN_FOCUS);
+ auto_dropdown.unset_flags (Gtk::CAN_FOCUS);
hide_button.unset_flags (Gtk::CAN_FOCUS);
controls_table.set_no_show_all();
- set_tooltip(auto_button, _("automation state"));
+ set_tooltip(auto_dropdown, _("automation state"));
set_tooltip(hide_button, _("hide track"));
const string str = gui_property ("height");
//name label isn't editable on an automation track; remove the tooltip
set_tooltip (name_label, X_(""));
- /* repack the name label */
+ /* repack the name label, which TimeAxisView has already attached to
+ * the controls_table
+ */
if (name_label.get_parent()) {
name_label.get_parent()->remove (name_label);
/* add the buttons */
controls_table.set_border_width (1);
- controls_table.remove (name_hbox);
controls_table.attach (hide_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
controls_table.attach (name_label, 2, 3, 1, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 2, 0);
- controls_table.attach (auto_button, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ controls_table.attach (auto_dropdown, 3, 4, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
Gtk::DrawingArea *blank0 = manage (new Gtk::DrawingArea());
Gtk::DrawingArea *blank1 = manage (new Gtk::DrawingArea());
// subscribe to route_active_changed, ...
if (rtv && rtv->is_audio_track()) {
blank0->set_name ("AudioTrackControlsBaseUnselected");
- }
- else if (rtv && rtv->is_midi_track()) {
+ } else if (rtv && rtv->is_midi_track()) {
blank0->set_name ("MidiTrackControlsBaseUnselected");
- }
- else {
+ } else if (rtv) {
blank0->set_name ("AudioBusControlsBaseUnselected");
+ } else {
+ blank0->set_name ("UnknownControlsBaseUnselected");
}
blank0->set_size_request (-1, -1);
blank1->set_size_request (1, 0);
controls_table.show_all ();
hide_button.signal_clicked.connect (sigc::mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
- auto_button.signal_clicked.connect (sigc::mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
controls_base_unselected_name = X_("AutomationTrackControlsBase");
);
line->set_line_color (UIConfiguration::instance().color ("processor automation line"));
+ line->set_fill (true);
line->queue_reset ();
add_line (line);
}
_route.reset ();
}
-void
-AutomationTimeAxisView::auto_clicked ()
-{
- using namespace Menu_Helpers;
-
- if (automation_menu == 0) {
- automation_menu = manage (new Menu);
- automation_menu->set_name ("ArdourContextMenu");
- MenuList& items (automation_menu->items());
-
- items.push_back (MenuElem (S_("Automation|Manual"), sigc::bind (sigc::mem_fun(*this,
- &AutomationTimeAxisView::set_automation_state), (AutoState) ARDOUR::Off)));
- items.push_back (MenuElem (_("Play"), sigc::bind (sigc::mem_fun(*this,
- &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
- items.push_back (MenuElem (_("Write"), sigc::bind (sigc::mem_fun(*this,
- &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
- items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this,
- &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
- }
-
- automation_menu->popup (1, gtk_get_current_event_time());
-}
-
void
AutomationTimeAxisView::set_automation_state (AutoState state)
{
switch (state & (ARDOUR::Off|Play|Touch|Write)) {
case ARDOUR::Off:
- auto_button.set_text (S_("Automation|Manual"));
+ auto_dropdown.set_text (S_("Automation|Manual"));
if (auto_off_item) {
ignore_state_request = true;
auto_off_item->set_active (true);
}
break;
case Play:
- auto_button.set_text (_("Play"));
+ auto_dropdown.set_text (_("Play"));
if (auto_play_item) {
ignore_state_request = true;
auto_play_item->set_active (true);
}
break;
case Write:
- auto_button.set_text (_("Write"));
+ auto_dropdown.set_text (_("Write"));
if (auto_write_item) {
ignore_state_request = true;
auto_write_item->set_active (true);
}
break;
case Touch:
- auto_button.set_text (_("Touch"));
+ auto_dropdown.set_text (_("Touch"));
if (auto_touch_item) {
ignore_state_request = true;
auto_touch_item->set_active (true);
}
break;
default:
- auto_button.set_text (_("???"));
+ auto_dropdown.set_text (_("???"));
break;
}
}
if (h >= preset_height (HeightNormal)) {
if (!(_parameter.type() >= MidiCCAutomation &&
_parameter.type() <= MidiChannelPressureAutomation)) {
- auto_button.show();
+ auto_dropdown.show();
}
name_label.show();
hide_button.show();
} else if (h >= preset_height (HeightSmall)) {
controls_table.hide_all ();
- auto_button.hide();
+ auto_dropdown.hide();
name_label.hide();
}
}
double x = 0;
- _canvas_display->canvas_to_item (x, y);
+ _line->grab_item().canvas_to_item (x, y);
/* compute vertical fractional position */
- y = 1.0 - (y / height);
+ y = 1.0 - (y / _line->height());
/* map using line */
}
bool
-AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
+AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
{
if (_line) {
return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy);
_line = line;
- line->set_height (height);
+ line->set_height (height - 2.5);
/* pick up the current state */
automation_state_changed ();
const XMLNode* gui_node = ac->extra_xml ("GUI");
if (gui_node) {
- const XMLProperty* prop = gui_node->property ("shown");
+ XMLProperty const * prop = gui_node->property ("shown");
if (prop) {
if (string_is_affirmative (prop->value())) {
visible.insert (i->first);
}
}
}
+
+PresentationInfo const &
+AutomationTimeAxisView::presentation_info () const
+{
+ return _route->presentation_info();
+}
+
+boost::shared_ptr<Stripable>
+AutomationTimeAxisView::stripable () const
+{
+ return _route;
+}
+
+Gdk::Color
+AutomationTimeAxisView::color () const
+{
+ return gdk_color_from_rgb (_route->presentation_info().color());
+}