Adapted for the latest MUtils library changes.

diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj
index 8507868..457de35 100644 (file)
--- a/LameXP_VS2013.vcxproj
+++ b/LameXP_VS2013.vcxproj
@@ -432,7 +432,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp" />
@@ -1821,7 +1821,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.netc.qrc">
+    <CustomBuild Include="res\Tools.mcat.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>

diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters
index e24fc36..488bdc8 100644 (file)
--- a/LameXP_VS2013.vcxproj.filters
+++ b/LameXP_VS2013.vcxproj.filters
@@ -550,7 +550,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1034,15 +1034,15 @@
     <CustomBuild Include="res\Tools.faad-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools.mcat.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
     <None Include="res\MainIcon.ico">
       <Filter>Miscellaneous</Filter>
     </None>
-    <None Include="res\Tools.netcat.qrc">
-      <Filter>Resources</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">

diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj
index afa20d8..df574fe 100644 (file)
--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -432,7 +432,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp" />
@@ -1821,7 +1821,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.netc.qrc">
+    <CustomBuild Include="res\Tools.mcat.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>

diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index e24fc36..488bdc8 100644 (file)
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -550,7 +550,7 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp">
+    <ClCompile Include="tmp\LameXP\QRC_Tools.mcat.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1034,15 +1034,15 @@
     <CustomBuild Include="res\Tools.faad-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools.mcat.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
     <None Include="res\MainIcon.ico">
       <Filter>Miscellaneous</Filter>
     </None>
-    <None Include="res\Tools.netcat.qrc">
-      <Filter>Resources</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">

diff --git a/res/Tools.mcat.qrc b/res/Tools.mcat.qrc
new file mode 100644 (file)
index 0000000..2147fc1
--- /dev/null
+++ b/res/Tools.mcat.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/mcat.exe</file></qresource></RCC>

diff --git a/res/Tools.netc.qrc b/res/Tools.netc.qrc
deleted file mode 100644 (file)
index 48668f7..0000000
--- a/res/Tools.netc.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/netc.exe</file></qresource></RCC>

diff --git a/res/tools/mcat.exe b/res/tools/mcat.exe
new file mode 100644 (file)
index 0000000..7f26286
Binary files /dev/null and b/res/tools/mcat.exe differ

diff --git a/res/tools/netc.exe b/res/tools/netc.exe
deleted file mode 100644 (file)
index 008ca52..0000000
Binary files a/res/tools/netc.exe and /dev/null differ

diff --git a/src/Config.h b/src/Config.h
index ff36484..bf8f238 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    5
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       2
-#define VER_LAMEXP_BUILD                                       1968
+#define VER_LAMEXP_BUILD                                       1969
 #define VER_LAMEXP_CONFG                                       1934
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp
index 0e0076d..a3f1a16 100644 (file)
--- a/src/Dialog_Update.cpp
+++ b/src/Dialog_Update.cpp
@@ -84,11 +84,11 @@ UpdateDialog::UpdateDialog(const SettingsModel *const settings, QWidget *parent)
        m_updaterProcess(NULL),
        m_binaryUpdater(lamexp_tools_lookup("wupdate.exe")),
        m_binaryWGet(lamexp_tools_lookup("wget.exe")),
-       m_binaryNC(lamexp_tools_lookup("netc.exe")),
+       m_binaryMCat(lamexp_tools_lookup("mcat.exe")),
        m_binaryGnuPG(lamexp_tools_lookup("gpgv.exe")),
        m_binaryKeys(lamexp_tools_lookup("keyring.gpg"))
 {
-       if(m_binaryUpdater.isEmpty() || m_binaryWGet.isEmpty() || m_binaryNC.isEmpty() || m_binaryGnuPG.isEmpty() || m_binaryKeys.isEmpty())
+       if(m_binaryUpdater.isEmpty() || m_binaryWGet.isEmpty() || m_binaryMCat.isEmpty() || m_binaryGnuPG.isEmpty() || m_binaryKeys.isEmpty())
        {
                MUTILS_THROW("Tools not initialized correctly!");
        }
@@ -151,7 +151,7 @@ void UpdateDialog::showEvent(QShowEvent *event)
        {
                if(m_thread.isNull())
                {
-                       m_thread.reset(new MUtils::UpdateChecker(m_binaryWGet, m_binaryNC, m_binaryGnuPG, m_binaryKeys, QLatin1String("LameXP"), lamexp_version_build(), m_betaUpdates));
+                       m_thread.reset(new MUtils::UpdateChecker(m_binaryWGet, m_binaryMCat, m_binaryGnuPG, m_binaryKeys, QLatin1String("LameXP"), lamexp_version_build(), m_betaUpdates));
                        connect(m_thread.data(), SIGNAL(statusChanged(int)), this, SLOT(threadStatusChanged(int)));
                        connect(m_thread.data(), SIGNAL(progressChanged(int)), this, SLOT(threadProgressChanged(int)));
                        connect(m_thread.data(), SIGNAL(messageLogged(QString)), this, SLOT(threadMessageLogged(QString)));
@@ -476,7 +476,7 @@ void UpdateDialog::testKnownHosts(void)
 {
        ui->statusLabel->setText("Testing all known hosts, this may take a few minutes...");
        
-       if(MUtils::UpdateChecker *testThread = new MUtils::UpdateChecker(m_binaryWGet, m_binaryNC, m_binaryGnuPG, m_binaryKeys, QLatin1String("LameXP"), lamexp_version_build(), m_betaUpdates, true))
+       if(MUtils::UpdateChecker *testThread = new MUtils::UpdateChecker(m_binaryWGet, m_binaryMCat, m_binaryGnuPG, m_binaryKeys, QLatin1String("LameXP"), lamexp_version_build(), m_betaUpdates, true))
        {
                QEventLoop loop;
                m_logFile->clear();

diff --git a/src/Dialog_Update.h b/src/Dialog_Update.h
index e18defe..a8f3581 100644 (file)
--- a/src/Dialog_Update.h
+++ b/src/Dialog_Update.h
@@ -78,7 +78,7 @@ private:
        const SettingsModel *const m_settings;
 
        const QString m_binaryWGet;
-       const QString m_binaryNC;
+       const QString m_binaryMCat;
        const QString m_binaryGnuPG;
        const QString m_binaryKeys;
        const QString m_binaryUpdater;

diff --git a/src/Tools.h b/src/Tools.h
index 5deac93..4351d16 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -92,7 +92,7 @@ g_lamexp_tools[] =
        {"d08097c7d310529b5b29268c3ecec436f8a55a28a8a524f09c1f94d6d47792f3aeae810353d0387352c2a487c5fd9225", CPU_TYPE_ALL_GEN, "mpg123.i386.exe", 1238, ""},
        {"1af626aaaacd67c4c5e4e1bc17dff298ba41b3d1466427b329a9850dee2455c35ca65d650b9abf5f87a93f8b7cf3348c", CPU_TYPE_ALL_SSE, "mpg123.sse2.exe", 1238, "" },
        {"ed1ad3df06f0de2924a63042901780e4055ed2963a3a348268aef711dfaa423e48bedbd6ba59bb798d1a1bb5c9384eaa", CPU_TYPE_ALL_AVX, "mpg123.avx.exe",  1238, "" },
-       {"15ad9c88684538d57dcb5e898bc59c9e7aba542702ecb1987de54b9f910d68a3121630828de45d1be424a90621af4363", CPU_TYPE_ALL_ALL, "netc.exe", 112, "" },
+       {"dda88fb66a80c362dfa367d07265eee3dcf8ee959191fc7685163fdee694ece7d84000065de217942749b6859d33fa84", CPU_TYPE_ALL_ALL, "mcat.exe", 101, "" },
        {"f1f2ea5c9e5539620b706e7af68e543bf7a731afb06ccce3815ab34dad64d697e4d6ffcd187a396619b8b52efe7edf88", CPU_TYPE_ALL_ALL, "oggdec.exe", 1101, ""},
        {"245181321625445ac42fce31d64bf03872e77e2d0dd3c19d6c17ca2771354f096a6040827dd6d00ffd7342c7dd26168e", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 288135603, "2015"},
        {"512b8efcd1003a0f67220a450d6ea4466194e8fd49fc090a69b15a858db11499acbf98f984530cd5d37b4b6abdd1c6d8", CPU_TYPE_X86_SSX, "oggenc2.sse2.exe", 288135603, "2015"},