#include <gtkmm2ext/barcontroller.h>
#include <gtkmm2ext/utils.h>
#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
#include "pbd/error.h"
#include "pbd/memento_command.h"
#include "pbd/stacktrace.h"
+#include "pbd/string_convert.h"
+#include "pbd/types_convert.h"
#include "ardour/automation_control.h"
+#include "ardour/beats_frames_converter.h"
#include "ardour/event_type_map.h"
#include "ardour/parameter_types.h"
#include "ardour/profile.h"
#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");
- if (!str.empty()) {
- set_height (atoi (str));
+ uint32_t height;
+ if (get_gui_property ("height", height)) {
+ set_height (height);
} else {
set_height (preset_height (HeightNormal));
}
controls_table.set_border_width (1);
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());
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();
}
}
}
void
-AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points)
+AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t frame, double y, bool with_guard_points)
{
if (!_line) {
return;
_line->view_to_model_coord (x, y);
+ MusicFrame when (frame, 0);
_editor.snap_to_with_modifier (when, event);
XMLNode& before = list->get_state();
std::list<Selectable*> results;
- if (list->editor_add (when, y, with_guard_points)) {
+
+ if (list->editor_add (when.frame, y, with_guard_points)) {
XMLNode& after = list->get_state();
_editor.begin_reversible_command (_("add automation event"));
_session->add_command (new MementoCommand<ARDOUR::AutomationList> (*list.get (), &before, &after));
- _line->get_selectables (when, when, 0.0, 1.0, results);
+ _line->get_selectables (when.frame, when.frame, 0.0, 1.0, results);
_editor.get_selection ().set (results);
_editor.commit_reversible_command ();
}
bool
-AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
+AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t divisions)
{
if (_line) {
return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy);
counts.increase_n_lines(_parameter);
/* add multi-paste offset if applicable */
- pos += _editor.get_paste_offset(pos, paste_count, (*p)->length());
+ AutomationType src_type = (AutomationType)(*p)->parameter().type ();
+ double len = (*p)->length();
+
+ if (parameter_is_midi (src_type)) {
+ // convert length to samples (incl tempo-ramps)
+ len = DoubleBeatsFramesConverter (_session->tempo_map(), pos).to (len * paste_count);
+ pos += _editor.get_paste_offset (pos, paste_count > 0 ? 1 : 0, len);
+ } else {
+ pos += _editor.get_paste_offset (pos, paste_count, len);
+ }
+
+ /* convert sample-position to model's unit and position */
double const model_pos = _line->time_converter().from (pos - _line->time_converter().origin_b ());
XMLNode &before = alist->get_state();
- alist->paste (**p, model_pos, times);
+ alist->paste (**p, model_pos, DoubleBeatsFramesConverter (_session->tempo_map(), pos));
_session->add_command (new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
return true;
_line = line;
- line->set_height (height);
+ line->set_height (height - 2.5);
/* pick up the current state */
automation_state_changed ();
AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/)
{
if (node.name() == X_("gain") && _parameter == Evoral::Parameter (GainAutomation)) {
- XMLProperty const * shown = node.property (X_("shown"));
- if (shown) {
- bool yn = string_is_affirmative (shown->value ());
- if (yn) {
+
+ bool shown;
+ if (node.get_property (X_("shown"), shown)) {
+ if (shown) {
_canvas_display->show (); /* FIXME: necessary? show_at? */
+ set_gui_property ("visible", shown);
}
- set_gui_property ("visible", yn);
} else {
set_gui_property ("visible", false);
}
const XMLNode* gui_node = ac->extra_xml ("GUI");
if (gui_node) {
- XMLProperty const * prop = gui_node->property ("shown");
- if (prop) {
- if (string_is_affirmative (prop->value())) {
- visible.insert (i->first);
- }
+ bool shown;
+ if (gui_node->get_property ("shown", shown) && shown) {
+ visible.insert (i->first);
}
}
}
AutomationTimeAxisView::state_id() const
{
if (_automatable != _route && _control) {
- return string_compose ("automation %1", _control->id().to_s());
+ return string("automation ") + _control->id().to_s();
} else if (_parameter) {
- return string_compose ("automation %1 %2/%3/%4",
- _route->id(),
- _parameter.type(),
- _parameter.id(),
- (int) _parameter.channel());
+ const string parameter_str = PBD::to_string (_parameter.type()) + "/" +
+ PBD::to_string (_parameter.id()) + "/" +
+ PBD::to_string (_parameter.channel ());
+
+ return string("automation ") + PBD::to_string(_route->id()) + " " + parameter_str;
} else {
error << "Automation time axis has no state ID" << endmsg;
return "";
bool & has_parameter,
Evoral::Parameter & parameter)
{
- stringstream s;
- s << state_id;
+ stringstream ss;
+ ss << state_id;
string a, b, c;
- s >> a >> b >> c;
+ ss >> a >> b >> c;
if (a != X_("automation")) {
return false;
assert (p.size() == 3);
parameter = Evoral::Parameter (
- boost::lexical_cast<int> (p[0]),
- boost::lexical_cast<int> (p[2]),
- boost::lexical_cast<int> (p[1])
+ PBD::string_to<uint32_t>(p[0]), // type
+ PBD::string_to<uint8_t>(p[2]), // channel
+ PBD::string_to<uint32_t>(p[1]) // id
);
return true;
}
}
}
+
+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());
+}
+
projects / ardour.git / blobdiff