Updated LAME binary to v3.99.0.16 (2011-04-04), compiled with ICL 12.0.2. Also updated LAME switches accordingly.

doc/Changelog.html

@@ -23,7 +23,7 @@ a:visited { color: #0000EE; }
 <li>Added an option to add directories recursively
 <li>Added support for embedding cover artwork (currently works with LAME, FLAC and Nero AAC only)
 <li>Updated Qt runtime libraries to v4.7.2
-<li>Updated LAME encoder to v3.99.0.15 (2011-03-22), compiled with ICL 12.0.2
+<li>Updated LAME encoder to v3.99.0.16 (2011-04-04), compiled with ICL 12.0.2
 <li>Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
 <li>Updated TTA decoder multiplatform library to v2.1 (2011-03-11), compiled with MSVC 9.0
 <li>Updated SoX to v14.3.2 (2010-02-27), compiled with ICL 12.0.2

doc/FAQ.html

@@ -388,7 +388,13 @@ doesn't apply the other way around! Moreover embedding an ID3v1 and an ID3v2 tag
 the information would have fit into a single ID3v1 tag, means an unnecessary redundancy!<br>
 <br>
 If, however, you need to enforce the creation of an ID3v2 tag for some reason, you can use the "--add-id3v2"<br>
-parameter for that purpose. Simply add the parameter to the "Custom Encoder Parameters" for LAME.<br><br>
+parameter for that purpose. Simply add the parameter to the "Custom Encoder Parameters" for LAME.<br>
+<br>
+That's what the LAME help says about ID3 tags:<br>
+<blockquote>A version 2 tag will NOT be added unless one of the input fields<br>
+won't fit in a version 1 tag (e.g. the title string is longer than 30<br>
+characters), or the '--add-id3v2' or '--id3v2-only' options are used,<br>
+or output is redirected to stdout.</blockquote>
 
 <br><br>
 

res/Icons.qrc

@@ -3,6 +3,7 @@
 	<qresource>
     <file>MainIcon.ico</file>
     <file>MainIcon.png</file>
+    <file>MainIcon2.png</file>
     <file>icons/add.png</file>
     <file>icons/accept.png</file>
     <file>icons/application_view_list.png</file>

src/Config.h

@@ -25,8 +25,8 @@
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
 #define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				416
+#define VER_LAMEXP_BUILD				417
-#define VER_LAMEXP_SUFFIX				RC-1
+#define VER_LAMEXP_SUFFIX				RC-3
 
 /*
  * Tools versions

src/Encoder_MP3.cpp

@@ -108,16 +108,24 @@ bool MP3Encoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
 		break;
 	}
 
-	if(!metaInfo.fileName().isEmpty()) args << (isUnicode(metaInfo.fileName()) ? "--uTitle" : "--lTitle") << metaInfo.fileName();
+	bool bUseUCS2 = false;
-	if(!metaInfo.fileArtist().isEmpty()) args << (isUnicode(metaInfo.fileArtist()) ? "--uArtist" : "--lArtist") << metaInfo.fileArtist();
+
-	if(!metaInfo.fileAlbum().isEmpty()) args << (isUnicode(metaInfo.fileAlbum()) ? "--uAlbum" : "--lAlbum") << metaInfo.fileAlbum();
+	if(!metaInfo.fileName().isEmpty() && isUnicode(metaInfo.fileName())) bUseUCS2 = true;
-	if(!metaInfo.fileGenre().isEmpty()) args << (isUnicode(metaInfo.fileGenre()) ? "--uGenre" : "--lGenre") << metaInfo.fileGenre();
+	if(!metaInfo.fileArtist().isEmpty() && isUnicode(metaInfo.fileArtist())) bUseUCS2 = true;
-	if(!metaInfo.fileComment().isEmpty()) args << (isUnicode(metaInfo.fileComment()) ? "--uComment" : "--lComment") << metaInfo.fileComment();
+	if(!metaInfo.fileAlbum().isEmpty() && isUnicode(metaInfo.fileAlbum())) bUseUCS2 = true;
+	if(!metaInfo.fileGenre().isEmpty() && isUnicode(metaInfo.fileGenre())) bUseUCS2 = true;
+	if(!metaInfo.fileComment().isEmpty() && isUnicode(metaInfo.fileComment())) bUseUCS2 = true;
+
+	if(bUseUCS2) args << "--id3v2-ucs2"; //Must specify this BEFORE "--tt" and friends!
+
+	if(!metaInfo.fileName().isEmpty()) args << "--tt" << metaInfo.fileName();
+	if(!metaInfo.fileArtist().isEmpty()) args << "--ta" << metaInfo.fileArtist();
+	if(!metaInfo.fileAlbum().isEmpty()) args << "--tl" << metaInfo.fileAlbum();
+	if(!metaInfo.fileGenre().isEmpty()) args << "--tg" << metaInfo.fileGenre();
+	if(!metaInfo.fileComment().isEmpty()) args << "--tc" << metaInfo.fileComment();
 	if(metaInfo.fileYear()) args << "--ty" << QString::number(metaInfo.fileYear());
 	if(metaInfo.filePosition()) args << "--tn" << QString::number(metaInfo.filePosition());
 	if(!metaInfo.fileCover().isEmpty()) args << "--ti" << QDir::toNativeSeparators(metaInfo.fileCover());
-	
-	//args << "--tv" << QString().sprintf("Encoder=LameXP v%d.%02d.%04d [%s]", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build(), lamexp_version_release());
 
 	if(!m_configCustomParams.isEmpty()) args << m_configCustomParams.split(" ", QString::SkipEmptyParts);
 

src/Global.cpp

@@ -666,12 +666,13 @@ bool lamexp_init_qt(int argc, char* argv[])
 	}
 
 	//Create Qt application instance and setup version info
+	QDate date = QDate::currentDate();
 	QApplication *application = new QApplication(argc, argv);
 	application->setApplicationName("LameXP - Audio Encoder Front-End");
 	application->setApplicationVersion(QString().sprintf("%d.%02d.%04d", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build())); 
 	application->setOrganizationName("LoRd_MuldeR");
 	application->setOrganizationDomain("mulder.dummwiedeutsch.de");
-	application->setWindowIcon(QIcon(":/MainIcon.png"));
+	application->setWindowIcon((date.month() == 12 && date.day() >= 24 && date.day() <= 26) ? QIcon(":/MainIcon2.png") : QIcon(":/MainIcon.png"));
 	
 	//Load plugins from application directory
 	QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath());

src/Thread_Initialization.cpp

@@ -53,7 +53,7 @@ g_lamexp_tools[] =
 	{"d33cd86f04bd4067e244d2804466583c7b90a4e2", "flac.exe", 121},
 	{"9328a50e89b54ec065637496d9681a7e3eebf915", "gpgv.exe", 1411},
 	{"d837bf6ee4dab557d8b02d46c75a24e58980fffa", "gpgv.gpg", UINT_MAX},
-	{"cc843a34b7207f887f80668b3f7a78716c276aca", "lame.exe", 39915},
+	{"5bc1ed92db501c0b281928893647e70fd5068540", "lame.exe", 39916},
 	{"a4e929cfaa42fa2e61a3d0c6434c77a06d45aef3", "mac.exe", 406},
 	{"ff65938a9d9b2f453887ca5e731fb75b98015683", "mediainfo_i386.exe", 743},
 	{"470b433b7ee06830f382266cc2680a3d6e1d3993", "mediainfo_x64.exe", 743},