Codebase list gnome-shell-extension-mediaplayer / 1282356
Merge tag 'upstream/0_git20160509' into debian/master Upstream version 0~git20160509 Simon McVittie 7 years ago
4 changed file(s) with 102 addition(s) and 42 deletion(s). Raw diff Collapse all Expand all
+91
-36
ChangeLog less more
0 commit 3b0012ab6e454baf255281e615e94e3548ca3c90
0 commit c5f9d905fd39dfc978d8416d2c1cb0f6694e0f09
1 Author: Jean-Philippe Braun <jean-philippe.braun@cloudwatt.com>
2 Date: 2016-05-09 20:44:30 +0200
3
4 Sync track timer after status change
5
6 When a song is repeating the player might just send a status update.
7
8 Refs #239
9
10 commit 8ed7665d1a79263d57dd52b61f2c039e4029809b
11 Author: Jean-Philippe Braun <jean-philippe.braun@cloudwatt.com>
12 Date: 2016-02-25 23:30:00 +0100
13
14 Fix cover refresh
15
16 Closes #226
17
18 commit 2cb5d6da4023c6e563fecdcc173dfcbc0c43cb67
19 Merge: 040807f b7a2a4f
20 Author: Jean-Philippe Braun <eon@patapon.info>
21 Date: 2016-04-19 00:37:47 +0200
22
23 Merge pull request #257 from p91paul/master
24
25 Do not disable already disabled extension
26
27 commit b7a2a4f5b787a70f981ededbf303e44ce7b1b4d8
28 Author: Paolo Inaudi <p91paul@gmail.com>
29 Date: 2016-04-18 23:22:52 +0200
30
31 Do not disable already disabled extension
32
33 Causes 'manager is null' js error
34
35 commit 040807fce94f952364c0b1a253b1031e44d5ca26
36 Merge: e14b8fe 6393aa8
37 Author: Jean-Philippe Braun <eon@patapon.info>
38 Date: 2016-04-03 12:14:20 +0200
39
40 Merge pull request #254 from jdoe0/update-unavailable
41
42 Clear artist, album, and title when they become unavailable
43
44 commit 6393aa8757a29d033aee995fad1945e0a0e34e99
45 Author: jdoe0 <jdoe@mailinator.com>
46 Date: 2016-03-31 00:04:10 +0700
47
48 Clear artist, album, and title when they become unavailable
49
50 This fixes the issue where these fields remain unchanged from the
51 previous file even when they are unavailable in the current file.
52
53 commit e14b8fe0139d058e494ec1c112de2686151f9c5b
54 Merge: 27c546d e19480d
55 Author: Jean-Philippe Braun <eon@patapon.info>
56 Date: 2016-03-28 12:58:23 +0200
57
58 Merge pull request #252 from smcv/schema-l10n
59
60 Mark the GSettings schema for translation
61
62 commit 27c546dcda23f220dddad09099fdbcdcfd720c63
63 Merge: 1b12e25 b877926
64 Author: Jean-Philippe Braun <eon@patapon.info>
65 Date: 2016-03-28 12:58:00 +0200
66
67 Merge pull request #251 from smcv/shell-3-20
68
69 Add support for GNOME Shell 3.20
70
71 commit e19480d31ac565a02f5d9258877d56d39f135b25
172 Author: Simon McVittie <smcv@debian.org>
2 Date: 2016-03-28 10:34:04 +0100
3
4 Fix Shell version
5
6 commit 3f05d0b186badce36b31b192a829207efb44990d
73 Date: 2016-03-24 07:49:37 +0000
74
75 Mark the GSettings schema for translation
76
77 Caught by "make check".
78
79 Signed-off-by: Simon McVittie <smcv@debian.org>
80
81 commit b87792681a011c21dfadd64ec5af5725a13edac9
782 Author: Simon McVittie <smcv@debian.org>
8 Date: 2016-03-28 10:29:03 +0100
9
10 Use DEP-14 branch names
11
12 commit cfd9a6faa68a92e0dcf80b547d73408525c13853
13 Author: Simon McVittie <smcv@debian.org>
14 Date: 2016-03-28 09:49:38 +0100
15
16 Mention the other initial patch in the changelog
17
18 commit f435eb06dad5e9803b84fa63a10197c85eeefcf2
19 Author: Simon McVittie <smcv@debian.org>
20 Date: 2016-03-28 09:49:05 +0100
21
22 Add patch to support GNOME Shell 3.20
23
24 commit a0acf180449cc9c4161d1e2cc2ff4201f5a38123
25 Author: Simon McVittie <smcv@debian.org>
26 Date: 2016-03-24 08:21:16 +0000
27
28 Initial package (Closes: #819151)
29
30 Packaging based on gnome-shell-extension-suspend-button (thanks to
31 Tobias Frost).
32
33 commit eb15b34420b727b3b728ad393f6fdbc0091c6b0e
34 Author: Simon McVittie <smcv@debian.org>
35 Date: 2016-03-24 07:35:13 +0000
36
37 Imported Upstream version 0~git20160215
83 Date: 2016-03-28 09:48:22 +0100
84
85 Add support for GNOME Shell 3.20
86
87 Now that GNOME Shell has its own media player control using MPRIS
88 (in the calendar/messages menu), this extension is less useful than
89 it was in previous versions, but it is still convenient to have a way
90 to place media player status directly on the top bar.
91
92 Signed-off-by: Simon McVittie <smcv@debian.org>
3893
3994 commit 1b12e2572f5285e87d112b9b1a68d92af8197f23
4095 Merge: e161aae 0780832
+4
-2
src/extension.js less more
3434 Lib.initTranslations(Me);
3535 Settings.init();
3636 Settings.gsettings.connect("changed::" + Settings.MEDIAPLAYER_INDICATOR_POSITION_KEY, function() {
37 disable();
38 enable();
37 if (manager) {
38 disable();
39 enable();
40 }
3941 });
4042 }
4143
+5
-2
src/player.js less more
362362 state.trackCoverUrl = metadata["mpris:artUrl"] ? metadata["mpris:artUrl"].unpack() : "";
363363 state.isRadio = false;
364364
365 if (state.trackCoverUrl !== null && state.trackCoverUrl !== this.state.trackCoverUrl) {
365 if (state.trackCoverUrl !== this.state.trackCoverUrl) {
366366 if (state.trackCoverUrl) {
367367 let cover_path = "";
368368 // Distant cover
384384 state.trackCoverPath = '';
385385 }
386386 }
387 else if (state.trackCoverUrl == '' && metadata["xesam:genre"]) {
387
388 if (state.trackCoverUrl === '' && metadata["xesam:genre"]) {
388389 let genres = metadata["xesam:genre"].deep_unpack();
389390 for (let i in genres) {
390391 if (genres[i].toLowerCase().indexOf("radio") > -1) {
526527 },
527528
528529 _onStatusChange: function() {
530 // sync track time
531 this._getPosition();
529532 let status = this.state.status;
530533 if (status == Settings.Status.PLAY) {
531534 this._startTimer();
+2
-2
src/ui.js less more
209209 }
210210 }
211211
212 if (newState.trackTitle || newState.trackArtist || newState.trackAlbum) {
212 if (newState.trackTitle !== null || newState.trackArtist !== null || newState.trackAlbum !== null) {
213213 this.trackBox.empty();
214214 JSON.parse(Settings.gsettings.get_string(Settings.MEDIAPLAYER_TRACKBOX_TEMPLATE))
215215 .forEach(Lang.bind(this, function(trackInfo) {
334334 this.setActivePlaylist(newState.playlist);
335335 }
336336
337 if (newState.trackCoverPath || newState.isRadio) {
337 if (newState.trackCoverPath !== null || newState.isRadio !== null) {
338338 this.hideCover();
339339 this.showCover(newState);
340340 }