From 26723fb82085981c4ef4a585ca0abf274eda99ac Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 22 Jul 2016 19:22:25 +0300 Subject: [PATCH] Alpha version 0.9.58: embedded video player. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/application.cpp | 9 ++------- Telegram/SourceFiles/core/version.h | 8 ++++---- Telegram/SourceFiles/media/media_audio.cpp | 2 +- Telegram/Telegram.xcodeproj/project.pbxproj | 4 ++-- Telegram/build/version | 10 +++++----- 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 4fbc4908a..3132ab97a 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,57,1 - PRODUCTVERSION 0,9,57,1 + FILEVERSION 0,9,58,0 + PRODUCTVERSION 0,9,58,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.57.1" + VALUE "FileVersion", "0.9.58.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.57.1" + VALUE "ProductVersion", "0.9.58.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 0c3a7892d..69822ab7a 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,57,1 - PRODUCTVERSION 0,9,57,1 + FILEVERSION 0,9,58,0 + PRODUCTVERSION 0,9,58,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.57.1" + VALUE "FileVersion", "0.9.58.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.57.1" + VALUE "ProductVersion", "0.9.58.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index be4e3c21c..d690d196f 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -1051,13 +1051,8 @@ void AppClass::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9057) { -#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements\n\xe2\x80\x94 Linux : trying to use GTK file chooser when it is available"); -#else // Q_OS_LINUX32 || Q_OS_LINUX64 - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Design improvements"); -#endif // Q_OS_LINUX32 || Q_OS_LINUX64 -// versionFeatures = langNewVersionText(); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9058) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Alpha version of an embedded video player"); } else if (Local::oldMapVersion() < 9056) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 7baecf548..795b8bef4 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,9 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/basic_types.h" -#define BETA_VERSION_MACRO (9057001ULL) +#define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 9057; -constexpr str_const AppVersionStr = "0.9.57"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 9058; +constexpr str_const AppVersionStr = "0.9.58"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp index 2ba1b0a88..f0411644c 100644 --- a/Telegram/SourceFiles/media/media_audio.cpp +++ b/Telegram/SourceFiles/media/media_audio.cpp @@ -1748,7 +1748,7 @@ void AudioCaptureInner::processFrame(int32 offset, int32 framesize) { AVFrame *frame = av_frame_alloc(); frame->nb_samples = d->dstSamples; - frame->pts = av_rescale_q(d->fullSamples, (AVRational){1, d->codecContext->sample_rate}, d->codecContext->time_base); + frame->pts = av_rescale_q(d->fullSamples, AVRational{1, d->codecContext->sample_rate}, d->codecContext->time_base); avcodec_fill_audio_frame(frame, d->codecContext->channels, d->codecContext->sample_fmt, d->dstSamplesData[0], d->dstSamplesSize, 0); diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index a571e4cdf..205b86bde 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -2531,7 +2531,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.57; + TDESKTOP_VERSION = 0.9.58; }; name = Release; }; @@ -2672,7 +2672,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.57; + TDESKTOP_VERSION = 0.9.58; }; name = Debug; }; diff --git a/Telegram/build/version b/Telegram/build/version index 5658212f2..f5aff1e62 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 9057 +AppVersion 9058 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.57 -AppVersionStr 0.9.57 -AlphaChannel 0 -BetaVersion 9057001 +AppVersionStrSmall 0.9.58 +AppVersionStr 0.9.58 +AlphaChannel 1 +BetaVersion 0