Packman Build Service PMBS

obs-studio.changes Changed

@@ -1,4 +1,33 @@
 -------------------------------------------------------------------
+Fri Nov 01 23:28:55 UTC 2024 - packman@nordisch.org
+
+- Update to version 31.0.0~beta3:
+  * obs-websocket: Update version to 5.5.4
+  * UI: Add trash and general icon
+  * UI: Add trash icon
+  * UI/themes: Fix missing icon in system theme
+  * UI/themes: Fix control button pressed color in Rachni theme
+  * graphics-hook: Fix null pointer dereference
+  * UI: Update profile encoder information after module load
+  * UI: Open active profile directory via File menu
+  * librtmp: Use /etc/ssl/certs/ path on FreeBSD
+  * UI/importers: Translate capture sources depending on WS
+  * UI: Add TikTok Live Studio Virtual Camera to DLL blocklist
+  * UI: Restore frontend API events being dispatched during initialization
+  * UI: Remove LineEditAutoResize widget
+  * UI: Remove SendChatMessage from YoutubeApiWrappers
+  * UI: Remove custom YouTube chat input
+  * linux-pipewire: Fix memory leaks
+  * cmake: Install desktop files and icons on FreeBSD
+  * cmake/plugins: Enable -Wswitch on GCC
+  * UI: Split out Whats New dialog, fix crash on shutdown
+  * cmake: Fix target_add_resource ARGN support on Linux
+  * UI: Log Twitch 403 error bodies
+  * UI: Don't load Restream UI before CEF is ready
+  * CI: Enable WebRTC on FreeBSD
+  * build-aux: Remove CEF stripping workaround
+
+-------------------------------------------------------------------
 Mon Oct 21 19:14:48 UTC 2024 - packman@nordisch.org
 
 - Update to version 31.0.0~beta2:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-31.0.0~beta2.tar.xz/UI/lineedit-autoresize.cpp Deleted

@@ -1,92 +0,0 @@
-#include "moc_lineedit-autoresize.cpp"
-
-LineEditAutoResize::LineEditAutoResize() : m_maxLength(32767)
-{
-	connect(this, &LineEditAutoResize::textChanged, this, &LineEditAutoResize::checkTextLength);
-	connect(document()->documentLayout(), &QAbstractTextDocumentLayout::documentSizeChanged, this,
-		&LineEditAutoResize::resizeVertically);
-}
-
-void LineEditAutoResize::checkTextLength()
-{
-	QString text = toPlainText();
-	if (text.length() > m_maxLength) {
-		setPlainText(text.left(m_maxLength));
-		QTextCursor cursor = textCursor();
-		cursor.setPosition(m_maxLength);
-		setTextCursor(cursor);
-	}
-}
-
-int LineEditAutoResize::maxLength()
-{
-	return m_maxLength;
-}
-
-void LineEditAutoResize::setMaxLength(int length)
-{
-	m_maxLength = length;
-}
-
-void LineEditAutoResize::keyPressEvent(QKeyEvent *event)
-{
-	/* Always allow events with modifiers, for example to Copy content */
-	Qt::KeyboardModifiers modifiers = event->modifiers();
-	if (modifiers != Qt::NoModifier && modifiers != Qt::ShiftModifier) {
-		QTextEdit::keyPressEvent(event);
-		return;
-	}
-
-	switch (event->key()) {
-	/* Always ignore the return key and send the signal instead */
-	case Qt::Key_Return:
-		event->ignore();
-		emit returnPressed();
-		break;
-	/* Always allow navigation and deletion */
-	case Qt::Key_Left:
-	case Qt::Key_Right:
-	case Qt::Key_Up:
-	case Qt::Key_Down:
-	case Qt::Key_PageUp:
-	case Qt::Key_PageDown:
-	case Qt::Key_Delete:
-	case Qt::Key_Backspace:
-		QTextEdit::keyPressEvent(event);
-		break;
-	/* Allow only if the content is not already at max length.
-	 * Some keys with modifiers should still be allowed though
-	 * (for example for Copy), and we don't want to make assumptions
-	 * about which modifiers are okay and which aren't, so let's
-	 * allow all. Actions that will still exceed the limit (like
-	 * Paste) can be caught in a later step. */
-	default:
-		if (toPlainText().length() >= m_maxLength && event->modifiers() == Qt::NoModifier &&
-		    !textCursor().hasSelection())
-			event->ignore();
-		else
-			QTextEdit::keyPressEvent(event);
-		break;
-	}
-}
-
-void LineEditAutoResize::resizeVertically(const QSizeF &newSize)
-{
-	QMargins margins = contentsMargins();
-	setMaximumHeight(newSize.height() + margins.top() + margins.bottom());
-}
-
-QString LineEditAutoResize::text()
-{
-	return toPlainText();
-}
-
-void LineEditAutoResize::setText(const QString &text)
-{
-	QMetaObject::invokeMethod(this, "SetPlainText", Qt::QueuedConnection, Q_ARG(const QString &, text));
-}
-
-void LineEditAutoResize::SetPlainText(const QString &text)
-{
-	setPlainText(text);
-}

obs-studio-31.0.0~beta2.tar.xz/UI/lineedit-autoresize.hpp Deleted

obs-studio-31.0.0~beta2.tar.xz/.cirrus.yml -> obs-studio-31.0.0~beta3.tar.xz/.cirrus.yml Changed

obs-studio-31.0.0~beta2.tar.xz/UI/auth-restream.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/auth-restream.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/UI/auth-twitch.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/auth-twitch.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/UI/auth-youtube.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/auth-youtube.cpp Changed

@@ -169,18 +169,16 @@
 	uiLoaded = true;
 }
 
-void YoutubeAuth::SetChatId(const QString &chat_id, const std::string &api_chat_id)
+void YoutubeAuth::SetChatId(const QString &chat_id)
 {
 #ifdef BROWSER_AVAILABLE
 	QString chat_url = QString(YOUTUBE_CHAT_POPOUT_URL).arg(chat_id);
 
 	if (chat && chat->cefWidget) {
 		chat->cefWidget->setURL(chat_url.toStdString());
-		chat->SetApiChatId(api_chat_id);
 	}
 #else
 	UNUSED_PARAMETER(chat_id);
-	UNUSED_PARAMETER(api_chat_id);
 #endif
 }
 
@@ -188,7 +186,6 @@
 {
 #ifdef BROWSER_AVAILABLE
 	if (chat && chat->cefWidget) {
-		chat->SetApiChatId("");
 		chat->cefWidget->setURL(YOUTUBE_CHAT_PLACEHOLDER_URL);
 	}
 #endif
@@ -323,46 +320,6 @@
 }
 
 #ifdef BROWSER_AVAILABLE
-YoutubeChatDock::YoutubeChatDock(const QString &title) : BrowserDock(title)
-{
-	lineEdit = new LineEditAutoResize();
-	lineEdit->setVisible(false);
-	lineEdit->setMaxLength(200);
-	lineEdit->setPlaceholderText(QTStr("YouTube.Chat.Input.Placeholder"));
-	sendButton = new QPushButton(QTStr("YouTube.Chat.Input.Send"));
-	sendButton->setVisible(false);
-
-	chatLayout = new QHBoxLayout();
-	chatLayout->setContentsMargins(0, 0, 0, 0);
-	chatLayout->addWidget(lineEdit, 1);
-	chatLayout->addWidget(sendButton);
-
-	QWidget::connect(lineEdit, &LineEditAutoResize::returnPressed, this, &YoutubeChatDock::SendChatMessage);
-	QWidget::connect(sendButton, &QPushButton::pressed, this, &YoutubeChatDock::SendChatMessage);
-}
-
-void YoutubeChatDock::SetWidget(QCefWidget *widget_)
-{
-	QVBoxLayout *layout = new QVBoxLayout();
-	layout->setContentsMargins(0, 0, 0, 0);
-	layout->addWidget(widget_, 1);
-	layout->addLayout(chatLayout);
-
-	QWidget *widget = new QWidget();
-	widget->setLayout(layout);
-	setWidget(widget);
-
-	cefWidget.reset(widget_);
-
-	QWidget::connect(cefWidget.get(), &QCefWidget::urlChanged, this, &YoutubeChatDock::YoutubeCookieCheck);
-}
-
-void YoutubeChatDock::SetApiChatId(const std::string &id)
-{
-	this->apiChatId = id;
-	QMetaObject::invokeMethod(this, "EnableChatInput", Qt::QueuedConnection, Q_ARG(bool, !id.empty()));
-}
-
 void YoutubeChatDock::YoutubeCookieCheck()
 {
 	QPointer<YoutubeChatDock> this_ = this;
@@ -372,8 +329,6 @@
 		bool loginStateChanged = (currentlyLoggedIn && !previouslyLoggedIn) ||
 					 (!currentlyLoggedIn && previouslyLoggedIn);
 		if (loginStateChanged) {
-			QMetaObject::invokeMethod(this_, "EnableChatInput", Qt::QueuedConnection,
-						 Q_ARG(bool, !currentlyLoggedIn));
 			OBSBasic *main = OBSBasic::Get();
 			if (main->GetYouTubeAppDock() != nullptr) {
 				QMetaObject::invokeMethod(main->GetYouTubeAppDock(), "SettingsUpdated",
@@ -385,40 +340,4 @@
 		panel_cookies->CheckForCookie("https://www.youtube.com", "SID", cb);
 	}
 }
-
-void YoutubeChatDock::SendChatMessage()
-{
-	const QString message = lineEdit->text();
-	if (message == "")
-		return;
-
-	OBSBasic *main = OBSBasic::Get();
-	YoutubeApiWrappers *apiYouTube(dynamic_cast<YoutubeApiWrappers *>(main->GetAuth()));
-
-	ExecuteFuncSafeBlock(&() {
-		lineEdit->setText("");
-		lineEdit->setPlaceholderText(QTStr("YouTube.Chat.Input.Sending"));
-		if (apiYouTube->SendChatMessage(apiChatId, message)) {
-			os_sleep_ms(3000);
-		} else {
-			QString error = apiYouTube->GetLastError();
-			apiYouTube->GetTranslatedError(error);
-			QMetaObject::invokeMethod(this, "ShowErrorMessage", Qt::QueuedConnection,
-						 Q_ARG(const QString &, error));
-		}
-		lineEdit->setPlaceholderText(QTStr("YouTube.Chat.Input.Placeholder"));
-	});
-}
-
-void YoutubeChatDock::ShowErrorMessage(const QString &error)
-{
-	QMessageBox::warning(this, QTStr("YouTube.Chat.Error.Title"), QTStr("YouTube.Chat.Error.Text").arg(error));
-}
-
-void YoutubeChatDock::EnableChatInput(bool visible)
-{
-	bool setVisible = visible && !isLoggedIn;
-	lineEdit->setVisible(setVisible);
-	sendButton->setVisible(setVisible);
-}
 #endif

obs-studio-31.0.0~beta2.tar.xz/UI/auth-youtube.hpp -> obs-studio-31.0.0~beta3.tar.xz/UI/auth-youtube.hpp Changed

@@ -9,28 +9,23 @@
 
 #ifdef BROWSER_AVAILABLE
 #include "window-dock-browser.hpp"
-#include "lineedit-autoresize.hpp"
 #include <QHBoxLayout>
 class YoutubeChatDock : public BrowserDock {
 	Q_OBJECT
 
 private:
-	std::string apiChatId;
 	bool isLoggedIn;
-	LineEditAutoResize *lineEdit;
-	QPushButton *sendButton;
-	QHBoxLayout *chatLayout;
 
 public:
-	YoutubeChatDock(const QString &title);
-	void SetWidget(QCefWidget *widget_);
-	void SetApiChatId(const std::string &id);
+	YoutubeChatDock(const QString &title) : BrowserDock(title) {}
 
+	inline void SetWidget(QCefWidget *widget_)
+	{
+		BrowserDock::SetWidget(widget_);
+		QWidget::connect(cefWidget.get(), &QCefWidget::urlChanged, this, &YoutubeChatDock::YoutubeCookieCheck);
+	}
 private slots:
 	void YoutubeCookieCheck();
-	void SendChatMessage();
-	void ShowErrorMessage(const QString &error);
-	void EnableChatInput(bool visible);
 };
 #endif
 
@@ -59,7 +54,7 @@
 	YoutubeAuth(const Def &d);
 	~YoutubeAuth();
 
-	void SetChatId(const QString &chat_id, const std::string &api_chat_id);
+	void SetChatId(const QString &chat_id);
 	void ResetChat();
 	void ReloadChat();

obs-studio-31.0.0~beta2.tar.xz/UI/cmake/os-freebsd.cmake -> obs-studio-31.0.0~beta3.tar.xz/UI/cmake/os-freebsd.cmake Changed

@@ -9,3 +9,36 @@
   target_link_libraries(obs-studio PRIVATE Python::Python)
   target_link_options(obs-studio PRIVATE LINKER:-no-as-needed)
 endif()
+
+configure_file(cmake/linux/com.obsproject.Studio.metainfo.xml.in com.obsproject.Studio.metainfo.xml)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/com.obsproject.Studio.metainfo.xml"
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
+)
+
+install(FILES cmake/linux/com.obsproject.Studio.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+
+install(
+  FILES cmake/linux/icons/obs-logo-128.png
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps"
+  RENAME com.obsproject.Studio.png
+)
+
+install(
+  FILES cmake/linux/icons/obs-logo-256.png
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps"
+  RENAME com.obsproject.Studio.png
+)
+
+install(
+  FILES cmake/linux/icons/obs-logo-512.png
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps"
+  RENAME com.obsproject.Studio.png
+)
+
+install(
+  FILES cmake/linux/icons/obs-logo-scalable.svg
+  DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
+  RENAME com.obsproject.Studio.svg
+)

obs-studio-31.0.0~beta2.tar.xz/UI/cmake/ui-elements.cmake -> obs-studio-31.0.0~beta3.tar.xz/UI/cmake/ui-elements.cmake Changed

obs-studio-31.0.0~beta2.tar.xz/UI/cmake/ui-windows.cmake -> obs-studio-31.0.0~beta3.tar.xz/UI/cmake/ui-windows.cmake Changed

obs-studio-31.0.0~beta2.tar.xz/UI/data/locale/en-US.ini -> obs-studio-31.0.0~beta3.tar.xz/UI/data/locale/en-US.ini Changed

@@ -1551,23 +1551,12 @@
 YouTube.Actions.AutoStartStreamingWarning="Auto-start is disabled for this event, click \"Go Live\" to start your broadcast."
 YouTube.Actions.AutoStopStreamingWarning="You will not be able to reconnect. Your stream will stop and you will no longer be live."
 
-YouTube.Chat.Input.Send="Send"
-YouTube.Chat.Input.Placeholder="Enter message here..."
-YouTube.Chat.Input.Sending="Sending..."
-YouTube.Chat.Error.Title="Error while sending message"
-YouTube.Chat.Error.Text="The message couldn't be sent: %1"
-
 # YouTube API errors in format "YouTube.Errors.<error reason>"
 YouTube.Errors.liveStreamingNotEnabled="Live streaming is not enabled on the selected YouTube channel. See <a href='https://www.youtube.com/features'>youtube.com/features</a> for more information."
 YouTube.Errors.livePermissionBlocked="Live streaming is unavailable on the selected YouTube Channel. Please note that it may take up to 24 hours for live streaming to become available after enabling it in your channel settings. See <a href='https://www.youtube.com/features'>youtube.com/features</a> for details."
 YouTube.Errors.errorExecutingTransition="Transition failed due to a backend error. Please try again in a few seconds."
 YouTube.Errors.errorStreamInactive="YouTube is not receiving data for your stream. Please check your configuration and try again."
 YouTube.Errors.invalidTransition="The attempted transition was invalid. This may be due to the stream not having finished a previous transition. Please wait a few seconds and try again."
-# Chat errors
-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."

obs-studio-31.0.0~beta2.tar.xz/UI/data/themes/System.obt -> obs-studio-31.0.0~beta3.tar.xz/UI/data/themes/System.obt Changed

obs-studio-31.0.0~beta2.tar.xz/UI/data/themes/Yami_Rachni.ovt -> obs-studio-31.0.0~beta3.tar.xz/UI/data/themes/Yami_Rachni.ovt Changed

obs-studio-31.0.0~beta3.tar.xz/UI/forms/images/trash.svg Added

obs-studio-31.0.0~beta2.tar.xz/UI/forms/obs.qrc -> obs-studio-31.0.0~beta3.tar.xz/UI/forms/obs.qrc Changed

obs-studio-31.0.0~beta2.tar.xz/UI/importers/studio.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/importers/studio.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/UI/win-dll-blocklist.c -> obs-studio-31.0.0~beta3.tar.xz/UI/win-dll-blocklist.c Changed

obs-studio-31.0.0~beta2.tar.xz/UI/window-basic-main-profiles.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/window-basic-main-profiles.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/UI/window-basic-main.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/window-basic-main.cpp Changed

@@ -68,6 +68,7 @@
 #include "window-youtube-actions.hpp"
 #include "youtube-api-wrappers.hpp"
 #endif
+#include "window-whats-new.hpp"
 #include "context-bar-controls.hpp"
 #include "obs-proxy-style.hpp"
 #include "display-helpers.hpp"
@@ -128,6 +129,8 @@
 
 namespace {
 
+QPointer<OBSWhatsNew> obsWhatsNew;
+
 template<typename OBSRef> struct SignalContainer {
 	OBSRef ref;
 	vector<shared_ptr<OBSSignal>> handlers;
@@ -164,8 +167,6 @@
 	item->setData(static_cast<int>(QtDataRole::OBSRef), QVariant::fromValue(val));
 }
 
-constexpr std::string_view OBSProfilePath = "/obs-studio/basic/profiles/";
-
 static void AddExtraModulePaths()
 {
 	string plugins_path, plugins_data_path;
@@ -1897,7 +1898,7 @@
 		return false;
 	}
 
-	return InitBasicConfigDefaults();
+	return true;
 }
 
 void OBSBasic::InitOBSCallbacks()
@@ -2122,9 +2123,7 @@
 		emit VirtualCamEnabled();
 	}
 
-	InitBasicConfigDefaults2();
-
-	CheckForSimpleModeX264Fallback();
+	UpdateProfileEncoders();
 
 	LogEncoders();
 
@@ -2189,6 +2188,15 @@
 			SetupNewSceneCollection(sceneCollectionName);
 			disableSaving++;
 		}
+
+		disableSaving--;
+		if (foundCollection || configuredCollection) {
+			OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED);
+			OnEvent(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED);
+		}
+		OnEvent(OBS_FRONTEND_EVENT_SCENE_CHANGED);
+		OnEvent(OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED);
+		disableSaving++;
 	}
 
 	loaded = true;
@@ -2544,37 +2552,11 @@
 	if (closing)
 		return;
 
-	std::string info_url = QT_TO_UTF8(url);
-
-	QDialog *dlg = new QDialog(this);
-	dlg->setAttribute(Qt::WA_DeleteOnClose, true);
-	dlg->setWindowTitle("What's New");
-	dlg->resize(700, 600);
-
-	Qt::WindowFlags flags = dlg->windowFlags();
-	Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
-	dlg->setWindowFlags(flags & (~helpFlag));
-
-	QCefWidget *cefWidget = cef->create_widget(nullptr, info_url);
-	if (!cefWidget) {
-		return;
+	if (obsWhatsNew) {
+		obsWhatsNew->close();
 	}
 
-	connect(cefWidget, &QCefWidget::titleChanged, dlg, &QDialog::setWindowTitle);
-
-	QPushButton *close = new QPushButton(QTStr("Close"));
-	connect(close, &QAbstractButton::clicked, dlg, &QDialog::accept);
-
-	QHBoxLayout *bottomLayout = new QHBoxLayout();
-	bottomLayout->addStretch();
-	bottomLayout->addWidget(close);
-	bottomLayout->addStretch();
-
-	QVBoxLayout *topLayout = new QVBoxLayout(dlg);
-	topLayout->addWidget(cefWidget);
-	topLayout->addLayout(bottomLayout);
-
-	dlg->show();
+	obsWhatsNew = new OBSWhatsNew(this, QT_TO_UTF8(url));
 #else
 	UNUSED_PARAMETER(url);
 #endif
@@ -7641,13 +7623,14 @@
 
 void OBSBasic::on_actionShowProfileFolder_triggered()
 {
-	std::string userProfilePath;
-	userProfilePath.reserve(App()->userProfilesLocation.u8string().size() + OBSProfilePath.size());
-	userProfilePath.append(App()->userProfilesLocation.u8string()).append(OBSProfilePath);
-
-	const QString userProfileLocation = QString::fromStdString(userProfilePath);
+	try {
+		const OBSProfile &currentProfile = GetCurrentProfile();
+		QString currentProfileLocation = QString::fromStdString(currentProfile.path.u8string());
 
-	QDesktopServices::openUrl(QUrl::fromLocalFile(userProfileLocation));
+		QDesktopServices::openUrl(QUrl::fromLocalFile(currentProfileLocation));
+	} catch (const std::invalid_argument &error) {
+		blog(LOG_ERROR, "%s", error.what());
+	}
 }
 
 int OBSBasic::GetTopSelectedSourceItem()

obs-studio-31.0.0~beta2.tar.xz/UI/window-basic-main.hpp -> obs-studio-31.0.0~beta3.tar.xz/UI/window-basic-main.hpp Changed

obs-studio-31.0.0~beta3.tar.xz/UI/window-whats-new.cpp Added

@@ -0,0 +1,74 @@
+#include "moc_window-whats-new.cpp"
+
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+#include "window-basic-main.hpp"
+
+#ifdef BROWSER_AVAILABLE
+#include <browser-panel.hpp>
+extern QCef *cef;
+#endif
+
+/* ------------------------------------------------------------------------- */
+
+OBSWhatsNew::OBSWhatsNew(QWidget *parent, const std::string &url) : QDialog(parent)
+{
+#ifdef BROWSER_AVAILABLE
+	if (!cef) {
+		return;
+	}
+
+	setWindowTitle("What's New");
+	setAttribute(Qt::WA_DeleteOnClose, true);
+	resize(700, 600);
+
+	Qt::WindowFlags flags = windowFlags();
+	Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
+	setWindowFlags(flags & (~helpFlag));
+
+	OBSBasic::InitBrowserPanelSafeBlock();
+
+	cefWidget = cef->create_widget(nullptr, url);
+	if (!cefWidget) {
+		return;
+	}
+
+	connect(cefWidget, &QCefWidget::titleChanged, this, &OBSWhatsNew::setWindowTitle);
+
+	QPushButton *close = new QPushButton(QTStr("Close"));
+	connect(close, &QAbstractButton::clicked, this, &QDialog::accept);
+
+	QHBoxLayout *bottomLayout = new QHBoxLayout();
+	bottomLayout->addStretch();
+	bottomLayout->addWidget(close);
+	bottomLayout->addStretch();
+
+	QVBoxLayout *topLayout = new QVBoxLayout(this);
+	topLayout->addWidget(cefWidget);
+	topLayout->addLayout(bottomLayout);
+
+	show();
+#else
+	UNUSED_PARAMETER(url);
+#endif
+}
+
+OBSWhatsNew::~OBSWhatsNew() {}
+
+void OBSWhatsNew::reject()
+{
+#ifdef BROWSER_AVAILABLE
+	delete cefWidget;
+#endif
+	QDialog::reject();
+}
+
+void OBSWhatsNew::accept()
+{
+#ifdef BROWSER_AVAILABLE
+	delete cefWidget;
+#endif
+	QDialog::accept();
+}

obs-studio-31.0.0~beta3.tar.xz/UI/window-whats-new.hpp Added

obs-studio-31.0.0~beta2.tar.xz/UI/window-youtube-actions.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/window-youtube-actions.cpp Changed

@@ -406,15 +406,13 @@
 			blog(LOG_DEBUG, "No stream created.");
 			return false;
 		}
-		json11::Json json;
-		if (!apiYouTube->BindStream(broadcast.id, stream.id, json)) {
+		if (!apiYouTube->BindStream(broadcast.id, stream.id)) {
 			blog(LOG_DEBUG, "No stream binded.");
 			return false;
 		}
 
 		if (broadcast.privacy != "private") {
-			const std::string apiLiveChatId = json"snippet""liveChatId".string_value();
-			apiYouTube->SetChatId(broadcast.id, apiLiveChatId);
+			apiYouTube->SetChatId(broadcast.id);
 		} else {
 			apiYouTube->ResetChat();
 		}
@@ -440,7 +438,6 @@
 
 	std::string boundStreamId = json"items".array_items()0"contentDetails""boundStreamId".string_value();
 	std::string broadcastPrivacy = json"items".array_items()0"status""privacyStatus".string_value();
-	std::string apiLiveChatId = json"items".array_items()0"snippet""liveChatId".string_value();
 
 	stream.id = boundStreamId.c_str();
 	if (!stream.id.isEmpty() && apiYouTube->FindStream(stream.id, json)) {
@@ -457,14 +454,14 @@
 			blog(LOG_DEBUG, "No stream created.");
 			return false;
 		}
-		if (!apiYouTube->BindStream(selectedBroadcast, stream.id, json)) {
+		if (!apiYouTube->BindStream(selectedBroadcast, stream.id)) {
 			blog(LOG_DEBUG, "No stream binded.");
 			return false;
 		}
 	}
 
 	if (broadcastPrivacy != "private")
-		apiYouTube->SetChatId(selectedBroadcast, apiLiveChatId);
+		apiYouTube->SetChatId(selectedBroadcast);
 	else
 		apiYouTube->ResetChat();

obs-studio-31.0.0~beta2.tar.xz/UI/youtube-api-wrappers.cpp -> obs-studio-31.0.0~beta3.tar.xz/UI/youtube-api-wrappers.cpp Changed

@@ -29,7 +29,6 @@
 #define YOUTUBE_LIVE_TOKEN_URL "https://oauth2.googleapis.com/token"
 #define YOUTUBE_LIVE_VIDEOCATEGORIES_URL YOUTUBE_LIVE_API_URL "/videoCategories"
 #define YOUTUBE_LIVE_VIDEOS_URL YOUTUBE_LIVE_API_URL "/videos"
-#define YOUTUBE_LIVE_CHAT_MESSAGES_URL YOUTUBE_LIVE_API_URL "/liveChat/messages"
 #define YOUTUBE_LIVE_THUMBNAIL_URL "https://www.googleapis.com/upload/youtube/v3/thumbnails/set"
 
 #define DEFAULT_BROADCASTS_PER_QUERY "50" // acceptable values are 0 to 50, inclusive
@@ -246,7 +245,7 @@
 	return stream.id.isEmpty() ? false : true;
 }
 
-bool YoutubeApiWrappers::BindStream(const QString broadcast_id, const QString stream_id, json11::Json &json_out)
+bool YoutubeApiWrappers::BindStream(const QString broadcast_id, const QString stream_id)
 {
 	lastErrorMessage.clear();
 	lastErrorReason.clear();
@@ -256,6 +255,7 @@
 	const QString url = url_template.arg(broadcast_id, stream_id);
 	const Json data = Json::object{};
 	this->broadcast_id = broadcast_id;
+	Json json_out;
 	return InsertCommand(QT_TO_UTF8(url), "application/json", "", data.dump().c_str(), json_out);
 }
 
@@ -518,18 +518,3 @@
 
 	return true;
 }
-
-bool YoutubeApiWrappers::SendChatMessage(const std::string &chat_id, const QString &message)
-{
-	QByteArray url = YOUTUBE_LIVE_CHAT_MESSAGES_URL "?part=snippet";
-
-	json11::Json json_in = Json::object{
-		{"snippet", Json::object{
-				    {"liveChatId", chat_id},
-				    {"type", "textMessageEvent"},
-				    {"textMessageDetails", Json::object{{"messageText", QT_TO_UTF8(message)}}},
-			    }}};
-
-	json11::Json json_out;
-	return InsertCommand(url, "application/json", "POST", json_in.dump().c_str(), json_out);
-}

obs-studio-31.0.0~beta2.tar.xz/UI/youtube-api-wrappers.hpp -> obs-studio-31.0.0~beta3.tar.xz/UI/youtube-api-wrappers.hpp Changed

obs-studio-31.0.0~beta2.tar.xz/build-aux/com.obsproject.Studio.json -> obs-studio-31.0.0~beta3.tar.xz/build-aux/com.obsproject.Studio.json Changed

obs-studio-31.0.0~beta2.tar.xz/cmake/linux/compilerconfig.cmake -> obs-studio-31.0.0~beta3.tar.xz/cmake/linux/compilerconfig.cmake Changed

obs-studio-31.0.0~beta2.tar.xz/cmake/linux/helpers.cmake -> obs-studio-31.0.0~beta3.tar.xz/cmake/linux/helpers.cmake Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/linux-pipewire/camera-portal.c -> obs-studio-31.0.0~beta3.tar.xz/plugins/linux-pipewire/camera-portal.c Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/linux-pipewire/pipewire.c -> obs-studio-31.0.0~beta3.tar.xz/plugins/linux-pipewire/pipewire.c Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/obs-nvenc/nvenc-helpers.c -> obs-studio-31.0.0~beta3.tar.xz/plugins/obs-nvenc/nvenc-helpers.c Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-31.0.0~beta3.tar.xz/plugins/obs-outputs/librtmp/rtmp.c Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/obs-qsv11/CMakeLists.txt -> obs-studio-31.0.0~beta3.tar.xz/plugins/obs-qsv11/CMakeLists.txt Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/obs-websocket/CMakeLists.txt -> obs-studio-31.0.0~beta3.tar.xz/plugins/obs-websocket/CMakeLists.txt Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Config.cpp -> obs-studio-31.0.0~beta3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Config.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp -> obs-studio-31.0.0~beta3.tar.xz/plugins/win-capture/graphics-hook/d3d10-capture.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp -> obs-studio-31.0.0~beta3.tar.xz/plugins/win-capture/graphics-hook/d3d11-capture.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/win-capture/graphics-hook/d3d12-capture.cpp -> obs-studio-31.0.0~beta3.tar.xz/plugins/win-capture/graphics-hook/d3d12-capture.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp -> obs-studio-31.0.0~beta3.tar.xz/plugins/win-capture/graphics-hook/d3d9-capture.cpp Changed

obs-studio-31.0.0~beta2.tar.xz/shared/obs-hook-config/graphics-hook-ver.h -> obs-studio-31.0.0~beta3.tar.xz/shared/obs-hook-config/graphics-hook-ver.h Changed

Changes of Revision 10