mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 06:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/Settings/SettingsAudio): unload ring player when window is not visible

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-03 10:05:48 +02:00
parent 933b441a43
commit 02ca3cb191
3 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-desktop/src/components/sound-player/SoundPlayer.cpp
View file

@ -68,6 +68,11 @@ SoundPlayer::SoundPlayer (QObject *parent) : QObject(parent) {
mInternalPlayer->setListener(mHandlers);
}
SoundPlayer::~SoundPlayer () {
mForceCloseTimer->stop();
mInternalPlayer->close();
}
// -----------------------------------------------------------------------------
void SoundPlayer::pause () {

2
linphone-desktop/src/components/sound-player/SoundPlayer.hpp
View file

@ -56,7 +56,7 @@ public:
Q_ENUM(PlaybackState);
SoundPlayer (QObject *parent = Q_NULLPTR);
~SoundPlayer () = default;
~SoundPlayer ();
Q_INVOKABLE void pause ();
Q_INVOKABLE void play ();

34
linphone-desktop/ui/views/App/Settings/SettingsAudio.qml
View file

@ -74,7 +74,11 @@ TabContainer {
selectedFile: SettingsModel.ringPath
onAccepted: {
ringPlayer.stop()
var item = ringPlayer.item
if (item) {
item.stop()
}
SettingsModel.ringPath = selectedFile
}
@ -84,27 +88,33 @@ TabContainer {
leftMargin: SettingsAudioStyle.ringPlayer.leftMargin
}
enabled: ringPlayer.playbackState === SoundPlayer.PlayingState
enabled: {
var item = ringPlayer.item
return item && item.playbackState === SoundPlayer.PlayingState
}
icon: 'pause'
onClicked: {
var item = ringPlayer.item
if (!item) {
return
}
if (enabled) {
ringPlayer.stop()
item.stop()
} else {
ringPlayer.play()
item.play()
}
}
SoundPlayer {
Loader {
id: ringPlayer
source: SettingsModel.ringPath
}
Connections {
target: window
onClosing: ringPlayer.stop()
active: window.visible
sourceComponent: SoundPlayer {
source: SettingsModel.ringPath
}
}
}
}