Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Bump version + update Changelog file.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-02-23 21:21:02 +01:00
parent 3c1938af3c
commit 86e17a04ff
7 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LameXP.rc
View File

@ -48,7 +48,7 @@ BEGIN
VALUE "FileDescription", "LameXP - Audio Encoder Front-End" VALUE "FileDescription", "LameXP - Audio Encoder Front-End"
VALUE "FileVersion", VER_LAMEXP_STR VALUE "FileVersion", VER_LAMEXP_STR
VALUE "InternalName", "LameXP Qt" 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 "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 "OriginalFilename", "LameXP.exe"
VALUE "ProductName", "LameXP - Audio Encoder Front-End" VALUE "ProductName", "LameXP - Audio Encoder Front-End"

1
doc/Changelog.html
View File

@ -33,6 +33,7 @@ a:visited { color: #0000EE; }
<li>Workaround for a bug that causes MediaInfo to not detect the duration of Wave files (64-Bit only) <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>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>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> </ul><br>
<a name="4.03"></a>Changes between v4.02 and v4.03:<br><ul> <a name="4.03"></a>Changes between v4.02 and v4.03:<br><ul>

BIN
etc/NSIS/license.rtf
View File

Binary file not shown.

4
etc/NSIS/setup.nsi
View File

@ -1,6 +1,6 @@
; /////////////////////////////////////////////////////////////////////////////// ; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End ; // 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 ; // 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 ; // 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 "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]" VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" 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 "LegalTrademarks" "GNU"
VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe"
VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend" VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend"

4
etc/NSIS/wrapper.nsi
View File

@ -1,6 +1,6 @@
; /////////////////////////////////////////////////////////////////////////////// ; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End ; // 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 ; // 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 ; // 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 "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]" VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})" 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 "LegalTrademarks" "GNU"
VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe" VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.exe"
VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend" VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend"

4
src/Config.h
View File

@ -29,8 +29,8 @@
#define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 891 #define VER_LAMEXP_BUILD 892
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

17
src/Dialog_SplashScreen.cpp
View File

@ -93,6 +93,10 @@ void SplashScreen::showSplash(QThread *thread)
connect(thread, SIGNAL(terminated()), loop, SLOT(quit()), Qt::QueuedConnection); connect(thread, SIGNAL(terminated()), loop, SLOT(quit()), Qt::QueuedConnection);
connect(thread, SIGNAL(finished()), 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 //Start thread
QApplication::processEvents(); QApplication::processEvents();
thread->start(); thread->start();
@ -110,13 +114,21 @@ void SplashScreen::showSplash(QThread *thread)
Sleep(FADE_DELAY); Sleep(FADE_DELAY);
} }
//Start the timer
timer->start(15360);
//Loop while thread is running //Loop while thread is running
while(thread->isRunning()) while(thread->isRunning())
{ {
QTimer::singleShot(15000, loop, SLOT(quit()));
loop->exec(); 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 //Fade out
for(int i = 100; i >= 0; i--) for(int i = 100; i >= 0; i--)
@ -136,6 +148,7 @@ void SplashScreen::showSplash(QThread *thread)
//Free //Free
LAMEXP_DELETE(loop); LAMEXP_DELETE(loop);
LAMEXP_DELETE(timer);
LAMEXP_DELETE(splashScreen); LAMEXP_DELETE(splashScreen);
} }