dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 07:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Load media after player is drawn

Browse Source 
Loading file too early might lead to Xorg related crash. We must first make sure the player widget is fully drawn, before we start drawing video frames.
This commit is contained in:
Rafostar
2020-09-06 12:18:37 +02:00
parent da652e1ec5
commit f5db250486
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
clapper_src/app.js
View File

@@ -40,8 +40,8 @@ var App = GObject.registerClass({
this.player = null; this.player = null;
this.dragStartReady = false; this.dragStartReady = false;
this.connect('startup', () => this._buildUI()); this.connect('startup', this._buildUI.bind(this));
this.connect('activate', () => this._openWindow()); this.connect('activate', this._openWindow.bind(this));
} }
run(arr) run(arr)
@@ -84,7 +84,7 @@ var App = GObject.registerClass({
{ {
this.window = new Window(this, APP_NAME); this.window = new Window(this, APP_NAME);
this.window.connect( this.windowRealizeSignal = this.window.connect(
'realize', this._onWindowRealize.bind(this) 'realize', this._onWindowRealize.bind(this)
); );
this.window.connect( this.window.connect(
@@ -109,6 +109,8 @@ var App = GObject.registerClass({
_onWindowRealize() _onWindowRealize()
{ {
this.window.disconnect(this.windowRealizeSignal);
Gtk.StyleContext.add_provider_for_screen( Gtk.StyleContext.add_provider_for_screen(
Gdk.Screen.get_default(), Gdk.Screen.get_default(),
this.cssProvider, this.cssProvider,
@@ -142,15 +144,14 @@ var App = GObject.registerClass({
this.player.widget.connect( this.player.widget.connect(
'motion-notify-event', this._onPlayerMotionNotifyEvent.bind(this) 'motion-notify-event', this._onPlayerMotionNotifyEvent.bind(this)
); );
this.player.widget.connect( this.playerRealizeSignal = this.player.widget.connect(
'realize', this._onPlayerRealize.bind(this) 'realize', this._onPlayerRealize.bind(this)
); );
this.playerDrawSignal = this.player.widget.connect(
'draw', this._onPlayerDraw.bind(this)
);
if(this.playlist.length) this.player.widget.show();
this.player.set_uri(this.playlist[0]);
this.player.widget.show_all();
this.emit('ready', true);
} }
_onWindowFullscreenChanged(window, isFullscreen) _onWindowFullscreenChanged(window, isFullscreen)
@@ -224,6 +225,9 @@ var App = GObject.registerClass({
_onPlayerRealize() _onPlayerRealize()
{ {
this.player.widget.disconnect(this.playerRealizeSignal);
this.player.renderer.expose();
let display = this.player.widget.get_display(); let display = this.player.widget.get_display();
this.defaultCursor = Gdk.Cursor.new_from_name( this.defaultCursor = Gdk.Cursor.new_from_name(
@@ -237,6 +241,17 @@ var App = GObject.registerClass({
this.setHideCursorTimeout(); this.setHideCursorTimeout();
} }
_onPlayerDraw(self, data)
{
this.player.widget.disconnect(this.playerDrawSignal);
this.emit('ready', true);
if(!this.playlist.length)
return;
this.player.set_uri(this.playlist[0]);
}
_onPlayerStateChanged(self, state) _onPlayerStateChanged(self, state)
{ {
if(state === GstPlayer.PlayerState.BUFFERING) if(state === GstPlayer.PlayerState.BUFFERING)