procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix jump-to-time from audio captions.

This commit is contained in:
John Preston 2020-02-06 13:19:33 +04:00
parent 76ff9a562e
commit 6cf9157fb5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/media/player/media_player_instance.cpp
View File

@ -189,14 +189,16 @@ void Instance::setCurrent(const AudioMsgId &audioId) {
} }
} }
void Instance::clearStreamed(not_null<Data*> data) { void Instance::clearStreamed(not_null<Data*> data, bool savePosition) {
if (!data->streamed || data->streamed->clearing) { if (!data->streamed || data->streamed->clearing) {
return; return;
} }
data->streamed->clearing = true; data->streamed->clearing = true;
SaveLastPlaybackPosition( if (savePosition) {
data->current.audio(), SaveLastPlaybackPosition(
data->streamed->instance.player().prepareLegacyState()); data->current.audio(),
data->streamed->instance.player().prepareLegacyState());
}
data->streamed->instance.stop(); data->streamed->instance.stop();
data->isPlaying = false; data->isPlaying = false;
requestRoundVideoResize(); requestRoundVideoResize();
@ -414,7 +416,7 @@ void Instance::playStreamed(
const auto data = getData(audioId.type()); const auto data = getData(audioId.type());
Assert(data != nullptr); Assert(data != nullptr);
clearStreamed(data); clearStreamed(data, data->current.audio() != audioId.audio());
data->streamed = std::make_unique<Streamed>( data->streamed = std::make_unique<Streamed>(
audioId, audioId,
std::move(shared)); std::move(shared));

2
Telegram/SourceFiles/media/player/media_player_instance.h
View File

@ -225,7 +225,7 @@ private:
not_null<Data*> data, not_null<Data*> data,
Streaming::Error &&error); Streaming::Error &&error);
void clearStreamed(not_null<Data *> data); void clearStreamed(not_null<Data*> data, bool savePosition = true);
void emitUpdate(AudioMsgId::Type type); void emitUpdate(AudioMsgId::Type type);
template <typename CheckCallback> template <typename CheckCallback>
void emitUpdate(AudioMsgId::Type type, CheckCallback check); void emitUpdate(AudioMsgId::Type type, CheckCallback check);