[Shinon] Fixes:

 - Use same audio hash path for multiple files to prevent hard disk fill ups
 - Do not hardcode DPI Icon but use user preferences instead.

libaegisub/audio/provider_hd.cpp

@@ -27,6 +27,7 @@
 #include <ctime>
 #include <thread>
 
+
 namespace {
 using namespace agi;
 
@@ -49,18 +50,21 @@ class HDAudioProvider final : public AudioProviderWrapper {
 		}
 	}
 
-	fs::path CacheFilename(fs::path const& dir) {
+	fs::path CacheFilename(fs::path dir, int hash) {
 		// Check free space
 		if ((uint64_t)num_samples * bytes_per_sample * channels > fs::FreeSpace(dir))
 			throw AudioProviderError("Not enough free disk space in " + dir.string() + " to cache the audio");
-
-		return "audio";
+		std::stringstream hexstream;
+		hexstream << std::hex << hash;
+		if (!fs::DirectoryExists(dir))
+			fs::CreateDirectory(dir);
+		return std::string("aegisub-audio-") + hexstream.str() + ".cache";
 	}
 
 public:
 	HDAudioProvider(std::unique_ptr<AudioProvider> src, agi::fs::path const& dir)
 	: AudioProviderWrapper(std::move(src))
-	, file(dir / CacheFilename(dir), num_samples * bytes_per_sample* channels)
+	, file(dir / CacheFilename(dir, this->GetHash()), num_samples* bytes_per_sample* channels)
 	{
 		decoded_samples = 0;
 		decoder = std::thread([&] {

libaegisub/include/libaegisub/audio/provider.h

@@ -34,6 +34,7 @@ class AudioProvider {
 	int sample_rate = 0;
 	int bytes_per_sample = 0;
 	bool float_samples = false;
+	int audioHash = 0;
 
 	virtual void FillBuffer(void *buf, int64_t start, int64_t count) const = 0;
 	virtual void FillBufferInt16Mono(int16_t* buf, int64_t start, int64_t count, bool asAmplitude=false) const;
@@ -53,6 +54,7 @@ class AudioProvider {
 	int     GetBytesPerSample() const { return bytes_per_sample; }
 	int     GetChannels()       const { return channels; }
 	bool    AreSamplesFloat()   const { return float_samples; }
+	int     GetHash()   const { return audioHash; }
 
 	/// Does this provider benefit from external caching?
 	virtual bool NeedsCache() const { return false; }
@@ -72,6 +74,7 @@ class AudioProviderWrapper : public AudioProvider {
 		sample_rate = source->GetSampleRate();
 		bytes_per_sample = source->GetBytesPerSample();
 		float_samples = source->AreSamplesFloat();
+		audioHash = source->GetHash();
 	}
 };
 

src/audio_provider_ffmpegsource.cpp

@@ -41,6 +41,7 @@
 #include <libaegisub/fs.h>
 #include <libaegisub/make_unique.h>
 
+#include <functional>
 #include <map>
 
 namespace {
@@ -76,6 +77,7 @@ FFmpegSourceAudioProvider::FFmpegSourceAudioProvider(agi::fs::path const& filena
 	SetLogLevel();
 
 	LoadAudio(filename);
+	audioHash = std::hash<std::string>{}(filename.filename().string());
 }
 catch (agi::EnvironmentError const& err) {
 	throw agi::AudioProviderError(err.GetMessage());

src/preferences.cpp

@@ -417,7 +417,7 @@ void Advanced_Audio(wxTreebook *book, Preferences *parent) {
 
 	p->OptionAdd(ffms, _("Always index all audio tracks"), "Provider/FFmpegSource/Index All Tracks");
 	wxControl* stereo = p->OptionAdd(ffms, _("Downmix to stereo"), "Provider/Audio/FFmpegSource/Downmix");
-	stereo->SetToolTip("Reduces memory usage on surround audio, but may cause audio tracks to sound blank in specific circumstances. This will not affect audio with 2 channels or lesser.");
+	stereo->SetToolTip("Reduces memory usage on surround audio, but may cause audio tracks to sound blank in specific circumstances.\nThis will not affect audio with 2 channels or fewer.");
 #endif
 
 #ifdef WITH_PORTAUDIO

src/toolbar.cpp

@@ -172,7 +172,7 @@ namespace {
 		, ht_context(std::move(ht_context))
 		, retina_helper(parent)
 #ifdef __WXMSW__
-		, icon_size(parent->FromDIP(16))
+		, icon_size(parent->FromDIP(OPT_GET("App/Toolbar Icon Size")->GetInt()))
 #else
 		, icon_size(OPT_GET("App/Toolbar Icon Size")->GetInt())
 #endif
@@ -191,7 +191,7 @@ namespace {
 		, retina_helper(parent)
 #ifndef __WXMAC__
 #ifdef __WXMSW__
-		, icon_size(parent->FromDIP(16))
+		, icon_size(parent->FromDIP(OPT_GET("App/Toolbar Icon Size")->GetInt()))
 #else
 		, icon_size(OPT_GET("App/Toolbar Icon Size")->GetInt())
 #endif