From 8e3e19a7f7c6af41b75f16885b6511aeaaa4ff8b Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 12 Nov 2022 14:30:38 -0600
Subject: [PATCH] Removed unused NullThreadedVsyncSource

---
 app/app.pro                                   |  6 +--
 .../pacer/nullthreadedvsyncsource.cpp         | 47 -------------------
 .../pacer/nullthreadedvsyncsource.h           | 21 ---------
 .../video/ffmpeg-renderers/pacer/pacer.cpp    |  2 -
 4 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
 delete mode 100644 app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h

diff --git a/app/app.pro b/app/app.pro
index 01e4eabe..b37d5bed 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -212,15 +212,13 @@ ffmpeg {
     SOURCES += \
         streaming/video/ffmpeg.cpp \
         streaming/video/ffmpeg-renderers/sdlvid.cpp \
-        streaming/video/ffmpeg-renderers/pacer/pacer.cpp \
-        streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
+        streaming/video/ffmpeg-renderers/pacer/pacer.cpp
 
     HEADERS += \
         streaming/video/ffmpeg.h \
         streaming/video/ffmpeg-renderers/renderer.h \
         streaming/video/ffmpeg-renderers/sdlvid.h \
-        streaming/video/ffmpeg-renderers/pacer/pacer.h \
-        streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
+        streaming/video/ffmpeg-renderers/pacer/pacer.h
 }
 libva {
     message(VAAPI renderer selected)
diff --git a/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp b/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
deleted file mode 100644
index 5bb10f0f..00000000
--- a/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "nullthreadedvsyncsource.h"
-
-NullThreadedVsyncSource::NullThreadedVsyncSource(Pacer* pacer) :
-    m_Pacer(pacer),
-    m_Thread(nullptr)
-{
-    SDL_AtomicSet(&m_Stopping, 0);
-}
-
-NullThreadedVsyncSource::~NullThreadedVsyncSource()
-{
-    if (m_Thread != nullptr) {
-        SDL_AtomicSet(&m_Stopping, 1);
-        SDL_WaitThread(m_Thread, nullptr);
-    }
-}
-
-bool NullThreadedVsyncSource::initialize(SDL_Window*, int displayFps)
-{
-    m_DisplayFps = displayFps;
-    m_Thread = SDL_CreateThread(vsyncThread, "NullVsync", this);
-    if (m_Thread == nullptr) {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Unable to create DX V-sync thread: %s",
-                     SDL_GetError());
-        return false;
-    }
-
-    return true;
-}
-
-int NullThreadedVsyncSource::vsyncThread(void* context)
-{
-    NullThreadedVsyncSource* me = reinterpret_cast<NullThreadedVsyncSource*>(context);
-
-#if SDL_VERSION_ATLEAST(2, 0, 9)
-    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_TIME_CRITICAL);
-#else
-    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
-#endif
-
-    while (SDL_AtomicGet(&me->m_Stopping) == 0) {
-        me->m_Pacer->vsyncCallback(1000 / me->m_DisplayFps);
-    }
-
-    return 0;
-}
diff --git a/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h b/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
deleted file mode 100644
index eda9239b..00000000
--- a/app/streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "pacer.h"
-
-class NullThreadedVsyncSource : public IVsyncSource
-{
-public:
-    NullThreadedVsyncSource(Pacer* pacer);
-
-    virtual ~NullThreadedVsyncSource();
-
-    virtual bool initialize(SDL_Window* window, int displayFps);
-
-private:
-    static int vsyncThread(void* context);
-
-    Pacer* m_Pacer;
-    SDL_Thread* m_Thread;
-    SDL_atomic_t m_Stopping;
-    int m_DisplayFps;
-};
diff --git a/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp b/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp
index 615e0da6..da907d90 100644
--- a/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp
+++ b/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp
@@ -1,8 +1,6 @@
 #include "pacer.h"
 #include "streaming/streamutils.h"
 
-#include "nullthreadedvsyncsource.h"
-
 #ifdef Q_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>