Rename class AdvSSScreenshotObj to ScreenshotHelper

src/external-macro-modules/opencv/macro-condition-video.cpp

@@ -180,8 +180,8 @@ std::string MacroConditionVideo::GetShortDesc()
 void MacroConditionVideo::GetScreenshot()
 {
 	auto source = obs_weak_source_get_source(_videoSource);
-	_screenshotData.~AdvSSScreenshotObj();
-	new (&_screenshotData) AdvSSScreenshotObj(source);
+	_screenshotData.~ScreenshotHelper();
+	new (&_screenshotData) ScreenshotHelper(source);
 	obs_source_release(source);
 	_getNextScreenshot = false;
 }
@@ -686,7 +686,7 @@ void MacroConditionVideoEdit::ImageBrowseButtonClicked()
 	} else {
 		auto source =
 			obs_weak_source_get_source(_entryData->_videoSource);
-		AdvSSScreenshotObj screenshot(source);
+		ScreenshotHelper screenshot(source);
 		obs_source_release(source);
 
 		path = QFileDialog::getSaveFileName(this);
@@ -1020,7 +1020,7 @@ void ShowMatchDialog::CheckForMatchLoop()
 	while (!_stop) {
 		auto source = obs_weak_source_get_source(
 			_conditionData->_videoSource);
-		AdvSSScreenshotObj screenshot(source);
+		ScreenshotHelper screenshot(source);
 		obs_source_release(source);
 		std::this_thread::sleep_for(std::chrono::seconds(1));
 		if (!screenshot.done) {

src/external-macro-modules/opencv/macro-condition-video.hpp

@@ -78,7 +78,7 @@ private:
 	bool CheckShouldBeSkipped();
 
 	bool _getNextScreenshot = true;
-	AdvSSScreenshotObj _screenshotData;
+	ScreenshotHelper _screenshotData;
 	QImage _matchImage;
 	std::string _modelDataPath =
 		obs_get_module_data_path(obs_current_module()) +

src/headers/screenshot-helper.hpp

@@ -4,13 +4,13 @@
 #include <QImage>
 #include <chrono>
 
-class AdvSSScreenshotObj {
+class ScreenshotHelper {
 public:
-	AdvSSScreenshotObj() = default;
-	AdvSSScreenshotObj(obs_source_t *source);
-	AdvSSScreenshotObj &operator=(const AdvSSScreenshotObj &) = delete;
-	AdvSSScreenshotObj(const AdvSSScreenshotObj &) = delete;
-	~AdvSSScreenshotObj();
+	ScreenshotHelper() = default;
+	ScreenshotHelper(obs_source_t *source);
+	ScreenshotHelper &operator=(const ScreenshotHelper &) = delete;
+	ScreenshotHelper(const ScreenshotHelper &) = delete;
+	~ScreenshotHelper();
 
 	void Screenshot();
 	void Download();

src/headers/switch-video.hpp

@@ -29,7 +29,7 @@ struct VideoSwitch : virtual SceneSwitcherEntry {
 	double duration = 0;
 	bool ignoreInactiveSource = false;
 
-	std::unique_ptr<AdvSSScreenshotObj> screenshotData = nullptr;
+	std::unique_ptr<ScreenshotHelper> screenshotData = nullptr;
 	std::chrono::high_resolution_clock::time_point previousTime{};
 	QImage matchImage;
 

src/screenshot-helper.cpp

@@ -3,14 +3,14 @@
 
 static void ScreenshotTick(void *param, float);
 
-AdvSSScreenshotObj::AdvSSScreenshotObj(obs_source_t *source)
+ScreenshotHelper::ScreenshotHelper(obs_source_t *source)
 	: weakSource(OBSGetWeakRef(source))
 {
 	_initDone = true;
 	obs_add_tick_callback(ScreenshotTick, this);
 }
 
-AdvSSScreenshotObj::~AdvSSScreenshotObj()
+ScreenshotHelper::~ScreenshotHelper()
 {
 	if (_initDone) {
 		obs_enter_graphics();
@@ -22,7 +22,7 @@ AdvSSScreenshotObj::~AdvSSScreenshotObj()
 	}
 }
 
-void AdvSSScreenshotObj::Screenshot()
+void ScreenshotHelper::Screenshot()
 {
 	OBSSource source = OBSGetStrongRef(weakSource);
 
@@ -72,12 +72,12 @@ void AdvSSScreenshotObj::Screenshot()
 	}
 }
 
-void AdvSSScreenshotObj::Download()
+void ScreenshotHelper::Download()
 {
 	gs_stage_texture(stagesurf, gs_texrender_get_texture(texrender));
 }
 
-void AdvSSScreenshotObj::Copy()
+void ScreenshotHelper::Copy()
 {
 	uint8_t *videoData = nullptr;
 	uint32_t videoLinesize = 0;
@@ -94,7 +94,7 @@ void AdvSSScreenshotObj::Copy()
 	}
 }
 
-void AdvSSScreenshotObj::MarkDone()
+void ScreenshotHelper::MarkDone()
 {
 	time = std::chrono::high_resolution_clock::now();
 	done = true;
@@ -107,8 +107,7 @@ void AdvSSScreenshotObj::MarkDone()
 
 static void ScreenshotTick(void *param, float)
 {
-	AdvSSScreenshotObj *data =
-		reinterpret_cast<AdvSSScreenshotObj *>(param);
+	ScreenshotHelper *data = reinterpret_cast<ScreenshotHelper *>(param);
 
 	if (data->stage == STAGE_FINISH) {
 		return;

src/switch-video.cpp

@@ -98,7 +98,7 @@ void AdvSceneSwitcher::on_getScreenshot_clicked()
 	}
 
 	auto source = obs_weak_source_get_source(s->videoSource);
-	auto screenshotData = std::make_unique<AdvSSScreenshotObj>(source);
+	auto screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);
 
 	QString filePath = QFileDialog::getSaveFileName(this);
@@ -254,7 +254,7 @@ void VideoSwitch::load(obs_data_t *obj)
 void VideoSwitch::getScreenshot()
 {
 	auto source = obs_weak_source_get_source(videoSource);
-	screenshotData = std::make_unique<AdvSSScreenshotObj>(source);
+	screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);
 }