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

misc panning related UI tweaks:

Browse source 
* connect 2D panner "edit" to big window
* disconnect 2D-panner GUI when it's visible but panner-type changes
* ignore mixer-strip level-meter context-menu for Aux-sends
This commit is contained in:
Robin Gareus 2014-01-13 11:08:37 +01:00
parent bc88203ef5
commit 1146d58d21
3 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/mixer_strip.cc
View file

@ -2149,6 +2149,9 @@ MixerStrip::ab_plugins ()
bool bool
MixerStrip::level_meter_button_press (GdkEventButton* ev) MixerStrip::level_meter_button_press (GdkEventButton* ev)
{ {
if (_current_delivery && boost::dynamic_pointer_cast<Send>(_current_delivery)) {
return false;
}
if (ev->button == 3) { if (ev->button == 3) {
popup_level_meter_menu (ev); popup_level_meter_menu (ev);
return true; return true;

8
gtk2_ardour/panner2d.cc
View file

@ -201,6 +201,14 @@ void
Panner2d::handle_state_change () Panner2d::handle_state_change ()
{ {
panconnect.drop_connections(); panconnect.drop_connections();
if (!panner_shell->panner()) {
/* we should really self-destruct the UI here
* -> * PannerUI::set_panner() -> delete
*/
queue_draw ();
return;
}
panner_shell->panner()->SignalPositionChanged.connect (panconnect, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); panner_shell->panner()->SignalPositionChanged.connect (panconnect, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context());
set<Evoral::Parameter> params = panner_shell->panner()->what_can_be_automated(); set<Evoral::Parameter> params = panner_shell->panner()->what_can_be_automated();

5
gtk2_ardour/panner_ui.cc
View file

@ -417,6 +417,11 @@ PannerUI::pan_edit ()
_mono_panner->edit (); _mono_panner->edit ();
} else if (_stereo_panner) { } else if (_stereo_panner) {
_stereo_panner->edit (); _stereo_panner->edit ();
} else if (twod_panner) {
if (!big_window) {
big_window = new Panner2dWindow (_panshell, 400, _panner->in().n_audio());
}
big_window->show ();
} }
} }