• R/O
  • HTTP
  • SSH
  • HTTPS

x264-launcher: 提交

Simple x264 Launcher development repository


Commit MetaInfo

修订版669a9151187da99c3c74cc4a3904738e6a9bb711 (tree)
时间2016-04-23 22:09:13
作者lordmulder <mulder2@gmx....>
Commiterlordmulder

Log Message

Some fixes in Update dialog to accommodate for latest MUtils changes.

更改概述

差异

--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -2,9 +2,10 @@
22 Simple x264/x265 Launcher version history
33 -----------------------------------------
44
5-Version 2.69 [2016-04-??]
5+Version 2.69 [2016-04-23]
66 * Updated x264 to revision 2692
77 * Updated x265 to version 1.9+140
8+* Some improvements to auto-update functionality
89
910 Version 2.68 [2016-04-09]
1011 * Updated build environment to Visual Studio 2015 with Update-2
Binary files /dev/null and b/res/toolset/common/netc.exe differ
--- a/src/version.h
+++ b/src/version.h
@@ -25,8 +25,8 @@
2525
2626 #define VER_X264_MAJOR 2
2727 #define VER_X264_MINOR 6
28-#define VER_X264_PATCH 8
29-#define VER_X264_BUILD 1022
28+#define VER_X264_PATCH 9
29+#define VER_X264_BUILD 1024
3030
3131 #define VER_X264_PORTABLE_EDITION (0)
3232
--- a/src/win_updater.cpp
+++ b/src/win_updater.cpp
@@ -50,6 +50,7 @@
5050 const UpdaterDialog::binary_t UpdaterDialog::BINARIES[] =
5151 {
5252 { "wget.exe", "7b522345239bcb95b5b0f7f50a883ba5957894a1feb769763e38ed789a8a0f63fead0155f54b9ffd0f1cdc5dfd855d207a6e7a8e4fd192589a8838ce646c504e", 1 },
53+ { "netc.exe", "c199ea12d761fa3191006da250f8f600ad426265fdf4a43e551cdf04a451a105692efd3ef82ac621c0799394aa21ac65bfbb4bab90c3fbb1f557e93f490fcb75", 1 },
5354 { "gpgv.exe", "18c5456cbb9ebf5cb9012a939b199d9eaa71c92a39f574f1e032babad0bbd9e72a064af96ca9d3d01f2892b064ec239fd61f27bac2eb9a64f7b2ece7beea3158", 1 },
5455 { "gpgv.gpg", "745c7a9c040196d9d322b1580e0046ff26ec13238cfd04325ceb3d4c8948294c593c027f895dc8ec427295175003e75d34f083019b706b0f4f06f81cce8df47d", 0 },
5556 { "wupd.exe", "7eb8338efe0ddf973ee9fda5e5bfa4728876f2fcff2b3add30cb8c439d3d59a5de1a0636176c34be0b0da1a764363d0cfec014679749dc504999aa184f35dfd5", 1 },
@@ -197,8 +198,7 @@ void UpdaterDialog::initUpdate(void)
197198 }
198199
199200 //Check binary files
200- QString wgetBin, gpgvBin;
201- if(!checkBinaries(wgetBin, gpgvBin))
201+ if(!checkBinaries())
202202 {
203203 ui->buttonCancel->setEnabled(true);
204204 const QString message = QString("%1<br><br><nobr><a href=\"%2\">%3</a></nobr><br>").arg(tr("At least one file required by the web-update tool is missing or corrupted.<br>Please re-install this application and then try again!"), QString::fromLatin1(m_updateUrl), QString::fromLatin1(m_updateUrl).replace("-", "&minus;"));
@@ -226,7 +226,7 @@ void UpdaterDialog::initUpdate(void)
226226 //Create and setup thread
227227 if(!m_thread)
228228 {
229- m_thread.reset(new MUtils::UpdateChecker(m_binaries.value("wget.exe"), m_binaries.value("gpgv.exe"), m_binaries.value("gpgv.gpg"), "Simple x264 Launcher", x264_version_build(), false));
229+ m_thread.reset(new MUtils::UpdateChecker(m_binaries.value("wget.exe"), m_binaries.value("netc.exe"), m_binaries.value("gpgv.exe"), m_binaries.value("gpgv.gpg"), "Simple x264 Launcher", x264_version_build(), false));
230230 connect(m_thread.data(), SIGNAL(statusChanged(int)), this, SLOT(threadStatusChanged(int)));
231231 connect(m_thread.data(), SIGNAL(finished()), this, SLOT(threadFinished()));
232232 connect(m_thread.data(), SIGNAL(terminated()), this, SLOT(threadFinished()));
@@ -458,7 +458,7 @@ void UpdaterDialog::installUpdate(void)
458458 // Private Functions
459459 ///////////////////////////////////////////////////////////////////////////////
460460
461-bool UpdaterDialog::checkBinaries(QString &wgetBin, QString &gpgvBin)
461+bool UpdaterDialog::checkBinaries(void)
462462 {
463463 qDebug("[File Verification]");
464464 m_binaries.clear();
--- a/src/win_updater.h
+++ b/src/win_updater.h
@@ -77,7 +77,7 @@ private slots:
7777 private:
7878 Ui::UpdaterDialog *const ui;
7979
80- bool checkBinaries(QString &wgetBin, QString &gpgvBin);
80+ bool checkBinaries();
8181 bool checkFileHash(const QString &filePath, const char *expectedHash);
8282 void cleanFiles(void);
8383
Show on old repository browser