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

Now using Qt v4.7.3, available trough Qt SDK v1.1 RC.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-04-19 16:14:05 +02:00
parent 3c996dcc90
commit 762b231037
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LameXP_VS2010.vcxproj
View File

@ -203,7 +203,7 @@ del "$(TargetDir)imageformats\q???d4.dll"
</ClCompile>
<Link>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>qtmain.lib;QtCore.lib;QtGui.lib;QtSvg.lib;qsvg.lib;qico.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>qtmain.lib;QtCore.lib;QtGui.lib;QtSvg.lib;qgif.lib;qsvg.lib;qico.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerboseLib</ShowProgress>
<AdditionalLibraryDirectories>$(SolutionDir)\etc\Prerequisites\qt4_static\lib;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

1
doc/Changelog.html
View File

@ -21,6 +21,7 @@ a:visited { color: #0000EE; }
<li>Dropping support for Windows 2000 and for Windows XP RTM/SP1, Windows XP needs SP2 or SP3 now!
<li>Added a new translation: Korean
<li>Added a method to use custom tools instead of the "built-in" ones (see <a href="FAQ.html#3d6684e9" target="_blank">FAQ doc</a> for details)
<li>Updated Qt runtime libraries to v4.7.3
<li>Updated LAME encoder to v3.99.1.0 (2011-04-15), compiled with ICL 12.0.3 and MSVC 10.0 (<a href="http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/html/history.html?revision=1.127" target="_blank">details</a>)
<li>Updated MediaInfo to v0.7.43 (2011-04-10), compiled with ICL 12.0.3 and MSVC 10.0
<li>Updated language files (big thank-you to all contributors !!!)

2
doc/FAQ.html
View File

@ -542,7 +542,7 @@ LameXP is developed using the <a href="http://en.wikipedia.org/wiki/Git_(softwar
<br>
LameXP is currently being developed using the following build environment:<br><ul>
<li>Visual Studio 2010 with Service Pack 1
<li>Qt libraries v4.7.2 for Windows (VS 2008), compiled with Visual Studio 2010
<li>Qt SDK v1.1 RC, Qt libraries v4.7.3 for Windows (MSVC 2008)
<li>Windows SDK for Windows 7 and .NET Framework 4 (v7.1)</ul>
<br>
Also note the following hints:<br><ul>

2
doc/Translate.html
View File

@ -20,7 +20,7 @@ a:visited { color: #0000EE; }
<br>
<h3>Prerequisites:</h3>
<p>LameXP v4.00 is a complete re-write of LameXP. This time LameXP is developed in C++ and it is based on the <a href="http://qt.nokia.com/products/" target="_blank">Qt</a> cross-platform application framework. The good news for translators is that Qt provides <i>full Unicode support</i>, which was also one of the main reasons for the re-write. Consequently there will be no more headache with different Codepages! Furthermore the Qt framework provides a sophisticated translation system, which allows for easy internationalization and localization. There even is an easy-to-use graphical tool for translating Qt application, the <a href="http://doc.qt.nokia.com/latest/linguist-manual.html" target="_blank">Qt Linguist</a>. So before you start translating, you should make yourself familiar with the <i>Qt Linguist</i> application first. As a translator, having a quick look at the <a href="http://doc.qt.nokia.com/latest/linguist-translators.html" target="_blank">guide for translators</a> should be sufficient.</p>
<p>You can download <i>Qt Linguist</i> as a part of the Qt Framework, which is available as a free download from the <a href="http://qt.nokia.com/downloads/downloads" target="_blank">Qt download site</a>. You should pick the "LGPL" version and the "Qt: Framework Only" download. If you are using Microsoft Windows, then the "VS 2008" version should be preferred. Moreover people who don't like to download the complete framework (230 MB) can find Qt Linguist for Windows as a stand-alone download at <a href="http://code.google.com/p/mulder/downloads/detail?name=qt-linguist-471-win32.rar" target="_blank">this</a> location (4 MB).</p>
<p>You can download <i>Qt Linguist</i> as a part of the Qt Framework, which is available as a free download from the <a href="http://qt.nokia.com/downloads/downloads" target="_blank">Qt download site</a>. You should pick the "LGPL" version and the "Qt: Framework Only" download. If you are using Microsoft Windows, then the "VS 2008" version should be preferred. Moreover people who don't like to download the complete framework (approx. 230 MB) can find Qt Linguist for Windows as a stand-alone download at <a href="http://code.google.com/p/mulder/downloads/detail?name=qt-linguist-473-win32.rar&q=" target="_blank">this</a> location (only 5 MB).</p>
<br>
<h3>Editing the language file:</h3>
<p>LameXP v4.xx translations are created as TS (translation) files, which can be edited using the <i>Qt Linguist</i> application. For new translations an empty TS file ("Blank.ts") is provided in the LameXP Git repository. When you open the empty TS file for the first time, Qt Linguist will ask for some basic settings. Here you must keep the "Source language" options at "English" and "Any Country". Change the "Target language" options to whatever language (region) you are going to translate to. Once you have edited all (or some) text strings, you can save your work to a TS file again. It is recommended to save your work to "LameXP_XX.ts", where <i>XX</i> should be replaced with the suitable upper-case <a href="http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm" target="_blank">ISO 3166-1</a> or <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php" target="_blank">ISO 639-1</a> country/language code (for example the German translation is saved as "LameXP_DE.ts"). You can re-open your TS file at any time in order to continue with your work. In case you want to improve an existing LameXP translation, simply download the corresponding TS file from the LameXP Git repository and edit it using the Qt Linguist tool.</p>

2
etc/Deployment/buildenv.template.txt
View File

@ -3,6 +3,6 @@
#define PATH_UPXBIN "C:\Program Files\UPX"
#define PATH_MKNSIS "C:\Program Files\NSIS\Unicode"
#define PATH_MSVC90 "C:\Program Files\Microsoft Visual Studio 9.0"
#define PATH_QTMSVC "C:\Qt\4.7.2"
#define PATH_QTMSVC "C:\QtSDK\Desktop\Qt\4.7.3\msvc2008"
#define PATH_GNUPG1 "C:\Program Files\GNU\GnuPG"
#define PATH_VCPROJ "LameXP_VS2008.sln"

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 449
#define VER_LAMEXP_BUILD 451
///////////////////////////////////////////////////////////////////////////////
// Tools versions

39
src/Global.cpp
View File

@ -55,16 +55,15 @@
#include <Objbase.h>
//Debug only includes
#ifdef _DEBUG
#if LAMEXP_DEBUG
#include <Psapi.h>
#endif //_DEBUG
#endif
//Static build only macros
//Initialize static Qt plugins
#ifdef QT_NODLL
#pragma warning(disable:4101)
#define LAMEXP_INIT_QT_STATIC_PLUGIN(X) Q_IMPORT_PLUGIN(X)
#else
#define LAMEXP_INIT_QT_STATIC_PLUGIN(X)
Q_IMPORT_PLUGIN(qgif)
Q_IMPORT_PLUGIN(qico)
Q_IMPORT_PLUGIN(qsvg)
#endif
///////////////////////////////////////////////////////////////////////////////
@ -560,10 +559,9 @@ lamexp_cpu_t lamexp_detect_cpu_features(void)
}
/*
* Check for debugger
* Check for debugger (thread proc)
*/
#if !defined(_DEBUG) || defined(NDEBUG)
void WINAPI lamexp_debug_thread_proc(__in LPVOID lpParameter)
static void WINAPI lamexp_debug_thread_proc(__in LPVOID lpParameter)
{
while(!IsDebuggerPresent())
{
@ -571,7 +569,11 @@ void WINAPI lamexp_debug_thread_proc(__in LPVOID lpParameter)
}
TerminateProcess(GetCurrentProcess(), -1);
}
HANDLE lamexp_debug_thread_init(void)
/*
* Check for debugger (startup routine)
*/
static HANDLE lamexp_debug_thread_init(void)
{
if(IsDebuggerPresent())
{
@ -580,8 +582,6 @@ HANDLE lamexp_debug_thread_init(void)
}
return CreateThread(NULL, NULL, reinterpret_cast<LPTHREAD_START_ROUTINE>(&lamexp_debug_thread_proc), NULL, NULL, NULL);
}
static const HANDLE g_debug_thread = lamexp_debug_thread_init();
#endif
/*
* Check for compatibility mode
@ -717,10 +717,6 @@ bool lamexp_init_qt(int argc, char* argv[])
QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath());
qDebug("Library Path:\n%s\n", QApplication::libraryPaths().first().toUtf8().constData());
//Init static Qt plugins
LAMEXP_INIT_QT_STATIC_PLUGIN(qico);
LAMEXP_INIT_QT_STATIC_PLUGIN(qsvg);
//Check for supported image formats
QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
for(int i = 0; g_lamexp_imageformats[i]; i++)
@ -1448,17 +1444,22 @@ void lamexp_finalization(void)
LAMEXP_DELETE(g_lamexp_ipc_ptr.semaphore_write);
}
/*
* Initialize debug thread
*/
static const HANDLE g_debug_thread = LAMEXP_DEBUG ? NULL : lamexp_debug_thread_init();
/*
* Get number private bytes [debug only]
*/
SIZE_T lamexp_dbg_private_bytes(void)
{
#ifdef _DEBUG
#if LAMEXP_DEBUG
PROCESS_MEMORY_COUNTERS_EX memoryCounters;
memoryCounters.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
GetProcessMemoryInfo(GetCurrentProcess(), (PPROCESS_MEMORY_COUNTERS) &memoryCounters, sizeof(PROCESS_MEMORY_COUNTERS_EX));
return memoryCounters.PrivateUsage;
#else
throw "Cannot call this function in a non-debug build!";
#endif //_DEBUG
#endif //LAMEXP_DEBUG
}