OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clean up OBSBasic::ReceivedIntroJson a bit

Browse source 
Just moves some defines above the function rather than have messy
defines all throughout the function.
This commit is contained in:
jp9000 2022-07-26 07:24:29 -07:00
parent 2df1ad5b39
commit 277e34fbb8
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
UI/window-basic-main.cpp
View file

@ -2082,6 +2082,17 @@ void OBSBasic::OnFirstLoad()
on_actionViewCurrentLog_triggered();
}
#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
#define CUR_VER OBS_RELEASE_CANDIDATE_VER
#define LAST_INFO_VERSION_STRING "LastRCVersion"
#elif OBS_BETA > 0
#define CUR_VER OBS_BETA_VER
#define LAST_INFO_VERSION_STRING "LastBetaVersion"
#else
#define CUR_VER LIBOBS_API_VER
#define LAST_INFO_VERSION_STRING "LastVersion"
#endif
/* shows a "what's new" page on startup of new versions using CEF */
void OBSBasic::ReceivedIntroJson(const QString &text)
{
@ -2132,26 +2143,11 @@ void OBSBasic::ReceivedIntroJson(const QString &text)
return;
}
#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
"LastRCVersion");
#elif OBS_BETA > 0
uint32_t lastVersion = config_get_int(App()->GlobalConfig(), "General",
"LastBetaVersion");
#else
uint32_t lastVersion =
config_get_int(App()->GlobalConfig(), "General", "LastVersion");
#endif
LAST_INFO_VERSION_STRING);
int current_version_increment = -1;
#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
if (lastVersion < OBS_RELEASE_CANDIDATE_VER) {
#elif OBS_BETA > 0
if (lastVersion < OBS_BETA_VER) {
#else
if ((lastVersion & ~0xFFFF) < (LIBOBS_API_VER & ~0xFFFF)) {
#endif
if (lastVersion < CUR_VER) {
config_set_int(App()->GlobalConfig(), "General",
"InfoIncrement", -1);
} else {
@ -2193,6 +2189,9 @@ void OBSBasic::ReceivedIntroJson(const QString &text)
#endif
}
#undef CUR_VER
#undef LAST_INFO_VERSION_STRING
void OBSBasic::ShowWhatsNew(const QString &url)
{
#ifdef BROWSER_AVAILABLE