From 86e17a04ff2a1bd5c61d88c738768193f35de7dd Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 23 Feb 2012 21:21:02 +0100 Subject: [PATCH] Bump version + update Changelog file. --- LameXP.rc | 2 +- doc/Changelog.html | 1 + etc/NSIS/license.rtf | Bin 1239 -> 1239 bytes etc/NSIS/setup.nsi | 4 ++-- etc/NSIS/wrapper.nsi | 4 ++-- src/Config.h | 4 ++-- src/Dialog_SplashScreen.cpp | 17 +++++++++++++++-- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/LameXP.rc b/LameXP.rc index ea7af672..bfe842de 100644 --- a/LameXP.rc +++ b/LameXP.rc @@ -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 " + VALUE "LegalCopyright", "Copyright (C) 2004-2012 LoRd_MuldeR " VALUE "LegalTrademarks", "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License " VALUE "OriginalFilename", "LameXP.exe" VALUE "ProductName", "LameXP - Audio Encoder Front-End" diff --git a/doc/Changelog.html b/doc/Changelog.html index 4ec14537..25302466 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -33,6 +33,7 @@ a:visited { color: #0000EE; }
  • Workaround for a bug that causes MediaInfo to not detect the duration of Wave files (64-Bit only)
  • Prevent LameXP from blocking a system shutdown (encoding process is aborted, if necessary)
  • Improved internal handling of MediaInfo output, including extraction of cover art +
  • Fixed a very rare "live-lock" situation in early initialization code
    Changes between v4.02 and v4.03:
      diff --git a/etc/NSIS/license.rtf b/etc/NSIS/license.rtf index d7b5fb44833a1f6e656a4120ab8e9330226c51a4..36e4f4fb5bde8715738c365774df28f192782883 100644 GIT binary patch delta 14 Vcmcc4d7X0u2P31=W=_U)%m5^01Umo# delta 14 Vcmcc4d7X0u2P325W=_U)%m5@_1Udi! diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi index f630db2e..6983eeb0 100644 --- a/etc/NSIS/setup.nsi +++ b/etc/NSIS/setup.nsi @@ -1,6 +1,6 @@ ; /////////////////////////////////////////////////////////////////////////////// ; // LameXP - Audio Encoder Front-End -; // Copyright (C) 2004-2011 LoRd_MuldeR +; // Copyright (C) 2004-2012 LoRd_MuldeR ; // ; // 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" diff --git a/etc/NSIS/wrapper.nsi b/etc/NSIS/wrapper.nsi index 985b9d53..5b347605 100644 --- a/etc/NSIS/wrapper.nsi +++ b/etc/NSIS/wrapper.nsi @@ -1,6 +1,6 @@ ; /////////////////////////////////////////////////////////////////////////////// ; // LameXP - Audio Encoder Front-End -; // Copyright (C) 2004-2011 LoRd_MuldeR +; // Copyright (C) 2004-2012 LoRd_MuldeR ; // ; // 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" diff --git a/src/Config.h b/src/Config.h index f83c0bf4..5feb87c1 100644 --- a/src/Config.h +++ b/src/Config.h @@ -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!) diff --git a/src/Dialog_SplashScreen.cpp b/src/Dialog_SplashScreen.cpp index 48461da5..4a35fdd8 100644 --- a/src/Dialog_SplashScreen.cpp +++ b/src/Dialog_SplashScreen.cpp @@ -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); }