Rebase fixes

plugins/image-source/obs-slideshow.c

@@ -1132,6 +1132,6 @@ struct obs_source_info slideshow_info = {
 	.media_next = ss_next_slide,
 	.media_previous = ss_previous_slide,
 	.media_get_state = ss_get_state,
-	.video_get_color_space = ss_video_get_color_space,
 	.media_get_title = ss_get_title,
+	.video_get_color_space = ss_video_get_color_space,
 };

plugins/win-capture/CMakeLists.txt

@@ -38,8 +38,6 @@ target_sources(
           compat-helpers.c
           compat-helpers.h
           compat-format-ver.h
-          custom_patch.c
-          custom_patch.h
           ../../libobs/util/windows/obfuscate.c
           ../../libobs/util/windows/obfuscate.h
           ${CMAKE_BINARY_DIR}/config/compat-config.h)

plugins/win-capture/window-capture.c

@@ -4,7 +4,6 @@
 #include <util/windows/window-helpers.h>
 #include "dc-capture.h"
 #include "compat-helpers.h"
-#include "custom_patch.h"
 #include "../../libobs/util/platform.h"
 #include "../../libobs-winrt/winrt-capture.h"
 
@@ -553,22 +552,15 @@ static void wc_tick(void *data, float seconds)
 
 		wc->check_window_timer = 0.0f;
 
-		if (wc->title && strstr(wc->title, "Projector Window")) {
-			// Special case
-			wc->window = getZoomProjector();
-		} else {
-			wc->window = (wc->method == METHOD_WGC)
+		wc->window =
+			(wc->method == METHOD_WGC)
 				? ms_find_window_top_level(INCLUDE_MINIMIZED,
-					wc->priority,
-					wc->class,
-					wc->title,
-					wc->executable)
+							   wc->priority,
+							   wc->class, wc->title,
+							   wc->executable)
 				: ms_find_window(INCLUDE_MINIMIZED,
-					wc->priority, wc->class,
-					wc->title, wc->executable);
-		}
-
-
+						 wc->priority, wc->class,
+						 wc->title, wc->executable);
 		if (!wc->window) {
 			if (wc->capture.valid)
 				dc_capture_free(&wc->capture);