Add global dither option

qwertymodo · Mar 14, 2017 · 5080661 · 5080661
1 parent d7b91ae
commit 5080661
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/msupcm++/GlobalConfig.cpp b/msupcm++/GlobalConfig.cpp
@@ -8,6 +8,7 @@ std::string GlobalConfig::m_artist = "";
 std::string GlobalConfig::m_url = "";
 std::string GlobalConfig::m_output_prefix = "";
 double GlobalConfig::m_normalization = 0.0;
+bool GlobalConfig::m_dither = true;
 unsigned int GlobalConfig::m_verbosity = 1;
 bool GlobalConfig::m_keep_temps = false;
 
@@ -47,6 +48,12 @@ double& GlobalConfig::normalization()
 }
 
 
+bool& GlobalConfig::dither()
+{
+	return m_dither;
+}
+
+
 unsigned int& GlobalConfig::verbosity()
 {
 	return m_verbosity;

diff --git a/msupcm++/GlobalConfig.h b/msupcm++/GlobalConfig.h
@@ -12,6 +12,7 @@ namespace msu
 		static std::string& url();
 		static std::string& output_prefix();
 		static double& normalization();
+		static bool& dither();
 		static unsigned int& verbosity();
 		static bool& keep_temps();
 
@@ -22,6 +23,7 @@ namespace msu
 		static std::string m_url;
 		static std::string m_output_prefix;
 		static double m_normalization;
+		static bool m_dither;
 		static unsigned int m_verbosity;
 		static bool m_keep_temps;
 	} config;

diff --git a/msupcm++/SoxWrapper.cpp b/msupcm++/SoxWrapper.cpp
@@ -306,6 +306,16 @@ bool SoxWrapper::normalize(double level)
 
 bool SoxWrapper::finalize()
 {
+	if (GlobalConfig::dither())
+	{
+		char* dither_args[1];
+
+		dither_args[0] = new char[3]{ '-','s','\0' };
+		addEffect("dither", 1, (char**)dither_args);
+
+		delete dither_args[0];
+	}
+
 	addOutput(m_output);
 
 	sox_format_handler_t const * handler =

diff --git a/msupcm++/TrackParser.hpp b/msupcm++/TrackParser.hpp
@@ -21,7 +21,7 @@ namespace msu {
 			{ "pad_start", a.padStart() },
 			{ "pad_end", a.padEnd() },
 			{ "tempo", a.tempo() },
-			{ "normalization", a.normalization() }
+			{ "normalization", a.normalization() },
 		};
 	}
 
@@ -83,6 +83,7 @@ namespace msu {
 			{ "url", config.url() },
 			{ "output_prefix", config.output_prefix() },
 			{ "normalization", config.normalization() },
+			{ "dither", config.dither() },
 			{ "verbosity", config.verbosity() },
 			{ "keep_temps", config.keep_temps() }
 		};
@@ -224,6 +225,9 @@ namespace msu {
 		if (j.find("normalization") != j.end())
 			config.normalization() = j["normalization"].get<int>();
 
+		if (j.find("dither") != j.end())
+			config.dither() = j["dither"].get<bool>();
+
 		if (j.find("verbosity") != j.end())
 			config.verbosity() = j["verbosity"].get<unsigned int>();