silence warnings

This commit is contained in:
WarmUpTill 2020-07-31 22:05:55 +02:00
parent 1516263d2a
commit f8b505fa4e
2 changed files with 15 additions and 15 deletions

View File

@ -452,18 +452,18 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
obs_data_set_default_int(obj, "idleTabPos", 10);
obs_data_set_default_int(obj, "sequenceTabPos", 11);
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "generalTabPos"));
switcher->tabOrder.emplace_back(
obs_data_get_int(obj, "transitionTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "pauseTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "titleTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "exeTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "regionTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "mediaTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "fileTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "randomTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "timeTabPos"));
switcher->tabOrder.emplace_back(obs_data_get_int(obj, "idleTabPos"));
switcher->tabOrder.emplace_back(
obs_data_get_int(obj, "sequenceTabPos"));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "generalTabPos")));
switcher->tabOrder.emplace_back((int)(
obs_data_get_int(obj, "transitionTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "pauseTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "titleTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "exeTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "regionTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "mediaTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "fileTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "randomTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "timeTabPos")));
switcher->tabOrder.emplace_back((int)(obs_data_get_int(obj, "idleTabPos")));
switcher->tabOrder.emplace_back((int)(
obs_data_get_int(obj, "sequenceTabPos")));
}

View File

@ -210,7 +210,7 @@ struct MediaSwitch {
OBSWeakSource source;
OBSWeakSource transition;
obs_media_state state;
uint64_t time;
int64_t time;
time_restriction restriction;
bool matched;
bool usePreviousScene;