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

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

Revision: 3493
          http://sourceforge.net/p/modplug/code/3493
Author:   manxorist
Date:     2013-12-18 18:28:25 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
[Imp] Mod Export: Also show lossy codecs in pattern render to wave dialog.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_seq.cpp
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moddoc.h

Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2013-12-18 18:21:25 UTC (rev 3492)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp	2013-12-18 18:28:25 UTC (rev 3493)
@@ -1185,7 +1185,7 @@
 //------------------------------
 {
 	OrdSelection selection = GetCurSel(false);
-	m_pModDoc.OnFileWaveConvert(selection.firstOrd, selection.lastOrd);
+	m_pModDoc.OnFileMP3Convert(selection.firstOrd, selection.lastOrd);
 }
 
 

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2013-12-18 18:21:25 UTC (rev 3492)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2013-12-18 18:28:25 UTC (rev 3493)
@@ -1858,6 +1858,12 @@
 void CModDoc::OnFileMP3Convert()
 //------------------------------
 {
+	OnFileMP3Convert(ORDERINDEX_INVALID, ORDERINDEX_INVALID, true);
+}
+
+void CModDoc::OnFileMP3Convert(ORDERINDEX nMinOrder, ORDERINDEX nMaxOrder, bool showWarning)
+//------------------------------------------------------------------------------------------
+{
 	WAVEncoder wavencoder;
 	FLACEncoder flacencoder;
 	OggOpusEncoder opusencoder;
@@ -1873,7 +1879,7 @@
 	if(mp3lame.IsAvailable())       encoders.push_back(&mp3lame);
 	if(mp3blade.IsAvailable())      encoders.push_back(&mp3blade);
 	if(mp3acm.IsAvailable())        encoders.push_back(&mp3acm);
-	if(encoders.size() == 2)
+	if(showWarning && encoders.size() == 2)
 	{
 		Reporting::Warning(
 			"No Opus/Vorbis/MP3 codec found.\n"
@@ -1885,7 +1891,7 @@
 			"Alternatively, you can install a MP3 ACM codec.",
 			"OpenMPT - Export");
 	}
-	OnFileWaveConvert(ORDERINDEX_INVALID, ORDERINDEX_INVALID, encoders);
+	OnFileWaveConvert(nMinOrder, nMaxOrder, encoders);
 }
 
 

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	2013-12-18 18:21:25 UTC (rev 3492)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2013-12-18 18:28:25 UTC (rev 3493)
@@ -358,6 +358,7 @@
 	CSize GetOldPatternScrollbarsPos() const { return m_szOldPatternScrollbarsPos; };
 	void SetOldPatternScrollbarsPos( CSize s ){ m_szOldPatternScrollbarsPos = s; };
 
+	void OnFileMP3Convert(ORDERINDEX nMinOrder, ORDERINDEX nMaxOrder, bool showWarning = false);
 	void OnFileWaveConvert(ORDERINDEX nMinOrder, ORDERINDEX nMaxOrder);
 	void OnFileWaveConvert(ORDERINDEX nMinOrder, ORDERINDEX nMaxOrder, const std::vector<EncoderFactoryBase*> &encFactories);
 

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