Cleanup

Author: CodeYan01

CMakeLists.txt

@@ -21,7 +21,7 @@ set(LINUX_MAINTAINER_EMAIL "codeyan01@gmail.com")
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/plugin-main.c)
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/source-defaults-filter.c)
 
-#   Import libobs as main plugin dependency
+# Import libobs as main plugin dependency
 find_package(libobs REQUIRED)
 include(cmake/ObsPluginHelpers.cmake)
 

src/plugin-main.c

@@ -28,9 +28,8 @@ extern struct obs_source_info source_defaults_video_info;
 extern struct obs_source_info source_defaults_audio_info;
 bool loaded = false;
 
-// obs_data_array_t *existing_sources; // so we can check if the created source is a new one
 static void source_defaults_frontend_event_cb(enum obs_frontend_event event,
-				       void *data)
+					      void *data)
 {
 	UNUSED_PARAMETER(data);
 	if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING ||
@@ -55,6 +54,5 @@ bool obs_module_load(void)
 
 void obs_module_unload()
 {
-	blog(LOG_INFO, "plugin unloaded", "");
-	// obs_data_array_release(existing_sources)
+	blog(LOG_INFO, "plugin unloaded");
 }

src/source-defaults-filter.c

@@ -39,31 +39,21 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 extern bool loaded;
 
 static const char *option_keys[] = {
-	"copy_properties",
-	"copy_filters",
-	"copy_audio_monitoring",
-	"copy_volume",
-	"copy_muted",
-	"copy_balance",
-	"copy_sync_offset",
-	"copy_audio_tracks",
+	"copy_properties",  "copy_filters",      "copy_audio_monitoring",
+	"copy_volume",      "copy_muted",        "copy_balance",
+	"copy_sync_offset", "copy_audio_tracks",
 };
 
 static const char *option_labels[] = {
-	"Properties",
-	"Filters",
-	"Audio Monitoring Type",
-	"Volume",
-	"Muted/Unmuted",
-	"Stereo Balance",
-	"Sync Offset",
-	"Audio Tracks",
+	"Properties",  "Filters",       "Audio Monitoring Type",
+	"Volume",      "Muted/Unmuted", "Stereo Balance",
+	"Sync Offset", "Audio Tracks",
 };
 
 struct source_defaults {
 	obs_source_t *source; // the filter itself
 	obs_source_t *parent_source;
-	bool options[sizeof(option_labels) / sizeof(bool)];
+	bool options[ARRAY_SIZE(option_keys)];
 };
 
 static void enum_filters(obs_source_t *src, obs_source_t *filter, void *param)
@@ -77,15 +67,14 @@ static void enum_filters(obs_source_t *src, obs_source_t *filter, void *param)
 	}
 }
 
-static void log_changes(struct source_defaults *src,
-				       obs_source_t *dst)
+static void log_changes(struct source_defaults *src, obs_source_t *dst)
 {
 	struct dstr log = {0};
 	dstr_init(&log);
 	dstr_cat(&log, "Applied ");
 
 	bool first_bool = true;
-	for (int i = 0; i < ARRAY_SIZE(option_keys); i++) {
+	for (unsigned long i = 0; i < ARRAY_SIZE(option_keys); i++) {
 		if (src->options[i]) {
 			if (first_bool) {
 				dstr_cat(&log, option_labels[i]);
@@ -96,12 +85,12 @@ static void log_changes(struct source_defaults *src,
 		}
 	}
 	if (!first_bool) {
-		dstr_catf(&log, " from '%s'", obs_source_get_name(src->parent_source));
+		dstr_catf(&log, " from '%s'",
+			  obs_source_get_name(src->parent_source));
 		dstr_catf(&log, " to '%s'", obs_source_get_name(dst));
 		blog(LOG_INFO, "%s", log.array);
 	}
 	dstr_free(&log);
-	blog(LOG_DEBUG, "%s", option_labels[3]);
 }
 
 static void source_created_cb(void *data, calldata_t *cd)
@@ -112,19 +101,24 @@ static void source_created_cb(void *data, calldata_t *cd)
 	struct source_defaults *src = data;
 	obs_source_t *dst = (obs_source_t *)calldata_ptr(cd, "source");
 	bool already_encountered;
-	blog(LOG_DEBUG, "source_created: %s", obs_source_get_name(dst));
 
 	src->parent_source = obs_filter_get_parent(src->source);
-	blog(LOG_DEBUG, "Parent: %s", obs_source_get_name(src->parent_source));
 
+	if (!src->parent_source) {
+		blog(LOG_WARNING,
+		     "Filter has no parent source, so new source was skipped.");
+		return;
+	}
+
+	// should be same type
 	if (strcmp(obs_source_get_id(src->parent_source),
 		   obs_source_get_id(dst)) != 0) {
 		return;
 	}
 	if (obs_source_get_type(dst) != OBS_SOURCE_TYPE_INPUT) {
 		return;
 	}
-	
+
 	/* We have to distinguish between new sources and 
 	   sources that are only recreated due to undo, 
 	   otherwise settings will be copied over to old sources
@@ -138,18 +132,24 @@ static void source_created_cb(void *data, calldata_t *cd)
 	already_encountered =
 		obs_data_get_bool(dst_properties, ENCOUNTERED_KEY);
 	if (!already_encountered) {
-		const char *dst_properties_json = obs_data_get_json(dst_properties);
+		const char *dst_properties_json =
+			obs_data_get_json(dst_properties);
 		already_encountered = strcmp(dst_properties_json, "{}") != 0;
-	}
-	if (!already_encountered && !src->options[COPY_PROPERTIES]) {
-		obs_data_set_bool(dst_properties, ENCOUNTERED_KEY, true);
-		obs_source_update(dst, dst_properties);
+		// If the new source has non-default settings (not "{}")
+		// consider it already encountered, but still write the
+		// ENCOUNTERED_KEY, so that if the user resets its properties
+		// to default, next callback execution will see it as already encountered.
+		if (already_encountered || !src->options[COPY_PROPERTIES]) {
+			obs_data_set_bool(dst_properties, ENCOUNTERED_KEY,
+					  true);
+			obs_source_update(dst, dst_properties);
+		}
 	}
 	obs_data_release(dst_properties);
+
 	if (already_encountered)
 		return;
 
-
 	if (src->options[COPY_PROPERTIES]) {
 		obs_data_t *settings =
 			obs_source_get_settings(src->parent_source);
@@ -160,10 +160,12 @@ static void source_created_cb(void *data, calldata_t *cd)
 		obs_source_update(dst, settings);
 		obs_data_release(settings);
 
+#ifndef NDEBUG
 		dst_properties = obs_source_get_settings(dst);
 		blog(LOG_DEBUG, "dst json2: %s",
 		     obs_data_get_json(dst_properties));
 		obs_data_release(dst_properties);
+#endif // !NDEBUG
 	}
 	if (src->options[COPY_FILTERS]) {
 		obs_source_enum_filters(src->parent_source, enum_filters, dst);
@@ -202,7 +204,7 @@ static void source_created_cb(void *data, calldata_t *cd)
 static void source_defaults_update(void *data, obs_data_t *settings)
 {
 	struct source_defaults *src = data;
-	for (int i = 0; i < ARRAY_SIZE(option_keys); i++) {
+	for (unsigned long i = 0; i < ARRAY_SIZE(option_keys); i++) {
 		src->options[i] = obs_data_get_bool(settings, option_keys[i]);
 	}
 }
@@ -222,16 +224,16 @@ static obs_properties_t *source_defaults_properties(void *data)
 		props, "description",
 		"Tick the checkboxes for those that you want to be copied to newly created sources of the same type.",
 		OBS_TEXT_INFO);
-	
+
 	for (int i = 0; i < 2; i++) {
-		obs_properties_add_bool(props, option_keys[i], option_labels[i]);
+		obs_properties_add_bool(props, option_keys[i],
+					option_labels[i]);
 	}
-	
 
 	src->parent_source = obs_filter_get_parent(src->source);
 	if (obs_source_get_output_flags(src->parent_source) &
 	    OBS_SOURCE_AUDIO) {
-		for (int i = 2; i < ARRAY_SIZE(option_keys); i++) {
+		for (unsigned long i = 2; i < ARRAY_SIZE(option_keys); i++) {
 			obs_properties_add_bool(props, option_keys[i],
 						option_labels[i]);
 		}
@@ -242,7 +244,7 @@ static obs_properties_t *source_defaults_properties(void *data)
 
 static void source_defaults_get_defaults(obs_data_t *settings)
 {
-	for (int i = 0; i < ARRAY_SIZE(option_keys); i++) {
+	for (unsigned long i = 0; i < ARRAY_SIZE(option_keys); i++) {
 		obs_data_set_default_bool(settings, option_keys[i], true);
 	}
 }
@@ -308,6 +310,9 @@ static void source_defaults_destroy(void *data)
 	bfree(data);
 }
 
+/* OBS doesn't allow creating a filter that will show up for both 
+	video and audio filters, so we define two. */
+
 struct obs_source_info source_defaults_video_info = {
 	.id = "source_defaults_video",
 	.version = 1,
@@ -319,7 +324,6 @@ struct obs_source_info source_defaults_video_info = {
 	.get_name = source_defaults_get_name,
 	.get_defaults = source_defaults_get_defaults,
 	.get_properties = source_defaults_properties,
-	.icon_type = OBS_ICON_TYPE_UNKNOWN,
 };
 
 struct obs_source_info source_defaults_audio_info = {
@@ -333,5 +337,4 @@ struct obs_source_info source_defaults_audio_info = {
 	.get_name = source_defaults_get_name,
 	.get_defaults = source_defaults_get_defaults,
 	.get_properties = source_defaults_properties,
-	.icon_type = OBS_ICON_TYPE_UNKNOWN,
 };