Permalink
Browse files

Bump version + update Changelog file.

  • Loading branch information...
lordmulder committed Feb 23, 2012
1 parent 3c1938a commit 86e17a04ff2a1bd5c61d88c738768193f35de7dd
Showing with 23 additions and 9 deletions.
  1. +1 −1 LameXP.rc
  2. +1 −0 doc/Changelog.html
  3. BIN etc/NSIS/license.rtf
  4. +2 −2 etc/NSIS/setup.nsi
  5. +2 −2 etc/NSIS/wrapper.nsi
  6. +2 −2 src/Config.h
  7. +15 −2 src/Dialog_SplashScreen.cpp
View
@@ -48,7 +48,7 @@ BEGIN
VALUE "FileDescription", "LameXP - Audio Encoder Front-End"
VALUE "FileVersion", VER_LAMEXP_STR
VALUE "InternalName", "LameXP Qt"
- VALUE "LegalCopyright", "Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>"
+ VALUE "LegalCopyright", "Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>"
VALUE "LegalTrademarks", "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License <http://www.gnu.org/>"
VALUE "OriginalFilename", "LameXP.exe"
VALUE "ProductName", "LameXP - Audio Encoder Front-End"
View
@@ -33,6 +33,7 @@ <h3>LameXP - Version History</h3><br>
<li>Workaround for a bug that causes MediaInfo to not detect the duration of Wave files (64-Bit only)
<li>Prevent LameXP from blocking a system shutdown (encoding process is aborted, if necessary)
<li>Improved internal handling of MediaInfo output, including extraction of cover art
+<li>Fixed a very rare "live-lock" situation in early initialization code
</ul><br>
<a name="4.03"></a>Changes between v4.02 and v4.03:<br><ul>
View
Binary file not shown.
View
@@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
-; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+; // Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // This program is free software; you can redistribute it and/or modify
; // it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ VIAddVersionKey "Comments" "This program is free software; you can redistribute
VIAddVersionKey "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})"
-VIAddVersionKey "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR"
+VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR"
VIAddVersionKey "LegalTrademarks" "GNU"
VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe"
VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend"
View
@@ -1,6 +1,6 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
-; // Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+; // Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // This program is free software; you can redistribute it and/or modify
; // it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ VIAddVersionKey "Comments" "This program is free software; you can redistribute
VIAddVersionKey "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})"
-VIAddVersionKey "LegalCopyright" "Copyright 2004-2011 LoRd_MuldeR"
+VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR"
VIAddVersionKey "LegalTrademarks" "GNU"
VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe"
VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend"
View
@@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta
-#define VER_LAMEXP_PATCH 1
-#define VER_LAMEXP_BUILD 891
+#define VER_LAMEXP_PATCH 2
+#define VER_LAMEXP_BUILD 892
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)
@@ -93,6 +93,10 @@ void SplashScreen::showSplash(QThread *thread)
connect(thread, SIGNAL(terminated()), loop, SLOT(quit()), Qt::QueuedConnection);
connect(thread, SIGNAL(finished()), loop, SLOT(quit()), Qt::QueuedConnection);
+ //Create timer
+ QTimer *timer = new QTimer();
+ connect(timer, SIGNAL(timeout()), loop, SLOT(quit()));
+
//Start thread
QApplication::processEvents();
thread->start();
@@ -110,14 +114,22 @@ void SplashScreen::showSplash(QThread *thread)
Sleep(FADE_DELAY);
}
+ //Start the timer
+ timer->start(15360);
+
//Loop while thread is running
while(thread->isRunning())
{
- QTimer::singleShot(15000, loop, SLOT(quit()));
loop->exec();
- if(thread->isRunning()) qWarning("Potential deadlock in Init thread!");
+ if(thread->isRunning())
+ {
+ qWarning("Potential deadlock in initialization thread!");
+ }
}
+ //Stop the timer
+ timer->stop();
+
//Fade out
for(int i = 100; i >= 0; i--)
{
@@ -136,6 +148,7 @@ void SplashScreen::showSplash(QThread *thread)
//Free
LAMEXP_DELETE(loop);
+ LAMEXP_DELETE(timer);
LAMEXP_DELETE(splashScreen);
}

0 comments on commit 86e17a0

Please sign in to comment.