From d6274d5c3e588ee0b66bf95551567a77b38b3619 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 Sep 2013 18:24:32 -0400 Subject: [PATCH] fix up enum mess caused by switching from JACK to Engine as the name for jack-related transport sync This will allow older versions of Ardour to continue to startup when the user sync preference is "JACK", because the string used by enum_2_string() will still be "JACK". Versions of ardour3 from git after the enum change until this commit will leave ardour.rc unloaded by old versions of Ardour ***if*** the user sync choice was "JACK". --- libs/ardour/ardour/types.h | 6 +++++- libs/ardour/enums.cc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index ca3f1acc19..526a71c58b 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -489,8 +489,12 @@ namespace ARDOUR { }; enum SyncSource { - Engine = 0, + /* These are "synonyms". It is important for JACK to be first + both here and in enums.cc, so that the string "JACK" is + correctly recognized in older session and preference files. + */ JACK = 0, + Engine = 0, MTC, MIDIClock, LTC diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 3898a0e881..2a38cd2c8a 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -335,8 +335,8 @@ setup_enum_writer () REGISTER (_PluginType); REGISTER_ENUM (MTC); - REGISTER_ENUM (Engine); REGISTER_ENUM (JACK); + REGISTER_ENUM (Engine); REGISTER_ENUM (MIDIClock); REGISTER_ENUM (LTC); REGISTER (_SyncSource); -- 2.30.2