diff --git a/libobs/obs-module.h b/libobs/obs-module.h index 2bcbbf1fe..80f0a969f 100644 --- a/libobs/obs-module.h +++ b/libobs/obs-module.h @@ -77,11 +77,12 @@ MODULE_EXPORT void obs_module_free_locale(void); obs_module_lookup = obs_module_load_locale( \ obs_current_module(), \ default_locale, locale); \ + } \ + void obs_module_free_locale(void) \ + { \ + text_lookup_destroy(obs_module_lookup); \ } -#define OBS_MODULE_FREE_DEFAULT_LOCALE() \ - text_lookup_destroy(obs_module_lookup) - /** Helper function for looking up locale if default locale handler was used */ extern const char *obs_module_text(const char *lookup_string); diff --git a/plugins/image-source/image-source.c b/plugins/image-source/image-source.c index 74fac16e1..687c7043c 100644 --- a/plugins/image-source/image-source.c +++ b/plugins/image-source/image-source.c @@ -128,8 +128,3 @@ bool obs_module_load(void) obs_register_source(&image_source_info); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/linux-pulseaudio/linux-pulseaudio.c b/plugins/linux-pulseaudio/linux-pulseaudio.c index 5f334f0c5..acfd10ea0 100644 --- a/plugins/linux-pulseaudio/linux-pulseaudio.c +++ b/plugins/linux-pulseaudio/linux-pulseaudio.c @@ -28,8 +28,3 @@ bool obs_module_load(void) obs_register_source(&pulse_output_capture); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/linux-v4l2/linux-v4l2.c b/plugins/linux-v4l2/linux-v4l2.c index c6ff186c6..287e10ccf 100644 --- a/plugins/linux-v4l2/linux-v4l2.c +++ b/plugins/linux-v4l2/linux-v4l2.c @@ -26,8 +26,3 @@ bool obs_module_load(void) obs_register_source(&v4l2_input); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/linux-xcomposite/plugin-main.cpp b/plugins/linux-xcomposite/plugin-main.cpp index 8c658134a..b08e0ceb4 100644 --- a/plugins/linux-xcomposite/plugin-main.cpp +++ b/plugins/linux-xcomposite/plugin-main.cpp @@ -94,7 +94,5 @@ void obs_module_unload() { XCompcapMain::deinit(); - OBS_MODULE_FREE_DEFAULT_LOCALE(); - blog(LOG_INFO, "Xcomposite capture plugin unloaded"); } diff --git a/plugins/linux-xshm/linux-xshm.c b/plugins/linux-xshm/linux-xshm.c index b04887932..2ab0e2829 100644 --- a/plugins/linux-xshm/linux-xshm.c +++ b/plugins/linux-xshm/linux-xshm.c @@ -26,8 +26,3 @@ bool obs_module_load(void) obs_register_source(&xshm_input); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/mac-avcapture/plugin-main.c b/plugins/mac-avcapture/plugin-main.c index d0ee8d958..19ab54069 100644 --- a/plugins/mac-avcapture/plugin-main.c +++ b/plugins/mac-avcapture/plugin-main.c @@ -10,8 +10,3 @@ bool obs_module_load(void) obs_register_source(&av_capture_info); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/mac-capture/plugin-main.c b/plugins/mac-capture/plugin-main.c index 18f52ec1e..5e0450ca5 100644 --- a/plugins/mac-capture/plugin-main.c +++ b/plugins/mac-capture/plugin-main.c @@ -14,8 +14,3 @@ bool obs_module_load(void) obs_register_source(&display_capture_info); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c index 65ad7a7fc..6386e1286 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg.c @@ -12,8 +12,3 @@ bool obs_module_load(void) obs_register_encoder(&aac_encoder_info); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c index 09851da21..90d944562 100644 --- a/plugins/obs-libfdk/obs-libfdk.c +++ b/plugins/obs-libfdk/obs-libfdk.c @@ -311,8 +311,3 @@ bool obs_module_load(void) OBS_DECLARE_MODULE() OBS_MODULE_USE_DEFAULT_LOCALE("obs-libfdk", "en-US") - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/obs-outputs/obs-outputs.c b/plugins/obs-outputs/obs-outputs.c index e4c43e97d..6277c00ce 100644 --- a/plugins/obs-outputs/obs-outputs.c +++ b/plugins/obs-outputs/obs-outputs.c @@ -28,6 +28,4 @@ void obs_module_unload(void) #ifdef _WIN32 WSACleanup(); #endif - - OBS_MODULE_FREE_DEFAULT_LOCALE(); } diff --git a/plugins/obs-x264/obs-x264-plugin-main.c b/plugins/obs-x264/obs-x264-plugin-main.c index 1ee0f17d4..fbb4c2cc4 100644 --- a/plugins/obs-x264/obs-x264-plugin-main.c +++ b/plugins/obs-x264/obs-x264-plugin-main.c @@ -10,8 +10,3 @@ bool obs_module_load(void) obs_register_encoder(&obs_x264_encoder); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/rtmp-services/rtmp-services-main.c b/plugins/rtmp-services/rtmp-services-main.c index 303c9558f..9f8b79093 100644 --- a/plugins/rtmp-services/rtmp-services-main.c +++ b/plugins/rtmp-services/rtmp-services-main.c @@ -14,8 +14,3 @@ bool obs_module_load(void) obs_register_service(&rtmp_custom_service); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/win-capture/plugin-main.c b/plugins/win-capture/plugin-main.c index 86c60c811..338c93172 100644 --- a/plugins/win-capture/plugin-main.c +++ b/plugins/win-capture/plugin-main.c @@ -12,8 +12,3 @@ bool obs_module_load(void) obs_register_source(&window_capture_info); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/win-dshow/win-dshow.cpp b/plugins/win-dshow/win-dshow.cpp index 6a3d605eb..221b3f220 100644 --- a/plugins/win-dshow/win-dshow.cpp +++ b/plugins/win-dshow/win-dshow.cpp @@ -1210,8 +1210,3 @@ bool obs_module_load(void) return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -} diff --git a/plugins/win-wasapi/plugin-main.cpp b/plugins/win-wasapi/plugin-main.cpp index 5885eaab6..3f3a0f34f 100644 --- a/plugins/win-wasapi/plugin-main.cpp +++ b/plugins/win-wasapi/plugin-main.cpp @@ -12,8 +12,3 @@ bool obs_module_load(void) RegisterWASAPIOutput(); return true; } - -void obs_module_unload(void) -{ - OBS_MODULE_FREE_DEFAULT_LOCALE(); -}