From 41c60419f16b99a252127cd0b8a94cac55c59646 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Mar 2019 11:46:56 +0400
Subject: [PATCH] Enable voice messages streaming.

---
 Telegram/SourceFiles/boxes/auto_download_box.cpp      |  6 +++++-
 Telegram/SourceFiles/data/data_auto_download.cpp      |  4 +++-
 .../media/player/media_player_instance.cpp            | 11 ++---------
 .../media/streaming/media_streaming_player.cpp        |  2 ++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/auto_download_box.cpp b/Telegram/SourceFiles/boxes/auto_download_box.cpp
index 51ac639cd..d042b9679 100644
--- a/Telegram/SourceFiles/boxes/auto_download_box.cpp
+++ b/Telegram/SourceFiles/boxes/auto_download_box.cpp
@@ -56,7 +56,11 @@ void AutoDownloadBox::setupContent() {
 		this,
 		std::move(wrap)));
 
-	static const auto kHidden = { Type::Video, Type::Music };
+	static const auto kHidden = {
+		Type::Video,
+		Type::Music,
+		Type::VoiceMessage
+	};
 
 	const auto values = Ui::CreateChild<base::flat_map<Type, int>>(content);
 	const auto add = [&](Type type, LangKey label) {
diff --git a/Telegram/SourceFiles/data/data_auto_download.cpp b/Telegram/SourceFiles/data/data_auto_download.cpp
index 66a75440f..21597d1c7 100644
--- a/Telegram/SourceFiles/data/data_auto_download.cpp
+++ b/Telegram/SourceFiles/data/data_auto_download.cpp
@@ -181,7 +181,9 @@ void Full::setBytesLimit(Source source, Type type, int bytesLimit) {
 }
 
 bool Full::shouldDownload(Source source, Type type, int fileSize) const {
-	if (type == Type::Video || type == Type::Music) {
+	if (type == Type::Video
+		|| type == Type::Music
+		|| type == Type::VoiceMessage) {
 		// With streaming we disable autodownload and hide them in Settings.
 		return false;
 	}
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index 5ba7a8a2b..108bcf82b 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -115,8 +115,7 @@ AudioMsgId::Type Instance::getActiveType() const {
 	const auto voiceData = getData(AudioMsgId::Type::Voice);
 	if (voiceData->current) {
 		const auto state = getState(voiceData->type);
-		if (voiceData->current == state.id
-			&& !IsStoppedOrStopping(state.state)) {
+		if (!IsStoppedOrStopping(state.state)) {
 			return voiceData->type;
 		}
 	}
@@ -355,18 +354,12 @@ void Instance::play(const AudioMsgId &audioId) {
 	if (!document) {
 		return;
 	}
-	if (document->isAudioFile()) {
+	if (document->isAudioFile() || document->isVoiceMessage()) {
 		auto loader = document->createStreamingLoader(audioId.contextId());
 		if (!loader) {
 			return;
 		}
 		playStreamed(audioId, std::move(loader));
-	} else if (document->isVoiceMessage()) {
-		mixer()->play(audioId);
-		setCurrent(audioId);
-		if (document->loading()) {
-			documentLoadProgress(document);
-		}
 	} else if (document->isVideoMessage()) {
 		if (const auto item = App::histItemById(audioId.contextId())) {
 			App::wnd()->controller()->startRoundVideo(item);
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
index 41f70bd61..327ed88d6 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
@@ -674,6 +674,8 @@ Media::Player::TrackState Player::prepareLegacyState() const {
 			? crl::time(0)
 			: document->song()
 			? document->song()->duration
+			: document->voice()
+			? document->voice()->duration
 			: document->duration();
 		if (duration > 0) {
 			result.length = duration * crl::time(1000);