dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-10-31 02:15:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wait for stop after playback instead of forcing it

Browse Source
This commit is contained in:
Rafostar
2020-12-03 11:20:42 +01:00
parent 7a66da1fed
commit c3d60a600e
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
clapper_src/player.js
View File

@@ -315,6 +315,22 @@ class ClapperPlayer extends PlayerBase
debug('cleared update time interval'); debug('cleared update time interval');
} }
_performCloseCleanup(window)
{
window.disconnect(this.closeRequestSignal);
this.closeRequestSignal = null;
let clapperWidget = this.widget.get_ancestor(Gtk.Grid);
if(!clapperWidget.fullscreenMode) {
let size = window.get_size();
if(size[0] > 0 && size[1] > 0)
clapperWidget._saveWindowSize(size);
}
settings.set_double('volume-last', this.volume);
clapperWidget.controls._onCloseRequest();
}
_onStateChanged(player, state) _onStateChanged(player, state)
{ {
this.state = state; this.state = state;
@@ -350,8 +366,11 @@ class ClapperPlayer extends PlayerBase
if(this._trackId < this._playlist.length) if(this._trackId < this._playlist.length)
this.set_media(this._playlist[this._trackId]); this.set_media(this._playlist[this._trackId]);
else if(settings.get_boolean('close-auto')) else if(settings.get_boolean('close-auto')) {
this._onCloseRequest(this.widget.get_root()); /* Stop will be automatically called soon afterwards */
this._performCloseCleanup(this.widget.get_root());
this.quitOnStop = true;
}
} }
_onUriLoaded(player, uri) _onUriLoaded(player, uri)
@@ -622,18 +641,7 @@ class ClapperPlayer extends PlayerBase
_onCloseRequest(window) _onCloseRequest(window)
{ {
window.disconnect(this.closeRequestSignal); this._performCloseCleanup(window);
this.closeRequestSignal = null;
let clapperWidget = this.widget.get_ancestor(Gtk.Grid);
if(!clapperWidget.fullscreenMode) {
let size = window.get_size();
if(size[0] > 0 && size[1] > 0)
clapperWidget._saveWindowSize(size);
}
settings.set_double('volume-last', this.volume);
clapperWidget.controls._onCloseRequest();
if(this.state === GstPlayer.PlayerState.STOPPED) if(this.state === GstPlayer.PlayerState.STOPPED)
return window.run_dispose(); return window.run_dispose();