kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Resume audio when call ends.

Browse source
This commit is contained in:
John Preston 2018-10-31 10:51:19 +04:00
parent fabf830132
commit 5192049194
2 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
Telegram/SourceFiles/media/player/media_player_instance.cpp
View file

@ -56,21 +56,24 @@ Instance::Instance()
}); });
// While we have one Media::Player::Instance for all authsessions we have to do this. // While we have one Media::Player::Instance for all authsessions we have to do this.
auto handleAuthSessionChange = [this] { const auto handleAuthSessionChange = [=] {
if (AuthSession::Exists()) { if (AuthSession::Exists()) {
subscribe(Auth().calls().currentCallChanged(), [this](Calls::Call *call) { subscribe(Auth().calls().currentCallChanged(), [=](Calls::Call *call) {
if (call) { if (call) {
pause(AudioMsgId::Type::Voice); pauseOnCall(AudioMsgId::Type::Voice);
pause(AudioMsgId::Type::Song); pauseOnCall(AudioMsgId::Type::Song);
} else {
resumeOnCall(AudioMsgId::Type::Voice);
resumeOnCall(AudioMsgId::Type::Song);
} }
}); });
} else { } else {
handleLogout(); handleLogout();
} }
}; };
subscribe(Messenger::Instance().authSessionChanged(), [=] { subscribe(
handleAuthSessionChange(); Messenger::Instance().authSessionChanged(),
}); handleAuthSessionChange);
handleAuthSessionChange(); handleAuthSessionChange();
} }
@ -289,6 +292,9 @@ void Instance::play(AudioMsgId::Type type) {
play(data->current); play(data->current);
} }
} }
if (const auto data = getData(type)) {
data->resumeOnCallEnd = false;
}
} }
void Instance::play(const AudioMsgId &audioId) { void Instance::play(const AudioMsgId &audioId) {
@ -313,21 +319,24 @@ void Instance::play(const AudioMsgId &audioId) {
} }
void Instance::pause(AudioMsgId::Type type) { void Instance::pause(AudioMsgId::Type type) {
auto state = mixer()->currentState(type); const auto state = mixer()->currentState(type);
if (state.id) { if (state.id) {
mixer()->pause(state.id); mixer()->pause(state.id);
} }
} }
void Instance::stop(AudioMsgId::Type type) { void Instance::stop(AudioMsgId::Type type) {
auto state = mixer()->currentState(type); const auto state = mixer()->currentState(type);
if (state.id) { if (state.id) {
mixer()->stop(state.id); mixer()->stop(state.id);
} }
if (const auto data = getData(type)) {
data->resumeOnCallEnd = false;
}
} }
void Instance::playPause(AudioMsgId::Type type) { void Instance::playPause(AudioMsgId::Type type) {
auto state = mixer()->currentState(type); const auto state = mixer()->currentState(type);
if (state.id) { if (state.id) {
if (IsStopped(state.state)) { if (IsStopped(state.state)) {
play(state.id); play(state.id);
@ -341,17 +350,43 @@ void Instance::playPause(AudioMsgId::Type type) {
play(data->current); play(data->current);
} }
} }
if (const auto data = getData(type)) {
data->resumeOnCallEnd = false;
}
}
void Instance::pauseOnCall(AudioMsgId::Type type) {
const auto state = mixer()->currentState(type);
if (!state.id
|| IsStopped(state.state)
|| IsPaused(state.state)
|| state.state == State::Pausing) {
return;
}
pause(type);
if (const auto data = getData(type)) {
data->resumeOnCallEnd = true;
}
}
void Instance::resumeOnCall(AudioMsgId::Type type) {
if (const auto data = getData(type)) {
if (data->resumeOnCallEnd) {
data->resumeOnCallEnd = false;
}
play(type);
}
} }
bool Instance::next(AudioMsgId::Type type) { bool Instance::next(AudioMsgId::Type type) {
if (auto data = getData(type)) { if (const auto data = getData(type)) {
return moveInPlaylist(data, 1, false); return moveInPlaylist(data, 1, false);
} }
return false; return false;
} }
bool Instance::previous(AudioMsgId::Type type) { bool Instance::previous(AudioMsgId::Type type) {
if (auto data = getData(type)) { if (const auto data = getData(type)) {
return moveInPlaylist(data, -1, false); return moveInPlaylist(data, -1, false);
} }
return false; return false;

4
Telegram/SourceFiles/media/player/media_player_instance.h
View file

@ -149,11 +149,15 @@ private:
History *migrated = nullptr; History *migrated = nullptr;
bool repeatEnabled = false; bool repeatEnabled = false;
bool isPlaying = false; bool isPlaying = false;
bool resumeOnCallEnd = false;
}; };
// Observed notifications. // Observed notifications.
void handleSongUpdate(const AudioMsgId &audioId); void handleSongUpdate(const AudioMsgId &audioId);
void pauseOnCall(AudioMsgId::Type type);
void resumeOnCall(AudioMsgId::Type type);
void setCurrent(const AudioMsgId &audioId); void setCurrent(const AudioMsgId &audioId);
void refreshPlaylist(not_null<Data*> data); void refreshPlaylist(not_null<Data*> data);
std::optional<SliceKey> playlistKey(not_null<Data*> data) const; std::optional<SliceKey> playlistKey(not_null<Data*> data) const;