232072 2010-03-25 05:40:27 +0000 iPod database is not updated after copying tracks from Amarok file browser 2011-12-20 12:09:13 +0000 1 1 2 Applications amarok Collections/iPod iPhone 2.4-GIT unspecified Linux RESOLVED FIXED NOR normal --- 1 semajdent amarok-bugs-null edneymatias matej tahall256 trlanzi 2.6 20 oldest_to_newest 939754 0 semajdent 2010-03-25 05:40:27 +0000 Version: 2.3.0 (using 4.4.1 (KDE 4.4.1), Arch Linux) Compiler: gcc OS: Linux (x86_64) release 2.6.32-ARCH When plug in my iPod (nano, 3G), I attempt to use the filesystem browser (in the "Media Sources" panel) to copy tracks to it from my hard drive. The songs in my collection are FLAC files, so I select equivalent MP3 files that I have converted previously. These do not belong to my collection, in order to avoid duplicates. When I select "Copy to Collection > iPod", the tracks are indeed copied to the iPod: however, all the ID3 tag information of the copies is lost (as well as the song length -- not sure whether that falls under the same category), rendering the iPod collection unmanageable. I am using Amarok 2.3.0. 1067645 1 trlanzi 2011-01-03 23:42:29 +0000 Amarok 2.4-GIT, kubuntu 10.10.iPod Nano 3G. Repeated Mr. Dent's actions with similar results. Disagree with diagnosis. Tracks properly copied to device, however, cannot see the tracks through the iPod UI in *Song List*. Do see copied songs in *Movie List* When I plug my iPod back into Amarok the tracks can be seen and all tags are present. The track count on iPod is incorrect as it's not seeing the track copied off Amarok in song list. Is it possible that Amarok is not updating the on-device song list/database? Ipod Nano 2G. Repeated Mr. Dent's actions with no issues. Song properly copied. Tags still present. Song visible in both iPod song UI and Amarok UI. 1067966 2 myriam 2011-01-04 16:25:02 +0000 Thank you for testing. 1117325 3 myriam 2011-05-10 03:04:09 +0000 *** Bug 272804 has been marked as a duplicate of this bug. *** 1117344 4 edneymatias 2011-05-10 03:35:36 +0000 Can help testing, i have an iPod Shuffle 2nd generation. Thanks. 1175475 5 matej 2011-10-20 12:59:42 +0000 I will look at this guys, please be patient until I find time to do so. 1197723 6 66605 matej 2011-12-10 22:26:08 +0000 Created attachment 66605 0001-media-device-collection-more-consistent-handling-of-.patch Reporters, please try this patch (shloud apply on top of 2.5 beta or 2.5 final) and report back whether it worked. This is rather bigger change, so it may not make it into 2.5, but let's see. 1197747 7 matej 2011-12-10 23:48:52 +0000 Also, if the songs you tranfer to iPod end up in Videos on iPod, you may be hitting bug 268238. (relates to .m4a files) 1202375 8 matej 2011-12-20 12:09:13 +0000 Git commit a8f1da1af7f3c3e2c2f99141ddb15e9dfa203932 by Matěj Laitl. Committed on 10/12/2011 at 15:27. Pushed by laitl into branch 'strohel-for-2.6'. media device collection: more consistent handling of compilations This makes handling of compilation albums consistent across: * Amarok collection * iPod viewed in Amarok * iPod viewed on itself The code used to determine best guess album artist in ScanResultProcessor was factored into ArtistHelper for reusability, ArtistHelper is now exported in amaroklib. This should definitely fix bug 232072. (or better - I'm not able to reproduce it with this patch applied) BUG: 232072 FIXED-IN: 2.6 DIGEST: compilation handling on iPod improved M +1 -0 ChangeLog M +1 -0 src/CMakeLists.txt M +3 -19 src/core-impl/collections/db/ScanResultProcessor.cpp M +0 -1 src/core-impl/collections/db/sql/CMakeLists.txt M +57 -31 src/core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp M +1 -1 src/core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.h M +26 -0 src/core-impl/collections/support/ArtistHelper.cpp M +13 -1 src/core-impl/collections/support/ArtistHelper.h http://commits.kde.org/amarok/a8f1da1af7f3c3e2c2f99141ddb15e9dfa203932 66605 2011-12-10 22:26:08 +0000 2011-12-10 22:26:08 +0000 0001-media-device-collection-more-consistent-handling-of-.patch 0001-media-device-collection-more-consistent-handling-of-.patch text/plain 13611 matej RnJvbSAwZWY1NGUwZTM4NzdkYjUyMDdlMDJmNTEwZDkyMzg5ZjdhMzA4NjUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/TWF0PUM0PTlCaj0yMExhaXRsPz0gPG1hdGVq QGxhaXRsLmN6PgpEYXRlOiBTYXQsIDEwIERlYyAyMDExIDE1OjI3OjA2ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gbWVkaWEgZGV2aWNlIGNvbGxlY3Rpb246IG1vcmUgY29uc2lzdGVudCBoYW5kbGlu ZyBvZgogY29tcGlsYXRpb25zCgpUaGlzIG1ha2VzIGhhbmRsaW5nIG9mIGNvbXBpbGF0aW9uIGFs YnVtcyBjb25zaXN0ZW50IGFjcm9zczoKICogQW1hcm9rIGNvbGxlY3Rpb24KICogaVBvZCB2aWV3 ZWQgaW4gQW1hcm9rCiAqIGlQb2Qgdmlld2VkIG9uIGl0c2VsZgoKRElHRVNUOiBjb21waWxhdGlv biBoYW5kbGluZyBvbiBpUG9kIGltcHJvdmVkClRPRE86IENoYW5nZUxvZyBlbnRyeSEhIQotLS0K IHNyYy9DTWFrZUxpc3RzLnR4dCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAg MSArCiAuLi4vY29sbGVjdGlvbnMvZGIvU2NhblJlc3VsdFByb2Nlc3Nvci5jcHAgICAgICAgICB8 ICAgMjIgKy0tLS0KIHNyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvZGIvc3FsL0NNYWtlTGlzdHMu dHh0ICAgIHwgICAgMSAtCiAuLi4vaGFuZGxlci9NZWRpYURldmljZUhhbmRsZXIuY3BwICAgICAg ICAgICAgICAgICB8ICAgODggKysrKysrKysrKysrKy0tLS0tLS0KIC4uLi9oYW5kbGVyL01lZGlh RGV2aWNlSGFuZGxlci5oICAgICAgICAgICAgICAgICAgIHwgICAgMiArLQogc3JjL2NvcmUtaW1w bC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5jcHAgfCAgIDI2ICsrKysrKwogc3Jj L2NvcmUtaW1wbC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5oICAgfCAgIDE0ICsr Ky0KIDcgZmlsZXMgY2hhbmdlZCwgMTAxIGluc2VydGlvbnMoKyksIDUzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3NyYy9DTWFrZUxpc3RzLnR4dCBiL3NyYy9DTWFrZUxpc3RzLnR4dAppbmRl eCBhZWQ1MTAyLi44MDEyNDM2IDEwMDY0NAotLS0gYS9zcmMvQ01ha2VMaXN0cy50eHQKKysrIGIv c3JjL0NNYWtlTGlzdHMudHh0CkBAIC0zMTIsNiArMzEyLDcgQEAgZW5kaWYoIFRBR0xJQl9GT1VO RCApCiAjIENPTExFQ1RJT04KICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogc2V0KGNvbGxlY3Rpb25fU1JDUworICAg IGNvcmUtaW1wbC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5jcHAKICAgICBjb3Jl LWltcGwvY29sbGVjdGlvbnMvc3VwcG9ydC9Db2xsZWN0aW9uTWFuYWdlci5jcHAKICAgICBjb3Jl LWltcGwvY29sbGVjdGlvbnMvc3VwcG9ydC9Db2xsZWN0aW9uTG9jYXRpb25EZWxlZ2F0ZUltcGwu Y3BwCiAgICAgY29yZS1pbXBsL2NvbGxlY3Rpb25zL3N1cHBvcnQvTWVtb3J5Q3VzdG9tVmFsdWUu Y3BwCmRpZmYgLS1naXQgYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL2RiL1NjYW5SZXN1bHRQ cm9jZXNzb3IuY3BwIGIvc3JjL2NvcmUtaW1wbC9jb2xsZWN0aW9ucy9kYi9TY2FuUmVzdWx0UHJv Y2Vzc29yLmNwcAppbmRleCBkYjAyNDQzLi5lMWYyMDI1IDEwMDY0NAotLS0gYS9zcmMvY29yZS1p bXBsL2NvbGxlY3Rpb25zL2RiL1NjYW5SZXN1bHRQcm9jZXNzb3IuY3BwCisrKyBiL3NyYy9jb3Jl LWltcGwvY29sbGVjdGlvbnMvZGIvU2NhblJlc3VsdFByb2Nlc3Nvci5jcHAKQEAgLTI1MywyNyAr MjUzLDExIEBAIFNjYW5SZXN1bHRQcm9jZXNzb3I6OmNvbW1pdFBsYXlsaXN0KCBDb2xsZWN0aW9u U2Nhbm5lcjo6UGxheWxpc3QgKnBsYXlsaXN0ICkKIENvbGxlY3Rpb25TY2FubmVyOjpBbGJ1bSoK IFNjYW5SZXN1bHRQcm9jZXNzb3I6OnNvcnRUcmFjayggQ29sbGVjdGlvblNjYW5uZXI6OlRyYWNr ICp0cmFjayApCiB7Ci0gICAgLy8gLS0gdHJ5IHRvIGZpbmQgYSBzZW5zaWJsZSBhbGJ1bSBhcnRp c3QKLSAgICBRU3RyaW5nIGFsYnVtQXJ0aXN0KCB0cmFjay0+YWxidW1BcnRpc3QoKSApOwotCi0g ICAgLy8gLSBmb3IgY2xhc3NpY2FsIHRyYWNrcyBpdCdzIHRoZSBjb21wb3NlcgotICAgIGlmKCBh bGJ1bUFydGlzdC5pc0VtcHR5KCkgJiYKLSAgICAgICAgKHRyYWNrLT5nZW5yZSgpLmNvbXBhcmUo IGkxOG5jKCAiVGhlIGdlbnJlIG5hbWUgZm9yIGNsYXNzaWNhbCBtdXNpYyIsICJDbGFzc2ljYWwi ICksIFF0OjpDYXNlSW5zZW5zaXRpdmUgKSA9PSAwIHx8Ci0gICAgICAgICB0cmFjay0+Z2VucmUo KS5jb21wYXJlKCBRTGF0aW4xU3RyaW5nKCAiQ2xhc3NpY2FsIiApLCBRdDo6Q2FzZUluc2Vuc2l0 aXZlICkgPT0gMCApICkKLSAgICAgICAgYWxidW1BcnRpc3QgPSBBcnRpc3RIZWxwZXI6OnJlYWxU cmFja0FydGlzdCggdHJhY2stPmNvbXBvc2VyKCkgKTsKLQotICAgIC8vIC0gZm9yICJub3JtYWwi IHRyYWNrcyBpdCdzIHRoZSB0cmFjayBhcnRpc3QKLSAgICBpZiggYWxidW1BcnRpc3QuaXNFbXB0 eSgpICkKLSAgICAgICAgICAgIGFsYnVtQXJ0aXN0ID0gQXJ0aXN0SGVscGVyOjpyZWFsVHJhY2tB cnRpc3QoIHRyYWNrLT5hcnRpc3QoKSApOwotCi0gICAgLy8gLSAiVmFyaW91cyBBcnRpc3RzIiBp cyB0aGUgc2FtZSBhcyBubyBhcnRpc3QKLSAgICBpZiggYWxidW1BcnRpc3QuY29tcGFyZSggaTE4 biggIlZhcmlvdXMgQXJ0aXN0cyIgKSwgUXQ6OkNhc2VJbnNlbnNpdGl2ZSApID09IDAgfHwKLSAg ICAgICAgYWxidW1BcnRpc3QuY29tcGFyZSggUUxhdGluMVN0cmluZyggIlZhcmlvdXMgQXJ0aXN0 cyIgKSwgUXQ6OkNhc2VJbnNlbnNpdGl2ZSApID09IDAgKQotICAgICAgICBhbGJ1bUFydGlzdC5j bGVhcigpOworICAgIFFTdHJpbmcgYWxidW1BcnRpc3QgPSBBcnRpc3RIZWxwZXI6OmJlc3RHdWVz c0FsYnVtQXJ0aXN0KCB0cmFjay0+YWxidW1BcnRpc3QoKSwKKyAgICAgICAgdHJhY2stPmFydGlz dCgpLCB0cmFjay0+Z2VucmUoKSwgdHJhY2stPmNvbXBvc2VyKCkgKTsKIAogICAgIGlmKCB0cmFj ay0+YWxidW0oKS5pc0VtcHR5KCkgJiYgYWxidW1BcnRpc3QuaXNFbXB0eSgpICkKLSAgICAgICAg cmV0dXJuIDA7Ci0KKyAgICAgICAgcmV0dXJuIDA7ICAvLyB1bmtub3duIGFsYnVtIGZyb20gdmFy aW91cyBhcnRpc3RzCiAgICAgcmV0dXJuIHNvcnRUcmFjayggdHJhY2ssIHRyYWNrLT5hbGJ1bSgp LCBhbGJ1bUFydGlzdCApOwogfQogCmRpZmYgLS1naXQgYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rp b25zL2RiL3NxbC9DTWFrZUxpc3RzLnR4dCBiL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvZGIv c3FsL0NNYWtlTGlzdHMudHh0CmluZGV4IGY3ZTk2ZTcuLmJkYjM5NjYgMTAwNjQ0Ci0tLSBhL3Ny Yy9jb3JlLWltcGwvY29sbGVjdGlvbnMvZGIvc3FsL0NNYWtlTGlzdHMudHh0CisrKyBiL3NyYy9j b3JlLWltcGwvY29sbGVjdGlvbnMvZGIvc3FsL0NNYWtlTGlzdHMudHh0CkBAIC0zMiw3ICszMiw2 IEBAIHNldChhbWFyb2tfY29sbGVjdGlvbi1zcWxjb2xsZWN0aW9uX1NSQ1MKICAgICBTcWxXcml0 ZUxhYmVsQ2FwYWJpbGl0eS5jcHAKICAgICBTcWxTY2FuUmVzdWx0UHJvY2Vzc29yLmNwcAogICAg ICR7Q01BS0VfU09VUkNFX0RJUn0vc2hhcmVkL0ZpbGVUeXBlLmNwcAotICAgICR7Q01BS0VfU09V UkNFX0RJUn0vc3JjL2NvcmUtaW1wbC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5j cHAKICAgICAke2V4dHJhX3NyY30KICApCiAKZGlmZiAtLWdpdCBhL3NyYy9jb3JlLWltcGwvY29s bGVjdGlvbnMvbWVkaWFkZXZpY2Vjb2xsZWN0aW9uL2hhbmRsZXIvTWVkaWFEZXZpY2VIYW5kbGVy LmNwcCBiL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvbWVkaWFkZXZpY2Vjb2xsZWN0aW9uL2hh bmRsZXIvTWVkaWFEZXZpY2VIYW5kbGVyLmNwcAppbmRleCBkOGU1MjNlLi4xYTAzMTY1IDEwMDY0 NAotLS0gYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL21lZGlhZGV2aWNlY29sbGVjdGlvbi9o YW5kbGVyL01lZGlhRGV2aWNlSGFuZGxlci5jcHAKKysrIGIvc3JjL2NvcmUtaW1wbC9jb2xsZWN0 aW9ucy9tZWRpYWRldmljZWNvbGxlY3Rpb24vaGFuZGxlci9NZWRpYURldmljZUhhbmRsZXIuY3Bw CkBAIC0xOCwxNiArMTgsMTQgQEAKIAogI2luY2x1ZGUgIk1lZGlhRGV2aWNlSGFuZGxlci5oIgog Ci0jaW5jbHVkZSAiTWVkaWFEZXZpY2VDb2xsZWN0aW9uLmgiCi0KICNpbmNsdWRlICJNZWRpYURl dmljZUhhbmRsZXJDYXBhYmlsaXR5LmgiCi0KICNpbmNsdWRlICJjb3JlL2ludGVyZmFjZXMvTG9n Z2VyLmgiCiAjaW5jbHVkZSAiY29yZS9zdXBwb3J0L0NvbXBvbmVudHMuaCIKKyNpbmNsdWRlICJj b3JlLWltcGwvY29sbGVjdGlvbnMvbWVkaWFkZXZpY2Vjb2xsZWN0aW9uL01lZGlhRGV2aWNlQ29s bGVjdGlvbi5oIgorI2luY2x1ZGUgImNvcmUtaW1wbC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlz dEhlbHBlci5oIgogI2luY2x1ZGUgInBsYXlsaXN0L01lZGlhRGV2aWNlVXNlclBsYXlsaXN0UHJv dmlkZXIuaCIKLSNpbmNsdWRlICJwbGF5bGlzdG1hbmFnZXIvUGxheWxpc3RNYW5hZ2VyLmgiCi0K ICNpbmNsdWRlICJwbGF5bGlzdC9NZWRpYURldmljZVBsYXlsaXN0LmgiCisjaW5jbHVkZSAicGxh eWxpc3RtYW5hZ2VyL1BsYXlsaXN0TWFuYWdlci5oIgogCiAjaW5jbHVkZSA8S01lc3NhZ2VCb3g+ CiAjaW5jbHVkZSA8dGhyZWFkd2VhdmVyL1RocmVhZFdlYXZlci5oPgpAQCAtMTQwLDI1ICsxMzgs NTEgQEAgTWVkaWFEZXZpY2VIYW5kbGVyOjpzZXRCYXNpY01lZGlhRGV2aWNlVHJhY2tJbmZvKCBj b25zdCBNZXRhOjpUcmFja1B0ciYgc3JjVHJhY2sKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV93 Yy0+bGliU2V0VGl0bGUoIGRlc3RUcmFjaywgc3JjVHJhY2stPm5hbWUoKSApOworCisgICAgUVN0 cmluZyBhbGJ1bUFydGlzdDsKKyAgICBib29sIGlzQ29tcGlsYXRpb24gPSBmYWxzZTsKICAgICBp ZiAoIHNyY1RyYWNrLT5hbGJ1bSgpICkKICAgICB7CiAgICAgICAgIEFsYnVtUHRyIGFsYnVtID0g c3JjVHJhY2stPmFsYnVtKCk7CiAKICAgICAgICAgbV93Yy0+bGliU2V0QWxidW0oIGRlc3RUcmFj aywgYWxidW0tPm5hbWUoKSApOwotICAgICAgICBtX3djLT5saWJTZXRJc0NvbXBpbGF0aW9uKCBk ZXN0VHJhY2ssIGFsYnVtLT5pc0NvbXBpbGF0aW9uKCkgKTsKLQorICAgICAgICBpc0NvbXBpbGF0 aW9uID0gYWxidW0tPmlzQ29tcGlsYXRpb24oKTsKKyAgICAgICAgbV93Yy0+bGliU2V0SXNDb21w aWxhdGlvbiggZGVzdFRyYWNrLCBpc0NvbXBpbGF0aW9uICk7CiAgICAgICAgIGlmKCBhbGJ1bS0+ aGFzQWxidW1BcnRpc3QoKSApCi0gICAgICAgICAgICBtX3djLT5saWJTZXRBbGJ1bUFydGlzdCgg ZGVzdFRyYWNrLCBhbGJ1bS0+YWxidW1BcnRpc3QoKS0+bmFtZSgpICk7CisgICAgICAgICAgICBh bGJ1bUFydGlzdCA9IGFsYnVtLT5hbGJ1bUFydGlzdCgpLT5uYW1lKCk7CiAKICAgICAgICAgaWYo IGFsYnVtLT5oYXNJbWFnZSgpICkKICAgICAgICAgICAgIG1fd2MtPmxpYlNldENvdmVyQXJ0KCBk ZXN0VHJhY2ssIGFsYnVtLT5pbWFnZSgpICk7CiAgICAgfQorCisgICAgUVN0cmluZyB0cmFja0Fy dGlzdDsKICAgICBpZiAoIHNyY1RyYWNrLT5hcnRpc3QoKSApCi0gICAgICAgIG1fd2MtPmxpYlNl dEFydGlzdCggZGVzdFRyYWNrLCBzcmNUcmFjay0+YXJ0aXN0KCktPm5hbWUoKSApOworICAgIHsK KyAgICAgICAgdHJhY2tBcnRpc3QgPSBzcmNUcmFjay0+YXJ0aXN0KCktPm5hbWUoKTsKKyAgICAg ICAgbV93Yy0+bGliU2V0QXJ0aXN0KCBkZXN0VHJhY2ssIHRyYWNrQXJ0aXN0ICk7CisgICAgfQor CisgICAgUVN0cmluZyBjb21wb3NlcjsKICAgICBpZiAoIHNyY1RyYWNrLT5jb21wb3NlcigpICkK LSAgICAgICAgbV93Yy0+bGliU2V0Q29tcG9zZXIoIGRlc3RUcmFjaywgc3JjVHJhY2stPmNvbXBv c2VyKCktPm5hbWUoKSApOworICAgIHsKKyAgICAgICAgY29tcG9zZXIgPSBzcmNUcmFjay0+Y29t cG9zZXIoKS0+bmFtZSgpOworICAgICAgICBtX3djLT5saWJTZXRDb21wb3NlciggZGVzdFRyYWNr LCBjb21wb3NlciApOworICAgIH0KKworICAgIFFTdHJpbmcgZ2VucmU7CiAgICAgaWYgKCBzcmNU cmFjay0+Z2VucmUoKSApCi0gICAgICAgIG1fd2MtPmxpYlNldEdlbnJlKCBkZXN0VHJhY2ssIHNy Y1RyYWNrLT5nZW5yZSgpLT5uYW1lKCkgKTsKKyAgICB7CisgICAgICAgIGdlbnJlID0gc3JjVHJh Y2stPmdlbnJlKCktPm5hbWUoKTsKKyAgICAgICAgbV93Yy0+bGliU2V0R2VucmUoIGRlc3RUcmFj aywgZ2VucmUgKTsKKyAgICB9CisKKyAgICBpZiggaXNDb21waWxhdGlvbiAmJiBhbGJ1bUFydGlz dC5pc0VtcHR5KCkgKQorICAgICAgICAvLyBpUG9kIGRvZXNuJ3QgaGFuZGxlIGVtcHkgYWxidW0g YXJ0aXN0IHdlbGwgZm9yIGNvbXBpbGF0aW9uIGFsYnVtcyAoc3BsaXRzIHRoZXNlIGFsYnVtcykK KyAgICAgICAgYWxidW1BcnRpc3QgPSBpMThuKCAiVmFyaW91cyBBcnRpc3RzIiApOworICAgIGVs c2UKKyAgICAgICAgYWxidW1BcnRpc3QgPSBBcnRpc3RIZWxwZXI6OmJlc3RHdWVzc0FsYnVtQXJ0 aXN0KCBhbGJ1bUFydGlzdCwgdHJhY2tBcnRpc3QsIGdlbnJlLCBjb21wb3NlciApOworICAgIG1f d2MtPmxpYlNldEFsYnVtQXJ0aXN0KCBkZXN0VHJhY2ssIGFsYnVtQXJ0aXN0ICk7CisKICAgICBp ZiAoIHNyY1RyYWNrLT55ZWFyKCkgKQogICAgICAgICBtX3djLT5saWJTZXRZZWFyKCBkZXN0VHJh Y2ssIHNyY1RyYWNrLT55ZWFyKCktPm5hbWUoKSApOwogICAgIG1fd2MtPmxpYlNldExlbmd0aCgg ZGVzdFRyYWNrLCBzcmNUcmFjay0+bGVuZ3RoKCkgKTsKQEAgLTcyMSwxMCArNzQ1LDkgQEAgTWVk aWFEZXZpY2VIYW5kbGVyOjpzbG90RGF0YWJhc2VXcml0dGVuKCBib29sIHN1Y2Nlc3MgKQogCiAK IHZvaWQKLU1lZGlhRGV2aWNlSGFuZGxlcjo6c2V0dXBBcnRpc3RNYXAoIE1ldGE6Ok1lZGlhRGV2 aWNlVHJhY2tQdHIgdHJhY2ssIEFydGlzdE1hcCYgYXJ0aXN0TWFwICkKK01lZGlhRGV2aWNlSGFu ZGxlcjo6c2V0dXBBcnRpc3RNYXAoIE1ldGE6Ok1lZGlhRGV2aWNlVHJhY2tQdHIgdHJhY2ssIEFy dGlzdE1hcCAmYXJ0aXN0TWFwICkKIHsKICAgICBjb25zdCBRU3RyaW5nIGFydGlzdCggbV9yY2It PmxpYkdldEFydGlzdCggdHJhY2sgKSApOwotICAgIGNvbnN0IFFTdHJpbmcgYWxidW1BcnRpc3Qo IG1fcmNiLT5saWJHZXRBbGJ1bUFydGlzdCggdHJhY2sgKSApOwogICAgIE1lZGlhRGV2aWNlQXJ0 aXN0UHRyIGFydGlzdFB0cjsKIAogICAgIGlmKCBhcnRpc3RNYXAuY29udGFpbnMoIGFydGlzdCAp ICkKQEAgLTczNywyMSArNzYwLDEzIEBAIE1lZGlhRGV2aWNlSGFuZGxlcjo6c2V0dXBBcnRpc3RN YXAoIE1ldGE6Ok1lZGlhRGV2aWNlVHJhY2tQdHIgdHJhY2ssIEFydGlzdE1hcCYKIAogICAgIGFy dGlzdFB0ci0+YWRkVHJhY2soIHRyYWNrICk7CiAgICAgdHJhY2stPnNldEFydGlzdCggYXJ0aXN0 UHRyICk7Ci0KLSAgICBpZiggIWFsYnVtQXJ0aXN0LmlzRW1wdHkoKSAmJiBhbGJ1bUFydGlzdCAh PSBhcnRpc3QgJiYKLSAgICAgICAgIWFydGlzdE1hcC5jb250YWlucyggYWxidW1BcnRpc3QgKSAp Ci0gICAgewotICAgICAgICBhcnRpc3RQdHIgPSBNZWRpYURldmljZUFydGlzdFB0ciggbmV3IE1l ZGlhRGV2aWNlQXJ0aXN0KCBhbGJ1bUFydGlzdCApICk7Ci0gICAgICAgIGFydGlzdE1hcC5pbnNl cnQoIGFsYnVtQXJ0aXN0LCBBcnRpc3RQdHI6OnN0YXRpY0Nhc3QoIGFydGlzdFB0ciApICk7Ci0g ICAgfQogfQogCiB2b2lkCi1NZWRpYURldmljZUhhbmRsZXI6OnNldHVwQWxidW1NYXAoIE1ldGE6 Ok1lZGlhRGV2aWNlVHJhY2tQdHIgdHJhY2ssIEFsYnVtTWFwJiBhbGJ1bU1hcCwgY29uc3QgQXJ0 aXN0TWFwICZhcnRpc3RNYXAgKQorTWVkaWFEZXZpY2VIYW5kbGVyOjpzZXR1cEFsYnVtTWFwKCBN ZXRhOjpNZWRpYURldmljZVRyYWNrUHRyIHRyYWNrLCBBbGJ1bU1hcCYgYWxidW1NYXAsIEFydGlz dE1hcCAmYXJ0aXN0TWFwICkKIHsKICAgICBjb25zdCBRU3RyaW5nIGFsYnVtKCBtX3JjYi0+bGli R2V0QWxidW0oIHRyYWNrICkgKTsKLSAgICBjb25zdCBRU3RyaW5nIGFydGlzdCggbV9yY2ItPmxp YkdldEFydGlzdCggdHJhY2sgKSApOwotICAgIGNvbnN0IFFTdHJpbmcgYWxidW1BcnRpc3QoIG1f cmNiLT5saWJHZXRBbGJ1bUFydGlzdCggdHJhY2sgKSApOworICAgIFFTdHJpbmcgYWxidW1BcnRp c3QoIG1fcmNiLT5saWJHZXRBbGJ1bUFydGlzdCggdHJhY2sgKSApOwogICAgIE1lZGlhRGV2aWNl QWxidW1QdHIgYWxidW1QdHI7CiAKICAgICBpZiAoIGFsYnVtTWFwLmNvbnRhaW5zKCBhbGJ1bSAp ICkKQEAgLTc3MSwxNyArNzg2LDI4IEBAIE1lZGlhRGV2aWNlSGFuZGxlcjo6c2V0dXBBbGJ1bU1h cCggTWV0YTo6TWVkaWFEZXZpY2VUcmFja1B0ciB0cmFjaywgQWxidW1NYXAmIGFsCiAgICAgaXND b21waWxhdGlvbiB8PSBtX3JjLT5saWJJc0NvbXBpbGF0aW9uKCB0cmFjayApOwogICAgIGFsYnVt UHRyLT5zZXRJc0NvbXBpbGF0aW9uKCBpc0NvbXBpbGF0aW9uICk7CiAKLSAgICBNZWRpYURldmlj ZUFydGlzdFB0ciBhcnRpc3RQdHI7Ci0KLSAgICBpZiggIWFsYnVtQXJ0aXN0LmlzRW1wdHkoKSAm JiBhcnRpc3RNYXAuY29udGFpbnMoIGFydGlzdCApICkKLSAgICAgICAgYXJ0aXN0UHRyID0gTWVk aWFEZXZpY2VBcnRpc3RQdHI6OnN0YXRpY0Nhc3QoIGFydGlzdE1hcC52YWx1ZSggYWxidW1BcnRp c3QgKSApOwotICAgIGVsc2UgaWYoICFhcnRpc3QuaXNFbXB0eSgpICYmIGFydGlzdE1hcC5jb250 YWlucyggYXJ0aXN0ICkgKQotICAgICAgICBhcnRpc3RQdHIgPSBNZWRpYURldmljZUFydGlzdFB0 cjo6c3RhdGljQ2FzdCggYXJ0aXN0TWFwLnZhbHVlKCBhcnRpc3QgKSApOworICAgIGlmKCBhbGJ1 bUFydGlzdC5jb21wYXJlKCAiVmFyaW91cyBBcnRpc3RzIiwgUXQ6OkNhc2VJbnNlbnNpdGl2ZSAp ID09IDAgfHwKKyAgICAgICAgYWxidW1BcnRpc3QuY29tcGFyZSggaTE4biggIlZhcmlvdXMgQXJ0 aXN0cyIgKSwgUXQ6OkNhc2VJbnNlbnNpdGl2ZSApID09IDAgKQorICAgIHsKKyAgICAgICAgYWxi dW1BcnRpc3QuY2xlYXIoKTsKKyAgICB9CisgICAgaWYoIGFsYnVtQXJ0aXN0LmlzRW1wdHkoKSAp CisgICAgeworICAgICAgICAvLyBzZXQgY29tcGlsYXRpb24gZmxhZywgb3RoZXJ3aXNlIHRoZSBh bGJ1bSB3b3VsZCBiZSBpbnZpc2libGUgaW4gY29sbGVjdGlvbgorICAgICAgICAvLyBicm93c2Vy IGlmICJBbGJ1bSBBcnRpc3QgLyBBbGJ1bSIgdmlldyBpcyBzZWxlY3RlZC4KKyAgICAgICAgYWxi dW1QdHItPnNldElzQ29tcGlsYXRpb24oIHRydWUgKTsKKyAgICAgICAgcmV0dXJuOyAgLy8gbm90 aGluZyBtb3JlIHRvIGRvIC0gdGhpcyBpcyBhbiBhbGJ1bSB3aXRoIG5vIGFsYnVtIGFydGlzdAor ICAgIH0KIAotICAgIGlmKCAhYXJ0aXN0UHRyLmlzTnVsbCgpICkKKyAgICBNZWRpYURldmljZUFy dGlzdFB0ciBhbGJ1bUFydGlzdFB0cjsKKyAgICBpZiggYXJ0aXN0TWFwLmNvbnRhaW5zKCBhbGJ1 bUFydGlzdCApICkKKyAgICAgICAgYWxidW1BcnRpc3RQdHIgPSBNZWRpYURldmljZUFydGlzdFB0 cjo6c3RhdGljQ2FzdCggYXJ0aXN0TWFwLnZhbHVlKCBhbGJ1bUFydGlzdCApICk7CisgICAgZWxz ZQogICAgIHsKLSAgICAgICAgYWxidW1QdHItPnNldEFsYnVtQXJ0aXN0KCBhcnRpc3RQdHIgKTsK KyAgICAgICAgYWxidW1BcnRpc3RQdHIgPSBNZWRpYURldmljZUFydGlzdFB0ciggbmV3IE1lZGlh RGV2aWNlQXJ0aXN0KCBhbGJ1bUFydGlzdCApICk7CisgICAgICAgIGFydGlzdE1hcC5pbnNlcnQo IGFsYnVtQXJ0aXN0LCBBcnRpc3RQdHI6OnN0YXRpY0Nhc3QoIGFsYnVtQXJ0aXN0UHRyICkgKTsK ICAgICB9CisgICAgYWxidW1QdHItPnNldEFsYnVtQXJ0aXN0KCBhbGJ1bUFydGlzdFB0ciApOwog fQogCiB2b2lkCmRpZmYgLS1naXQgYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL21lZGlhZGV2 aWNlY29sbGVjdGlvbi9oYW5kbGVyL01lZGlhRGV2aWNlSGFuZGxlci5oIGIvc3JjL2NvcmUtaW1w bC9jb2xsZWN0aW9ucy9tZWRpYWRldmljZWNvbGxlY3Rpb24vaGFuZGxlci9NZWRpYURldmljZUhh bmRsZXIuaAppbmRleCA5MjUwYmQzLi42YzhjOWU1IDEwMDY0NAotLS0gYS9zcmMvY29yZS1pbXBs L2NvbGxlY3Rpb25zL21lZGlhZGV2aWNlY29sbGVjdGlvbi9oYW5kbGVyL01lZGlhRGV2aWNlSGFu ZGxlci5oCisrKyBiL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvbWVkaWFkZXZpY2Vjb2xsZWN0 aW9uL2hhbmRsZXIvTWVkaWFEZXZpY2VIYW5kbGVyLmgKQEAgLTMyMyw3ICszMjMsNyBAQCBwcml2 YXRlOgogICAgICovCiAKICAgICB2b2lkIHNldHVwQXJ0aXN0TWFwKCBNZXRhOjpNZWRpYURldmlj ZVRyYWNrUHRyIHRyYWNrLCBBcnRpc3RNYXAgJmFydGlzdE1hcCApOwotICAgIHZvaWQgc2V0dXBB bGJ1bU1hcCggTWV0YTo6TWVkaWFEZXZpY2VUcmFja1B0ciB0cmFjaywgQWxidW1NYXAgJmFsYnVt TWFwLCBjb25zdCBBcnRpc3RNYXAgJmFydGlzdE1hcCApOworICAgIHZvaWQgc2V0dXBBbGJ1bU1h cCggTWV0YTo6TWVkaWFEZXZpY2VUcmFja1B0ciB0cmFjaywgQWxidW1NYXAgJmFsYnVtTWFwLCBB cnRpc3RNYXAgJmFydGlzdE1hcCApOwogICAgIHZvaWQgc2V0dXBHZW5yZU1hcCggTWV0YTo6TWVk aWFEZXZpY2VUcmFja1B0ciB0cmFjaywgR2VucmVNYXAgJmdlbnJlTWFwICk7CiAgICAgdm9pZCBz ZXR1cENvbXBvc2VyTWFwKCBNZXRhOjpNZWRpYURldmljZVRyYWNrUHRyIHRyYWNrLCBDb21wb3Nl ck1hcCAmY29tcG9zZXJNYXAgKTsKICAgICB2b2lkIHNldHVwWWVhck1hcCggTWV0YTo6TWVkaWFE ZXZpY2VUcmFja1B0ciB0cmFjaywgWWVhck1hcCAmeWVhck1hcCApOwpkaWZmIC0tZ2l0IGEvc3Jj L2NvcmUtaW1wbC9jb2xsZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5jcHAgYi9zcmMvY29y ZS1pbXBsL2NvbGxlY3Rpb25zL3N1cHBvcnQvQXJ0aXN0SGVscGVyLmNwcAppbmRleCA3MDUxNmI1 Li40YzNmNzQyIDEwMDY0NAotLS0gYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL3N1cHBvcnQv QXJ0aXN0SGVscGVyLmNwcAorKysgYi9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL3N1cHBvcnQv QXJ0aXN0SGVscGVyLmNwcApAQCAtMTYsOSArMTYsMzUgQEAKIAogI2luY2x1ZGUgIkFydGlzdEhl bHBlci5oIgogCisjaW5jbHVkZSA8S0xvY2FsaXplZFN0cmluZz4KKwogI2luY2x1ZGUgPFFTdHJp bmdMaXN0PgogCiBRU3RyaW5nCitBcnRpc3RIZWxwZXI6OmJlc3RHdWVzc0FsYnVtQXJ0aXN0KCBj b25zdCBRU3RyaW5nICZhbGJ1bUFydGlzdCwgY29uc3QgUVN0cmluZyAmdHJhY2tBcnRpc3QsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZnZW5yZSwg Y29uc3QgUVN0cmluZyAmY29tcG9zZXIpCit7CisgICAgUVN0cmluZyBiZXN0KCBhbGJ1bUFydGlz dCApOworCisgICAgLy8gLSBmb3IgY2xhc3NpY2FsIHRyYWNrcyBpdCdzIHRoZSBjb21wb3Nlcgor ICAgIGlmKCBiZXN0LmlzRW1wdHkoKSAmJgorICAgICAgICAoZ2VucmUuY29tcGFyZSggaTE4bmMo ICJUaGUgZ2VucmUgbmFtZSBmb3IgY2xhc3NpY2FsIG11c2ljIiwgIkNsYXNzaWNhbCIgKSwgUXQ6 OkNhc2VJbnNlbnNpdGl2ZSApID09IDAgfHwKKyAgICAgICAgIGdlbnJlLmNvbXBhcmUoIFFMYXRp bjFTdHJpbmcoICJDbGFzc2ljYWwiICksIFF0OjpDYXNlSW5zZW5zaXRpdmUgKSA9PSAwICkgKQor ICAgICAgICBiZXN0ID0gQXJ0aXN0SGVscGVyOjpyZWFsVHJhY2tBcnRpc3QoIGNvbXBvc2VyICk7 CisKKyAgICAvLyAtIGZvciAibm9ybWFsIiB0cmFja3MgaXQncyB0aGUgdHJhY2sgYXJ0aXN0Cisg ICAgaWYoIGJlc3QuaXNFbXB0eSgpICkKKyAgICAgICAgYmVzdCA9IEFydGlzdEhlbHBlcjo6cmVh bFRyYWNrQXJ0aXN0KCB0cmFja0FydGlzdCApOworCisgICAgLy8gLSAiVmFyaW91cyBBcnRpc3Rz IiBpcyB0aGUgc2FtZSBhcyBubyBhcnRpc3QKKyAgICBpZiggYmVzdC5jb21wYXJlKCBpMThuKCAi VmFyaW91cyBBcnRpc3RzIiApLCBRdDo6Q2FzZUluc2Vuc2l0aXZlICkgPT0gMCB8fAorICAgICAg ICBiZXN0LmNvbXBhcmUoIFFMYXRpbjFTdHJpbmcoICJWYXJpb3VzIEFydGlzdHMiICksIFF0OjpD YXNlSW5zZW5zaXRpdmUgKSA9PSAwICkKKyAgICAgICAgYmVzdC5jbGVhcigpOworCisgICAgcmV0 dXJuIGJlc3Q7Cit9CisKK1FTdHJpbmcKIEFydGlzdEhlbHBlcjo6cmVhbFRyYWNrQXJ0aXN0KCBj b25zdCBRU3RyaW5nICZ0cmFja0FydGlzdFRhZyApCiB7CiAgICAgYm9vbCBmZWF0dXJpbmcgPSBm YWxzZTsKZGlmZiAtLWdpdCBhL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvc3VwcG9ydC9BcnRp c3RIZWxwZXIuaCBiL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvc3VwcG9ydC9BcnRpc3RIZWxw ZXIuaAppbmRleCBjMmVkODBlLi5iMWZmMWEwIDEwMDY0NAotLS0gYS9zcmMvY29yZS1pbXBsL2Nv bGxlY3Rpb25zL3N1cHBvcnQvQXJ0aXN0SGVscGVyLmgKKysrIGIvc3JjL2NvcmUtaW1wbC9jb2xs ZWN0aW9ucy9zdXBwb3J0L0FydGlzdEhlbHBlci5oCkBAIC0xNywxNiArMTcsMjggQEAKICNpZm5k ZWYgQVJUSVNUSEVMUEVSX0gKICNkZWZpbmUgQVJUSVNUSEVMUEVSX0gKIAorI2luY2x1ZGUgImFt YXJva19leHBvcnQuaCIKKwogI2luY2x1ZGUgPFFTdHJpbmc+CiAKIG5hbWVzcGFjZSBBcnRpc3RI ZWxwZXIKIHsKICAgICAvKioKKyAgICAgKiBSZXR1cm4gdGhlIGJlc3QgZ3Vlc3Mgb2YgdGhlIGFs YnVtIGFydGlzdC4KKyAgICAgKgorICAgICAqIEd1ZXNzaW5nIGFsZ29yaXRobSBpbmNsdWRlcyBl eHRyYWN0aW5nIGFydGlzdCBmcm9tIGNvbXBvc2VyIGZvciBjbGFzc2ljYWwgdHJhY2tzLAorICAg ICAqIGZhbGxpbmcgYmFjayB0byB0cmFja0FydGlzdCBpZiBhbGJ1bUFydGlzdCBpcyBlbXB0eSBl dGMuIFJldHVybnMgZW1wdHkgc3RyaW5nIGZvcgorICAgICAqIHRyYWNrcyB0aGF0IGFyZSBiZWxp ZXZlZCB0byBiZWxvbmcgdG8gYmVsb25nIGludG8gYSBjb21waWxhdGlvbi4KKyAgICAgKi8KKyAg ICBBTUFST0tfRVhQT1JUIFFTdHJpbmcgYmVzdEd1ZXNzQWxidW1BcnRpc3QoIGNvbnN0IFFTdHJp bmcgJmFsYnVtQXJ0aXN0LCBjb25zdCBRU3RyaW5nICZ0cmFja0FydGlzdCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZnZW5yZSwgY29uc3QgUVN0cmlu ZyAmY29tcG9zZXIgKTsKKworICAgIC8qKgogICAgICAgKiBUaGlzIGhlbHBlciBmdW5jdGlvbiB3 aWxsIGRldGVybWluZSB0aGUgYWN0dWFsIHRyYWNrIGFydGlzdC4KICAgICAgICogSXQgdGFrZXMg aW50byBhY2NvdW50ICJBIGZlYXR1cmluZyBCIiBzdHJpbmdzLCBpbiB3aGljaCBjYXNlCiAgICAg ICAqIHRoZSBhY3R1YWwgdHJhY2sgYXJ0aXN0IHdvdWxkIGJlIEEuCiAgICAgICAqLwotICAgIFFT dHJpbmcgcmVhbFRyYWNrQXJ0aXN0KCBjb25zdCBRU3RyaW5nICZ0cmFja0FydGlzdFRhZyApOwor ICAgIEFNQVJPS19FWFBPUlQgUVN0cmluZyByZWFsVHJhY2tBcnRpc3QoIGNvbnN0IFFTdHJpbmcg JnRyYWNrQXJ0aXN0VGFnICk7CiB9CiAKICNlbmRpZgotLSAKMS43LjQuNQoK