smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Add BasicUI::selection()

Browse source 
Towards removing the direct use of Session by surfaces.
This commit is contained in:
David Robillard 2021-06-16 02:15:07 -04:00
parent 8cbff2b202
commit 003f1a4974
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/surfaces/control_protocol/basic_ui.cc
View file

@ -901,6 +901,12 @@ BasicUI::locations ()
return _session->locations ();
}
CoreSelection&
BasicUI::selection () const
{
return _session->selection ();
}
/* Signals */
PBD::Signal0<void>&

5
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View file

@ -40,6 +40,7 @@
namespace ARDOUR {
class Amp;
class CoreSelection;
class Locations;
class RouteGroup;
class Session;
@ -220,6 +221,10 @@ public:
const Locations* locations () const;
Locations* locations ();
/* Selection */
CoreSelection& selection () const;
/* Signals */
PBD::Signal0<void>& BundleAddedOrRemoved ();

20
libs/surfaces/push2/mix.cc
View file

@ -389,7 +389,7 @@ MixLayout::show_vpot_mode ()
void
MixLayout::button_mute ()
{
boost::shared_ptr<Stripable> s = session.selection().first_selected_stripable();
boost::shared_ptr<Stripable> s = p2.selection ().first_selected_stripable();
if (s) {
boost::shared_ptr<AutomationControl> ac = s->mute_control();
if (ac) {
@ -401,7 +401,7 @@ MixLayout::button_mute ()
void
MixLayout::button_solo ()
{
boost::shared_ptr<Stripable> s = session.selection().first_selected_stripable();
boost::shared_ptr<Stripable> s = p2.selection ().first_selected_stripable();
if (s) {
boost::shared_ptr<AutomationControl> ac = s->solo_control();
if (ac) {
@ -417,7 +417,7 @@ MixLayout::button_lower (uint32_t n)
return;
}
session.selection().set (stripable[n], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[n], boost::shared_ptr<AutomationControl>());
}
void
@ -689,7 +689,7 @@ MixLayout::button_select_release ()
/* no visible track selected, select first (if any) */
if (stripable[0]) {
session.selection().set (stripable[0], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[0], boost::shared_ptr<AutomationControl>());
}
} else {
@ -702,10 +702,10 @@ MixLayout::button_select_release ()
switch banks by one, and select leftmost
*/
if (bank_start != 0) {
session.selection().clear_stripables ();
p2.selection ().clear_stripables ();
switch_bank (bank_start-1);
if (stripable[0]) {
session.selection().set (stripable[0], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[0], boost::shared_ptr<AutomationControl>());
}
}
} else {
@ -715,7 +715,7 @@ MixLayout::button_select_release ()
--n;
}
if (n >= 0) {
session.selection().set (stripable[n], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[n], boost::shared_ptr<AutomationControl>());
}
}
@ -727,10 +727,10 @@ MixLayout::button_select_release ()
/* current selected is rightmost ... cancel selection,
switch banks by one, and select righmost
*/
session.selection().toggle (stripable[selected], boost::shared_ptr<AutomationControl>());
p2.selection ().toggle (stripable[selected], boost::shared_ptr<AutomationControl>());
switch_bank (bank_start+1);
if (stripable[7]) {
session.selection().set (stripable[7], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[7], boost::shared_ptr<AutomationControl>());
}
} else {
/* select next, if any */
@ -740,7 +740,7 @@ MixLayout::button_select_release ()
}
if (n != 8) {
session.selection().set (stripable[n], boost::shared_ptr<AutomationControl>());
p2.selection ().set (stripable[n], boost::shared_ptr<AutomationControl>());
}
}
}