vapoursynth: Unify capitalization

Author: arch1t3cht

automation/vapoursynth/aegisub_vs.py

@@ -1,14 +1,14 @@
 """
-Utility functions for loading video files into Aegisub using the Vapoursynth
+Utility functions for loading video files into Aegisub using the VapourSynth
 video provider.
 
 When encountering a file whose file extension is not .py or .vpy, the
-Vapoursynth audio and video providers will execute the respective default
+VapourSynth audio and video providers will execute the respective default
 script set in Aegisub's configuration, with the following string variables set:
 - filename: The path to the file that's being opened.
 - __aegi_data, __aegi_dictionary, __aegi_local, __aegi_script, __aegi_temp, __aegi_user:
   The values of ?data, ?dictionary, etc. respectively.
-- __aegi_vscache: The path to a directory where the Vapoursynth script can
+- __aegi_vscache: The path to a directory where the VapourSynth script can
   store cache files. This directory is cleaned by Aegisub when it gets too
   large (as defined by Aegisub's configuration).
 
@@ -53,7 +53,7 @@ def set_paths(vars: dict):
 
 def ensure_plugin(name: str, loadname: str, errormsg: str):
     """
-    Ensures that the Vapoursynth plugin with the given name exists.
+    Ensures that the VapourSynth plugin with the given name exists.
     If it doesn't, it tries to load it from `loadname`.
     If that fails, it raises an error with the given error message.
     """

src/audio_provider_factory.cpp

@@ -32,7 +32,7 @@ using namespace agi;
 std::unique_ptr<AudioProvider> CreateAvisynthAudioProvider(fs::path const& filename, BackgroundRunner *);
 std::unique_ptr<AudioProvider> CreateFFmpegSourceAudioProvider(fs::path const& filename, BackgroundRunner *);
 std::unique_ptr<AudioProvider> CreateBSAudioProvider(fs::path const& filename, BackgroundRunner *);
-std::unique_ptr<AudioProvider> CreateVapoursynthAudioProvider(fs::path const& filename, BackgroundRunner *);
+std::unique_ptr<AudioProvider> CreateVapourSynthAudioProvider(fs::path const& filename, BackgroundRunner *);
 
 namespace {
 struct factory {
@@ -54,7 +54,7 @@ const factory providers[] = {
 	{"BestSource", CreateBSAudioProvider, false},
 #endif
 #ifdef WITH_VAPOURSYNTH
-	{"Vapoursynth", CreateVapoursynthAudioProvider, false},
+	{"VapourSynth", CreateVapourSynthAudioProvider, false},
 #endif
 };
 }

src/audio_provider_vs.cpp

@@ -15,7 +15,7 @@
 // Aegisub Project http://www.aegisub.org/
 
 /// @file audio_provider_vs.cpp
-/// @brief Vapoursynth-based audio provider
+/// @brief VapourSynth-based audio provider
 /// @ingroup audio_input
 ///
 
@@ -38,7 +38,7 @@
 #include "VSScript4.h"
 
 namespace {
-class VapoursynthAudioProvider final : public agi::AudioProvider {
+class VapourSynthAudioProvider final : public agi::AudioProvider {
 	VapourSynthWrapper vs;
 	VSScript *script = nullptr;
 	VSNode *node = nullptr;
@@ -47,36 +47,36 @@ class VapoursynthAudioProvider final : public agi::AudioProvider {
 	void FillBufferWithFrame(void *buf, int frame, int64_t start, int64_t count) const;
 	void FillBuffer(void *buf, int64_t start, int64_t count) const override;
 public:
-	VapoursynthAudioProvider(agi::fs::path const& filename);
-	~VapoursynthAudioProvider();
+	VapourSynthAudioProvider(agi::fs::path const& filename);
+	~VapourSynthAudioProvider();
 
 	bool NeedsCache() const override { return true; }
 };
 
-VapoursynthAudioProvider::VapoursynthAudioProvider(agi::fs::path const& filename) try {
+VapourSynthAudioProvider::VapourSynthAudioProvider(agi::fs::path const& filename) try {
 	std::lock_guard<std::mutex> lock(vs.GetMutex());
 
 	VSCleanCache();
 
 	script = vs.GetScriptAPI()->createScript(nullptr);
 	if (script == nullptr) {
-		throw VapoursynthError("Error creating script API");
+		throw VapourSynthError("Error creating script API");
 	}
 	vs.GetScriptAPI()->evalSetWorkingDir(script, 1);
 	if (OpenScriptOrVideo(vs.GetAPI(), vs.GetScriptAPI(), script, filename, OPT_GET("Provider/Audio/VapourSynth/Default Script")->GetString())) {
 		std::string msg = agi::format("Error executing VapourSynth script: %s", vs.GetScriptAPI()->getError(script));
 		vs.GetScriptAPI()->freeScript(script);
-		throw VapoursynthError(msg);
+		throw VapourSynthError(msg);
 	}
 	node = vs.GetScriptAPI()->getOutputNode(script, 0);
 	if (node == nullptr) {
 		vs.GetScriptAPI()->freeScript(script);
-		throw VapoursynthError("No output node set");
+		throw VapourSynthError("No output node set");
 	}
 	if (vs.GetAPI()->getNodeType(node) != mtAudio) {
 		vs.GetAPI()->freeNode(node);
 		vs.GetScriptAPI()->freeScript(script);
-		throw VapoursynthError("Output node isn't an audio node");
+		throw VapourSynthError("Output node isn't an audio node");
 	}
 	vi = vs.GetAPI()->getAudioInfo(node);
 	float_samples = vi->format.sampleType == stFloat;
@@ -85,10 +85,10 @@ VapoursynthAudioProvider::VapoursynthAudioProvider(agi::fs::path const& filename
 	channels = vi->format.numChannels;
 	num_samples = vi->numSamples;
 }
-catch (VapoursynthError const& err) {
+catch (VapourSynthError const& err) {
 	// Unlike the video provider manager, the audio provider factory catches AudioProviderErrors and picks whichever source doesn't throw one.
 	// So just rethrow the Error here with an extra label so the user will see the error message and know the audio wasn't loaded with VS
-	throw VapoursynthError(agi::format("Vapoursynth error: %s", err.GetMessage()));
+	throw VapourSynthError(agi::format("VapourSynth error: %s", err.GetMessage()));
 }
 
 template<typename T>
@@ -102,27 +102,27 @@ static void PackChannels(const uint8_t **Src, void *Dst, size_t Length, size_t C
 	}
 }
 
-void VapoursynthAudioProvider::FillBufferWithFrame(void *buf, int n, int64_t start, int64_t count) const {
+void VapourSynthAudioProvider::FillBufferWithFrame(void *buf, int n, int64_t start, int64_t count) const {
 	char errorMsg[1024];
 	const VSFrame *frame = vs.GetAPI()->getFrame(n, node, errorMsg, sizeof(errorMsg));
 	if (frame == nullptr) {
-		throw VapoursynthError(agi::format("Error getting frame: %s", errorMsg));
+		throw VapourSynthError(agi::format("Error getting frame: %s", errorMsg));
 	}
 	if (vs.GetAPI()->getFrameLength(frame) < count) {
 		vs.GetAPI()->freeFrame(frame);
-		throw VapoursynthError("Audio frame too short");
+		throw VapourSynthError("Audio frame too short");
 	}
 	if (vs.GetAPI()->getAudioFrameFormat(frame)->numChannels != channels || vs.GetAPI()->getAudioFrameFormat(frame)->bytesPerSample != bytes_per_sample) {
 		vs.GetAPI()->freeFrame(frame);
-		throw VapoursynthError("Audio format is not constant");
+		throw VapourSynthError("Audio format is not constant");
 	}
 
 	std::vector<const uint8_t *> planes(channels);
 	for (int c = 0; c < channels; c++) {
 		planes[c] = vs.GetAPI()->getReadPtr(frame, c) + bytes_per_sample * start;
 		if (planes[c] == nullptr) {
 			vs.GetAPI()->freeFrame(frame);
-			throw VapoursynthError("Failed to read audio channel");
+			throw VapourSynthError("Failed to read audio channel");
 		}
 	}
 
@@ -138,7 +138,7 @@ void VapoursynthAudioProvider::FillBufferWithFrame(void *buf, int n, int64_t sta
 	vs.GetAPI()->freeFrame(frame);
 }
 
-void VapoursynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) const {
+void VapourSynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) const {
 	int end = start + count; 	// exclusive
 	int startframe = start / VS_AUDIO_FRAME_SAMPLES;
 	int endframe = (end - 1) / VS_AUDIO_FRAME_SAMPLES;
@@ -154,7 +154,7 @@ void VapoursynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t coun
 	}
 }
 
-VapoursynthAudioProvider::~VapoursynthAudioProvider() {
+VapourSynthAudioProvider::~VapourSynthAudioProvider() {
 	if (node != nullptr) {
 		vs.GetAPI()->freeNode(node);
 	}
@@ -164,7 +164,7 @@ VapoursynthAudioProvider::~VapoursynthAudioProvider() {
 }
 }
 
-std::unique_ptr<agi::AudioProvider> CreateVapoursynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) {
-	return agi::make_unique<VapoursynthAudioProvider>(file);
+std::unique_ptr<agi::AudioProvider> CreateVapourSynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) {
+	return agi::make_unique<VapourSynthAudioProvider>(file);
 }
 #endif

src/vapoursynth_common.cpp

@@ -28,7 +28,7 @@
 
 void SetStringVar(const VSAPI *api, VSMap *map, std::string variable, std::string value) {
 	if (api->mapSetData(map, variable.c_str(), value.c_str(), -1, dtUtf8, 1))
-		throw VapoursynthError("Failed to set VSMap entry");
+		throw VapourSynthError("Failed to set VSMap entry");
 }
 
 int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *script, agi::fs::path const& filename, std::string default_script) {
@@ -38,7 +38,7 @@ int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *scrip
 	} else {
 		VSMap *map = api->createMap();
 		if (map == nullptr)
-			throw VapoursynthError("Failed to create VSMap for script info");
+			throw VapourSynthError("Failed to create VSMap for script info");
 
 		SetStringVar(api, map, "filename", filename.string());
 		SetStringVar(api, map, "__aegi_vscache", config::path->Decode("?local/vscache").string());
@@ -52,7 +52,7 @@ int OpenScriptOrVideo(const VSAPI *api, const VSSCRIPTAPI *sapi, VSScript *scrip
 			SetStringVar(api, map, "__aegi_" + dir, config::path->Decode("?" + dir).string());
 
 		if (sapi->setVariables(script, map))
-			throw VapoursynthError("Failed to set script info variables");
+			throw VapourSynthError("Failed to set script info variables");
 
 		api->freeMap(map);
 

src/vapoursynth_wrap.cpp

@@ -15,7 +15,7 @@
 // Aegisub Project http://www.aegisub.org/
 
 /// @file vapoursynth_wrap.cpp
-/// @brief Wrapper-layer for Vapoursynth
+/// @brief Wrapper-layer for VapourSynth
 /// @ingroup video_input audio_input
 ///
 
@@ -67,15 +67,15 @@ VapourSynthWrapper::VapourSynthWrapper() {
 #endif
 
 		if (!hLib)
-			throw VapoursynthError("Could not load " VSSCRIPT_SO);
+			throw VapourSynthError("Could not load " VSSCRIPT_SO);
 
 #ifdef _WIN32
 		FUNC* getVSScriptAPI = (FUNC*)GetProcAddress(hLib, "getVSScriptAPI");
 #else
 		FUNC* getVSScriptAPI = (FUNC*)dlsym(hLib, "getVSScriptAPI");
 #endif
 		if (!getVSScriptAPI)
-			throw VapoursynthError("Failed to get address of getVSScriptAPI from " VSSCRIPT_SO);
+			throw VapourSynthError("Failed to get address of getVSScriptAPI from " VSSCRIPT_SO);
 
 		// Python will set the program's locale to the user's default locale, which will break
 		// half of wxwidgets on some operating systems due to locale mismatches. There's not really anything
@@ -85,12 +85,12 @@ VapourSynthWrapper::VapourSynthWrapper() {
 		setlocale(LC_ALL, oldlocale.c_str());
 
 		if (!scriptapi)
-			throw VapoursynthError("Failed to get Vapoursynth ScriptAPI");
+			throw VapourSynthError("Failed to get VapourSynth ScriptAPI");
 
 		api = scriptapi->getVSAPI(VAPOURSYNTH_API_VERSION);
 
 		if (!api)
-			throw VapoursynthError("Failed to get Vapoursynth API");
+			throw VapourSynthError("Failed to get VapourSynth API");
 
 		vs_loaded = true;
 	}

src/vapoursynth_wrap.h

@@ -23,7 +23,7 @@
 
 #include <libaegisub/exception.h>
 
-DEFINE_EXCEPTION(VapoursynthError, agi::Exception);
+DEFINE_EXCEPTION(VapourSynthError, agi::Exception);
 
 struct VSAPI;
 struct VSSCRIPTAPI;

src/video_provider_manager.cpp

@@ -30,7 +30,7 @@ std::unique_ptr<VideoProvider> CreateYUV4MPEGVideoProvider(agi::fs::path const&,
 std::unique_ptr<VideoProvider> CreateFFmpegSourceVideoProvider(agi::fs::path const&, std::string const&, agi::BackgroundRunner *);
 std::unique_ptr<VideoProvider> CreateAvisynthVideoProvider(agi::fs::path const&, std::string const&, agi::BackgroundRunner *);
 std::unique_ptr<VideoProvider> CreateBSVideoProvider(agi::fs::path const&, std::string const&, agi::BackgroundRunner *);
-std::unique_ptr<VideoProvider> CreateVapoursynthVideoProvider(agi::fs::path const&, std::string const&, agi::BackgroundRunner *);
+std::unique_ptr<VideoProvider> CreateVapourSynthVideoProvider(agi::fs::path const&, std::string const&, agi::BackgroundRunner *);
 
 std::unique_ptr<VideoProvider> CreateCacheVideoProvider(std::unique_ptr<VideoProvider>);
 
@@ -54,7 +54,7 @@ namespace {
 		{"BestSource", CreateBSVideoProvider, false},
 #endif
 #ifdef WITH_VAPOURSYNTH
-		{"Vapoursynth", CreateVapoursynthVideoProvider, false},
+		{"VapourSynth", CreateVapourSynthVideoProvider, false},
 #endif
 	};
 }