#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>
playlist_button.unset_flags (Gtk::CAN_FOCUS);
automation_button.unset_flags (Gtk::CAN_FOCUS);
- route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
+ route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_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));
rec_enable_button->show_all ();
controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+
+ if (is_midi_track()) {
+ ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
+ } else {
+ ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+ }
rec_enable_button->set_sensitive (_session->writable());
}
update_diskstream_display ();
+ _subplugin_menu_map.clear ();
subplugin_menu.items().clear ();
_route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
_route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
}
gint
-RouteTimeAxisView::edit_click (GdkEventButton *ev)
+RouteTimeAxisView::route_group_click (GdkEventButton *ev)
{
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
if (_route->route_group()) {
void
RouteTimeAxisView::playlist_click ()
{
- // always build a new action menu
-
- delete playlist_action_menu;
-
- playlist_action_menu = new Menu;
- playlist_action_menu->set_name ("ArdourContextMenu");
-
- build_playlist_menu (playlist_action_menu);
-
+ build_playlist_menu ();
conditionally_add_to_selection ();
playlist_action_menu->popup (1, gtk_get_current_event_time());
}
detach_menu (subplugin_menu);
+ _main_automation_menu_map.clear ();
delete automation_action_menu;
automation_action_menu = new Menu;
MenuList& items = display_menu->items();
display_menu->set_name ("ArdourContextMenu");
- items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
+ items.push_back (MenuElem (_("Color..."), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Layers"), *layers_menu));
- Menu* alignment_menu = manage (new Menu);
- MenuList& alignment_items = alignment_menu->items();
- alignment_menu->set_name ("ArdourContextMenu");
-
- RadioMenuItem::Group align_group;
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
- sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
- align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (track()->alignment_style() == ExistingMaterial) {
- align_existing_item->set_active();
- }
-
- alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
- sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
- align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
- if (track()->alignment_style() == CaptureTime) {
- align_capture_item->set_active();
- }
-
if (!Profile->get_sae()) {
+ Menu* alignment_menu = manage (new Menu);
+ MenuList& alignment_items = alignment_menu->items();
+ alignment_menu->set_name ("ArdourContextMenu");
+
+ RadioMenuItem::Group align_group;
+
+ alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
+ align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+ if (track()->alignment_style() == ExistingMaterial) {
+ align_existing_item->set_active();
+ }
+
+ alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
+ sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
+ align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+ if (track()->alignment_style() == CaptureTime) {
+ align_capture_item->set_active();
+ }
+
items.push_back (MenuElem (_("Alignment"), *alignment_menu));
track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+ Menu* mode_menu = manage (new Menu);
+ MenuList& mode_items = mode_menu->items ();
+ mode_menu->set_name ("ArdourContextMenu");
+
RadioMenuItem::Group mode_group;
- items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
+
+ mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Normal)));
- normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
- items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
+ mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
ARDOUR::Destructive)));
- destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
- items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
+ mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
- non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+ non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
_ignore_track_mode_change = true;
}
_ignore_track_mode_change = false;
- }
- track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+ items.push_back (MenuElem (_("Mode"), *mode_menu));
+ }
color_mode_menu = build_color_mode_menu();
if (color_mode_menu) {
}
items.push_back (SeparatorElem());
+
+ build_playlist_menu ();
+ items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
+
+ route_group_menu->rebuild (_route->route_group ());
+ items.push_back (MenuElem (_("Route Group"), *route_group_menu));
+
+ build_automation_action_menu ();
+ items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+
+ items.push_back (SeparatorElem());
}
items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active)));
* @param results List to add things to.
*/
void
-RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
{
double speed = 1.0;
return -1;
}
-bool
+void
RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
{
boost::shared_ptr<Playlist> what_we_got;
boost::shared_ptr<Track> tr = track ();
boost::shared_ptr<Playlist> playlist;
- bool ret = false;
if (tr == 0) {
/* route is a bus, not a track */
- return false;
+ return;
}
playlist = tr->playlist();
_session->add_command (*c);
}
_session->add_command (new StatefulDiffCommand (playlist));
- ret = true;
}
break;
case Copy:
}
_session->add_command (new StatefulDiffCommand (playlist));
what_we_got->release ();
- ret = true;
}
break;
}
-
- return ret;
}
bool
-RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
{
if (!is_track()) {
return false;
}
-TimeAxisView::Children
-RouteTimeAxisView::get_child_list()
-{
- TimeAxisView::Children redirect_children;
-
- for (Children::iterator i = children.begin(); i != children.end(); ++i) {
- if (!(*i)->hidden()) {
- redirect_children.push_back(*i);
- }
- }
- return redirect_children;
-}
-
-
struct PlaylistSorter {
bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
return a->sort_id() < b->sort_id();
};
void
-RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
+RouteTimeAxisView::build_playlist_menu ()
{
using namespace Menu_Helpers;
- if (!menu || !is_track()) {
+ if (!is_track()) {
return;
}
- MenuList& playlist_items = menu->items();
- menu->set_name ("ArdourContextMenu");
+ delete playlist_action_menu;
+ playlist_action_menu = new Menu;
+ playlist_action_menu->set_name ("ArdourContextMenu");
+
+ MenuList& playlist_items = playlist_action_menu->items();
+ playlist_action_menu->set_name ("ArdourContextMenu");
playlist_items.clear();
delete playlist_menu;
-
vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
boost::shared_ptr<Track> tr = track();
RadioMenuItem::Group playlist_group;
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);
+ if (menu) {
+ menu->set_active(true);
+ }
}
}
items.push_back (CheckMenuElem (name));
mitem = dynamic_cast<CheckMenuItem*> (&items.back());
- _parameter_menu_map[*i] = mitem;
+ _subplugin_menu_map[*i] = mitem;
if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
mitem->set_active(true);
(*i)->valid = false;
}
+ _subplugin_menu_map.clear ();
subplugin_menu.items().clear ();
_route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
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;
+ ParameterMenuMap::iterator i = _main_automation_menu_map.find (param);
+ if (i != _main_automation_menu_map.end()) {
+ return i->second;
+ }
+
+ i = _subplugin_menu_map.find (param);
+ if (i != _subplugin_menu_map.end()) {
+ return i->second;
}
- return i->second;
+ return 0;
}
projects / ardour.git / blobdiff