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

Fix volume saving to settings.

This commit is contained in:
John Preston 2019-03-12 09:09:53 +04:00
parent 6afb3f70bb
commit 846499a4fb
9 changed files with 95 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
Telegram/SourceFiles/media/audio/media_audio.cpp
View File

@ -775,16 +775,15 @@ bool Mixer::fadedStop(AudioMsgId::Type type, bool *fadedStart) {
return false; return false;
} }
void Mixer::play(const AudioMsgId &audio, crl::time positionMs) {
setSongVolume(Global::SongVolume());
play(audio, nullptr, positionMs);
}
void Mixer::play( void Mixer::play(
const AudioMsgId &audio, const AudioMsgId &audio,
std::unique_ptr<ExternalSoundData> externalData, std::unique_ptr<ExternalSoundData> externalData,
crl::time positionMs) { crl::time positionMs) {
Expects((externalData != nullptr) == (audio.externalPlayId() != 0)); Expects(externalData != nullptr);
Expects(audio.externalPlayId() != 0);
setSongVolume(Global::SongVolume());
setVideoVolume(Global::VideoVolume());
auto type = audio.type(); auto type = audio.type();
AudioMsgId stopped; AudioMsgId stopped;
@ -1049,72 +1048,74 @@ void Mixer::resume(const AudioMsgId &audio, bool fast) {
} }
if (current) emit updated(current); if (current) emit updated(current);
} }
//
void Mixer::seek(AudioMsgId::Type type, crl::time positionMs) { // Right now all the music is played in the streaming player.
QMutexLocker lock(&AudioMutex); //
//void Mixer::seek(AudioMsgId::Type type, crl::time positionMs) {
const auto current = trackForType(type); // QMutexLocker lock(&AudioMutex);
const auto audio = current->state.id; //
// const auto current = trackForType(type);
Audio::AttachToDevice(); // const auto audio = current->state.id;
const auto streamCreated = current->isStreamCreated(); //
const auto position = (positionMs * current->frequency) / 1000LL; // Audio::AttachToDevice();
const auto fastSeek = [&] { // const auto streamCreated = current->isStreamCreated();
const auto loadedStart = current->bufferedPosition; // const auto position = (positionMs * current->frequency) / 1000LL;
const auto loadedLength = current->bufferedLength; // const auto fastSeek = [&] {
const auto skipBack = (current->loaded ? 0 : kDefaultFrequency); // const auto loadedStart = current->bufferedPosition;
const auto availableEnd = loadedStart + loadedLength - skipBack; // const auto loadedLength = current->bufferedLength;
if (position < loadedStart) { // const auto skipBack = (current->loaded ? 0 : kDefaultFrequency);
return false; // const auto availableEnd = loadedStart + loadedLength - skipBack;
} else if (position >= availableEnd) { // if (position < loadedStart) {
return false; // return false;
} else if (!streamCreated) { // } else if (position >= availableEnd) {
return false; // return false;
} else if (IsStoppedOrStopping(current->state.state)) { // } else if (!streamCreated) {
return false; // return false;
} // } else if (IsStoppedOrStopping(current->state.state)) {
return true; // return false;
}(); // }
if (fastSeek) { // return true;
alSourcei(current->stream.source, AL_SAMPLE_OFFSET, position - current->bufferedPosition); // }();
if (!checkCurrentALError(type)) return; // if (fastSeek) {
// alSourcei(current->stream.source, AL_SAMPLE_OFFSET, position - current->bufferedPosition);
alSourcef(current->stream.source, AL_GAIN, ComputeVolume(type)); // if (!checkCurrentALError(type)) return;
if (!checkCurrentALError(type)) return; //
// alSourcef(current->stream.source, AL_GAIN, ComputeVolume(type));
resetFadeStartPosition(type, position - current->bufferedPosition); // if (!checkCurrentALError(type)) return;
} else { //
setStoppedState(current); // resetFadeStartPosition(type, position - current->bufferedPosition);
} // } else {
switch (current->state.state) { // setStoppedState(current);
case State::Pausing: // }
case State::Paused: // switch (current->state.state) {
case State::PausedAtEnd: { // case State::Pausing:
if (current->state.state == State::PausedAtEnd) { // case State::Paused:
current->state.state = State::Paused; // case State::PausedAtEnd: {
} // if (current->state.state == State::PausedAtEnd) {
lock.unlock(); // current->state.state = State::Paused;
return resume(audio, true); // }
} break; // lock.unlock();
case State::Starting: // return resume(audio, true);
case State::Resuming: // } break;
case State::Playing: { // case State::Starting:
current->state.state = State::Pausing; // case State::Resuming:
resetFadeStartPosition(type); // case State::Playing: {
if (type == AudioMsgId::Type::Voice) { // current->state.state = State::Pausing;
emit unsuppressSong(); // resetFadeStartPosition(type);
} // if (type == AudioMsgId::Type::Voice) {
} break; // emit unsuppressSong();
case State::Stopping: // }
case State::Stopped: // } break;
case State::StoppedAtEnd: // case State::Stopping:
case State::StoppedAtError: // case State::Stopped:
case State::StoppedAtStart: { // case State::StoppedAtEnd:
lock.unlock(); // case State::StoppedAtError:
} return play(audio, positionMs); // case State::StoppedAtStart: {
} // lock.unlock();
emit faderOnTimer(); // } return play(audio, positionMs);
} // }
// emit faderOnTimer();
//}
void Mixer::stop(const AudioMsgId &audio) { void Mixer::stop(const AudioMsgId &audio) {
AudioMsgId current; AudioMsgId current;

4
Telegram/SourceFiles/media/audio/media_audio.h
View File

@ -128,14 +128,12 @@ class Mixer : public QObject, private base::Subscriber {
public: public:
explicit Mixer(not_null<Audio::Instance*> instance); explicit Mixer(not_null<Audio::Instance*> instance);
void play(const AudioMsgId &audio, crl::time positionMs = 0);
void play( void play(
const AudioMsgId &audio, const AudioMsgId &audio,
std::unique_ptr<ExternalSoundData> externalData, std::unique_ptr<ExternalSoundData> externalData,
crl::time positionMs = 0); crl::time positionMs);
void pause(const AudioMsgId &audio, bool fast = false); void pause(const AudioMsgId &audio, bool fast = false);
void resume(const AudioMsgId &audio, bool fast = false); void resume(const AudioMsgId &audio, bool fast = false);
void seek(AudioMsgId::Type type, crl::time positionMs); // type == AudioMsgId::Type::Song
void stop(const AudioMsgId &audio); void stop(const AudioMsgId &audio);
void stop(const AudioMsgId &audio, State state); void stop(const AudioMsgId &audio, State state);

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

@ -556,11 +556,13 @@ void Instance::finishSeeking(AudioMsgId::Type type, float64 progress) {
position)); position));
emitUpdate(type); emitUpdate(type);
} }
} else { //
const auto state = getState(type); // Right now all music is played in streaming player.
if (state.id && state.length && state.frequency) { //} else {
mixer()->seek(type, qRound(progress * state.length * 1000. / state.frequency)); // const auto state = getState(type);
} // if (state.id && state.length && state.frequency) {
// mixer()->seek(type, qRound(progress * state.length * 1000. / state.frequency));
// }
} }
} }
cancelSeeking(type); cancelSeeking(type);

2
Telegram/SourceFiles/media/player/media_player_volume_controller.cpp
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "styles/style_media_player.h" #include "styles/style_media_player.h"
#include "styles/style_widgets.h" #include "styles/style_widgets.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "auth_session.h"
namespace Media { namespace Media {
namespace Player { namespace Player {
@ -29,6 +30,7 @@ VolumeController::VolumeController(QWidget *parent) : TWidget(parent)
Global::SetRememberedSongVolume(volume); Global::SetRememberedSongVolume(volume);
} }
applyVolumeChange(volume); applyVolumeChange(volume);
Auth().saveSettingsDelayed();
}); });
subscribe(Global::RefSongVolumeChanged(), [this] { subscribe(Global::RefSongVolumeChanged(), [this] {
if (!_slider->isChanging()) { if (!_slider->isChanging()) {

5
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -2297,6 +2297,11 @@ void OverlayWidget::playbackControlsVolumeChanged(float64 volume) {
Global::SetVideoVolume(volume); Global::SetVideoVolume(volume);
updateMixerVideoVolume(); updateMixerVideoVolume();
Global::RefVideoVolumeChanged().notify(); Global::RefVideoVolumeChanged().notify();
Auth().saveSettingsDelayed();
}
float64 OverlayWidget::playbackControlsCurrentVolume() {
return Global::VideoVolume();
} }
void OverlayWidget::playbackToggleFullScreen() { void OverlayWidget::playbackToggleFullScreen() {

1
Telegram/SourceFiles/media/view/media_view_overlay_widget.h
View File

@ -163,6 +163,7 @@ private:
void playbackControlsSeekProgress(crl::time position) override; void playbackControlsSeekProgress(crl::time position) override;
void playbackControlsSeekFinished(crl::time position) override; void playbackControlsSeekFinished(crl::time position) override;
void playbackControlsVolumeChanged(float64 volume) override; void playbackControlsVolumeChanged(float64 volume) override;
float64 playbackControlsCurrentVolume() override;
void playbackControlsToFullScreen() override; void playbackControlsToFullScreen() override;
void playbackControlsFromFullScreen() override; void playbackControlsFromFullScreen() override;
void playbackPauseResume(); void playbackPauseResume();

6
Telegram/SourceFiles/media/view/media_view_playback_controls.cpp
View File

@ -19,7 +19,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Media { namespace Media {
namespace View { namespace View {
PlaybackControls::PlaybackControls(QWidget *parent, not_null<Delegate *> delegate) PlaybackControls::PlaybackControls(
QWidget *parent,
not_null<Delegate*> delegate)
: RpWidget(parent) : RpWidget(parent)
, _delegate(delegate) , _delegate(delegate)
, _playPauseResume(this, st::mediaviewPlayButton) , _playPauseResume(this, st::mediaviewPlayButton)
@ -38,7 +40,7 @@ PlaybackControls::PlaybackControls(QWidget *parent, not_null<Delegate *> delegat
fadeUpdated(opacity); fadeUpdated(opacity);
}); });
_volumeController->setValue(Global::VideoVolume()); _volumeController->setValue(_delegate->playbackControlsCurrentVolume());
_volumeController->setChangeProgressCallback([=](float64 value) { _volumeController->setChangeProgressCallback([=](float64 value) {
_delegate->playbackControlsVolumeChanged(value); _delegate->playbackControlsVolumeChanged(value);
}); });

1
Telegram/SourceFiles/media/view/media_view_playback_controls.h
View File

@ -34,6 +34,7 @@ public:
virtual void playbackControlsSeekProgress(crl::time position) = 0; virtual void playbackControlsSeekProgress(crl::time position) = 0;
virtual void playbackControlsSeekFinished(crl::time position) = 0; virtual void playbackControlsSeekFinished(crl::time position) = 0;
virtual void playbackControlsVolumeChanged(float64 volume) = 0; virtual void playbackControlsVolumeChanged(float64 volume) = 0;
[[nodiscard]] virtual float64 playbackControlsCurrentVolume() = 0;
virtual void playbackControlsToFullScreen() = 0; virtual void playbackControlsToFullScreen() = 0;
virtual void playbackControlsFromFullScreen() = 0; virtual void playbackControlsFromFullScreen() = 0;
}; };

2
Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp
View File

@ -50,7 +50,7 @@ QRect ContinuousSlider::getSeekRect() const {
} }
void ContinuousSlider::setValue(float64 value) { void ContinuousSlider::setValue(float64 value) {
setValue(value, value); setValue(value, -1);
} }
void ContinuousSlider::setValue(float64 value, float64 receivedTill) { void ContinuousSlider::setValue(float64 value, float64 receivedTill) {