Revert "Temporary session-format compatibility (revert before release)"
This reverts commit 8cd8cb1650
.
This commit is contained in:
parent
766113a024
commit
1545c426d9
@ -1175,7 +1175,6 @@ AutomationLine::view_to_model_coord (double& x, double& y) const
|
|||||||
void
|
void
|
||||||
AutomationLine::view_to_model_coord_y (double& y) const
|
AutomationLine::view_to_model_coord_y (double& y) const
|
||||||
{
|
{
|
||||||
#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
if (alist->default_interpolation () != alist->interpolation()) {
|
if (alist->default_interpolation () != alist->interpolation()) {
|
||||||
switch (alist->interpolation()) {
|
switch (alist->interpolation()) {
|
||||||
case AutomationList::Linear:
|
case AutomationList::Linear:
|
||||||
@ -1186,7 +1185,6 @@ AutomationLine::view_to_model_coord_y (double& y) const
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
y = _desc.from_interface (y);
|
y = _desc.from_interface (y);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1211,7 +1209,6 @@ AutomationLine::apply_delta (double& val, double delta) const
|
|||||||
void
|
void
|
||||||
AutomationLine::model_to_view_coord_y (double& y) const
|
AutomationLine::model_to_view_coord_y (double& y) const
|
||||||
{
|
{
|
||||||
#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
if (alist->default_interpolation () != alist->interpolation()) {
|
if (alist->default_interpolation () != alist->interpolation()) {
|
||||||
switch (alist->interpolation()) {
|
switch (alist->interpolation()) {
|
||||||
case AutomationList::Linear:
|
case AutomationList::Linear:
|
||||||
@ -1222,7 +1219,6 @@ AutomationLine::model_to_view_coord_y (double& y) const
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
y = _desc.to_interface (y);
|
y = _desc.to_interface (y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -652,7 +652,7 @@ AutomationTimeAxisView::build_display_menu ()
|
|||||||
items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
|
items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
Menu* auto_mode_menu = manage (new Menu);
|
Menu* auto_mode_menu = manage (new Menu);
|
||||||
auto_mode_menu->set_name ("ArdourContextMenu");
|
auto_mode_menu->set_name ("ArdourContextMenu");
|
||||||
MenuList& am_items = auto_mode_menu->items();
|
MenuList& am_items = auto_mode_menu->items();
|
||||||
@ -692,7 +692,6 @@ AutomationTimeAxisView::build_display_menu ()
|
|||||||
delete auto_mode_menu;
|
delete auto_mode_menu;
|
||||||
auto_mode_menu = 0;
|
auto_mode_menu = 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* make sure the automation menu state is correct */
|
/* make sure the automation menu state is correct */
|
||||||
|
@ -224,10 +224,6 @@ AutomationList::default_interpolation () const
|
|||||||
case GainAutomation:
|
case GainAutomation:
|
||||||
case BusSendLevel:
|
case BusSendLevel:
|
||||||
case EnvelopeAutomation:
|
case EnvelopeAutomation:
|
||||||
#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
/* use old, wrong linear gain interpolation */
|
|
||||||
return ControlList::Linear;
|
|
||||||
#endif
|
|
||||||
return ControlList::Exponential;
|
return ControlList::Exponential;
|
||||||
break;
|
break;
|
||||||
case TrimAutomation:
|
case TrimAutomation:
|
||||||
@ -354,22 +350,7 @@ AutomationList::state (bool full, bool need_lock)
|
|||||||
|
|
||||||
root->set_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
|
root->set_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
|
||||||
root->set_property ("id", id());
|
root->set_property ("id", id());
|
||||||
|
|
||||||
#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
/* force new enums to existing ones in session-file */
|
|
||||||
Evoral::ControlList::InterpolationStyle is = _interpolation;
|
|
||||||
switch (is) {
|
|
||||||
case ControlList::Exponential:
|
|
||||||
case ControlList::Logarithmic:
|
|
||||||
is = ControlList::Linear;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
root->set_property ("interpolation-style", is);
|
|
||||||
#else
|
|
||||||
root->set_property ("interpolation-style", _interpolation);
|
root->set_property ("interpolation-style", _interpolation);
|
||||||
#endif
|
|
||||||
|
|
||||||
if (full) {
|
if (full) {
|
||||||
/* never serialize state with Write enabled - too dangerous
|
/* never serialize state with Write enabled - too dangerous
|
||||||
@ -544,12 +525,6 @@ AutomationList::set_state (const XMLNode& node, int version)
|
|||||||
if (!node.get_property (X_("interpolation-style"), _interpolation)) {
|
if (!node.get_property (X_("interpolation-style"), _interpolation)) {
|
||||||
_interpolation = default_interpolation ();
|
_interpolation = default_interpolation ();
|
||||||
}
|
}
|
||||||
#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
|
|
||||||
/* internally force logarithmic and Trim params to use Log-scale */
|
|
||||||
if (_desc.logarithmic || _parameter.type() == TrimAutomation) {
|
|
||||||
_interpolation = ControlList::Logarithmic;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (node.get_property (X_("state"), _state)) {
|
if (node.get_property (X_("state"), _state)) {
|
||||||
if (_state == Write) {
|
if (_state == Write) {
|
||||||
|
Loading…
Reference in New Issue
Block a user