120051 2006-01-13 17:45:14 +0000 Wish: display elapsed time in OSD 2006-12-08 09:13:42 +0000 1 1 2 Applications amarok general 1.2.4 Gentoo Packages Linux RESOLVED FIXED NOR wishlist --- 0 helmling amarok-bugs-null 1 oldest_to_newest 405806 0 helmling 2006-01-13 17:45:14 +0000 Version: 1.2.4 (using KDE KDE 3.5.0) Installed from: Gentoo Packages Compiler: gcc-3.4.4 OS: Linux I would like to display the currently elapsed (or remaining) time of a song in the OSD, because I have a lot of tracks that are over 10 minutes long, just to have a better overview. Shouldn't be too hard to implement. ;) 492207 1 18834 christian.engels 2006-12-07 19:27:24 +0000 Created attachment 18834 Patch for osd.cpp, .h, Options5.ui.h 492208 2 christian.engels 2006-12-07 19:28:08 +0000 I wrote a small patch for it (and clear out the extra Vector class). 492231 3 18835 christian.engels 2006-12-07 21:23:38 +0000 Created attachment 18835 working patch 492316 4 kretschmann 2006-12-08 09:13:38 +0000 SVN commit 611451 by markey: Elapsed time can be shown in OSD. Patch by Christian Engels <s9chenge@stud.uni-sb.de>. BUG: 120051 M +2 -0 ChangeLog M +5 -4 src/Options5.ui.h M +26 -17 src/osd.cpp M +1 -1 src/osd.h --- trunk/extragear/multimedia/amarok/ChangeLog #611450:611451 @@ -5,6 +5,8 @@ VERSION 1.4.5 FEATURES: + * Elapsed time can be shown in OSD. Patch by Christian Engels + <s9chenge@stud.uni-sb.de>. (BR 120051) * New redownload manager for the Magnatune.com store. Allows re-download of any previous purchase free of charge (in any format). * Star ratings now have different colors for different ratings, to easily --- trunk/extragear/multimedia/amarok/src/Options5.ui.h #611450:611451 @@ -77,6 +77,7 @@ "<li>Disc Number - %15" "<li>Rating - %16" "<li>Moodbar - %17" + "<li>Elapsed Time - %18" "</ul>" "If you surround sections of text that contain a token with curly-braces, that section will be hidden if the token is empty, for example:" "<pre>%11</pre>" @@ -84,10 +85,10 @@ QToolTip::add( kcfg_OsdText, text.args( QStringList() // we don't translate these, it is not sensible to do so - << "%title" << "%album" << "%artist" << "%genre" << "%bitrate" - << "%year " << "%length" << "%track" << "%filename" << "%directory" - << "%type" << "%comment" << "%score" << "%playcount" << "%discnumber" - << "%rating" << "%moodbar" + << "%title" << "%album" << "%artist" << "%genre" << "%bitrate" + << "%year " << "%length" << "%track" << "%filename" << "%directory" + << "%type" << "%comment" << "%score" << "%playcount" << "%discnumber" + << "%rating" << "%moodbar" << "%elapsed" << "%title {Score: %score}" ) ); } --- trunk/extragear/multimedia/amarok/src/osd.cpp #611450:611451 @@ -16,6 +16,7 @@ #include "amarokconfig.h" #include "collectiondb.h" //for albumCover location #include "debug.h" +#include "enginecontroller.h" #include "osd.h" #include "playlist.h" //if osdUsePlaylistColumns() #include "playlistitem.h" //ditto @@ -626,17 +627,6 @@ this, SLOT( slotImageChanged( const QString& ) ) ); } -template<class T> -class MyVector: public QValueVector<T> //QValueVector doesn't have operator<<, wtf? -{ - public: - inline MyVector<T> &operator<< (const T &x) - { - append( x ); - return *this; - } -}; - void Amarok::OSD::show( const MetaBundle &bundle ) //slot { @@ -646,10 +636,10 @@ else { - MyVector<QString> tags; - tags << bundle.prettyTitle(); + QValueVector<QString> tags; + tags.append(bundle.prettyTitle()); for( int i = 0; i < PlaylistItem::NUM_COLUMNS; ++i ) - tags << bundle.prettyText( i ); + tags.append(bundle.prettyText( i )); if( bundle.length() <= 0 ) tags[PlaylistItem::Length+1] = QString::null; @@ -657,7 +647,7 @@ if( AmarokConfig::osdUsePlaylistColumns() ) { QString tag; - MyVector<int> availableTags; //eg, ones that aren't empty + QValueVector<int> availableTags; //eg, ones that aren't empty static const QValueList<int> parens = //display these in parentheses QValueList<int>() << PlaylistItem::PlayCount << PlaylistItem::Year << PlaylistItem::Comment << PlaylistItem::Genre << PlaylistItem::Length << PlaylistItem::Bitrate @@ -668,7 +658,7 @@ { const int column = Playlist::instance()->mapToLogicalColumn( i ); if( !tags.at( column + 1 ).isEmpty() && column != PlaylistItem::Rating ) - availableTags << column; + availableTags.append(column); if( column == PlaylistItem::Rating ) OSDWidget::setRating( bundle.rating() ); else if( column == PlaylistItem::Mood ) @@ -695,7 +685,26 @@ if( bundle.length() <= 0 ) args["length"] = QString::null; - + + + uint time=EngineController::instance()->engine()->position(); + uint sec=(time/1000)%60; //is there a better way to calculate the time? + time /= 1000; + uint min=(time/60)%60; + time /= 60; + uint hour=(time/60)%60; + QString timeformat=""; + if(hour!=0) + { + timeformat += QString::number(hour); + timeformat +=":"; + } + timeformat +=QString::number(min); + timeformat +=":"; + if(sec<10) + timeformat +="0"; + timeformat +=QString::number(sec); + args["elapsed"]=timeformat; QStringx osd = AmarokConfig::osdText(); // hacky, but works... --- trunk/extragear/multimedia/amarok/src/osd.h #611450:611451 @@ -16,7 +16,7 @@ #define AMAROK_OSD_H #include "metabundle.h" - + #include <kpixmap.h> #include <qimage.h> #include <qvaluelist.h> 18834 2006-12-07 19:27:24 +0000 2006-12-07 19:27:24 +0000 Patch for osd.cpp, .h, Options5.ui.h osd-patch.diff text/plain 4336 christian.engels LS0tIG9zZC5jcHAJMjAwNi0xMi0wNyAxODoyODoyMi4wMDAwMDAwMDAgKzAxMDAKKysrIG9zZC1w YXRjaC5jcHAJMjAwNi0xMi0wNyAxODoyNzoxMy4wMDAwMDAwMDAgKzAxMDAKQEAgLTYxOSwxNyAr NjE5LDYgQEAKICAgICAgICAgICAgICB0aGlzLCAgICAgICAgICAgICAgICAgICBTTE9UKCBzbG90 SW1hZ2VDaGFuZ2VkKCBjb25zdCBRU3RyaW5nJiApICkgKTsKIH0KIAotdGVtcGxhdGU8Y2xhc3Mg VD4KLWNsYXNzIE15VmVjdG9yOiBwdWJsaWMgUVZhbHVlVmVjdG9yPFQ+IC8vUVZhbHVlVmVjdG9y IGRvZXNuJ3QgaGF2ZSBvcGVyYXRvcjw8LCB3dGY/Ci17Ci0gICAgcHVibGljOgotICAgIGlubGlu ZSBNeVZlY3RvcjxUPiAmb3BlcmF0b3I8PCAoY29uc3QgVCAmeCkKLSAgICB7Ci0gICAgICAgIGFw cGVuZCggeCApOwotICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAgfQotfTsKLQogdm9pZAogQW1h cm9rOjpPU0Q6OnNob3coIGNvbnN0IE1ldGFCdW5kbGUgJmJ1bmRsZSApIC8vc2xvdAogewpAQCAt NjM5LDEwICs2MjgsMTAgQEAKIAogICAgIGVsc2UKICAgICB7Ci0gICAgICAgIE15VmVjdG9yPFFT dHJpbmc+IHRhZ3M7Ci0gICAgICAgIHRhZ3MgPDwgYnVuZGxlLnByZXR0eVRpdGxlKCk7CisgICAg ICAgIFFWYWx1ZVZlY3RvcjxRU3RyaW5nPiB0YWdzOworICAgICAgICB0YWdzLmFwcGVuZChidW5k bGUucHJldHR5VGl0bGUoKSk7CiAgICAgICAgIGZvciggaW50IGkgPSAwOyBpIDwgUGxheWxpc3RJ dGVtOjpOVU1fQ09MVU1OUzsgKytpICkKLSAgICAgICAgICAgIHRhZ3MgPDwgYnVuZGxlLnByZXR0 eVRleHQoIGkgKTsKKyAgICAgICAgICAgIHRhZ3MuYXBwZW5kKGJ1bmRsZS5wcmV0dHlUZXh0KCBp ICkpOwogCiAgICAgICAgIGlmKCBidW5kbGUubGVuZ3RoKCkgPD0gMCApCiAgICAgICAgICAgICB0 YWdzW1BsYXlsaXN0SXRlbTo6TGVuZ3RoKzFdID0gUVN0cmluZzo6bnVsbDsKQEAgLTY1MCw3ICs2 MzksNyBAQAogICAgICAgICBpZiggQW1hcm9rQ29uZmlnOjpvc2RVc2VQbGF5bGlzdENvbHVtbnMo KSApCiAgICAgICAgIHsKICAgICAgICAgICAgIFFTdHJpbmcgdGFnOwotICAgICAgICAgICAgTXlW ZWN0b3I8aW50PiBhdmFpbGFibGVUYWdzOyAvL2VnLCBvbmVzIHRoYXQgYXJlbid0IGVtcHR5Cisg ICAgICAgICAgICBRVmFsdWVWZWN0b3I8aW50PiBhdmFpbGFibGVUYWdzOyAvL2VnLCBvbmVzIHRo YXQgYXJlbid0IGVtcHR5CiAgICAgICAgICAgICBzdGF0aWMgY29uc3QgUVZhbHVlTGlzdDxpbnQ+ IHBhcmVucyA9IC8vZGlzcGxheSB0aGVzZSBpbiBwYXJlbnRoZXNlcwogICAgICAgICAgICAgICAg IFFWYWx1ZUxpc3Q8aW50PigpIDw8IFBsYXlsaXN0SXRlbTo6UGxheUNvdW50ICA8PCBQbGF5bGlz dEl0ZW06OlllYXIgICA8PCBQbGF5bGlzdEl0ZW06OkNvbW1lbnQKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8PCBQbGF5bGlzdEl0ZW06OkdlbnJlICAgICAgPDwgUGxheWxpc3RJ dGVtOjpMZW5ndGggPDwgUGxheWxpc3RJdGVtOjpCaXRyYXRlCkBAIC02NjEsNyArNjUwLDcgQEAK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBjb25zdCBpbnQgY29sdW1uID0gUGxheWxp c3Q6Omluc3RhbmNlKCktPm1hcFRvTG9naWNhbENvbHVtbiggaSApOwogICAgICAgICAgICAgICAg IGlmKCAhdGFncy5hdCggY29sdW1uICsgMSApLmlzRW1wdHkoKSAmJiBjb2x1bW4gIT0gUGxheWxp c3RJdGVtOjpSYXRpbmcgKQotICAgICAgICAgICAgICAgICAgICBhdmFpbGFibGVUYWdzIDw8IGNv bHVtbjsKKyAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlVGFncy5hcHBlbmQoY29sdW1uKTsK ICAgICAgICAgICAgICAgICBpZiggY29sdW1uID09IFBsYXlsaXN0SXRlbTo6UmF0aW5nICkKICAg ICAgICAgICAgICAgICAgICAgT1NEV2lkZ2V0OjpzZXRSYXRpbmcoIGJ1bmRsZS5yYXRpbmcoKSAp OwogICAgICAgICAgICAgICAgIGVsc2UgaWYoIGNvbHVtbiA9PSBQbGF5bGlzdEl0ZW06Ok1vb2Qg KQpAQCAtNjg4LDcgKzY3NywyNiBAQAogCiAgICAgICAgICAgICBpZiggYnVuZGxlLmxlbmd0aCgp IDw9IDAgKQogICAgICAgICAgICAgICAgIGFyZ3NbImxlbmd0aCJdID0gUVN0cmluZzo6bnVsbDsK LQorCSAgICAKKwkgICAgCisJICAgIHVpbnQgdGltZT1FbmdpbmVDb250cm9sbGVyOjppbnN0YW5j ZSgpLT5lbmdpbmUoKS0+cG9zaXRpb24oKTsKKwkgICAgdWludCBzZWM9KHRpbWUvMTAwMCklNjA7 CS8vaXMgdGhlcmUgYSBiZXR0ZXIgd2F5IHRvIGNhbGN1bGF0ZSB0aGUgdGltZT8KKwkgICAgdGlt ZSAvPSAxMDAwOworCSAgICB1aW50IG1pbj0odGltZS82MCklNjA7CisJICAgIHRpbWUgLz0gNjA7 CisJICAgIHVpbnQgaG91cj0odGltZS82MCklNjA7CisJICAgIFFTdHJpbmcgdGltZWZvcm1hdD0i IjsKKwkgICAgaWYoaG91ciE9MCkKKwkgICAgeworCQkgICAgdGltZWZvcm1hdCArPSBRU3RyaW5n OjpudW1iZXIoaG91cik7CisJCSAgICB0aW1lZm9ybWF0ICs9IjoiOworCSAgICB9CisJICAgIHRp bWVmb3JtYXQgKz1RU3RyaW5nOjpudW1iZXIobWluKTsKKwkgICAgdGltZWZvcm1hdCArPSI6IjsK KwkgICAgaWYoc2VjPDEwKQorCQkgICAgdGltZWZvcm1hdCArPSIwIjsKKwkgICAgdGltZWZvcm1h dCArPVFTdHJpbmc6Om51bWJlcihzZWMpOworCSAgICBhcmdzWyJlbGFwc2VkIl09dGltZWZvcm1h dDsKICAgICAgICAgICAgIFFTdHJpbmd4IG9zZCA9IEFtYXJva0NvbmZpZzo6b3NkVGV4dCgpOwog CiAgICAgICAgICAgICAvLyBoYWNreSwgYnV0IHdvcmtzLi4uCgotLS0gb3NkLmgJMjAwNi0xMi0w NyAxODoyODoyMi4wMDAwMDAwMDAgKzAxMDAKKysrIG9zZC1wYXRjaC5oCTIwMDYtMTItMDcgMTg6 MzI6MzcuMDAwMDAwMDAwICswMTAwCkBAIC0xNiw3ICsxNiw4IEBACiAjZGVmaW5lIEFNQVJPS19P U0RfSAogCiAjaW5jbHVkZSAibWV0YWJ1bmRsZS5oIgotCisjaW5jbHVkZSAiZW5naW5lY29udHJv bGxlci5oIgorCQkKICNpbmNsdWRlIDxrcGl4bWFwLmg+CiAjaW5jbHVkZSA8cWltYWdlLmg+CiAj aW5jbHVkZSA8cXZhbHVlbGlzdC5oPgoKCQkKLS0tIE9wdGlvbnM1LnVpLmgJMjAwNi0xMi0wNyAx OToyMjoxOS4wMDAwMDAwMDAgKzAxMDAKKysrIE9wdGlvbnM1LnVpLmgtcGF0Y2gJMjAwNi0xMi0w NyAxOToyMzo0MC4wMDAwMDAwMDAgKzAxMDAKQEAgLTc3LDYgKzc3LDcgQEAKICAgICAgICAgICAg ICAgICAiPGxpPkRpc2MgTnVtYmVyIC0gJTE1IgogICAgICAgICAgICAgICAgICI8bGk+UmF0aW5n IC0gJTE2IgogICAgICAgICAgICAgICAgICI8bGk+TW9vZGJhciAtICUxNyIKKwkJIjxsaT5FbGFw c2VkIFRpbWUgLSAlMTgiCiAgICAgICAgICAgICAgICAgIjwvdWw+IgogICAgICAgICAgICAgIklm IHlvdSBzdXJyb3VuZCBzZWN0aW9ucyBvZiB0ZXh0IHRoYXQgY29udGFpbiBhIHRva2VuIHdpdGgg Y3VybHktYnJhY2VzLCB0aGF0IHNlY3Rpb24gd2lsbCBiZSBoaWRkZW4gaWYgdGhlIHRva2VuIGlz IGVtcHR5LCBmb3IgZXhhbXBsZToiCiAgICAgICAgICAgICAgICAgIjxwcmU+JTExPC9wcmU+IgpA QCAtODQsMTAgKzg1LDEwIEBACiAKICAgICBRVG9vbFRpcDo6YWRkKCBrY2ZnX09zZFRleHQsIHRl eHQuYXJncyggUVN0cmluZ0xpc3QoKQogICAgICAgICAgICAgLy8gd2UgZG9uJ3QgdHJhbnNsYXRl IHRoZXNlLCBpdCBpcyBub3Qgc2Vuc2libGUgdG8gZG8gc28KLSAgICAgICAgICAgIDw8ICIldGl0 bGUiIDw8ICIlYWxidW0iICAgPDwgIiVhcnRpc3QiIDw8ICIlZ2VucmUiICAgICA8PCAiJWJpdHJh dGUiCi0gICAgICAgICAgICA8PCAiJXllYXIgIiA8PCAiJWxlbmd0aCIgIDw8ICIldHJhY2siICA8 PCAiJWZpbGVuYW1lIiAgPDwgIiVkaXJlY3RvcnkiCi0gICAgICAgICAgICA8PCAiJXR5cGUiICA8 PCAiJWNvbW1lbnQiIDw8ICIlc2NvcmUiICA8PCAiJXBsYXljb3VudCIgPDwgIiVkaXNjbnVtYmVy IgotICAgICAgICAgICAgPDwgIiVyYXRpbmciIDw8ICIlbW9vZGJhciIKKyAgICAgICAgICAgIDw8 ICIldGl0bGUiICA8PCAiJWFsYnVtIiAgIDw8ICIlYXJ0aXN0IiAgPDwgIiVnZW5yZSIgICAgIDw8 ICIlYml0cmF0ZSIKKyAgICAgICAgICAgIDw8ICIleWVhciAiICA8PCAiJWxlbmd0aCIgIDw8ICIl dHJhY2siICAgPDwgIiVmaWxlbmFtZSIgIDw8ICIlZGlyZWN0b3J5IgorICAgICAgICAgICAgPDwg IiV0eXBlIiAgIDw8ICIlY29tbWVudCIgPDwgIiVzY29yZSIgICA8PCAiJXBsYXljb3VudCIgPDwg IiVkaXNjbnVtYmVyIgorICAgICAgICAgICAgPDwgIiVyYXRpbmciIDw8ICIlbW9vZGJhciIgPDwg IiVlbGFwc2VkIgogICAgICAgICAgICAgPDwgIiV0aXRsZSB7U2NvcmU6ICVzY29yZX0iICkgKTsK IH0KIA== 18835 2006-12-07 21:23:38 +0000 2006-12-07 21:23:38 +0000 working patch osd-patch.diff text/plain 4337 christian.engels LS0tIG9zZC5jcHAJMjAwNi0xMi0wNyAxODoyODoyMi4wMDAwMDAwMDAgKzAxMDAKKysrIG9zZC1w YXRjaC5jcHAJMjAwNi0xMi0wNyAxODoyNzoxMy4wMDAwMDAwMDAgKzAxMDAKQEAgLTYxOSwxNyAr NjE5LDYgQEAKICAgICAgICAgICAgICB0aGlzLCAgICAgICAgICAgICAgICAgICBTTE9UKCBzbG90 SW1hZ2VDaGFuZ2VkKCBjb25zdCBRU3RyaW5nJiApICkgKTsKIH0KIAotdGVtcGxhdGU8Y2xhc3Mg VD4KLWNsYXNzIE15VmVjdG9yOiBwdWJsaWMgUVZhbHVlVmVjdG9yPFQ+IC8vUVZhbHVlVmVjdG9y IGRvZXNuJ3QgaGF2ZSBvcGVyYXRvcjw8LCB3dGY/Ci17Ci0gICAgcHVibGljOgotICAgIGlubGlu ZSBNeVZlY3RvcjxUPiAmb3BlcmF0b3I8PCAoY29uc3QgVCAmeCkKLSAgICB7Ci0gICAgICAgIGFw cGVuZCggeCApOwotICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAgfQotfTsKLQogdm9pZAogQW1h cm9rOjpPU0Q6OnNob3coIGNvbnN0IE1ldGFCdW5kbGUgJmJ1bmRsZSApIC8vc2xvdAogewpAQCAt NjM5LDEwICs2MjgsMTAgQEAKIAogICAgIGVsc2UKICAgICB7Ci0gICAgICAgIE15VmVjdG9yPFFT dHJpbmc+IHRhZ3M7Ci0gICAgICAgIHRhZ3MgPDwgYnVuZGxlLnByZXR0eVRpdGxlKCk7CisgICAg ICAgIFFWYWx1ZVZlY3RvcjxRU3RyaW5nPiB0YWdzOworICAgICAgICB0YWdzLmFwcGVuZChidW5k bGUucHJldHR5VGl0bGUoKSk7CiAgICAgICAgIGZvciggaW50IGkgPSAwOyBpIDwgUGxheWxpc3RJ dGVtOjpOVU1fQ09MVU1OUzsgKytpICkKLSAgICAgICAgICAgIHRhZ3MgPDwgYnVuZGxlLnByZXR0 eVRleHQoIGkgKTsKKyAgICAgICAgICAgIHRhZ3MuYXBwZW5kKGJ1bmRsZS5wcmV0dHlUZXh0KCBp ICkpOwogCiAgICAgICAgIGlmKCBidW5kbGUubGVuZ3RoKCkgPD0gMCApCiAgICAgICAgICAgICB0 YWdzW1BsYXlsaXN0SXRlbTo6TGVuZ3RoKzFdID0gUVN0cmluZzo6bnVsbDsKQEAgLTY1MCw3ICs2 MzksNyBAQAogICAgICAgICBpZiggQW1hcm9rQ29uZmlnOjpvc2RVc2VQbGF5bGlzdENvbHVtbnMo KSApCiAgICAgICAgIHsKICAgICAgICAgICAgIFFTdHJpbmcgdGFnOwotICAgICAgICAgICAgTXlW ZWN0b3I8aW50PiBhdmFpbGFibGVUYWdzOyAvL2VnLCBvbmVzIHRoYXQgYXJlbid0IGVtcHR5Cisg ICAgICAgICAgICBRVmFsdWVWZWN0b3I8aW50PiBhdmFpbGFibGVUYWdzOyAvL2VnLCBvbmVzIHRo YXQgYXJlbid0IGVtcHR5CiAgICAgICAgICAgICBzdGF0aWMgY29uc3QgUVZhbHVlTGlzdDxpbnQ+ IHBhcmVucyA9IC8vZGlzcGxheSB0aGVzZSBpbiBwYXJlbnRoZXNlcwogICAgICAgICAgICAgICAg IFFWYWx1ZUxpc3Q8aW50PigpIDw8IFBsYXlsaXN0SXRlbTo6UGxheUNvdW50ICA8PCBQbGF5bGlz dEl0ZW06OlllYXIgICA8PCBQbGF5bGlzdEl0ZW06OkNvbW1lbnQKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8PCBQbGF5bGlzdEl0ZW06OkdlbnJlICAgICAgPDwgUGxheWxpc3RJ dGVtOjpMZW5ndGggPDwgUGxheWxpc3RJdGVtOjpCaXRyYXRlCkBAIC02NjEsNyArNjUwLDcgQEAK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBjb25zdCBpbnQgY29sdW1uID0gUGxheWxp c3Q6Omluc3RhbmNlKCktPm1hcFRvTG9naWNhbENvbHVtbiggaSApOwogICAgICAgICAgICAgICAg IGlmKCAhdGFncy5hdCggY29sdW1uICsgMSApLmlzRW1wdHkoKSAmJiBjb2x1bW4gIT0gUGxheWxp c3RJdGVtOjpSYXRpbmcgKQotICAgICAgICAgICAgICAgICAgICBhdmFpbGFibGVUYWdzIDw8IGNv bHVtbjsKKyAgICAgICAgICAgICAgICAgICAgYXZhaWxhYmxlVGFncy5hcHBlbmQoY29sdW1uKTsK ICAgICAgICAgICAgICAgICBpZiggY29sdW1uID09IFBsYXlsaXN0SXRlbTo6UmF0aW5nICkKICAg ICAgICAgICAgICAgICAgICAgT1NEV2lkZ2V0OjpzZXRSYXRpbmcoIGJ1bmRsZS5yYXRpbmcoKSAp OwogICAgICAgICAgICAgICAgIGVsc2UgaWYoIGNvbHVtbiA9PSBQbGF5bGlzdEl0ZW06Ok1vb2Qg KQpAQCAtNjg4LDcgKzY3NywyNiBAQAogCiAgICAgICAgICAgICBpZiggYnVuZGxlLmxlbmd0aCgp IDw9IDAgKQogICAgICAgICAgICAgICAgIGFyZ3NbImxlbmd0aCJdID0gUVN0cmluZzo6bnVsbDsK LQorCSAgICAKKwkgICAgCisJICAgIHVpbnQgdGltZT1FbmdpbmVDb250cm9sbGVyOjppbnN0YW5j ZSgpLT5lbmdpbmUoKS0+cG9zaXRpb24oKTsKKwkgICAgdWludCBzZWM9KHRpbWUvMTAwMCklNjA7 CS8vaXMgdGhlcmUgYSBiZXR0ZXIgd2F5IHRvIGNhbGN1bGF0ZSB0aGUgdGltZT8KKwkgICAgdGlt ZSAvPSAxMDAwOworCSAgICB1aW50IG1pbj0odGltZS82MCklNjA7CisJICAgIHRpbWUgLz0gNjA7 CisJICAgIHVpbnQgaG91cj0odGltZS82MCklNjA7CisJICAgIFFTdHJpbmcgdGltZWZvcm1hdD0i IjsKKwkgICAgaWYoaG91ciE9MCkKKwkgICAgeworCQkgICAgdGltZWZvcm1hdCArPSBRU3RyaW5n OjpudW1iZXIoaG91cik7CisJCSAgICB0aW1lZm9ybWF0ICs9IjoiOworCSAgICB9CisJICAgIHRp bWVmb3JtYXQgKz1RU3RyaW5nOjpudW1iZXIobWluKTsKKwkgICAgdGltZWZvcm1hdCArPSI6IjsK KwkgICAgaWYoc2VjPDEwKQorCQkgICAgdGltZWZvcm1hdCArPSIwIjsKKwkgICAgdGltZWZvcm1h dCArPVFTdHJpbmc6Om51bWJlcihzZWMpOworCSAgICBhcmdzWyJlbGFwc2VkIl09dGltZWZvcm1h dDsKICAgICAgICAgICAgIFFTdHJpbmd4IG9zZCA9IEFtYXJva0NvbmZpZzo6b3NkVGV4dCgpOwog CiAgICAgICAgICAgICAvLyBoYWNreSwgYnV0IHdvcmtzLi4uCgotLS0gb3NkLmgJMjAwNi0xMi0w NyAxODoyODoyMi4wMDAwMDAwMDAgKzAxMDAKKysrIG9zZC1wYXRjaC5oCTIwMDYtMTItMDcgMTg6 MzI6MzcuMDAwMDAwMDAwICswMTAwCkBAIC0xNiw3ICsxNiw4IEBACiAjZGVmaW5lIEFNQVJPS19P U0RfSAogCiAjaW5jbHVkZSAibWV0YWJ1bmRsZS5oIgotCisjaW5jbHVkZSAiZW5naW5lY29udHJv bGxlci5oIgorCQkKICNpbmNsdWRlIDxrcGl4bWFwLmg+CiAjaW5jbHVkZSA8cWltYWdlLmg+CiAj aW5jbHVkZSA8cXZhbHVlbGlzdC5oPgoKCQkKLS0tIE9wdGlvbnM1LnVpLmgJMjAwNi0xMi0wNyAy MToxOTo0Mi4wMDAwMDAwMDAgKzAxMDAKKysrIE9wdGlvbnM1LnVpLmgtcGF0Y2gJMjAwNi0xMi0w NyAxOToyMzo0MC4wMDAwMDAwMDAgKzAxMDAKQEAgLTc3LDYgKzc3LDcgQEAKICAgICAgICAgICAg ICAgICAiPGxpPkRpc2MgTnVtYmVyIC0gJTE1IgogICAgICAgICAgICAgICAgICI8bGk+UmF0aW5n IC0gJTE2IgogICAgICAgICAgICAgICAgICI8bGk+TW9vZGJhciAtICUxNyIKKwkJIjxsaT5FbGFw c2VkIFRpbWUgLSAlMTgiCiAgICAgICAgICAgICAgICAgIjwvdWw+IgogICAgICAgICAgICAgIklm IHlvdSBzdXJyb3VuZCBzZWN0aW9ucyBvZiB0ZXh0IHRoYXQgY29udGFpbiBhIHRva2VuIHdpdGgg Y3VybHktYnJhY2VzLCB0aGF0IHNlY3Rpb24gd2lsbCBiZSBoaWRkZW4gaWYgdGhlIHRva2VuIGlz IGVtcHR5LCBmb3IgZXhhbXBsZToiCiAgICAgICAgICAgICAgICAgIjxwcmU+JTExPC9wcmU+IgpA QCAtODQsMTAgKzg1LDEwIEBACiAKICAgICBRVG9vbFRpcDo6YWRkKCBrY2ZnX09zZFRleHQsIHRl eHQuYXJncyggUVN0cmluZ0xpc3QoKQogICAgICAgICAgICAgLy8gd2UgZG9uJ3QgdHJhbnNsYXRl IHRoZXNlLCBpdCBpcyBub3Qgc2Vuc2libGUgdG8gZG8gc28KLSAgICAgICAgICAgIDw8ICIldGl0 bGUiIDw8ICIlYWxidW0iICAgPDwgIiVhcnRpc3QiIDw8ICIlZ2VucmUiICAgICA8PCAiJWJpdHJh dGUiCi0gICAgICAgICAgICA8PCAiJXllYXIgIiA8PCAiJWxlbmd0aCIgIDw8ICIldHJhY2siICA8 PCAiJWZpbGVuYW1lIiAgPDwgIiVkaXJlY3RvcnkiCi0gICAgICAgICAgICA8PCAiJXR5cGUiICA8 PCAiJWNvbW1lbnQiIDw8ICIlc2NvcmUiICA8PCAiJXBsYXljb3VudCIgPDwgIiVkaXNjbnVtYmVy IgotICAgICAgICAgICAgPDwgIiVyYXRpbmciIDw8ICIlbW9vZGJhciIKKyAgICAgICAgICAgIDw8 ICIldGl0bGUiICA8PCAiJWFsYnVtIiAgIDw8ICIlYXJ0aXN0IiAgPDwgIiVnZW5yZSIgICAgIDw8 ICIlYml0cmF0ZSIKKyAgICAgICAgICAgIDw8ICIleWVhciAiICA8PCAiJWxlbmd0aCIgIDw8ICIl dHJhY2siICAgPDwgIiVmaWxlbmFtZSIgIDw8ICIlZGlyZWN0b3J5IgorICAgICAgICAgICAgPDwg IiV0eXBlIiAgIDw8ICIlY29tbWVudCIgPDwgIiVzY29yZSIgICA8PCAiJXBsYXljb3VudCIgPDwg IiVkaXNjbnVtYmVyIgorICAgICAgICAgICAgPDwgIiVyYXRpbmciIDw8ICIlbW9vZGJhciIgPDwg IiVlbGFwc2VkIgogICAgICAgICAgICAgPDwgIiV0aXRsZSB7U2NvcmU6ICVzY29yZX0iICkgKTsK IH0KIAo=