Request 4565 (accepted)

Overview

Request 4565 (accepted)

- Update to version 24.0.1:
* obs-browser: Fix a deadlock
* libobs: Update version to 24.0.1
* libobs: Add API to get last OBS version of a source
* obs-browser: Signal whether audio active/inactive
* UI: Hide mixer sources if audio deactivated
* libobs: Add funcs to determine whether audio active
* obs-browser: Turn rerouting audio off by default
* UI: Check for null pointer
* UI: Fix crash closing mixer dock panels
* win-dshow: Do not allow H264 to have same priority as MJPEG
* win-dshow: Disable HW decode in DirectShow for now
* UI: Adjust locale name for zh-TW

Created by boombatower over 4 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

Submit package home:boombatow...es:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-24.0.0.tar.xz/UI/auth-mixer.cpp -> obs-studio-24.0.1.tar.xz/UI/auth-mixer.cpp Changed

obs-studio-24.0.0.tar.xz/UI/data/locale.ini -> obs-studio-24.0.1.tar.xz/UI/data/locale.ini Changed

obs-studio-24.0.0.tar.xz/UI/window-basic-main.cpp -> obs-studio-24.0.1.tar.xz/UI/window-basic-main.cpp Changed

@@ -1411,6 +1411,12 @@
 	signalHandlers.emplace_back(obs_get_signal_handler(),
 				    "source_deactivate",
 				    OBSBasic::SourceDeactivated, this);
+	signalHandlers.emplace_back(obs_get_signal_handler(),
+				    "source_audio_activate",
+				    OBSBasic::SourceAudioActivated, this);
+	signalHandlers.emplace_back(obs_get_signal_handler(),
+				    "source_audio_deactivate",
+				    OBSBasic::SourceAudioDeactivated, this);
 	signalHandlers.emplace_back(obs_get_signal_handler(), "source_rename",
 				    OBSBasic::SourceRenamed, this);
 }
@@ -2961,6 +2967,8 @@
 {
 	if (SourceMixerHidden(source))
 		return;
+	if (!obs_source_audio_active(source))
+		return;
 
 	bool vertical = config_get_bool(GetGlobalConfig(), "BasicWindow",
 					"VerticalVolControl");
@@ -3282,6 +3290,24 @@
 					  Q_ARG(OBSSource, OBSSource(source)));
 }
 
+void OBSBasic::SourceAudioActivated(void *data, calldata_t *params)
+{
+	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
+
+	if (obs_source_active(source))
+		QMetaObject::invokeMethod(static_cast<OBSBasic *>(data),
+					  "ActivateAudioSource",
+					  Q_ARG(OBSSource, OBSSource(source)));
+}
+
+void OBSBasic::SourceAudioDeactivated(void *data, calldata_t *params)
+{
+	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
+	QMetaObject::invokeMethod(static_cast<OBSBasic *>(data),
+				  "DeactivateAudioSource",
+				  Q_ARG(OBSSource, OBSSource(source)));
+}
+
 void OBSBasic::SourceRenamed(void *data, calldata_t *params)
 {
 	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");

obs-studio-24.0.0.tar.xz/UI/window-basic-main.hpp -> obs-studio-24.0.1.tar.xz/UI/window-basic-main.hpp Changed

obs-studio-24.0.0.tar.xz/UI/window-dock-browser.cpp -> obs-studio-24.0.1.tar.xz/UI/window-dock-browser.cpp Changed

obs-studio-24.0.0.tar.xz/libobs/obs-config.h -> obs-studio-24.0.1.tar.xz/libobs/obs-config.h Changed

obs-studio-24.0.0.tar.xz/libobs/obs-internal.h -> obs-studio-24.0.1.tar.xz/libobs/obs-internal.h Changed

obs-studio-24.0.0.tar.xz/libobs/obs-source.c -> obs-studio-24.0.1.tar.xz/libobs/obs-source.c Changed

@@ -72,6 +72,8 @@
 	"void update_flags(ptr source, int flags)",
 	"void audio_sync(ptr source, int out int offset)",
 	"void audio_mixers(ptr source, in out int mixers)",
+	"void audio_activate(ptr source)",
+	"void audio_deactivate(ptr source)",
 	"void filter_add(ptr source, ptr filter)",
 	"void filter_remove(ptr source, ptr filter)",
 	"void reorder_filters(ptr source)",
@@ -152,6 +154,7 @@
 	source->volume = 1.0f;
 	source->sync_offset = 0;
 	source->balance = 0.5f;
+	source->audio_active = true;
 	pthread_mutex_init_value(&source->filter_mutex);
 	pthread_mutex_init_value(&source->async_mutex);
 	pthread_mutex_init_value(&source->audio_mutex);
@@ -304,11 +307,10 @@
 		obs_source_hotkey_push_to_talk, source);
 }
 
-static obs_source_t *obs_source_create_internal(const char *id,
-						const char *name,
-						obs_data_t *settings,
-						obs_data_t *hotkey_data,
-						bool private)
+static obs_source_t *
+obs_source_create_internal(const char *id, const char *name,
+			   obs_data_t *settings, obs_data_t *hotkey_data,
+			   bool private, uint32_t last_obs_ver)
 {
 	struct obs_source *source = bzalloc(sizeof(struct obs_source));
 
@@ -333,6 +335,7 @@
 	source->mute_unmute_key = OBS_INVALID_HOTKEY_PAIR_ID;
 	source->push_to_mute_key = OBS_INVALID_HOTKEY_ID;
 	source->push_to_talk_key = OBS_INVALID_HOTKEY_ID;
+	source->last_obs_ver = last_obs_ver;
 
 	if (!obs_source_init_context(source, settings, name, hotkey_data,
 				     private))
@@ -385,13 +388,23 @@
 				obs_data_t *settings, obs_data_t *hotkey_data)
 {
 	return obs_source_create_internal(id, name, settings, hotkey_data,
-					  false);
+					  false, LIBOBS_API_VER);
 }
 
 obs_source_t *obs_source_create_private(const char *id, const char *name,
 					obs_data_t *settings)
 {
-	return obs_source_create_internal(id, name, settings, NULL, true);
+	return obs_source_create_internal(id, name, settings, NULL, true,
+					  LIBOBS_API_VER);
+}
+
+obs_source_t *obs_source_create_set_last_ver(const char *id, const char *name,
+					     obs_data_t *settings,
+					     obs_data_t *hotkey_data,
+					     uint32_t last_obs_ver)
+{
+	return obs_source_create_internal(id, name, settings, hotkey_data,
+					  false, last_obs_ver);
 }
 
 static char *get_new_filter_name(obs_source_t *dst, const char *name)
@@ -4669,3 +4682,33 @@
 		       ? source->balance
 		       : 0.5f;
 }
+
+void obs_source_set_audio_active(obs_source_t *source, bool active)
+{
+	if (!obs_source_valid(source, "obs_source_set_audio_active"))
+		return;
+
+	if (os_atomic_set_bool(&source->audio_active, active) == active)
+		return;
+
+	if (active)
+		obs_source_dosignal(source, "source_audio_activate",
+				    "audio_activate");
+	else
+		obs_source_dosignal(source, "source_audio_deactivate",
+				    "audio_deactivate");
+}
+
+bool obs_source_audio_active(const obs_source_t *source)
+{
+	return obs_source_valid(source, "obs_source_audio_active")
+		       ? os_atomic_load_bool(&source->audio_active)
+		       : false;
+}
+
+uint32_t obs_source_get_last_obs_version(const obs_source_t *source)
+{
+	return obs_source_valid(source, "obs_source_get_last_obs_version")
+		       ? source->last_obs_ver
+		       : 0;
+}

obs-studio-24.0.0.tar.xz/libobs/obs.c -> obs-studio-24.0.1.tar.xz/libobs/obs.c Changed

obs-studio-24.0.0.tar.xz/libobs/obs.h -> obs-studio-24.0.1.tar.xz/libobs/obs.h Changed

obs-studio-24.0.0.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-24.0.1.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-24.0.0.tar.xz/plugins/obs-browser/data/locale/en-US.ini -> obs-studio-24.0.1.tar.xz/plugins/obs-browser/data/locale/en-US.ini Changed

obs-studio-24.0.0.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp -> obs-studio-24.0.1.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Changed

obs-studio-24.0.0.tar.xz/plugins/obs-browser/obs-browser-source.cpp -> obs-studio-24.0.1.tar.xz/plugins/obs-browser/obs-browser-source.cpp Changed

obs-studio-24.0.0.tar.xz/plugins/obs-browser/panel/browser-panel.cpp -> obs-studio-24.0.1.tar.xz/plugins/obs-browser/panel/browser-panel.cpp Changed

obs-studio-24.0.0.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-24.0.1.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

obs-studio-24.0.0.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp -> obs-studio-24.0.1.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp Changed

obs-studio-24.0.0.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp -> obs-studio-24.0.1.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp Changed

Build Results
RPM Lint

Refresh

Comments for request 4565 0

Request History

boombatower created request over 4 years ago

boombatower accepted request over 4 years ago