Bump version

CrendKing · Jun 17, 2021 · 4293fd1 · 4293fd1
1 parent a1a6f69
commit 4293fd1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/avisynth_filter/src/frame_handler.h b/avisynth_filter/src/frame_handler.h
@@ -20,8 +20,8 @@ class FrameHandler {
     auto GetSourceFrame(int frameNb) -> PVideoFrame;
     auto BeginFlush() -> void;
     auto EndFlush(const std::function<void ()> &interim) -> void;
-    auto Start() -> void;
-    auto Stop() -> void;
+    auto StartWorker() -> void;
+    auto Flush() -> void;
     auto GetInputBufferSize() const -> int;
     constexpr auto GetSourceFrameNb() const -> int { return _nextSourceFrameNb; }
     constexpr auto GetOutputFrameNb() const -> int { return _nextOutputFrameNb; }

diff --git a/filter_common/src/frame_handler_common.cpp b/filter_common/src/frame_handler_common.cpp
@@ -15,27 +15,27 @@ FrameHandler::FrameHandler(CSynthFilter &filter)
 FrameHandler::~FrameHandler() {
     if (_workerThread.joinable()) {
         _isStopping = true;
-        Stop();
+        Flush();
         _workerThread.join();
     }
 }
 
-auto FrameHandler::Start() -> void {
+auto FrameHandler::StartWorker() -> void {
     if (!_workerThread.joinable()) {
         _isStopping = false;
         _workerThread = std::thread(&FrameHandler::WorkerProc, this);
     }
 }
 
-auto FrameHandler::Stop() -> void {
+auto FrameHandler::Flush() -> void {
     BeginFlush();
     EndFlush([]() -> void {
         /*
-    * Stop the script after worker threads are paused and before flushing is done so that no new frame request (GetSourceFrame()) happens.
-    * And since _isFlushing is still on, existing frame request should also just drain instead of block.
-    *
-    * If no stop here, since AddInputSample() no longer adds frame, existing GetSourceFrame() calls will stuck forever.
-    */
+         * Stop the script after worker threads are paused and before flushing is done so that no new frame request (GetSourceFrame()) happens.
+         * And since _isFlushing is still on, existing frame request should also just drain instead of block.
+         *
+         * If no stop here, since AddInputSample() no longer adds frame, existing GetSourceFrame() calls will stuck forever.
+         */
         MainFrameServer::GetInstance().StopScript();
     });
 }

diff --git a/filter_common/src/input_pin.cpp b/filter_common/src/input_pin.cpp
@@ -85,13 +85,13 @@ auto CSynthFilterInputPin::Active() -> HRESULT {
     FrameServerCommon::GetInstance().LinkFrameHandler(_filter.frameHandler.get());
     // need reload here instead of CompleteConnect() so that switching video works
     MainFrameServer::GetInstance().ReloadScript(_filter.m_pInput->CurrentMediaType(), true);
-    _filter.frameHandler->Start();
+    _filter.frameHandler->StartWorker();
 
     return __super::Active();
 }
 
 auto CSynthFilterInputPin::Inactive() -> HRESULT {
-    _filter.frameHandler->Stop();
+    _filter.frameHandler->Flush();
 
     return __super::Inactive();
 }

diff --git a/filter_common/src/version.h b/filter_common/src/version.h
@@ -29,7 +29,7 @@ namespace SynthFilter {
 #define FILTER_NAME_WIDE                WIDEN(FILTER_NAME_BASE)
 #define FILTER_VERSION_MAJOR            1
 #define FILTER_VERSION_MINOR            1
-#define FILTER_VERSION_PATCH            1
+#define FILTER_VERSION_PATCH            2
 #define FILTER_VERSION_STRING           STRINGIZE(FILTER_VERSION_MAJOR) "." STRINGIZE(FILTER_VERSION_MINOR) "." STRINGIZE(FILTER_VERSION_PATCH) FILTER_VARIANT " # " FILTER_GIT_HASH
 
 }
diff --git a/vapoursynth_filter/src/frame_handler.h b/vapoursynth_filter/src/frame_handler.h
@@ -20,8 +20,8 @@ class FrameHandler {
     auto GetSourceFrame(int frameNb) -> const VSFrameRef *;
     auto BeginFlush() -> void;
     auto EndFlush(const std::function<void ()> &interim) -> void;
-    auto Start() -> void;
-    auto Stop() -> void;
+    auto StartWorker() -> void;
+    auto Flush() -> void;
     auto GetInputBufferSize() const -> int;
     constexpr auto GetSourceFrameNb() const -> int { return _nextSourceFrameNb; }
     constexpr auto GetOutputFrameNb() const -> int { return _nextOutputFrameNb; }