diff options
Diffstat (limited to 'community/cinnamon/gnome-3.8.patch')
-rw-r--r-- | community/cinnamon/gnome-3.8.patch | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index 5af7c3a79..b79ea497a 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -1404,7 +1404,9 @@ index 50c4e1e..c8427ac 100644 this._trackInfosTop.set_child(this.infos_top); this._trackInfosBottom.set_child(this.infos_bottom); -@@ -414,90 +256,39 @@ Player.prototype = { +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -414,45 +414,20 @@ this._trackControls.set_child(this.controls); this.addActor(this._trackControls); @@ -1463,14 +1465,8 @@ index 50c4e1e..c8427ac 100644 + } /* this players don't support seek */ -- if (support_seek.indexOf(this._name) == -1) { -+ if (support_seek.indexOf(this._name) == -1) - this._time.hide(); -- this.showPosition = false; -- this._positionSlider.hide(); -- } - this._getStatus(); - this._trackId = {}; + if (support_seek.indexOf(this._name) == -1) { +@@ -465,39 +440,23 @@ this._getMetadata(); this._currentTime = 0; this._getPosition(); @@ -1486,14 +1482,17 @@ index 50c4e1e..c8427ac 100644 - this._setMetadata(iface, value["Metadata"]); - //qmmp - if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -- if (value["playbackStatus"]) ++ this._setMetadata(value["Metadata"]); ++ // qmmp ++ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { + if (value["playbackStatus"]) - this._setStatus(iface, value["playbackStatus"]); -- if (value["metadata"]) ++ this._setStatus(value["playbackStatus"]); + if (value["metadata"]) - this._setMetadata(sender, value["metadata"]); - } -+ this._setMetadata(value["Metadata"]); - })); - +- })); +- - this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { - if (value > 0) { - this._setPosition(value); @@ -1504,17 +1503,20 @@ index 50c4e1e..c8427ac 100644 - // when the track is seeked so we set the position at the - // value we set on the slider - this._setPosition(this._wantedSeekValue); -- } ++ this._setMetadata(value["metadata"]); + } - // Seek value send by the player - else - this._setPosition(value); -- ++ })); + - this._wantedSeekValue = 0; + this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + this._setPosition(sender, value); })); Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); + @@ -512,45 +303,26 @@ Player.prototype = { this._playerInfo.setText(this._getName() + " - " + _(status)); }, @@ -3923,20 +3925,7 @@ index c8427ac..a7b2e09 100644 /* dummy vars for translation */ let x = _("Playing"); x = _("Paused"); -@@ -285,6 +285,13 @@ Player.prototype = { - this._setStatus(value["PlaybackStatus"]); - if (value["Metadata"]) - this._setMetadata(value["Metadata"]); -+ // qmmp -+ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { -+ if (value["playbackStatus"]) -+ this._setStatus(value["playbackStatus"]); -+ if (value["metadata"]) -+ this._setMetadata(value["metadata"]); -+ } - })); - - this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + @@ -377,7 +384,8 @@ Player.prototype = { cover.read_async(null, null, Lang.bind(this, this._onReadCover)); } @@ -4181,3 +4170,17 @@ index 418fb60..773fb65 100644 static void -- 1.8.1.6 + +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -801,7 +801,7 @@ + this._players = {}; + // watch players + for (var p=0; p<compatible_players.length; p++) { +- DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], false, ++ Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, + Lang.bind(this, this._addPlayer), + Lang.bind(this, this._removePlayer) + ); +-- +1.8.1.6
\ No newline at end of file |