UI: Add "YouTube Control Panel" dock panel

New dock panel with integrated youtube studio live control room.
This commit also modifies CI files.

UI/cmake/feature-youtube.cmake

@@ -2,8 +2,16 @@ if(YOUTUBE_CLIENTID
    AND YOUTUBE_SECRET
    AND YOUTUBE_CLIENTID_HASH MATCHES "(0|[a-fA-F0-9]+)"
    AND YOUTUBE_SECRET_HASH MATCHES "(0|[a-fA-F0-9]+)")
-  target_sources(obs-studio PRIVATE auth-youtube.cpp auth-youtube.hpp window-youtube-actions.cpp
-                                    window-youtube-actions.hpp youtube-api-wrappers.cpp youtube-api-wrappers.hpp)
+  target_sources(
+    obs-studio
+    PRIVATE auth-youtube.cpp
+            auth-youtube.hpp
+            window-dock-youtube-app.cpp
+            window-dock-youtube-app.hpp
+            window-youtube-actions.cpp
+            window-youtube-actions.hpp
+            youtube-api-wrappers.cpp
+            youtube-api-wrappers.hpp)
 
   target_enable_feature(obs-studio "YouTube API connection" YOUTUBE_ENABLED)
 else()

UI/cmake/legacy.cmake

@@ -330,8 +330,16 @@ endif()
 
 if(YOUTUBE_ENABLED)
   target_compile_definitions(obs PRIVATE YOUTUBE_ENABLED)
-  target_sources(obs PRIVATE auth-youtube.cpp auth-youtube.hpp youtube-api-wrappers.cpp youtube-api-wrappers.hpp
-                             window-youtube-actions.cpp window-youtube-actions.hpp)
+  target_sources(
+    obs
+    PRIVATE auth-youtube.cpp
+            auth-youtube.hpp
+            window-dock-youtube-app.cpp
+            window-dock-youtube-app.hpp
+            window-youtube-actions.cpp
+            window-youtube-actions.hpp
+            youtube-api-wrappers.cpp
+            youtube-api-wrappers.hpp)
 endif()
 
 if(OS_WINDOWS)

UI/data/locale/en-US.ini

@@ -1526,3 +1526,6 @@ YouTube.Errors.liveChatDisabled="Live chat is disabled on this stream."
 YouTube.Errors.liveChatEnded="Live stream has ended."
 YouTube.Errors.messageTextInvalid="The message text is not valid."
 YouTube.Errors.rateLimitExceeded="You are sending messages too quickly."
+# Browser Dock
+YouTube.DocksRemoval.Title="Clear Legacy YouTube Browser Docks"
+YouTube.DocksRemoval.Text="These browser docks will be removed as deprecated:\n\n%1\nUse \"Docks/YouTube Live Control Room\" instead."

UI/window-basic-auto-config.cpp

@@ -1050,6 +1050,13 @@ void AutoConfig::done(int result)
 		if (type == Type::Streaming)
 			SaveStreamSettings();
 		SaveSettings();
+
+#ifdef YOUTUBE_ENABLED
+		if (YouTubeAppDock::IsYTServiceSelected()) {
+			OBSBasic *main = OBSBasic::Get();
+			main->NewYouTubeAppDock();
+		}
+#endif
 	}
 }
 

UI/window-basic-main.cpp

@@ -2170,6 +2170,9 @@ void OBSBasic::OBSInit()
 
 	/* ----------------------------- */
 	/* add custom browser docks      */
+#if defined(BROWSER_AVAILABLE) && defined(YOUTUBE_ENABLED)
+	YouTubeAppDock::CleanupYouTubeUrls();
+#endif
 
 #ifdef BROWSER_AVAILABLE
 	if (cef) {
@@ -2331,6 +2334,12 @@ void OBSBasic::OBSInit()
 	UpdatePreviewProgramIndicators();
 	OnFirstLoad();
 
+#ifdef YOUTUBE_ENABLED
+	/* setup YouTube app dock */
+	if (YouTubeAppDock::IsYTServiceSelected())
+		youtubeAppDock = new YouTubeAppDock();
+#endif
+
 	if (!hideWindowOnStart)
 		activateWindow();
 
@@ -6823,9 +6832,10 @@ void OBSBasic::DisplayStreamStartError()
 }
 
 #ifdef YOUTUBE_ENABLED
-void OBSBasic::YouTubeActionDialogOk(const QString &id, const QString &key,
-				     bool autostart, bool autostop,
-				     bool start_now)
+void OBSBasic::YouTubeActionDialogOk(const QString &broadcast_id,
+				     const QString &stream_id,
+				     const QString &key, bool autostart,
+				     bool autostop, bool start_now)
 {
 	//blog(LOG_DEBUG, "Stream key: %s", QT_TO_UTF8(key));
 	obs_service_t *service_obj = GetService();
@@ -6834,8 +6844,11 @@ void OBSBasic::YouTubeActionDialogOk(const QString &id, const QString &key,
 	const std::string a_key = QT_TO_UTF8(key);
 	obs_data_set_string(settings, "key", a_key.c_str());
 
-	const std::string an_id = QT_TO_UTF8(id);
-	obs_data_set_string(settings, "stream_id", an_id.c_str());
+	const std::string b_id = QT_TO_UTF8(broadcast_id);
+	obs_data_set_string(settings, "broadcast_id", b_id.c_str());
+
+	const std::string s_id = QT_TO_UTF8(stream_id);
+	obs_data_set_string(settings, "stream_id", s_id.c_str());
 
 	obs_service_update(service_obj, settings);
 	autoStartBroadcast = autostart;
@@ -7419,6 +7432,11 @@ void OBSBasic::StreamingStart()
 
 	OnActivate();
 
+#ifdef YOUTUBE_ENABLED
+	if (YouTubeAppDock::IsYTServiceSelected())
+		youtubeAppDock->IngestionStarted();
+#endif
+
 	blog(LOG_INFO, STREAMING_START);
 }
 
@@ -7499,6 +7517,11 @@ void OBSBasic::StreamingStop(int code, QString last_error)
 
 	OnDeactivate();
 
+#ifdef YOUTUBE_ENABLED
+	if (YouTubeAppDock::IsYTServiceSelected())
+		youtubeAppDock->IngestionStopped();
+#endif
+
 	blog(LOG_INFO, STREAMING_STOP);
 
 	if (encode_error) {
@@ -8462,6 +8485,27 @@ config_t *OBSBasic::Config() const
 	return basicConfig;
 }
 
+#ifdef YOUTUBE_ENABLED
+YouTubeAppDock *OBSBasic::GetYouTubeAppDock()
+{
+	return youtubeAppDock;
+}
+
+void OBSBasic::NewYouTubeAppDock()
+{
+	if (youtubeAppDock)
+		delete youtubeAppDock;
+	youtubeAppDock = new YouTubeAppDock();
+}
+
+void OBSBasic::DeleteYouTubeAppDock()
+{
+	if (youtubeAppDock)
+		delete youtubeAppDock;
+	youtubeAppDock = nullptr;
+}
+#endif
+
 void OBSBasic::UpdateEditMenu()
 {
 	QModelIndexList items = GetAllSelectedSourceItems();

UI/window-basic-main.hpp

@@ -36,6 +36,9 @@
 #include "window-missing-files.hpp"
 #include "window-projector.hpp"
 #include "window-basic-about.hpp"
+#ifdef YOUTUBE_ENABLED
+#include "window-dock-youtube-app.hpp"
+#endif
 #include "auth-base.hpp"
 #include "log-viewer.hpp"
 #include "undo-stack-obs.hpp"
@@ -262,6 +265,9 @@ class OBSBasic : public OBSMainWindow {
 	QPointer<OBSBasicAdvAudio> advAudioWindow;
 	QPointer<OBSBasicFilters> filters;
 	QPointer<QDockWidget> statsDock;
+#ifdef YOUTUBE_ENABLED
+	QPointer<YouTubeAppDock> youtubeAppDock;
+#endif
 	QPointer<OBSAbout> about;
 	QPointer<OBSMissingFiles> missDialog;
 	QPointer<OBSLogViewer> logView;
@@ -631,7 +637,8 @@ class OBSBasic : public OBSMainWindow {
 #ifdef YOUTUBE_ENABLED
 	void YoutubeStreamCheck(const std::string &key);
 	void ShowYouTubeAutoStartWarning();
-	void YouTubeActionDialogOk(const QString &id, const QString &key,
+	void YouTubeActionDialogOk(const QString &broadcast_id,
+				   const QString &stream_id, const QString &key,
 				   bool autostart, bool autostop,
 				   bool start_now);
 #endif
@@ -1253,6 +1260,11 @@ public slots:
 				   const char *file) const override;
 
 	static void InitBrowserPanelSafeBlock();
+#ifdef YOUTUBE_ENABLED
+	void NewYouTubeAppDock();
+	void DeleteYouTubeAppDock();
+	YouTubeAppDock *GetYouTubeAppDock();
+#endif
 };
 
 class SceneRenameDelegate : public QStyledItemDelegate {

UI/window-basic-settings-stream.cpp

@@ -770,6 +770,14 @@ void OBSBasicSettings::on_connectAccount_clicked()
 	auth = OAuthStreamKey::Login(this, service);
 	if (!!auth) {
 		OnAuthConnected();
+#ifdef YOUTUBE_ENABLED
+		if (IsYouTubeService(service)) {
+			if (!main->GetYouTubeAppDock()) {
+				main->NewYouTubeAppDock();
+			}
+			main->GetYouTubeAppDock()->AccountConnected();
+		}
+#endif
 
 		ui->useStreamKeyAdv->setVisible(false);
 	}
@@ -812,6 +820,16 @@ void OBSBasicSettings::on_disconnectAccount_clicked()
 
 	ui->connectedAccountLabel->setVisible(false);
 	ui->connectedAccountText->setVisible(false);
+
+#ifdef YOUTUBE_ENABLED
+	if (IsYouTubeService(service)) {
+		if (!main->GetYouTubeAppDock()) {
+			main->NewYouTubeAppDock();
+		}
+		main->GetYouTubeAppDock()->AccountDisconnected();
+		main->GetYouTubeAppDock()->Update();
+	}
+#endif
 }
 
 void OBSBasicSettings::on_useStreamKey_clicked()

UI/window-basic-settings.cpp

@@ -48,6 +48,10 @@
 #include "window-basic-main-outputs.hpp"
 #include "window-projector.hpp"
 
+#ifdef YOUTUBE_ENABLED
+#include "youtube-api-wrappers.hpp"
+#endif
+
 #include <util/platform.h>
 #include <util/dstr.hpp>
 #include "ui-config.h"
@@ -4251,6 +4255,22 @@ void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
 			return;
 
 		SaveSettings();
+
+#ifdef YOUTUBE_ENABLED
+		std::string service = ui->service->currentText().toStdString();
+		if (IsYouTubeService(service)) {
+			if (!main->GetYouTubeAppDock()) {
+				main->NewYouTubeAppDock();
+			}
+			main->GetYouTubeAppDock()->SettingsUpdated(
+				!IsYouTubeService(service) || stream1Changed);
+		} else {
+			if (main->GetYouTubeAppDock()) {
+				main->GetYouTubeAppDock()->AccountDisconnected();
+			}
+			main->DeleteYouTubeAppDock();
+		}
+#endif
 		ClearChanged();
 	}