From 50a23799b075a42e0787c9e2c2d847b4f3075dfc Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 8 Nov 2021 12:11:32 +0100 Subject: [PATCH] filter/transform: Swap parameter names in migration code --- source/filters/filter-transform.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/filters/filter-transform.cpp b/source/filters/filter-transform.cpp index e413fb78..009322c4 100644 --- a/source/filters/filter-transform.cpp +++ b/source/filters/filter-transform.cpp @@ -176,14 +176,14 @@ void transform_instance::migrate(obs_data_t* settings, uint64_t version) // Only test for A.B.C in A.B.C.D version = version & STREAMFX_MASK_UPDATE; -#define COPY_UNSET(TYPE, OLDNAME, NEWNAME) \ - if (obs_data_has_user_value(settings, OLDNAME)) { \ - obs_data_set_##TYPE(settings, NEWNAME, obs_data_get_##TYPE(settings, OLDNAME)); \ - obs_data_unset_user_value(settings, OLDNAME); \ +#define COPY_UNSET(TYPE, NAME, OLDNAME) \ + if (obs_data_has_user_value(settings, OLDNAME)) { \ + obs_data_set_##TYPE(settings, NAME, obs_data_get_##TYPE(settings, OLDNAME)); \ + obs_data_unset_user_value(settings, OLDNAME); \ } -#define COPY_IGNORE(TYPE, OLDNAME, NEWNAME) \ - if (obs_data_has_user_value(settings, OLDNAME)) { \ - obs_data_set_##TYPE(settings, NEWNAME, obs_data_get_##TYPE(settings, OLDNAME)); \ +#define COPY_IGNORE(TYPE, NAME, OLDNAME) \ + if (obs_data_has_user_value(settings, OLDNAME)) { \ + obs_data_set_##TYPE(settings, NAME, obs_data_get_##TYPE(settings, OLDNAME)); \ } #define SET_IF_UNSET(TYPE, NAME, value) \ if (!obs_data_has_user_value(settings, NAME)) { \