frontend: replace Auth with YoutubeApiWrappers for YouTube callers

Author: xakep8

frontend/dialogs/OBSYoutubeActions.cpp

@@ -17,11 +17,11 @@ const QString SchedulDateAndTimeFormat = "yyyy-MM-dd'T'hh:mm:ss'Z'";
 const QString RepresentSchedulDateAndTimeFormat = "dddd, MMMM d, yyyy h:m";
 const QString IndexOfGamingCategory = "20";
 
-OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcastReady)
+OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, YoutubeApiWrappers &apiYouTube, bool broadcastReady)
 	: QDialog(parent),
 	  ui(new Ui::OBSYoutubeActions),
-	  apiYouTube(dynamic_cast<YoutubeApiWrappers *>(auth)),
-	  workerThread(new WorkerThread(apiYouTube)),
+	  apiYouTube(&apiYouTube),
+	  workerThread(new WorkerThread(&apiYouTube)),
 	  broadcastReady(broadcastReady)
 {
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
@@ -122,12 +122,6 @@ OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcast
 	connect(ui->selectFileButton, &QPushButton::clicked, this, thumbSelectionHandler);
 	connect(ui->thumbnailPreview, &ClickableLabel::clicked, this, thumbSelectionHandler);
 
-	if (!apiYouTube) {
-		blog(LOG_DEBUG, "YouTube API auth NOT found.");
-		Cancel();
-		return;
-	}
-
 	const char *name = config_get_string(OBSBasic::Get()->Config(), "YouTube", "ChannelName");
 	this->setWindowTitle(QTStr("YouTube.Actions.WindowTitle").arg(name));
 

frontend/dialogs/OBSYoutubeActions.hpp

@@ -47,7 +47,7 @@ class OBSYoutubeActions : public QDialog {
 	void ShowErrorDialog(QWidget *parent, QString text);
 
 public:
-	explicit OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcastReady);
+	explicit OBSYoutubeActions(QWidget *parent, YoutubeApiWrappers &apiYouTube, bool broadcastReady);
 	virtual ~OBSYoutubeActions() override;
 
 	bool Valid() { return valid; };

frontend/settings/OBSBasicSettings_Stream.cpp

@@ -787,7 +787,7 @@ OBSService OBSBasicSettings::SpawnTempService()
 
 void OBSBasicSettings::OnOAuthStreamKeyConnected()
 {
-	OAuthStreamKey *a = reinterpret_cast<OAuthStreamKey *>(auth.get());
+	OAuthStreamKey *a = dynamic_cast<OAuthStreamKey *>(auth.get());
 
 	if (a) {
 		bool validKey = !a->key().empty();

frontend/widgets/OBSBasic.hpp

@@ -60,6 +60,7 @@ class OBSProjector;
 class VolumeControl;
 #ifdef YOUTUBE_ENABLED
 class YouTubeAppDock;
+class YoutubeApiWrappers;
 #endif
 class QMessageBox;
 class QWidgetAction;
@@ -1667,7 +1668,7 @@ private slots:
 	QPointer<YouTubeAppDock> youtubeAppDock;
 	uint64_t lastYouTubeAppDockCreationTime = 0;
 
-	void YoutubeStreamCheck(const std::string &key);
+	void YoutubeStreamCheck(YoutubeApiWrappers *apiYouTube, const std::string &key);
 	void ShowYouTubeAutoStartWarning();
 	void YouTubeActionDialogOk(const std::string &broadcastId, const std::string &streamId, const std::string &key,
 				   bool autostart, bool autostop, bool startNow);

frontend/widgets/OBSBasic_Streaming.cpp

@@ -244,8 +244,10 @@ void OBSBasic::StreamingStart()
 		obs_service_t *service_obj = GetService();
 		OBSDataAutoRelease settings = obs_service_get_settings(service_obj);
 		std::string key = obs_data_get_string(settings, "stream_id");
-		if (!key.empty() && !youtubeStreamCheckThread) {
-			youtubeStreamCheckThread = CreateQThread([this, key] { YoutubeStreamCheck(key); });
+		YoutubeApiWrappers *apiYouTube = dynamic_cast<YoutubeApiWrappers *>(GetAuth());
+		if (apiYouTube && !key.empty() && !youtubeStreamCheckThread) {
+			youtubeStreamCheckThread =
+				CreateQThread([this, apiYouTube, key] { YoutubeStreamCheck(apiYouTube, key); });
 			youtubeStreamCheckThread->setObjectName("YouTubeStreamCheckThread");
 			youtubeStreamCheckThread->start();
 		}

frontend/widgets/OBSBasic_YouTube.cpp

@@ -53,9 +53,8 @@ void OBSBasic::YouTubeActionDialogOk(const std::string &broadcastId, const std::
 		QMetaObject::invokeMethod(this, "StartStreaming");
 }
 
-void OBSBasic::YoutubeStreamCheck(const std::string &key)
+void OBSBasic::YoutubeStreamCheck(YoutubeApiWrappers *apiYouTube, const std::string &key)
 {
-	YoutubeApiWrappers *apiYouTube(dynamic_cast<YoutubeApiWrappers *>(GetAuth()));
 	if (!apiYouTube) {
 		/* technically we should never get here -Lain */
 		QMetaObject::invokeMethod(this, "ForceStopStreaming", Qt::QueuedConnection);
@@ -196,8 +195,9 @@ void OBSBasic::SetupBroadcast()
 {
 #ifdef YOUTUBE_ENABLED
 	Auth *const auth = GetAuth();
-	if (IsYouTubeService(auth->service())) {
-		OBSYoutubeActions dialog(this, auth, broadcastReady);
+	YoutubeApiWrappers *apiYouTube = dynamic_cast<YoutubeApiWrappers *>(auth);
+	if (apiYouTube) {
+		OBSYoutubeActions dialog(this, *apiYouTube, broadcastReady);
 		connect(&dialog, &OBSYoutubeActions::ok, this, &OBSBasic::YouTubeActionDialogOk);
 		dialog.exec();
 	}

frontend/wizards/AutoConfigStreamPage.cpp

@@ -255,7 +255,7 @@ void AutoConfigStreamPage::on_show_clicked()
 
 void AutoConfigStreamPage::OnOAuthStreamKeyConnected()
 {
-	OAuthStreamKey *a = reinterpret_cast<OAuthStreamKey *>(auth.get());
+	OAuthStreamKey *a = dynamic_cast<OAuthStreamKey *>(auth.get());
 
 	if (a) {
 		bool validKey = !a->key().empty();
@@ -281,16 +281,17 @@ void AutoConfigStreamPage::OnOAuthStreamKeyConnected()
 
 			ui->connectedAccountText->setText(QTStr("Auth.LoadingChannel.Title"));
 
-			YoutubeApiWrappers *ytAuth = reinterpret_cast<YoutubeApiWrappers *>(a);
-			ChannelDescription cd;
-			if (ytAuth->GetChannelDescription(cd)) {
-				ui->connectedAccountText->setText(cd.title);
-
-				/* Create throwaway stream key for bandwidth test */
-				if (ui->doBandwidthTest->isChecked()) {
-					StreamDescription stream = {"", "", "OBS Studio Test Stream"};
-					if (ytAuth->InsertStream(stream)) {
-						ui->key->setText(stream.name);
+			if (YoutubeApiWrappers *ytAuth = dynamic_cast<YoutubeApiWrappers *>(a)) {
+				ChannelDescription cd;
+				if (ytAuth->GetChannelDescription(cd)) {
+					ui->connectedAccountText->setText(cd.title);
+
+					/* Create throwaway stream key for bandwidth test */
+					if (ui->doBandwidthTest->isChecked()) {
+						StreamDescription stream = {"", "", "OBS Studio Test Stream"};
+						if (ytAuth->InsertStream(stream)) {
+							ui->key->setText(stream.name);
+						}
 					}
 				}
 			}
@@ -395,7 +396,7 @@ void AutoConfigStreamPage::reset_service_ui_fields(std::string &service)
 {
 #ifdef YOUTUBE_ENABLED
 	// when account is already connected:
-	OAuthStreamKey *a = reinterpret_cast<OAuthStreamKey *>(auth.get());
+	OAuthStreamKey *a = dynamic_cast<OAuthStreamKey *>(auth.get());
 	if (a && service == a->service() && IsYouTubeService(a->service())) {
 		ui->connectedAccountLabel->setVisible(true);
 		ui->connectedAccountText->setVisible(true);