diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a79268..ef94ca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12..4.0) -project(move-transition VERSION 2.5.5) +project(move-transition VERSION 2.5.6) set(PROJECT_FULL_NAME "Move Transition") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h) diff --git a/move-source-filter.c b/move-source-filter.c index c42ef68..afef3b1 100644 --- a/move-source-filter.c +++ b/move-source-filter.c @@ -963,15 +963,6 @@ void move_source_source_rename(void *data, calldata_t *call_data) obs_data_release(settings); } -static void move_source_frontend_event(enum obs_frontend_event event, - void *private_data) -{ - if (event == OBS_FRONTEND_EVENT_SCENE_CHANGED) { - int i = 0; - } else if (event == OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED) { - int i = 0; - } -} static void *move_source_create(obs_data_t *settings, obs_source_t *source) { @@ -983,16 +974,12 @@ static void *move_source_create(obs_data_t *settings, obs_source_t *source) signal_handler_connect(obs_get_signal_handler(), "source_rename", move_source_source_rename, move_source); - obs_frontend_add_event_callback(move_source_frontend_event, - move_source); return move_source; } static void move_source_destroy(void *data) { struct move_source_info *move_source = data; - obs_frontend_remove_event_callback(move_source_frontend_event, - move_source); signal_handler_disconnect(obs_get_signal_handler(), "source_rename", move_source_source_rename, move_source); diff --git a/move-value-filter.c b/move-value-filter.c index 1a67b72..a8d4e6b 100644 --- a/move-value-filter.c +++ b/move-value-filter.c @@ -402,6 +402,7 @@ void move_value_start(struct move_value_info *move_value) move_value_start(filter_data); } } + obs_source_release(filter); } } } @@ -1639,6 +1640,8 @@ void move_value_tick(void *data, float seconds) obs_source_t *source = move_value->filter ? move_value->filter : obs_filter_get_parent(move_value->source); + if (!source) + return; obs_data_t *ss = obs_source_get_settings(source); if (move_value->settings) { const size_t count = obs_data_array_count(move_value->settings); @@ -1865,6 +1868,7 @@ void move_value_tick(void *data, float seconds) filter); move_value_start(filter_data); } + obs_source_release(filter); } } } else if (move_value->next_move_on == NEXT_MOVE_ON_HOTKEY &&