diff --git a/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj
index 69909ccaa..df6e5bdca 100644
--- a/build/Aegisub/Aegisub.vcxproj
+++ b/build/Aegisub/Aegisub.vcxproj
@@ -124,6 +124,7 @@
+
@@ -163,7 +164,6 @@
-
@@ -271,15 +271,9 @@
-
-
-
+
-
-
-
-
diff --git a/build/Aegisub/Aegisub.vcxproj.filters b/build/Aegisub/Aegisub.vcxproj.filters
index 9e8c86650..f8016a5f6 100644
--- a/build/Aegisub/Aegisub.vcxproj.filters
+++ b/build/Aegisub/Aegisub.vcxproj.filters
@@ -417,7 +417,7 @@
Audio\Players
-
+
Audio\Providers
@@ -575,30 +575,15 @@
ASS
-
- Audio\Providers
-
-
+
Audio\Providers
Audio\Providers
-
- Audio\Providers
-
-
- Audio\Providers
-
Audio\Providers
-
- Audio\Providers
-
-
- Audio\Providers
-
Audio\UI
diff --git a/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj
index d46c88919..9b46a2277 100644
--- a/build/libaegisub/libaegisub.vcxproj
+++ b/build/libaegisub/libaegisub.vcxproj
@@ -64,6 +64,7 @@
+
@@ -121,6 +122,13 @@
+
+
+
+
+
+
+
diff --git a/build/libaegisub/libaegisub.vcxproj.filters b/build/libaegisub/libaegisub.vcxproj.filters
index 5dee77b43..dd843fe13 100644
--- a/build/libaegisub/libaegisub.vcxproj.filters
+++ b/build/libaegisub/libaegisub.vcxproj.filters
@@ -12,9 +12,6 @@
{4084442f-51e9-4c31-8d5a-c825e076c012}
-
- {5af331b5-ea1f-493f-abf9-f5912e2350df}
-
{1d2e187a-1681-4c30-8912-a4b5a5d0ab9d}
@@ -27,6 +24,12 @@
{2cf3ad94-e8a9-4a89-b47e-29523d90fd08}
+
+ {fce4f3aa-dc34-44fe-9a6a-99b0914e3436}
+
+
+ {5af331b5-ea1f-493f-abf9-f5912e2350df}
+
@@ -203,6 +206,9 @@
Header Files
+
+ Audio
+
@@ -340,10 +346,31 @@
Source Files\Common
+
+ Audio
+
+
+ Audio
+
+
+ Audio
+
+
+ Audio
+
+
+ Audio
+
+
+ Audio
+
+
+ Audio
+
Header Files
-
+
\ No newline at end of file
diff --git a/libaegisub/audio/provider_hd.cpp b/libaegisub/audio/provider_hd.cpp
index 4dd6234c7..19e33eeed 100644
--- a/libaegisub/audio/provider_hd.cpp
+++ b/libaegisub/audio/provider_hd.cpp
@@ -84,6 +84,6 @@ public:
namespace agi {
std::unique_ptr CreateHDAudioProvider(std::unique_ptr src, agi::fs::path const& dir) {
- return make_unique(std::move(src), dir);
+ return agi::make_unique(std::move(src), dir);
}
}
diff --git a/libaegisub/audio/provider_ram.cpp b/libaegisub/audio/provider_ram.cpp
index f177840b5..0c1da546c 100644
--- a/libaegisub/audio/provider_ram.cpp
+++ b/libaegisub/audio/provider_ram.cpp
@@ -91,6 +91,6 @@ void RAMAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count) const
namespace agi {
std::unique_ptr CreateRAMAudioProvider(std::unique_ptr src) {
- return make_unique(std::move(src));
+ return agi::make_unique(std::move(src));
}
}
diff --git a/src/audio_provider_avs.cpp b/src/audio_provider_avs.cpp
index 26480188b..b94cb4df4 100644
--- a/src/audio_provider_avs.cpp
+++ b/src/audio_provider_avs.cpp
@@ -89,22 +89,22 @@ AvisynthAudioProvider::AvisynthAudioProvider(agi::fs::path const& filename) {
LoadFromClip(env->Invoke("DirectShowSource", AVSValue(args, 3), argnames));
// Otherwise fail
else
- throw agi::AudioProviderOpenError("No suitable audio source filter found. Try placing DirectShowSource.dll in the Aegisub application directory.");
+ throw agi::AudioProviderError("No suitable audio source filter found. Try placing DirectShowSource.dll in the Aegisub application directory.");
}
}
catch (AvisynthError &err) {
std::string errmsg(err.msg);
if (errmsg.find("filter graph manager won't talk to me") != errmsg.npos)
- throw agi::AudioDataNotFoundError("Avisynth error: " + errmsg);
+ throw agi::AudioDataNotFound("Avisynth error: " + errmsg);
else
- throw agi::AudioProviderOpenError("Avisynth error: " + errmsg);
+ throw agi::AudioProviderError("Avisynth error: " + errmsg);
}
}
void AvisynthAudioProvider::LoadFromClip(AVSValue clip) {
// Check if it has audio
VideoInfo vi = clip.AsClip()->GetVideoInfo();
- if (!vi.HasAudio()) throw agi::AudioDataNotFoundError("No audio found.");
+ if (!vi.HasAudio()) throw agi::AudioDataNotFound("No audio found.");
IScriptEnvironment *env = avs_wrapper.GetEnv();
@@ -143,7 +143,7 @@ void AvisynthAudioProvider::FillBuffer(void *buf, int64_t start, int64_t count)
}
}
-std::unique_ptr CreateAvisynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) {
+std::unique_ptr CreateAvisynthAudioProvider(agi::fs::path const& file, agi::BackgroundRunner *) {
return agi::make_unique(file);
}
#endif