[Scummvm-cvs-logs] SF.net SVN: scummvm:[48584] tools/branches/branch-1-1-0/gui/gui_tools.cpp

[criezy at users.sourceforge.net]

Revision: 48584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48584&view=rev
Author:   criezy
Date:     2010-04-07 23:46:41 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
Backport patch #2982306: set MP3 ABR bit rate in GUI Tools

Modified Paths:
--------------
    tools/branches/branch-1-1-0/gui/gui_tools.cpp

Modified: tools/branches/branch-1-1-0/gui/gui_tools.cpp
===================================================================
--- tools/branches/branch-1-1-0/gui/gui_tools.cpp	2010-04-07 22:34:07 UTC (rev 48583)
+++ tools/branches/branch-1-1-0/gui/gui_tools.cpp	2010-04-07 23:46:41 UTC (rev 48584)
@@ -148,9 +148,12 @@
 		// mp3
 		compression->setMp3CompressionType( (const char *)conf.mp3CompressionType.mb_str() );
 		compression->setMp3MpegQuality    ( (const char *)conf.mp3MpegQuality.mb_str()     );
-		compression->setMp3ABRBitrate     ( (const char *)conf.mp3ABRBitrate.mb_str()      );
-		compression->setMp3VBRMinBitrate  ( (const char *)conf.mp3VBRMinBitrate.mb_str()   );
-		compression->setMp3VBRMaxBitrate  ( (const char *)conf.mp3VBRMaxBitrate.mb_str()   );
+		if (conf.mp3CompressionType == "ABR")
+			compression->setMp3ABRBitrate     ( (const char *)conf.mp3ABRBitrate.mb_str()      );
+		else {
+			compression->setMp3VBRMinBitrate  ( (const char *)conf.mp3VBRMinBitrate.mb_str()   );
+			compression->setMp3VBRMaxBitrate  ( (const char *)conf.mp3VBRMaxBitrate.mb_str()   );
+		}
 		compression->setMp3VBRQuality     ( (const char *)conf.mp3VBRQuality.mb_str()      );
 
 		// flac


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