Stop using deprecated obs_frontend_add_dock()

OBS Studio 30.0.0 deprecated the obs_frontend_add_dock() function and
advised plugins to use obs_frontend_add_dock_by_id() instead. However,
the new API takes the contents of the dock widget as an argument instead
of the dock widget itself, which requires rework of the widget
structure.

This commit removes the QDockWidget instance from the .ui file and
changes the PTZControls class to inheret from QWidget instead of
QDockWidget. It then reworks the instantiation to use the new API when
building against obs-studio 30.0.0 or higher. When building against
older versions it will create the needed QDockWidget before calling the
old API.

Fixes: #186
Signed-off-by: Grant Likely <[email protected]>

src/ptz-controls.cpp

@@ -15,6 +15,7 @@
 #include <QToolTip>
 #include <QWindow>
 #include <QResizeEvent>
+#include <QDockWidget>
 
 #include "imported/qt-wrappers.hpp"
 #include "imported/qjoysticks/QJoysticks.h"
@@ -29,9 +30,25 @@ void ptz_load_controls(void)
 	const auto main_window =
 		static_cast<QMainWindow *>(obs_frontend_get_main_window());
 	obs_frontend_push_ui_translation(obs_module_get_string);
-	auto *tmp = new PTZControls(main_window);
-	obs_frontend_add_dock(tmp);
-	tmp->setFloating(true); // Do after add_dock() to keep hidden at startup
+	auto *dock_widget = new PTZControls(main_window);
+
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 0, 0)
+	if (!obs_frontend_add_dock_by_id("obs-ptz-dock", "PTZ Controls", dock_widget)) {
+		blog(LOG_ERROR, "failed to add PTZ controls dock");
+		delete dock_widget;
+	}
+#else
+	auto dock = new QDockWidget(main_window);
+	dock->setObjectName("obs-ptz-dock");
+	dock->setWindowTitle("PTZ Controls");
+	dock->setWidget(dock_widget);
+	dock->setFeatures(QDockWidget::DockWidgetMovable |
+			  QDockWidget::DockWidgetFloatable);
+	dock->setFloating(true);
+	dock->hide();
+	obs_frontend_add_dock(dock);
+#endif
+
 	obs_frontend_pop_ui_translation();
 }
 
@@ -121,7 +138,7 @@ void PTZControls::OBSFrontendEvent(enum obs_frontend_event event)
 }
 
 PTZControls::PTZControls(QWidget *parent)
-	: QDockWidget(parent), ui(new Ui::PTZControls)
+	: QWidget(parent), ui(new Ui::PTZControls)
 {
 	instance = this;
 	ui->setupUi(this);

src/ptz-controls.hpp

@@ -9,13 +9,12 @@
 #include "ptz.h"
 #include <QTimer>
 #include <obs.hpp>
-#include <QDockWidget>
 #include "imported/qjoysticks/QJoysticks.h"
 #include "touch-control.hpp"
 #include "ptz-device.hpp"
 #include "ui_ptz-controls.h"
 
-class PTZControls : public QDockWidget {
+class PTZControls : public QWidget {
 	Q_OBJECT
 
 private: