use new RouteGroup property names
This commit is contained in:
parent
939bc07b4b
commit
2161c5d507
|
@ -4254,7 +4254,7 @@ Editor::new_playlists (TimeAxisView* v)
|
|||
begin_reversible_command (_("new playlists"));
|
||||
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
|
||||
_session->playlists->get (playlists);
|
||||
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::select.property_id);
|
||||
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::group_select.property_id);
|
||||
commit_reversible_command ();
|
||||
}
|
||||
|
||||
|
@ -4270,7 +4270,7 @@ Editor::copy_playlists (TimeAxisView* v)
|
|||
begin_reversible_command (_("copy playlists"));
|
||||
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
|
||||
_session->playlists->get (playlists);
|
||||
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::select.property_id);
|
||||
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::group_select.property_id);
|
||||
commit_reversible_command ();
|
||||
}
|
||||
|
||||
|
@ -4285,7 +4285,7 @@ Editor::clear_playlists (TimeAxisView* v)
|
|||
begin_reversible_command (_("clear playlists"));
|
||||
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
|
||||
_session->playlists->get (playlists);
|
||||
mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::select.property_id);
|
||||
mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::group_select.property_id);
|
||||
commit_reversible_command ();
|
||||
}
|
||||
|
||||
|
|
|
@ -5110,7 +5110,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
|
|||
TrackViewList grouped_add = new_selection;
|
||||
for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) {
|
||||
RouteTimeAxisView *n = dynamic_cast<RouteTimeAxisView *>(*i);
|
||||
if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::select.property_id) ) {
|
||||
if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::group_select.property_id) ) {
|
||||
for (TrackViewList::const_iterator j = all_tracks.begin(); j != all_tracks.end(); ++j) {
|
||||
RouteTimeAxisView *check = dynamic_cast<RouteTimeAxisView *>(*j);
|
||||
if ( check && (n != check) && (check->route()->route_group() == n->route()->route_group()) )
|
||||
|
|
|
@ -380,21 +380,22 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
|
|||
plist.add (Properties::name, string ((*iter)[_columns.text]));
|
||||
|
||||
bool val = (*iter)[_columns.gain];
|
||||
plist.add (Properties::gain, val);
|
||||
plist.add (Properties::group_gain, val);
|
||||
val = (*iter)[_columns.gain_relative];
|
||||
plist.add (Properties::relative, val);
|
||||
plist.add (Properties::group_relative, val);
|
||||
val = (*iter)[_columns.mute];
|
||||
plist.add (Properties::mute, val);
|
||||
plist.add (Properties::group_mute, val);
|
||||
val = (*iter)[_columns.solo];
|
||||
plist.add (Properties::solo, val);
|
||||
plist.add (Properties::group_solo, val);
|
||||
val = (*iter)[_columns.record];
|
||||
plist.add (Properties::recenable, val);
|
||||
plist.add (Properties::group_recenable, val);
|
||||
val = (*iter)[_columns.monitoring];
|
||||
plist.add (Properties::monitoring, val);
|
||||
plist.add (Properties::group_monitoring, val);
|
||||
val = (*iter)[_columns.select];
|
||||
plist.add (Properties::select, val);
|
||||
plist.add (Properties::group_select, val);
|
||||
val = (*iter)[_columns.active_shared];
|
||||
plist.add (Properties::route_active, val);
|
||||
plist.add (Properties::group_route_active, val);
|
||||
|
||||
val = (*iter)[_columns.active_state];
|
||||
plist.add (Properties::active, val);
|
||||
val = (*iter)[_columns.is_visible];
|
||||
|
@ -563,7 +564,7 @@ EditorRouteGroups::set_session (Session* s)
|
|||
}
|
||||
|
||||
PBD::PropertyChange pc;
|
||||
pc.add (Properties::select);
|
||||
pc.add (Properties::group_select);
|
||||
pc.add (Properties::active);
|
||||
|
||||
groups_changed ();
|
||||
|
|
|
@ -621,7 +621,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
|
|||
if (press) {
|
||||
|
||||
if (selection->selected (clicked_routeview)) {
|
||||
get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
|
||||
get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
|
||||
} else {
|
||||
all_equivalent_regions.push_back (clicked_regionview);
|
||||
}
|
||||
|
@ -639,7 +639,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
|
|||
|
||||
case Selection::Set:
|
||||
if (!selection->selected (clicked_regionview)) {
|
||||
get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
|
||||
get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
|
||||
selection->set (all_equivalent_regions);
|
||||
commit = true;
|
||||
} else {
|
||||
|
@ -649,7 +649,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op)
|
|||
else {
|
||||
if (selection->regions.size() > 1) {
|
||||
/* collapse region selection down to just this one region (and its equivalents) */
|
||||
get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
|
||||
get_equivalent_regions(clicked_regionview, all_equivalent_regions, ARDOUR::Properties::group_select.property_id);
|
||||
selection->set(all_equivalent_regions);
|
||||
commit = true;
|
||||
}
|
||||
|
|
|
@ -1537,9 +1537,9 @@ MixerStrip::select_route_group (GdkEventButton *ev)
|
|||
|
||||
PropertyList* plist = new PropertyList();
|
||||
|
||||
plist->add (Properties::gain, true);
|
||||
plist->add (Properties::mute, true);
|
||||
plist->add (Properties::solo, true);
|
||||
plist->add (Properties::group_gain, true);
|
||||
plist->add (Properties::group_mute, true);
|
||||
plist->add (Properties::group_solo, true);
|
||||
|
||||
group_menu = new RouteGroupMenu (_session, plist);
|
||||
}
|
||||
|
|
|
@ -128,7 +128,7 @@ RegionLayeringOrderEditor::row_selected ()
|
|||
RegionView* rv = row[layering_order_columns.region_view];
|
||||
|
||||
vector<RegionView*> eq;
|
||||
editor.get_equivalent_regions (rv, eq, Properties::select.property_id);
|
||||
editor.get_equivalent_regions (rv, eq, Properties::group_select.property_id);
|
||||
|
||||
/* XXX this should be reversible, really */
|
||||
|
||||
|
|
|
@ -215,17 +215,17 @@ RouteGroupDialog::update ()
|
|||
{
|
||||
PropertyList plist;
|
||||
|
||||
plist.add (Properties::gain, _gain.get_active());
|
||||
plist.add (Properties::recenable, _rec_enable.get_active());
|
||||
plist.add (Properties::mute, _mute.get_active());
|
||||
plist.add (Properties::solo, _solo.get_active ());
|
||||
plist.add (Properties::select, _select.get_active());
|
||||
plist.add (Properties::route_active, _route_active.get_active());
|
||||
plist.add (Properties::relative, _relative.get_active());
|
||||
plist.add (Properties::group_gain, _gain.get_active());
|
||||
plist.add (Properties::group_recenable, _rec_enable.get_active());
|
||||
plist.add (Properties::group_mute, _mute.get_active());
|
||||
plist.add (Properties::group_solo, _solo.get_active ());
|
||||
plist.add (Properties::group_select, _select.get_active());
|
||||
plist.add (Properties::group_route_active, _route_active.get_active());
|
||||
plist.add (Properties::group_relative, _relative.get_active());
|
||||
plist.add (Properties::group_color, _share_color.get_active());
|
||||
plist.add (Properties::group_monitoring, _share_monitoring.get_active());
|
||||
plist.add (Properties::active, _active.get_active());
|
||||
plist.add (Properties::name, string (_name.get_text()));
|
||||
plist.add (Properties::color, _share_color.get_active());
|
||||
plist.add (Properties::monitoring, _share_monitoring.get_active());
|
||||
|
||||
_group->apply_changes (plist);
|
||||
|
||||
|
|
|
@ -313,8 +313,8 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
|
|||
|
||||
PropertyList* plist = new PropertyList();
|
||||
|
||||
plist->add (ARDOUR::Properties::mute, true);
|
||||
plist->add (ARDOUR::Properties::solo, true);
|
||||
plist->add (ARDOUR::Properties::group_mute, true);
|
||||
plist->add (ARDOUR::Properties::group_solo, true);
|
||||
|
||||
route_group_menu = new RouteGroupMenu (_session, plist);
|
||||
|
||||
|
@ -1176,7 +1176,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Play
|
|||
|
||||
name = pl->name();
|
||||
|
||||
if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
|
||||
if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
|
||||
name = resolve_new_group_playlist_name(name, playlists_before_op);
|
||||
}
|
||||
|
||||
|
@ -1231,7 +1231,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playl
|
|||
|
||||
name = pl->name();
|
||||
|
||||
if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
|
||||
if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
|
||||
name = resolve_new_group_playlist_name(name,playlists_before_op);
|
||||
}
|
||||
|
||||
|
@ -1686,7 +1686,7 @@ RouteTimeAxisView::build_playlist_menu ()
|
|||
playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
|
||||
playlist_items.push_back (SeparatorElem());
|
||||
|
||||
if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
|
||||
if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
|
||||
playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
|
||||
playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
|
||||
|
||||
|
@ -1730,7 +1730,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
|
|||
|
||||
RouteGroup* rg = route_group();
|
||||
|
||||
if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
|
||||
if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
|
||||
std::string group_string = "." + rg->name() + ".";
|
||||
|
||||
std::string take_name = pl->name();
|
||||
|
@ -1776,7 +1776,7 @@ void
|
|||
RouteTimeAxisView::update_playlist_tip ()
|
||||
{
|
||||
RouteGroup* rg = route_group ();
|
||||
if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
|
||||
if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
|
||||
string group_string = "." + rg->name() + ".";
|
||||
|
||||
string take_name = track()->playlist()->name();
|
||||
|
|
Loading…
Reference in New Issue