[OMPT-svn-commit] SF.net SVN: modplug:[3760] trunk/OpenMPT/mptrack

[<man...@us...>]

Revision: 3760
          http://sourceforge.net/p/modplug/code/3760
Author:   manxorist
Date:     2014-02-23 15:54:25 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
[Ref] Move stream export settings into TrackerSettings.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/StreamEncoder.cpp
    trunk/OpenMPT/mptrack/StreamEncoder.h
    trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
    trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
    trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
    trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/mptrack/StreamEncoder.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoder.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -12,10 +12,30 @@
 
 #include "StreamEncoder.h"
 
+#include "Mptrack.h"
+#include "TrackerSettings.h"
+
 #include <ostream>
 
 
+StreamEncoderSettings &StreamEncoderSettings::Instance()
+//------------------------------------------------------
+{
+	return TrackerSettings::Instance().ExportStreamEncoderSettings;
+}
 
+
+StreamEncoderSettings::StreamEncoderSettings(SettingsContainer &conf, const std::string &section)
+//-----------------------------------------------------------------------------------------------
+	: FLACCompressionLevel(conf, section, "FLACCompressionLevel", 5)
+	, MP3LameQuality(conf, section, "MP3LameQuality", 3)
+	, MP3ACMFast(conf, section, "MP3ACMFast", false)
+	, OpusComplexity(conf, section, "OpusComplexity", -1)
+{
+	return;
+}
+
+
 StreamWriterBase::StreamWriterBase(std::ostream &stream)
 //------------------------------------------------------
 	: f(stream)

Modified: trunk/OpenMPT/mptrack/StreamEncoder.h
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.h	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoder.h	2014-02-23 15:54:25 UTC (rev 3760)
@@ -191,6 +191,19 @@
 } // namespace Encoder
 
 
+//==========================
+struct StreamEncoderSettings
+//==========================
+{
+	Setting<int32> FLACCompressionLevel;
+	Setting<int32> MP3LameQuality;
+	Setting<bool> MP3ACMFast;
+	Setting<int32> OpusComplexity;
+	StreamEncoderSettings(SettingsContainer &conf, const std::string &section);
+	static StreamEncoderSettings &Instance();
+};
+
+
 //=======================
 class IAudioStreamEncoder
 //=======================

Modified: trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -13,7 +13,6 @@
 #include "StreamEncoder.h"
 #include "StreamEncoderFLAC.h"
 
-#include "Mainfrm.h"
 #include "Mptrack.h"
 #include "TrackerSettings.h"
 
@@ -158,11 +157,8 @@
 		FLAC__stream_encoder_set_bits_per_sample(encoder, formatInfo.Sampleformat.GetBitsPerSample());
 		FLAC__stream_encoder_set_sample_rate(encoder, formatInfo.Samplerate);
 
-#ifdef MODPLUG_TRACKER
-		int compressionLevel = 5;
-		compressionLevel = theApp.GetSettings().Read<int32>("Export", "FLACCompressionLevel", compressionLevel);
+		int compressionLevel = StreamEncoderSettings::Instance().FLACCompressionLevel;
 		FLAC__stream_encoder_set_compression_level(encoder, compressionLevel);
-#endif // MODPLUG_TRACKER
 		
 		inited = true;
 

Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -13,11 +13,7 @@
 #include "StreamEncoder.h"
 #include "StreamEncoderMP3.h"
 
-#ifdef MODPLUG_TRACKER
-#include "../mptrack/Mainfrm.h"
-#include "../mptrack/Mptrack.h"
-#include "../mptrack/Reporting.h"
-#endif //MODPLUG_TRACKER
+#include "Mptrack.h"
 
 #include "../soundlib/Sndfile.h"
 
@@ -487,10 +483,8 @@
 		lame.lame_set_in_samplerate(gfp, samplerate);
 		lame.lame_set_num_channels(gfp, channels);
 
-#ifdef MODPLUG_TRACKER
-		int lameQuality = theApp.GetSettings().Read<int32>("Export", "MP3LameQuality", 3);
+		int lameQuality = StreamEncoderSettings::Instance().MP3LameQuality;
 		lame.lame_set_quality(gfp, lameQuality);
-#endif // MODPLUG_TRACKER
 
 		if(settings.Mode == Encoder::ModeCBR)
 		{
@@ -1232,11 +1226,7 @@
 		wfex.cbSize = 0;
 		LPWAVEFORMATEX pwfexDst = (LPWAVEFORMATEX)&acm.formats_waveformats[format][0];
 
-		bool acmFast = false;
-#ifdef MODPLUG_TRACKER
-		acmFast = theApp.GetSettings().Read<bool>("Export", "MP3ACMFast", acmFast);
-#endif // MODPLUG_TRACKER
-
+		bool acmFast = StreamEncoderSettings::Instance().MP3ACMFast;
 		if(acmStreamOpen(&acmStream, acmDriver, &wfex, pwfexDst, NULL, 0, 0, acmFast ? 0 : ACM_STREAMOPENF_NONREALTIME) != MMSYSERR_NOERROR)
 		{
 			acmDriverClose(acmDriver, 0);

Modified: trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoderOpus.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -13,11 +13,7 @@
 #include "StreamEncoder.h"
 #include "StreamEncoderOpus.h"
 
-#ifdef MODPLUG_TRACKER
-#include "../mptrack/Mainfrm.h"
-#include "../mptrack/Mptrack.h"
-#include "../mptrack/Reporting.h"
-#endif //MODPLUG_TRACKER
+#include "Mptrack.h"
 
 #include <deque>
 
@@ -429,12 +425,11 @@
 			opus.opus_multistream_encoder_ctl(st, OPUS_SET_VBR_CONSTRAINT(ctl_vbrcontraint));
 		}
 
-#ifdef MODPLUG_TRACKER
-		opus_int32 complexity = 0;
-		opus.opus_multistream_encoder_ctl(st, OPUS_GET_COMPLEXITY(&complexity));
-		complexity = theApp.GetSettings().Read<int32>("Export", "OpusComplexity", complexity);
-		opus.opus_multistream_encoder_ctl(st, OPUS_SET_COMPLEXITY(complexity));
-#endif // MODPLUG_TRACKER
+		opus_int32 complexity = StreamEncoderSettings::Instance().OpusComplexity;
+		if(complexity >= 0)
+		{
+			opus.opus_multistream_encoder_ctl(st, OPUS_SET_COMPLEXITY(complexity));
+		}
 
 		OpusHeader header;
 		MemsetZero(header);

Modified: trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -13,7 +13,6 @@
 #include "StreamEncoder.h"
 #include "StreamEncoderWAV.h"
 
-#include "Mainfrm.h"
 #include "Mptrack.h"
 #include "TrackerSettings.h"
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-02-23 15:54:25 UTC (rev 3760)
@@ -200,6 +200,7 @@
 	, SampleEditorFLACCompressionLevel(conf, "Sample Editor", "FLACCompressionLevel", 5)
 	// Export
 	, ExportDefaultToSoundcardSamplerate(conf, "Export", "DefaultToSoundcardSamplerate", true)
+	, ExportStreamEncoderSettings(conf, "Export")
 	// Default template
 	, defaultTemplateFile(conf, "Paths", "DefaultTemplate", mpt::PathString())
 	// MRU List

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2014-02-23 13:22:57 UTC (rev 3759)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2014-02-23 15:54:25 UTC (rev 3760)
@@ -18,6 +18,7 @@
 #include "../sounddsp/DSP.h"
 #include "../sounddsp/Reverb.h"
 #include "../sounddev/SoundDevice.h"
+#include "StreamEncoder.h"
 #include "../common/version.h"
 #include "Settings.h"
 
@@ -348,6 +349,7 @@
 	// Export
 
 	Setting<bool> ExportDefaultToSoundcardSamplerate;
+	StreamEncoderSettings ExportStreamEncoderSettings;
 
 	// Effects
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.