#include <gtkmm/menuitem.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>
, button_table (3, 3)
, route_group_button (_("g"))
, playlist_button (_("p"))
- , size_button (_("h"))
, automation_button (_("a"))
- , visual_button (_("v"))
, gm (sess, slider, true, 115)
, _ignore_track_mode_change (false)
{
}
mute_changed (0);
- solo_changed (0);
+ update_solo_display ();
timestretch_rect = 0;
no_redraw = false;
route_group_button.set_name ("TrackGroupButton");
playlist_button.set_name ("TrackPlaylistButton");
automation_button.set_name ("TrackAutomationButton");
- size_button.set_name ("TrackSizeButton");
- visual_button.set_name ("TrackVisualButton");
- hide_button.set_name ("TrackRemoveButton");
route_group_button.unset_flags (Gtk::CAN_FOCUS);
playlist_button.unset_flags (Gtk::CAN_FOCUS);
automation_button.unset_flags (Gtk::CAN_FOCUS);
- size_button.unset_flags (Gtk::CAN_FOCUS);
- visual_button.unset_flags (Gtk::CAN_FOCUS);
- hide_button.unset_flags (Gtk::CAN_FOCUS);
-
- hide_button.add (*(manage (new Image (::get_icon("hide")))));
- hide_button.show_all ();
route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
- size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false);
- visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click));
- hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click));
if (is_track()) {
ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
- ARDOUR_UI::instance()->set_tip(size_button,_("Display Height"));
ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist"));
ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
- ARDOUR_UI::instance()->set_tip(visual_button, _("Visual options"));
- ARDOUR_UI::instance()->set_tip(hide_button, _("Hide this track"));
label_view ();
- if (0) {
-
- /* old school - when we used to put an extra row of buttons in place */
-
- controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-
- } else {
-
- controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
- }
+ controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
if (is_track() && track()->mode() == ARDOUR::Normal) {
controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
delete _view;
_view = 0;
- for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
- delete i->second;
- }
-
_automation_tracks.clear ();
delete route_group_menu;
{
using namespace Menu_Helpers;
+ /* detach subplugin_menu from automation_action_menu before we delete automation_action_menu,
+ otherwise bad things happen (see comment for similar case in MidiTimeAxisView::build_automation_action_menu)
+ */
+
+ detach_menu (subplugin_menu);
+
delete automation_action_menu;
automation_action_menu = new Menu;
items.push_back (MenuElem (_("Hide All Automation"),
sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+
+ items.push_back (SeparatorElem ());
- /* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */
+ /* Attach the plugin submenu. It may have previously been used elsewhere,
+ so it was detached above */
- detach_menu (subplugin_menu);
- items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+ items.push_back (MenuElem (_("Plugins"), subplugin_menu));
items.back().set_sensitive (!subplugin_menu.items().empty());
}
{
using namespace Menu_Helpers;
- /* get the size menu ready */
-
- build_size_menu ();
-
/* prepare it */
TimeAxisView::build_display_menu ();
MenuList& items = display_menu->items();
display_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Height"), *size_menu));
items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
items.push_back (SeparatorElem());
route_active_menu_item->set_active (_route->active());
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)));
+ items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, false)));
if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
} else {
snprintf (buf, sizeof (buf), "%u", height);
xml_node->add_property ("height", buf);
- if (height >= hNormal) {
+ if (height >= preset_height (HeightNormal)) {
reset_meter();
show_name_entry ();
hide_name_label ();
rec_enable_button->show();
route_group_button.show();
- hide_button.show();
- visual_button.show();
- size_button.show();
automation_button.show();
if (is_track() && track()->mode() == ARDOUR::Normal) {
playlist_button.show();
}
- } else if (height >= hSmaller) {
+ } else if (height >= preset_height (HeightSmaller)) {
reset_meter();
show_name_entry ();
rec_enable_button->show();
route_group_button.hide ();
- hide_button.hide ();
- visual_button.hide ();
- size_button.hide ();
automation_button.hide ();
if (is_track() && track()->mode() == ARDOUR::Normal) {
rec_enable_button->hide();
route_group_button.hide ();
- hide_button.hide ();
- visual_button.hide ();
- size_button.hide ();
automation_button.hide ();
playlist_button.hide ();
name_label.set_text (_route->name());
return;
}
-bool
-RouteTimeAxisView::show_automation(Evoral::Parameter param)
-{
- return (_show_automation.find(param) != _show_automation.end());
-}
-
-/** Retuns 0 if track for \a param doesn't exist.
- */
-RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track (Evoral::Parameter param)
-{
- map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find (param);
-
- if (i != _automation_tracks.end()) {
- return i->second;
- } else {
- return 0;
- }
-}
-
-/** Shorthand for GainAutomation, etc.
- */
-RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track (AutomationType type)
-{
- return automation_track (Evoral::Parameter(type));
-}
-
RouteGroup*
RouteTimeAxisView::route_group () const
{
}
}
-void
-RouteTimeAxisView::visual_click ()
-{
- popup_display_menu (0);
-}
-
-void
-RouteTimeAxisView::hide_click ()
-{
- // LAME fix for hide_button refresh fix
- hide_button.set_sensitive(false);
-
- _editor.hide_track_in_display (*this);
-
- hide_button.set_sensitive(true);
-}
-
boost::shared_ptr<Region>
RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
{
void
RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
{
- RouteAutomationNode* node = automation_track(param);
+ boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
+ Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
- if (!node) {
+ if (!track) {
/* it doesn't exist yet, so we don't care about the button state: just add it */
create_automation_child (param, true);
} else {
- bool yn = node->menu_item->get_active();
- if (node->track->set_visibility (node->menu_item->get_active()) && yn) {
+ assert (menu);
+ bool yn = menu->get_active();
+ if (track->set_visibility (menu->get_active()) && yn) {
/* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden()
will have done that for us.
void
RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
{
- RouteAutomationNode* ran = automation_track(param);
+ boost::shared_ptr<AutomationTimeAxisView> track = automation_child (param);
- if (!ran) {
+ if (!track) {
return;
}
+ Gtk::CheckMenuItem* menu = automation_child_menu_item (param);
+
// if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here....
- _show_automation.erase (param);
- ran->track->get_state_node()->add_property (X_("shown"), X_("no"));
+ track->get_state_node()->add_property (X_("shown"), X_("no"));
- if (ran->menu_item && !_hidden) {
+ if (menu && !_hidden) {
ignore_toggle = true;
- ran->menu_item->set_active (false);
+ menu->set_active (false);
ignore_toggle = false;
}
/* Show our automation */
- map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
- for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
- i->second->track->set_marked_for_display (true);
- i->second->track->canvas_display()->show();
- i->second->track->get_state_node()->add_property ("shown", X_("yes"));
- if (i->second->menu_item) {
- i->second->menu_item->set_active(true);
+ for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+ i->second->set_marked_for_display (true);
+ i->second->canvas_display()->show();
+ i->second->get_state_node()->add_property ("shown", X_("yes"));
+
+ Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+
+ if (menu) {
+ menu->set_active(true);
}
}
/* Show our automation */
- map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
- for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
- if (i->second->track->line() && i->second->track->line()->npoints() > 0) {
- i->second->track->set_marked_for_display (true);
- i->second->track->canvas_display()->show();
- i->second->track->get_state_node()->add_property ("shown", X_("yes"));
- i->second->menu_item->set_active(true);
+ for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+ if (i->second->has_automation()) {
+ i->second->set_marked_for_display (true);
+ i->second->canvas_display()->show();
+ i->second->get_state_node()->add_property ("shown", X_("yes"));
+
+ Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+ assert (menu);
+ menu->set_active(true);
}
}
/* Hide our automation */
- for (map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
- i->second->track->set_marked_for_display (false);
- i->second->track->hide ();
- i->second->track->get_state_node()->add_property ("shown", X_("no"));
- if (i->second->menu_item) {
- i->second->menu_item->set_active (false);
+ for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+ i->second->set_marked_for_display (false);
+ i->second->hide ();
+ i->second->get_state_node()->add_property ("shown", X_("no"));
+
+ Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first);
+
+ if (menu) {
+ menu->set_active (false);
}
}
}
}
- _show_automation.clear();
-
no_redraw = false;
_route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
}
}
- _automation_tracks.insert (std::make_pair (param, new RouteAutomationNode(param, NULL, track)));
+ _automation_tracks[param] = track;
track->set_visibility (!hideit);
- if (!hideit) {
- _show_automation.insert (param);
- }
-
if (!no_redraw) {
_route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
}
items.push_back (CheckMenuElem (name));
mitem = dynamic_cast<CheckMenuItem*> (&items.back());
+ _parameter_menu_map[*i] = mitem;
+
if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
mitem->set_active(true);
}
{
AutomationTracks::iterator i = _automation_tracks.find(param);
if (i != _automation_tracks.end()) {
- return i->second->track;
+ return i->second;
} else {
return boost::shared_ptr<AutomationTimeAxisView>();
}
}
mute_button_label.set_text (_("m"));
}
+
+Gtk::CheckMenuItem*
+RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
+{
+ ParameterMenuMap::iterator i = _parameter_menu_map.find (param);
+ if (i == _parameter_menu_map.end()) {
+ return 0;
+ }
+
+ return i->second;
+}