ardour/livetrax
13
0
Fork 0
Code

Make region gain envelope drawing work again.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4339 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2008-12-23 10:36:06 +00:00
parent e9a9fe30cf
commit 510d6d6dd3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/audio_region_view.cc
View File

@ -1004,8 +1004,8 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
/* compute vertical fractional position */
y = 1.0 - (y / (trackview.current_height() - NAME_HIGHLIGHT_SIZE));
y = 1.0 - (y / (_height - NAME_HIGHLIGHT_SIZE));
/* map using gain line */
gain_line->view_to_model_y (y);

9
gtk2_ardour/automation_line.cc
View File

@ -84,7 +84,8 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
trackview.session().register_with_memento_command_factory(alist->id(), this);
if (alist->parameter().type() == GainAutomation) {
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
set_uses_gain_mapping (true);
}
@ -1245,7 +1246,8 @@ void
AutomationLine::view_to_model_y (double& y) const
{
/* TODO: This should be more generic ... */
if (alist->parameter().type() == GainAutomation) {
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
y = slider_position_to_gain (y);
y = max (0.0, y);
y = min (2.0, y);
@ -1263,7 +1265,8 @@ void
AutomationLine::model_to_view_y (double& y) const
{
/* TODO: This should be more generic ... */
if (alist->parameter().type() == GainAutomation) {
if (alist->parameter().type() == GainAutomation ||
alist->parameter().type() == EnvelopeAutomation) {
y = gain_to_slider_position (y);
} else if (alist->parameter().type() == PanAutomation) {
// vertical coordinate axis reversal