From amarok-devel  Mon Sep 14 19:02:20 2009
From: Martin <darklight.xdarklight () googlemail ! com>
Date: Mon, 14 Sep 2009 19:02:20 +0000
To: amarok-devel
Subject: [PATCH] (needs review) fix lyrics applet
Message-Id: <888a464d0909141202w4b7125aep70f702b0ace1997b () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=amarok-devel&m=125295512332734
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--00032555fe5e203a2a04738e4ee1"

--00032555fe5e203a2a04738e4ee1
Content-Type: text/plain; charset=UTF-8

Hi,

ok, fixing 'some' lyrics issues was not enough for me :)
I was really annoyed by the fact that the lyrics applet
did NOT use system colors. as I'm using the Obisidan Coast
theme I have a dark color scheme - but somehow (not a bug
but a feature ;)) the background of the lyrics applet was
white (SIGH)

there's a bug report about this problem..
https://bugs.kde.org/show_bug.cgi?id=206495

so - I started refactoring the lyrics applet a bit
here's a list of changes that I've made:

* use system colors (FINALLY)
* show that cool spinner (from videoapplet) when a script
  is searching for lyrics
* optimize m_titleText away
* set the title of the applet to "Lyrics : Fetching ..."
  when a script is searching for lyrics (note: this does
  NOT break the string freeze as "Fetching ..." has
  been translated for the videoapplet already)
* removed some unused code
* tiny code cleanup

if you disagree with my coding style please feel free to
inform me what I should change :)

this patch needs testing before it can be pushed into
any stable branch! so you better don't put it in 2.2 ;)

PS: I'll try to seperate the color fix from all other changes
so maybe that part of the patch can go into 2.2
(if it's stable enough)

Regards,
Martin

--00032555fe5e203a2a04738e4ee1
Content-Type: text/x-diff; charset=US-ASCII; name="amarok-fix_lyrics_applet.patch"
Content-Disposition: attachment; filename="amarok-fix_lyrics_applet.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fzll0ifa0

ZGlmZiAtLWdpdCBhL3NyYy9jb250ZXh0L2FwcGxldHMvbHlyaWNzL0x5cmljc0FwcGxldC5jcHAg
Yi9zcmMvY29udGV4dC9hcHBsZXRzL2x5cmljcy9MeXJpY3NBcHBsZXQuY3BwCmluZGV4IDllZmU5
OTQuLjI4YThjOWEgMTAwNjQ0Ci0tLSBhL3NyYy9jb250ZXh0L2FwcGxldHMvbHlyaWNzL0x5cmlj
c0FwcGxldC5jcHAKKysrIGIvc3JjL2NvbnRleHQvYXBwbGV0cy9seXJpY3MvTHlyaWNzQXBwbGV0
LmNwcApAQCAtNDIsNyArNDIsNiBAQAogCiBMeXJpY3NBcHBsZXQ6Okx5cmljc0FwcGxldCggUU9i
amVjdCogcGFyZW50LCBjb25zdCBRVmFyaWFudExpc3QmIGFyZ3MgKQogICAgIDogQ29udGV4dDo6
QXBwbGV0KCBwYXJlbnQsIGFyZ3MgKQotICAgICwgbV90aXRsZVRleHQoIGkxOG4oICJMeXJpY3Mi
ICkgKQogICAgICwgbV90aXRsZUxhYmVsKCAwICkKICAgICAsIG1fc2F2ZUljb24oIDAgKQogICAg
ICwgbV9lZGl0SWNvbiggMCApCkBAIC01Myw3ICs1Miw2IEBAIEx5cmljc0FwcGxldDo6THlyaWNz
QXBwbGV0KCBRT2JqZWN0KiBwYXJlbnQsIGNvbnN0IFFWYXJpYW50TGlzdCYgYXJncyApCiB7CiAg
ICAgc2V0SGFzQ29uZmlndXJhdGlvbkludGVyZmFjZSggZmFsc2UgKTsKICAgICBzZXRCYWNrZ3Jv
dW5kSGludHMoIFBsYXNtYTo6QXBwbGV0OjpOb0JhY2tncm91bmQgKTsKLQogfQogCiBMeXJpY3NB
cHBsZXQ6On4gTHlyaWNzQXBwbGV0KCkKQEAgLTEwNCwyOSArMTAyLDIzIEBAIHZvaWQgTHlyaWNz
QXBwbGV0Ojppbml0KCkKICAgICBjb25uZWN0KCBtX3JlbG9hZEljb24sIFNJR05BTCggYWN0aXZh
dGVkKCkgKSwgdGhpcywgU0xPVCggcmVmcmVzaEx5cmljcygpICkgKTsKIAogICAgIG1fbHlyaWNz
UHJveHkgPSBuZXcgUUdyYXBoaWNzUHJveHlXaWRnZXQoIHRoaXMgKTsKKyAgICAKICAgICBtX2x5
cmljcyA9IG5ldyBRVGV4dEJyb3dzZXI7CisgICAgLy8gcmVxdWlyZWQgLSBpZiByZW1vdmVkIHRo
ZSBiYWNrZ3JvdW5kIGNvbG9yIGNoYW5nZQorICAgIC8vIGZ1bmN0aW9uYWxpdHkgaW4gZWRpdCBt
b2RlIHdpbGwgYnJlYWshCiAgICAgbV9seXJpY3MtPnNldEF0dHJpYnV0ZSggUXQ6OldBX05vU3lz
dGVtQmFja2dyb3VuZCApOwogICAgIG1fbHlyaWNzLT5zZXRPcGVuRXh0ZXJuYWxMaW5rcyggdHJ1
ZSApOwogICAgIG1fbHlyaWNzLT5zZXRXb3JkV3JhcE1vZGUoIFFUZXh0T3B0aW9uOjpXb3JkV3Jh
cCApOwogICAgIG1fbHlyaWNzLT5zZXRUZXh0SW50ZXJhY3Rpb25GbGFncyggUXQ6OlRleHRCcm93
c2VySW50ZXJhY3Rpb24gfCBRdDo6VGV4dFNlbGVjdGFibGVCeUtleWJvYXJkICk7CisKICAgICBz
ZXRFZGl0aW5nKCBmYWxzZSApOwogCiAgICAgbV9seXJpY3MtPnNldFN0eWxlU2hlZXQoIFFTdHJp
bmcoICJRVGV4dEJyb3dzZXIgeyBiYWNrZ3JvdW5kLWNvbG9yOiAlMTsgYm9yZGVyLXdpZHRoOiAw
cHg7IGJvcmRlci1yYWRpdXM6IDBweDsgY29sb3I6ICUyOyB9IiApCi0gICAgICAgIC5hcmcoIFBh
bGV0dGVIYW5kbGVyOjpoaWdobGlnaHRDb2xvcigpLmxpZ2h0ZXIoIDE1MCApLm5hbWUoKSApCi0g
ICAgICAgIC5hcmcoIFBhbGV0dGVIYW5kbGVyOjpoaWdobGlnaHRDb2xvcigpLmRhcmtlciggNDAw
ICkubmFtZSgpICkgKTsKLQorICAgICAgICAuYXJnKCBBcHA6Omluc3RhbmNlKCktPnBhbGV0dGUo
KS5iYWNrZ3JvdW5kKCkuY29sb3IoKS5uYW1lKCkgKQorICAgICAgICAuYXJnKCBBcHA6Omluc3Rh
bmNlKCktPnBhbGV0dGUoKS50ZXh0KCkuY29sb3IoKS5uYW1lKCkgKSApOworICAgIAogICAgIG1f
bHlyaWNzUHJveHktPnNldFdpZGdldCggbV9seXJpY3MgKTsKIAotICAgIFFQYWxldHRlIHBhbDsK
LSAgICBRQnJ1c2ggYnJ1c2goIFBhbGV0dGVIYW5kbGVyOjpoaWdobGlnaHRDb2xvcigpLmxpZ2h0
ZXIoIDE3MCApICk7Ci0gICAgYnJ1c2guc2V0U3R5bGUoIFF0OjpTb2xpZFBhdHRlcm4gKTsKLSAg
ICBwYWwuc2V0QnJ1c2goIFFQYWxldHRlOjpBY3RpdmUsIFFQYWxldHRlOjpCYXNlLCBicnVzaCAp
OwotICAgIHBhbC5zZXRCcnVzaCggUVBhbGV0dGU6OkluYWN0aXZlLCBRUGFsZXR0ZTo6QmFzZSwg
YnJ1c2ggKTsKLSAgICBwYWwuc2V0QnJ1c2goIFFQYWxldHRlOjpEaXNhYmxlZCwgUVBhbGV0dGU6
OkJhc2UsIGJydXNoICk7Ci0gICAgcGFsLnNldEJydXNoKCBRUGFsZXR0ZTo6V2luZG93LCBicnVz
aCApOwotICAgIG1fbHlyaWNzLT5zZXRQYWxldHRlKCBwYWwgKTsKLSAgICBtX2x5cmljc1Byb3h5
LT5zZXRQYWxldHRlKCBwYWwgKTsKLQogICAgIC8vIG9ubHkgc2hvdyB3aGVuIHdlIG5lZWQgdG8g
bGV0IHRoZSB1c2VyCiAgICAgLy8gY2hvb3NlIGJldHdlZW4gc3VnZ2VzdGlvbnMKICAgICBtX3N1
Z2dlc3RlZCA9IG5ldyBRR3JhcGhpY3NUZXh0SXRlbSggdGhpcyApOwpAQCAtMTcwLDcgKzE2Miw3
IEBAIHZvaWQgTHlyaWNzQXBwbGV0Ojpjb25zdHJhaW50c0V2ZW50KCBQbGFzbWE6OkNvbnN0cmFp
bnRzIGNvbnN0cmFpbnRzICkKICAgICBxcmVhbCB3aWRtYXggPSBib3VuZGluZ1JlY3QoKS53aWR0
aCgpIC0gMiAqIGljb25XaWR0aCAqIDMgLSA2ICogc3RhbmRhcmRQYWRkaW5nKCk7CiAgICAgUVJl
Y3RGIHJlY3QoICggYm91bmRpbmdSZWN0KCkud2lkdGgoKSAtIHdpZG1heCApIC8gMiwgMCAsIHdp
ZG1heCwgMTUgKTsKICAgICAKLSAgICBtX3RpdGxlTGFiZWwtPnNldFNjcm9sbGluZ1RleHQoIG1f
dGl0bGVUZXh0LCByZWN0ICk7CisgICAgbV90aXRsZUxhYmVsLT5zZXRTY3JvbGxpbmdUZXh0KCBt
X3RpdGxlTGFiZWwtPnRleHQoKSwgcmVjdCApOwogICAgIG1fdGl0bGVMYWJlbC0+c2V0UG9zKCAo
IHNpemUoKS53aWR0aCgpIC0gbV90aXRsZUxhYmVsLT5ib3VuZGluZ1JlY3QoKS53aWR0aCgpICkg
LyAyICwgc3RhbmRhcmRQYWRkaW5nKCkgKyAzICk7CiAgICAKICAgICBtX3JlbG9hZEljb24tPnNl
dFBvcyggc2l6ZSgpLndpZHRoKCkgLSBpY29uV2lkdGggLSBzdGFuZGFyZFBhZGRpbmcoKSwgc3Rh
bmRhcmRQYWRkaW5nKCkgKTsKQEAgLTE5Niw0NyArMTg4LDY0IEBAIHZvaWQgTHlyaWNzQXBwbGV0
OjpkYXRhVXBkYXRlZCggY29uc3QgUVN0cmluZyYgbmFtZSwgY29uc3QgUGxhc21hOjpEYXRhRW5n
aW5lOjpECiAKICAgICBtX2hhc0x5cmljcyA9IGZhbHNlOwogCi0gICAgaWYoIGRhdGEuc2l6ZSgp
ID09IDAgKSByZXR1cm47CisgICAgaWYoIGRhdGEuc2l6ZSgpID09IDAgKQorICAgICAgICByZXR1
cm47CiAKICAgICAvL2RlYnVnKCkgPDwgImdvdCBseXJpY3MgZGF0YTogIiA8PCBkYXRhOwogCisg
ICAgbV90aXRsZUxhYmVsLT5zZXRUZXh0KCBpMThuKCAiTHlyaWNzIiApICk7CisKICAgICBtX3Rp
dGxlTGFiZWwtPnNob3coKTsKKworICAgIHNldEJ1c3koIGZhbHNlICk7CisgICAgCiAgICAgaWYo
IGRhdGEuY29udGFpbnMoICJub3NjcmlwdHJ1bm5pbmciICkgKQogICAgIHsKICAgICAgICAgbV9z
dWdnZXN0ZWQtPmhpZGUoKTsKLSAgICAgICAgbV9seXJpY3MtPnNob3coKTttX2x5cmljcy0+c2V0
UGxhaW5UZXh0KCBpMThuKCAiTm8gbHlyaWNzIHNjcmlwdCBpcyBydW5uaW5nLiIgKSApOworCisg
ICAgICAgIG1fbHlyaWNzLT5zaG93KCk7CisgICAgICAgIG1fbHlyaWNzLT5zZXRQbGFpblRleHQo
IGkxOG4oICJObyBseXJpY3Mgc2NyaXB0IGlzIHJ1bm5pbmcuIiApICk7CiAgICAgfQogICAgIGVs
c2UgaWYoIGRhdGEuY29udGFpbnMoICJzdG9wcGVkIiApICkKICAgICB7Ci0gICAgICAgIG1fbHly
aWNzLT5jbGVhcigpOwotICAgICAgICBtX3RpdGxlVGV4dCA9IFFTdHJpbmcoICIlMSIgKS5hcmco
IGkxOG4oICJMeXJpY3MiICkgKTsKKyAgICAgICAgbV9seXJpY3MtPmhpZGUoKTsKKwogICAgICAg
ICBzZXRDb2xsYXBzZUhlaWdodCggNDAgKTsKICAgICAgICAgc2V0Q29sbGFwc2VPbigpOwogICAg
IH0KICAgICBlbHNlIGlmKCBkYXRhLmNvbnRhaW5zKCAiZmV0Y2hpbmciICkgKQogICAgIHsKKyAg
ICAgICAgbV90aXRsZUxhYmVsLT5zZXRUZXh0KCBpMThuKCAiTHlyaWNzIiApICsgUVN0cmluZygg
IiA6ICIgKSArIGkxOG4oICJGZXRjaGluZyAuLi4iICkgKTsKKyAgICAgICAgCiAgICAgICAgIG1f
c3VnZ2VzdGVkLT5oaWRlKCk7CisKICAgICAgICAgbV9seXJpY3MtPnNob3coKTsKICAgICAgICAg
bV9seXJpY3MtPnNldFBsYWluVGV4dCggaTE4biggIkx5cmljcyBhcmUgYmVpbmcgZmV0Y2hlZC4i
ICkgKTsKLSAgICAgICAgc2V0Q29sbGFwc2VIZWlnaHQoIDgwICk7Ci0gICAgICAgIGRlYnVnKCkg
PDwgImx5cmljcyBzbWFsbCBzaXplaGludCBoZWlnaHQ6IiA8PCBtX2x5cmljcy0+c2l6ZUhpbnQo
KS5oZWlnaHQoKTsKKworICAgICAgICBzZXRDb2xsYXBzZUhlaWdodCggMTMwICk7CiAgICAgICAg
IHNldENvbGxhcHNlT24oKTsKKworICAgICAgICBzZXRCdXN5KCB0cnVlICk7CiAgICAgfQogICAg
IGVsc2UgaWYoIGRhdGEuY29udGFpbnMoICJlcnJvciIgKSApCiAgICAgewogICAgICAgICBtX3N1
Z2dlc3RlZC0+aGlkZSgpOworCiAgICAgICAgIG1fbHlyaWNzLT5zaG93KCk7CiAgICAgICAgIG1f
bHlyaWNzLT5zZXRQbGFpblRleHQoIGkxOG4oICJDb3VsZCBub3QgZG93bmxvYWQgbHlyaWNzLlxu
UGxlYXNlIGNoZWNrIHlvdXIgaW50ZXJuZXQgY29ubmVjdGlvbi5cbkVycm9yIG1lc3NhZ2U6XG4l
MSIsIGRhdGFbImVycm9yIl0udG9TdHJpbmcoKSApICk7CisKICAgICAgICAgc2V0Q29sbGFwc2VI
ZWlnaHQoIDgwICk7CiAgICAgICAgIHNldENvbGxhcHNlT24oKTsKICAgICB9CiAgICAgZWxzZSBp
ZiggZGF0YS5jb250YWlucyggInN1Z2dlc3RlZCIgKSApCiAgICAgewogICAgICAgICBtX2x5cmlj
cy0+aGlkZSgpOworCiAgICAgICAgIFFWYXJpYW50TGlzdCBzdWdnZXN0ZWQgPSBkYXRhWyAic3Vn
Z2VzdGVkIiBdLnRvTGlzdCgpOwogICAgICAgICAvLyBidWlsZCBzaW1wbGUgSFRNTCB0byBzaG93
CiAgICAgICAgIC8vIGEgbGlzdAogICAgICAgICBRU3RyaW5nIGh0bWwgPSBRU3RyaW5nKCAiPGJy
Pjxicj4iICk7CisgICAgICAgIAogICAgICAgICBmb3JlYWNoKCBjb25zdCBRVmFyaWFudCAmc3Vn
Z2VzdGlvbiwgc3VnZ2VzdGVkICkKICAgICAgICAgewogICAgICAgICAgICAgY29uc3QgUVN0cmlu
ZyBzdWcgPSBzdWdnZXN0aW9uLnRvU3RyaW5nKCk7CkBAIC0yNDQsMzggKzI1Myw0NyBAQCB2b2lk
IEx5cmljc0FwcGxldDo6ZGF0YVVwZGF0ZWQoIGNvbnN0IFFTdHJpbmcmIG5hbWUsIGNvbnN0IFBs
YXNtYTo6RGF0YUVuZ2luZTo6RAogICAgICAgICAgICAgY29uc3QgUVN0cmluZyBsaW5rID0gUVN0
cmluZyggIjxhIGhyZWY9XCIlMXwlMnwlM1wiPiU0IC0gJTU8L2E+PGJyPiIgKS5hcmcoIHBpZWNl
c1sgMCBdICkuYXJnKCBwaWVjZXNbIDEgXSApLmFyZyggcGllY2VzWyAyIF0gKS5hcmcoIHBpZWNl
c1sgMSBdICkuYXJnKCBwaWVjZXNbIDAgXSApOwogICAgICAgICAgICAgaHRtbCArPSBsaW5rOwog
ICAgICAgICB9CisgICAgICAgIAogICAgICAgICBtX3N1Z2dlc3RlZC0+c2V0SHRtbCggaHRtbCAp
OwogICAgICAgICBtX3N1Z2dlc3RlZC0+c2hvdygpOwogICAgIH0KICAgICBlbHNlIGlmKCBkYXRh
LmNvbnRhaW5zKCAiaHRtbCIgKSApCiAgICAgewogICAgICAgICBtX2hhc0x5cmljcyA9IHRydWU7
CisgICAgICAgIAogICAgICAgICAvLyBzaG93IHB1cmUgaHRtbCBpbiB0aGUgdGV4dCBhcmVhCiAg
ICAgICAgIG1fc3VnZ2VzdGVkLT5oaWRlKCk7CisKICAgICAgICAgbV9seXJpY3MtPnNldEh0bWwo
IGRhdGFbICJodG1sIiBdLnRvU3RyaW5nKCkgKTsKICAgICAgICAgbV9seXJpY3MtPnNob3coKTsK
KyAgICAgICAgCiAgICAgICAgIHNldENvbGxhcHNlT2ZmKCk7CiAgICAgfQogICAgIGVsc2UgaWYo
IGRhdGEuY29udGFpbnMoICJseXJpY3MiICkgKQogICAgIHsKICAgICAgICAgbV9oYXNMeXJpY3Mg
PSB0cnVlOworCisgICAgICAgIFFWYXJpYW50TGlzdCBseXJpY3MgID0gZGF0YVsgImx5cmljcyIg
XS50b0xpc3QoKTsKKyAgICAgICAgCisgICAgICAgIG1fdGl0bGVMYWJlbC0+c2V0VGV4dChRU3Ry
aW5nKCAiICUxIDogJTIgLSAlMyIgKS5hcmcoIGkxOG4oICJMeXJpY3MiICkgKS5hcmcoIGx5cmlj
c1sgMCBdLnRvU3RyaW5nKCkgKS5hcmcoIGx5cmljc1sgMSBdLnRvU3RyaW5nKCkgKSApOworICAg
ICAgICAKICAgICAgICAgbV9zdWdnZXN0ZWQtPmhpZGUoKTsKKwogICAgICAgICBtX2x5cmljcy0+
c2hvdygpOwotICAgICAgICBRVmFyaWFudExpc3QgbHlyaWNzICA9IGRhdGFbICJseXJpY3MiIF0u
dG9MaXN0KCk7CiAKLSAgICAgICAgbV90aXRsZVRleHQgPSBRU3RyaW5nKCAiICUxIDogJTIgLSAl
MyIgKS5hcmcoIGkxOG4oICJMeXJpY3MiICkgKS5hcmcoIGx5cmljc1sgMCBdLnRvU3RyaW5nKCkg
KS5hcmcoIGx5cmljc1sgMSBdLnRvU3RyaW5nKCkgKTsKICAgICAgICAgLy8gIG5lZWQgcGFkZGlu
ZyBmb3IgdGl0bGUKICAgICAgICAgbV9seXJpY3MtPnNldFBsYWluVGV4dCggbHlyaWNzWyAzIF0u
dG9TdHJpbmcoKS50cmltbWVkKCkgKTsKKyAgICAgICAgCiAgICAgICAgIHNldENvbGxhcHNlT2Zm
KCk7CiAgICAgfQogICAgIGVsc2UgaWYoIGRhdGEuY29udGFpbnMoICJub3Rmb3VuZCIgKSApCiAg
ICAgewogICAgICAgICBtX3N1Z2dlc3RlZC0+aGlkZSgpOworCiAgICAgICAgIG1fbHlyaWNzLT5z
aG93KCk7CiAgICAgICAgIG1fbHlyaWNzLT5zZXRQbGFpblRleHQoIGkxOG4oICJUaGVyZSB3ZXJl
IG5vIGx5cmljcyBmb3VuZCBmb3IgdGhpcyB0cmFjayIgKSApOwogCi0gICAgICAgIHNldENvbGxh
cHNlSGVpZ2h0KCBtX2x5cmljcy0+c2l6ZUhpbnQoKS5oZWlnaHQoKSApOwotICAgICAgICBkZWJ1
ZygpIDw8ICJseXJpY3Mgc21hbGwgc2l6ZWhpbnQgaGVpZ2h0OiIgPDwgbV9seXJpY3MtPnNpemVI
aW50KCkuaGVpZ2h0KCk7CisgICAgICAgIHNldENvbGxhcHNlSGVpZ2h0KCA0MCApOwogICAgICAg
ICBzZXRDb2xsYXBzZU9uKCk7CiAgICAgfQogCkBAIC0yOTUsNiArMzEzLDcgQEAgTHlyaWNzQXBw
bGV0OjpwYWludEludGVyZmFjZSggUVBhaW50ZXIgKnAsIGNvbnN0IFFTdHlsZU9wdGlvbkdyYXBo
aWNzSXRlbSAqb3B0aW8KIHsKICAgICBRX1VOVVNFRCggb3B0aW9uICk7CiAgICAgUV9VTlVTRUQo
IGNvbnRlbnRzUmVjdCApOworCiAgICAgcC0+c2V0UmVuZGVySGludCggUVBhaW50ZXI6OkFudGlh
bGlhc2luZyApOwogCiAgICAgLy8gdGludCB0aGUgd2hvbGUgYXBwbGV0CkBAIC0zMDcsMTMgKzMy
NiwxMiBAQCBMeXJpY3NBcHBsZXQ6OnBhaW50SW50ZXJmYWNlKCBRUGFpbnRlciAqcCwgY29uc3Qg
UVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtICpvcHRpbwogICAgIC8vZHJhdyBiYWNrZ3JvdW5kIG9m
IGx5cmljcyB0ZXh0CiAgICAgcC0+c2F2ZSgpOwogCi0gICAgUUNvbG9yIGJhY2tncm91bmQgPSBR
dDo6d2hpdGU7IC8vIFRPRE86IExvb2tzIGNyYXAgb24gZGFyayBjb2xvdXIgc2NoZW1lcz8KLSAg
ICBpZiggbV9seXJpY3MtPmlzUmVhZE9ubHkoKSApCisgICAgUUNvbG9yIGJhY2tncm91bmQoIEFw
cDo6aW5zdGFuY2UoKS0+cGFsZXR0ZSgpLmJhY2tncm91bmQoKS5jb2xvcigpICk7CisgICAgCisg
ICAgaWYoICFtX2x5cmljcy0+aXNSZWFkT25seSgpICkKICAgICB7Ci0gICAgICAgIFFDb2xvciBo
aWdobGlnaHQoIEFwcDo6aW5zdGFuY2UoKS0+cGFsZXR0ZSgpLmhpZ2hsaWdodCgpLmNvbG9yKCkg
KTsKLSAgICAgICAgaGlnaGxpZ2h0LnNldEhzdkYoIGhpZ2hsaWdodC5odWVGKCksIDAuMDcsIDEs
IGhpZ2hsaWdodC5hbHBoYUYoKSApOwotCi0gICAgICAgIGJhY2tncm91bmQgPSBoaWdobGlnaHQ7
CisgICAgICAgIC8vIGRpZmZlcmVudCBiYWNrZ3JvdW5kIGNvbG9yIHdoZW4gd2UncmUgaW4gZWRp
dCBtb2RlCisgICAgICAgIGJhY2tncm91bmQgPSBBcHA6Omluc3RhbmNlKCktPnBhbGV0dGUoKS5h
bHRlcm5hdGVCYXNlKCkuY29sb3IoKTsKICAgICB9CiAKICAgICAvLyBIQUNLCkBAIC0zMzYsOCAr
MzU0LDkgQEAgTHlyaWNzQXBwbGV0OjpwYWxldHRlQ2hhbmdlZCggY29uc3QgUVBhbGV0dGUgJiBw
YWxldHRlICkKICAgICBRX1VOVVNFRCggcGFsZXR0ZSApCiAKICAgICBpZiggbV9seXJpY3MgKQot
ICAgICAgIG1fbHlyaWNzLT5zZXRTdHlsZVNoZWV0KCBRU3RyaW5nKCAiUVRleHRCcm93c2VyIHsg
YmFja2dyb3VuZC1jb2xvcjogJTE7IGJvcmRlci13aWR0aDogMHB4OyBib3JkZXItcmFkaXVzOiAw
cHg7IGNvbG9yOiAlMjsgfSIgKQotICAgICAgICAgICAgLmFyZyggUGFsZXR0ZUhhbmRsZXI6Omhp
Z2hsaWdodENvbG9yKCkubGlnaHRlciggMTUwICkubmFtZSgpICkuYXJnKCBQYWxldHRlSGFuZGxl
cjo6aGlnaGxpZ2h0Q29sb3IoKS5kYXJrZXIoIDQwMCApLm5hbWUoKSApICk7CisgICAgICAgIG1f
bHlyaWNzLT5zZXRTdHlsZVNoZWV0KCBRU3RyaW5nKCAiUVRleHRCcm93c2VyIHsgYmFja2dyb3Vu
ZC1jb2xvcjogJTE7IGJvcmRlci13aWR0aDogMHB4OyBib3JkZXItcmFkaXVzOiAwcHg7IGNvbG9y
OiAlMjsgfSIgKQorICAgICAgICAgICAgLmFyZyggQXBwOjppbnN0YW5jZSgpLT5wYWxldHRlKCku
YmFja2dyb3VuZCgpLmNvbG9yKCkubmFtZSgpICkKKyAgICAgICAgICAgIC5hcmcoIEFwcDo6aW5z
dGFuY2UoKS0+cGFsZXR0ZSgpLnRleHQoKS5jb2xvcigpLm5hbWUoKSApICk7CiB9CiAKIHZvaWQK
ZGlmZiAtLWdpdCBhL3NyYy9jb250ZXh0L2FwcGxldHMvbHlyaWNzL0x5cmljc0FwcGxldC5oIGIv
c3JjL2NvbnRleHQvYXBwbGV0cy9seXJpY3MvTHlyaWNzQXBwbGV0LmgKaW5kZXggZDVkOTE1NC4u
YjE2MGE4YyAxMDA2NDQKLS0tIGEvc3JjL2NvbnRleHQvYXBwbGV0cy9seXJpY3MvTHlyaWNzQXBw
bGV0LmgKKysrIGIvc3JjL2NvbnRleHQvYXBwbGV0cy9seXJpY3MvTHlyaWNzQXBwbGV0LmgKQEAg
LTY2LDcgKzY2LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgY29sbGFwc2VUb01pbigpOwogCi0g
ICAgUVN0cmluZyBtX3RpdGxlVGV4dDsKICAgICBUZXh0U2Nyb2xsaW5nV2lkZ2V0KiBtX3RpdGxl
TGFiZWw7CiAKICAgICBQbGFzbWE6Okljb25XaWRnZXQqICBtX3NhdmVJY29uOwoK
--00032555fe5e203a2a04738e4ee1
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Amarok-devel mailing list
Amarok-devel@kde.org
https://mail.kde.org/mailman/listinfo/amarok-devel

--00032555fe5e203a2a04738e4ee1--