Commit Graph

10064 Commits

Author SHA1 Message Date
Paul Davis
91f8c0be54 use new API for control slave/master relationships 2016-05-31 15:30:40 -04:00
Paul Davis
9f66fe1ebb start adding a context menu for VCA strips 2016-05-31 15:30:40 -04:00
Paul Davis
567fb50aad GUI tweaks for VCAMasterStrip, including renaming 2016-05-31 15:30:40 -04:00
Paul Davis
b34f949518 follow session track-number policy in mixer strip, as is done in the editor 2016-05-31 15:30:40 -04:00
Paul Davis
1249e61d73 trivially change API of GainMeter but more importantly don't show meter if no Route is set 2016-05-31 15:30:40 -04:00
Paul Davis
fcec93a28e remove VCA active button 2016-05-31 15:30:40 -04:00
Paul Davis
04e26fe7e6 move VCA assignment up to Route level 2016-05-31 15:30:39 -04:00
Paul Davis
406e9d05ce use redesigned Route and VCA object architecture/API 2016-05-31 15:30:39 -04:00
Paul Davis
a03d969a97 update VCA assign buttons to show status for VCA strips 2016-05-31 15:30:39 -04:00
Paul Davis
cd6a88d0d4 fix incorrect selection of all strips/tracks at opening.
Old code was counting how many child nodes where in the MixerUI, assuming they
were all routes, and using that to decide if this was a from_scratch setup.
The addition of VCAs to the track_model changes that, so now we have to actually
check there are no existing Routes before doing the from_scratch setup
2016-05-31 15:30:39 -04:00
Paul Davis
6f9beb1e33 no self-assign for VCA masters 2016-05-31 15:30:39 -04:00
Paul Davis
dc9f579a8b add GUI support for slaving VCAs to other VCAs 2016-05-31 15:30:39 -04:00
Paul Davis
9339a7b997 add solo/mute controls to VCAMasterStrip 2016-05-31 15:30:39 -04:00
Paul Davis
a38aabfce3 revert GainMeter back to simpler code now that VCA model appears correct 2016-05-31 15:30:39 -04:00
Paul Davis
c572d4ed9e add VCAMasterStrip::set_selected() 2016-05-31 15:30:39 -04:00
Paul Davis
4d87503863 fix restoration of editor pane positions 2016-05-31 15:30:39 -04:00
Paul Davis
419c7e95f3 GUI modifications to improve VCA strips and their placement in the mixer
Note that this includes some changes that actually make mixer pane settings get restored,
which has been broken for some time. Of course, they are not restored perfectly, yet.
2016-05-31 15:30:39 -04:00
Paul Davis
c5c6be4170 adjust logic for slaved faders, not necessarily correctly.
More info in the code comments.
2016-05-31 15:30:39 -04:00
Paul Davis
0275582b89 rename GainMeter::gain_adjusted() to GainMeter::fader_moved() to be more clear 2016-05-31 15:30:39 -04:00
Paul Davis
8e643563e5 make GUI fader positions reflect VCA master values 2016-05-31 15:30:39 -04:00
Paul Davis
7f244ce14d use VCAUpdateStatus to keep VCA button current 2016-05-31 15:30:39 -04:00
Paul Davis
3be9d6dccc remove debug output 2016-05-31 15:30:39 -04:00
Paul Davis
8ce39c891b change sort ordering model in mixer and editor
This allows correct reordering of the mixer "track_model" even
when non-route elements are present.

This isn't really utilized in the Editor at present because we do
not show VCAs there at all, but it will become important in the
future when we represent VCA automation there
2016-05-31 15:30:39 -04:00
Paul Davis
75b327964b tweak mixer VCA button appearance and prepare for live updates to VCA state 2016-05-31 15:30:39 -04:00
Paul Davis
d47dc72595 single button for VCA assignment, plus unassign now works 2016-05-31 15:30:38 -04:00
Paul Davis
acaaa98bd0 start shaping up VCA assign process 2016-05-31 15:30:38 -04:00
Paul Davis
4d14ae4e23 mostly restore VCA state on session loading.
This does not restore VCA assignments
2016-05-31 15:30:38 -04:00
Paul Davis
33e56e58d7 initial part of vca assignment via context menu 2016-05-31 15:30:38 -04:00
Paul Davis
089549acb6 add 4 harrison-style vca assign buttons to the mixer strip 2016-05-31 15:30:38 -04:00
Paul Davis
51c833dff5 change packing of GainMeter so that the fader+meter will expand to fill available space 2016-05-31 15:30:38 -04:00
Paul Davis
99d251de7d first pass at making the GUI for a VCA visible 2016-05-31 15:30:38 -04:00
Paul Davis
3819d4f9ed fix manual merge error 2016-05-31 15:30:38 -04:00
Paul Davis
0e1190c555 extend add route dialog to include VCA masters 2016-05-31 15:30:38 -04:00
Paul Davis
c5ba2d1eb6 add a new packer to the mixer, to hold vca master faders (if any) 2016-05-31 15:30:38 -04:00
Paul Davis
99b0712be4 remove the entire idea of a tabbable for VCA master faders
Conflicts:
	gtk2_ardour/master_faders.cc
2016-05-31 15:30:38 -04:00
Paul Davis
f4032599f2 fix API of VCA strip
Conflicts:
	gtk2_ardour/master_faders.cc
2016-05-31 15:30:38 -04:00
Paul Davis
026dc718ee set controls for VCA strip 2016-05-31 15:30:38 -04:00
Paul Davis
b3d5d4f138 correctly set up members of GainMeterBase in ::set_controls() 2016-05-31 15:30:38 -04:00
Paul Davis
f5c717e893 fake the existence of a master fader strip
Conflicts:
	gtk2_ardour/master_faders.cc
2016-05-31 15:30:38 -04:00
Paul Davis
fd3a19b06e skeleton versions of VCA master strips 2016-05-31 15:30:38 -04:00
Paul Davis
eec6b7fee2 call ::set_session on master faders section 2016-05-31 15:30:38 -04:00
Paul Davis
b07d0e3747 remove unused "old-order" stuff from AxisView 2016-05-31 15:30:38 -04:00
Paul Davis
33bf858a5f remove stupid, unused function 2016-05-31 15:30:38 -04:00
Paul Davis
89a4d689d1 make the master faders visibility button work 2016-05-31 15:30:38 -04:00
Paul Davis
5c658db4bf most of the changes required to add a new master faders tabbable
the visibility button isn't actually working correctly
2016-05-31 15:30:38 -04:00
Robin Gareus
bd74d7fbe9 there won't be an Ardour 4.8 release 2016-05-30 21:02:12 +02:00
nick_m
5d6ad68004 Revert terrible thinko in 647c86e. (back to slow for now) 2016-05-29 05:57:19 +10:00
nick_m
647c86e0f7 Speed up redraw while tempo dragging with midi regions (and possibly other redraws) 2016-05-29 05:47:11 +10:00
nick_m
a924e938aa Allow non-musical snap when dragging bbt ruler.
- probably not what the user wants,
	  unless snapping beats to timecode frames.
2016-05-28 06:50:22 +10:00
nick_m
0d17c21410 Revert 2d7f755 2016-05-28 05:17:43 +10:00