More std::string_view

use std::format for logging
CrendKing · Jun 25, 2021 · 2b8c7ce · 2b8c7ce
1 parent c83a993
commit 2b8c7ce
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 19 deletions.
diff --git a/avisynth_filter/src/frameserver.cpp b/avisynth_filter/src/frameserver.cpp
@@ -26,7 +26,7 @@ FrameServerCommon::FrameServerCommon() {
     IScriptEnvironment *env = CreateEnv();
     AVS_linkage = env->GetAVSLinkage();
     _versionString = env->Invoke("Eval", AVSValue("VersionString()")).AsString();
-    Environment::GetInstance().Log(L"AviSynth version: %S", GetVersionString());
+    Environment::GetInstance().Log(L"AviSynth version: %S", GetVersionString().data());
     env->DeleteScriptEnvironment();
 
     _sourceClip = new SourceClip(_sourceVideoInfo);

diff --git a/avisynth_filter/src/frameserver.h b/avisynth_filter/src/frameserver.h
@@ -23,7 +23,7 @@ class FrameServerCommon : public RefCountedSingleton<FrameServerCommon> {
 
     auto SetScriptPath(const std::filesystem::path &scriptPath) -> void;
     auto LinkFrameHandler(FrameHandler *frameHandler) const -> void;
-    constexpr auto GetVersionString() const -> const char * { return _versionString == nullptr ? "unknown AviSynth version" : _versionString; }
+    constexpr auto GetVersionString() const -> std::string_view { return _versionString == nullptr ? "unknown AviSynth version" : _versionString; }
     constexpr auto GetScriptPath() const -> const std::filesystem::path & { return _scriptPath; }
 
 private:

diff --git a/filter_common/src/environment.cpp b/filter_common/src/environment.cpp
@@ -68,17 +68,15 @@ auto Environment::Log(const WCHAR *format, ...) -> void {
         return;
     }
 
-    const std::unique_lock logLock(_logMutex);
+    const std::wstring fmt = std::format(L"T {:6} @ {:8}: {}\n", GetCurrentThreadId(), timeGetTime() - _logStartTime, format);
 
-    fwprintf_s(_logFile, L"T %6lu @ %8lu: ", GetCurrentThreadId(), timeGetTime() - _logStartTime);
+    const std::unique_lock logLock(_logMutex);
 
     va_list args;
     va_start(args, format);
-    vfwprintf_s(_logFile, format, args);
+    vfwprintf_s(_logFile, fmt.c_str(), args);
     va_end(args);
 
-    fputwc(L'\n', _logFile);
-
     fflush(_logFile);
 }
 
@@ -98,11 +96,11 @@ auto Environment::SetRemoteControlEnabled(bool enabled) -> void {
     }
 }
 
-auto Environment::IsInputFormatEnabled(const WCHAR *formatName) const -> bool {
+auto Environment::IsInputFormatEnabled(std::wstring_view formatName) const -> bool {
     return _enabledInputFormats.contains(formatName);
 }
 
-auto Environment::SetInputFormatEnabled(const WCHAR *formatName, bool enabled) -> void {
+auto Environment::SetInputFormatEnabled(std::wstring_view formatName, bool enabled) -> void {
     if (enabled) {
         _enabledInputFormats.emplace(formatName);
     } else {
@@ -153,7 +151,7 @@ auto Environment::SaveSettingsToRegistry() const -> void {
     static_cast<void>(_registry.WriteString(SETTING_NAME_SCRIPT_FILE, _scriptPath.c_str()));
     static_cast<void>(_registry.WriteNumber(SETTING_NAME_REMOTE_CONTROL, _isRemoteControlEnabled));
 
-    std::ranges::for_each(Format::PIXEL_FORMATS, [this](const WCHAR *name) {
+    std::ranges::for_each(Format::PIXEL_FORMATS, [this](std::wstring_view name) {
         const std::wstring settingName = std::format(L"{}{}", SETTING_NAME_INPUT_FORMAT_PREFIX, name);
         static_cast<void>(_registry.WriteNumber(settingName.c_str(), IsInputFormatEnabled(name)));
     }, &Format::PixelFormat::name);

diff --git a/filter_common/src/environment.h b/filter_common/src/environment.h
@@ -20,8 +20,8 @@ class Environment : public RefCountedSingleton<Environment> {
 
     constexpr auto GetScriptPath() const -> const std::filesystem::path & { return _scriptPath; }
     auto SetScriptPath(const std::filesystem::path &scriptPath) -> void;
-    auto IsInputFormatEnabled(const WCHAR *formatName) const -> bool;
-    auto SetInputFormatEnabled(const WCHAR *formatName, bool enabled) -> void;
+    auto IsInputFormatEnabled(std::wstring_view formatName) const -> bool;
+    auto SetInputFormatEnabled(std::wstring_view formatName, bool enabled) -> void;
     constexpr auto IsRemoteControlEnabled() const -> bool { return _isRemoteControlEnabled; }
     auto SetRemoteControlEnabled(bool enabled) -> void;
     constexpr auto GetExtraSourceBuffer() const -> int { return _extraSourceBuffer; }
@@ -42,7 +42,7 @@ class Environment : public RefCountedSingleton<Environment> {
     Registry _registry;
 
     std::filesystem::path _scriptPath;
-    std::unordered_set<const WCHAR *> _enabledInputFormats;
+    std::unordered_set<std::wstring_view> _enabledInputFormats;
     bool _isRemoteControlEnabled = false;
     int _extraSourceBuffer;
 

diff --git a/vapoursynth_filter/src/frameserver.cpp b/vapoursynth_filter/src/frameserver.cpp
@@ -44,7 +44,7 @@ FrameServerCommon::FrameServerCommon() {
     }
 
     _versionString = std::format("VapourSynth R{} API R{}.{}", coreInfo.core, coreInfo.api >> 16, coreInfo.api & 0xffff);
-    Environment::GetInstance().Log(L"VapourSynth version: %S", GetVersionString());
+    Environment::GetInstance().Log(L"VapourSynth version: %S", GetVersionString().data());
 
     _vsApi->freeCore(vsCore);
 }
@@ -55,10 +55,6 @@ FrameServerCommon::~FrameServerCommon() {
     vsscript_finalize();
 }
 
-auto FrameServerCommon::GetVersionString() const -> const char * {
-    return _versionString.c_str();
-}
-
 auto FrameServerCommon::LinkFrameHandler(FrameHandler *frameHandler) -> void {
     _frameHandler = frameHandler;
 }

diff --git a/vapoursynth_filter/src/frameserver.h b/vapoursynth_filter/src/frameserver.h
@@ -22,8 +22,8 @@ class FrameServerCommon : public RefCountedSingleton<FrameServerCommon> {
     DISABLE_COPYING(FrameServerCommon)
 
     auto SetScriptPath(const std::filesystem::path &scriptPath) -> void;
-    auto GetVersionString() const -> const char *;
     auto LinkFrameHandler(FrameHandler *frameHandler) -> void;
+    constexpr auto GetVersionString() const -> std::string_view { return _versionString; }
     constexpr auto GetScriptPath() const -> const std::filesystem::path & { return _scriptPath; }
     constexpr auto GetFrameHandler() const -> FrameHandler & { return *_frameHandler; }
     constexpr auto GetSourceVideoInfo() const -> const VSVideoInfo & { return _sourceVideoInfo; }