@@ -572,11 +572,6 @@ bool version_info_downloaded(void *param, struct file_download_data *file)
572572
573573bool obs_module_load (void )
574574{
575- if (obs_get_version () < MAKE_SEMANTIC_VERSION (30 , 0 , 0 )) {
576- blog (LOG_ERROR, " [Vertical Canvas] loading version %s failed, OBS version %s is to low" , PROJECT_VERSION,
577- obs_get_version_string ());
578- return false ;
579- }
580575 blog (LOG_INFO, " [Vertical Canvas] loaded version %s" , PROJECT_VERSION);
581576 obs_frontend_add_event_callback (frontend_event, nullptr );
582577
@@ -1617,41 +1612,10 @@ static bool SceneItemHasVideo(obs_sceneitem_t *item)
16171612 return (flags & OBS_SOURCE_VIDEO) != 0 ;
16181613}
16191614
1620- #if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(31, 0, 0)
1621- static config_t *(*get_user_config_func)(void ) = nullptr ;
1622- static config_t *user_config = nullptr ;
1623- #endif
16241615
16251616config_t *get_user_config (void )
16261617{
1627- #if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(31, 0, 0)
1628- if (user_config)
1629- return user_config;
1630- if (!get_user_config_func) {
1631- if (obs_get_version () < MAKE_SEMANTIC_VERSION (31 , 0 , 0 )) {
1632- get_user_config_func = obs_frontend_get_global_config;
1633- blog (LOG_INFO, " [Vertical Canvas] use global config" );
1634- } else {
1635- #ifdef __APPLE__
1636- auto handle = os_dlopen (" obs-frontend-api.dylib" );
1637- #else
1638- auto handle = os_dlopen (" obs-frontend-api" );
1639- #endif
1640- if (handle) {
1641- get_user_config_func = (config_t * (*)(void )) os_dlsym (handle, " obs_frontend_get_user_config" );
1642- os_dlclose (handle);
1643- if (get_user_config_func)
1644- blog (LOG_INFO, " [Vertical Canvas] use user config" );
1645- }
1646- }
1647- }
1648- if (get_user_config_func)
1649- return get_user_config_func ();
1650- user_config = obs_frontend_get_global_config ();
1651- return user_config;
1652- #else
16531618 return obs_frontend_get_user_config ();
1654- #endif
16551619}
16561620
16571621void CanvasDock::DrawOverflow (float scale)
@@ -2922,12 +2886,8 @@ static bool CenterAlignSelectedItems(obs_scene_t *scene, obs_sceneitem_t *item,
29222886 vec2_set (&itemInfo.bounds , float (obs_source_get_base_width (scene_source)), float (obs_source_get_base_height (scene_source)));
29232887 itemInfo.bounds_type = boundsType;
29242888 itemInfo.bounds_alignment = OBS_ALIGN_CENTER;
2925- #if LIBOBS_API_VER < MAKE_SEMANTIC_VERSION(30, 1, 0)
2926- obs_sceneitem_set_info (item, &itemInfo);
2927- #else
29282889 itemInfo.crop_to_bounds = obs_sceneitem_get_bounds_crop (item);
29292890 obs_sceneitem_set_info2 (item, &itemInfo);
2930- #endif
29312891
29322892 UNUSED_PARAMETER (scene);
29332893 return true ;
0 commit comments