From kde-multimedia Fri Aug 10 07:16:08 2007 From: "Daniel Weigl" Date: Fri, 10 Aug 2007 07:16:08 +0000 To: kde-multimedia Subject: Two small patches for juk (against tags/KDE/3.5.7) Message-Id: X-MARC-Message: https://marc.info/?l=kde-multimedia&m=118676264823467 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------------gyW1HpZkQZhtBnSakiyUsC" ------------gyW1HpZkQZhtBnSakiyUsC Content-Type: text/plain; format=flowed; delsp=yes; charset=iso-8859-15 Content-Transfer-Encoding: 8bit Hello, wheel.diff: ------------ Long time ago i had posted a bug/wish for juk for changing the default behaviour when scrolling over the icon in the System Tray. ( http://bugs.kde.org/show_bug.cgi?id=139219 ). It is just a little, non invasive Patch - so maybe you could include it. shuffle_random.diff: ----------------------- I cant describe the behavior detailed - but somehow the random-play was dependand on the underliying directory structure of the mp3's on the harddisk. Since i started using JuK i had the feeling, that it preferes some mp3's (or at least some genre). Some weeks ago i had resorted my complete collection - now one folder for each artist. And somehow, JuK now preferes some artist :) The patch shuffles the random list each time it is build (i.e. if Juk is started, Collection is rebuild,...) The last patch should work against the latest svn trunk. With wheel.diff I am not sure - i havent set up a KDE4 developing environment. If there are some problems - pls. contact me. I would be very glad, if the patches find its way into the m,ain trunk :) Thank you in advance, Daniel Weigl -- Erstellt mit Operas revolutionärem E-Mail-Modul: http://www.opera.com/mail/ ------------gyW1HpZkQZhtBnSakiyUsC Content-Disposition: attachment; filename=shuffle_random.diff Content-Type: application/octet-stream; name=shuffle_random.diff Content-Transfer-Encoding: Base64 SW5kZXg6IHRyYWNrc2VxdWVuY2VpdGVyYXRvci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gdHJhY2tzZXF1ZW5jZWl0ZXJhdG9yLmNwcAkoUmV2aXNpb24gNjk4 MzU1KQorKysgdHJhY2tzZXF1ZW5jZWl0ZXJhdG9yLmNwcAkoQXJiZWl0c2tvcGll KQpAQCAtMjU2LDYgKzI1NiwyMCBAQAogCiAgICAgbV9yYW5kb21JdGVtcyA9IHAt PnZpc2libGVJdGVtcygpOwogICAgIG1fcmFuZG9tSXRlbXMucmVtb3ZlKGN1cnJl bnQoKSk7CisKKyAgICAvLyBOb3cgc2h1ZmZsZSB0aGUgUmFuZG9tTGlzdCwgc28g d2UgZ2V0ICdtb3JlJyByYW5kb21uZXNzCisgICAgaW50IGNudCA9IG1fcmFuZG9t SXRlbXMuY291bnQoKTsKKyAgICBxRGVidWcoIlNodWZmbGluZyAlZCBpdGVtcy4u LiIsY250KTsKKyAgICBmb3IoIGludCBhPTAgOyBhPGNudCA7IGErKyApIHsKKyAg ICAJLy8gR28gdGhyb3VnaCB0aGUgd2hvbGUgbGlzdCBvZiBtX3JhbmRvbUl0ZW1z IGFuZCBzd2FwIGVhY2ggb25lIHdpdGggYSByYW5kb20gb25lLi4uCisgICAgCS8v IChTbyBzb21lIGl0ZW1zIG1heSBiZSBtb3ZlZCB0d2ljZSBvciBtb3JlIC0gYnV0 IGhleSEgdGhhdHMgcmFuZG9tLi4uKQorICAgIAlpbnQgcG9zMiA9IEtBcHBsaWNh dGlvbjo6cmFuZG9tKCkgJSBjbnQ7CisgICAgCVBsYXlsaXN0SXRlbSogdGVtcDsK KyAgICAJdGVtcCA9IG1fcmFuZG9tSXRlbXNbYV07CisgICAgCW1fcmFuZG9tSXRl bXNbYV0gPSBtX3JhbmRvbUl0ZW1zW3BvczJdOworICAgIAltX3JhbmRvbUl0ZW1z W3BvczJdID0gdGVtcDsKKyAgICB9CisgICAgCiAgICAgbV9hbGJ1bVNlYXJjaC5j bGVhckNvbXBvbmVudHMoKTsKICAgICBtX2FsYnVtU2VhcmNoLnNlYXJjaCgpOwog fQo= ------------gyW1HpZkQZhtBnSakiyUsC Content-Disposition: attachment; filename=wheel.diff Content-Type: application/octet-stream; name=wheel.diff Content-Transfer-Encoding: Base64 SW5kZXg6IGp1ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ganVrLmNwcAko UmV2aXNpb24gNjk4MzU1KQorKysganVrLmNwcAkoQXJiZWl0c2tvcGllKQpAQCAt MTc2LDcgKzE3NiwxMiBAQAogICAgIG1fdG9nZ2xlUG9wdXBzQWN0aW9uID0KIAlu ZXcgS1RvZ2dsZUFjdGlvbihpMThuKCJQb3B1cCAmVHJhY2sgQW5ub3VuY2VtZW50 IiksCiAJCQkgIEtTaG9ydGN1dCgpLCB0aGlzLCAwLCBhY3Rpb25zKCksICJ0b2dn bGVQb3B1cHMiKTsKLSAgICBuZXcgS1RvZ2dsZUFjdGlvbihpMThuKCJTYXZlICZQ bGF5IFF1ZXVlIG9uIEV4aXQiKSwKKwkJbV90b2dnbGVXaGVlbEFjdGlvbiA9CisJ CQkgIG5ldyBLVG9nZ2xlQWN0aW9uKGkxOG4oIldoZWVsICZjaGFuZ2VzIFZvbHVt ZSIpLAorCQkJICBLU2hvcnRjdXQoKSwgdGhpcywgMCwgYWN0aW9ucygpLCAidG9n Z2xlV2hlZWwiKTsKKworCQkKKwluZXcgS1RvZ2dsZUFjdGlvbihpMThuKCJTYXZl ICZQbGF5IFF1ZXVlIG9uIEV4aXQiKSwKICAgICAgICAgICAgICAgICAgICAgICBL U2hvcnRjdXQoKSwgdGhpcywgMCwgYWN0aW9ucygpLCAic2F2ZVVwY29taW5nVHJh Y2tzIik7CiAKICAgICBjb25uZWN0KG1fdG9nZ2xlU3lzdGVtVHJheUFjdGlvbiwg U0lHTkFMKHRvZ2dsZWQoYm9vbCkpLApAQCAtMzIwLDcgKzMyNSwxMCBAQAogCiAg ICAgYm9vbCBzaG93UG9wdXBzID0gc2V0dGluZ3NDb25maWcucmVhZEJvb2xFbnRy eSgiVHJhY2tQb3B1cCIsIGZhbHNlKTsKICAgICBtX3RvZ2dsZVBvcHVwc0FjdGlv bi0+c2V0Q2hlY2tlZChzaG93UG9wdXBzKTsKLQorICAgIAorICAgIGJvb2wgV2hl ZWxBY3Rpb24gPSBzZXR0aW5nc0NvbmZpZy5yZWFkQm9vbEVudHJ5KCJXaGVlbENo YW5nZXNWb2x1bWUiLCBmYWxzZSk7CisJCW1fdG9nZ2xlV2hlZWxBY3Rpb24tPnNl dENoZWNrZWQoV2hlZWxBY3Rpb24pOworCQkKICAgICBpZihtX291dHB1dFNlbGVj dEFjdGlvbikKIAltX291dHB1dFNlbGVjdEFjdGlvbi0+c2V0Q3VycmVudEl0ZW0o c2V0dGluZ3NDb25maWcucmVhZE51bUVudHJ5KCJNZWRpYVN5c3RlbSIsIDApKTsK IApAQCAtMzU5LDggKzM2NywxMCBAQAogICAgIHNldHRpbmdzQ29uZmlnLndyaXRl RW50cnkoIkRvY2tJblN5c3RlbVRyYXkiLCBtX3RvZ2dsZVN5c3RlbVRyYXlBY3Rp b24tPmlzQ2hlY2tlZCgpKTsKICAgICBzZXR0aW5nc0NvbmZpZy53cml0ZUVudHJ5 KCJEb2NrT25DbG9zZSIsIG1fdG9nZ2xlRG9ja09uQ2xvc2VBY3Rpb24tPmlzQ2hl Y2tlZCgpKTsKICAgICBzZXR0aW5nc0NvbmZpZy53cml0ZUVudHJ5KCJUcmFja1Bv cHVwIiwgbV90b2dnbGVQb3B1cHNBY3Rpb24tPmlzQ2hlY2tlZCgpKTsKKyAgICBz ZXR0aW5nc0NvbmZpZy53cml0ZUVudHJ5KCJXaGVlbENoYW5nZXNWb2x1bWUiLCBt X3RvZ2dsZVdoZWVsQWN0aW9uLT5pc0NoZWNrZWQoKSk7CisJCQogICAgIGlmKG1f b3V0cHV0U2VsZWN0QWN0aW9uKQotCXNldHRpbmdzQ29uZmlnLndyaXRlRW50cnko Ik1lZGlhU3lzdGVtIiwgbV9vdXRwdXRTZWxlY3RBY3Rpb24tPmN1cnJlbnRJdGVt KCkpOworICAgICAgc2V0dGluZ3NDb25maWcud3JpdGVFbnRyeSgiTWVkaWFTeXN0 ZW0iLCBtX291dHB1dFNlbGVjdEFjdGlvbi0+Y3VycmVudEl0ZW0oKSk7CiAKICAg ICBLR2xvYmFsOjpjb25maWcoKS0+c3luYygpOwogfQpJbmRleDoganVrLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0ganVrLmgJKFJldmlzaW9uIDY5ODM1NSkKKysr IGp1ay5oCShBcmJlaXRza29waWUpCkBAIC04NSw3ICs4NSw4IEBACiAgICAgS1Rv Z2dsZUFjdGlvbiAqbV90b2dnbGVTeXN0ZW1UcmF5QWN0aW9uOwogICAgIEtUb2dn bGVBY3Rpb24gKm1fdG9nZ2xlRG9ja09uQ2xvc2VBY3Rpb247CiAgICAgS1RvZ2ds ZUFjdGlvbiAqbV90b2dnbGVQb3B1cHNBY3Rpb247Ci0gICAgS1RvZ2dsZUFjdGlv biAqbV90b2dnbGVTcGxhc2hBY3Rpb247CisJCUtUb2dnbGVBY3Rpb24gKm1fdG9n Z2xlV2hlZWxBY3Rpb247CisJCUtUb2dnbGVBY3Rpb24gKm1fdG9nZ2xlU3BsYXNo QWN0aW9uOwogICAgIEtUb2dnbGVBY3Rpb24gKm1fbG9vcFBsYXlsaXN0QWN0aW9u OwogICAgIEtTZWxlY3RBY3Rpb24gKm1fb3V0cHV0U2VsZWN0QWN0aW9uOwogCklu ZGV4OiBzeXN0ZW10cmF5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXN0 ZW10cmF5LmNwcAkoUmV2aXNpb24gNjk4MzU1KQorKysgc3lzdGVtdHJheS5jcHAJ KEFyYmVpdHNrb3BpZSkKQEAgLTE4OCw3ICsxODgsOCBAQAogICAgIG1lbnUtPnBs dWcoY20pOwogCiAgICAgYWN0aW9uKCJ0b2dnbGVQb3B1cHMiKS0+cGx1ZyhjbSk7 Ci0KKwkJYWN0aW9uKCJ0b2dnbGVXaGVlbCIpLT5wbHVnKGNtKTsKKwkJCiAgICAg bV9mYWRlVGltZXIgPSBuZXcgUVRpbWVyKHRoaXMsICJzeXN0cmF5RmFkZVRpbWVy Iik7CiAgICAgY29ubmVjdChtX2ZhZGVUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSks IFNMT1Qoc2xvdE5leHRTdGVwKCkpKTsKIApAQCAtNTQ3LDIxICs1NDgsMjAgQEAK ICAgICAvLyB0bykga25vdyBhYm91dCB0aGUgSnVLIGNsYXNzLCBzbyBhIHN0YXRp Y19jYXN0IHdvbid0IHdvcmssIGFuZCBJIHdhcyB0b2xkCiAgICAgLy8gdGhhdCBh IHJlaW50ZXJwcmV0X2Nhc3QgaXNuJ3QgcG9ydGFibGUgd2hlbiBjb21iaW5lZCB3 aXRoIG11bHRpcGxlCiAgICAgLy8gaW5oZXJpdGFuY2UuICAoVGhpcyBpcyB3aHkg SSBkb24ndCBjaGVjayB0aGUgcmVzdWx0LikKKyAgICBib29sIHNoaWZ0PShlLT5z dGF0ZSgpKT09U2hpZnRCdXR0b247CisgICAgYm9vbCB0Vz0hYWN0aW9uPEtUb2dn bGVBY3Rpb24+KCJ0b2dnbGVXaGVlbCIpLT5pc0NoZWNrZWQoKTsKKyAgICBpZiAo c2hpZnRedFcpeworICAgICAgaWYoZS0+ZGVsdGEoKSA+IDApCisgICAgICAgIGFj dGlvbigiZm9yd2FyZCIpLT5hY3RpdmF0ZSgpOworICAgICAgZWxzZQorICAgICAg ICBhY3Rpb24oImJhY2siKS0+YWN0aXZhdGUoKTsKKyAgICB9ZWxzZXsKKyAgICAg IGlmKGUtPmRlbHRhKCkgPiAwKQorICAgICAgICBhY3Rpb24oInZvbHVtZVVwIikt PmFjdGl2YXRlKCk7CisgICAgICBlbHNlCisgICAgICAgIGFjdGlvbigidm9sdW1l RG93biIpLT5hY3RpdmF0ZSgpOworICAgfQogCi0gICAgc3dpdGNoKGUtPnN0YXRl KCkpIHsKLSAgICBjYXNlIFNoaWZ0QnV0dG9uOgotICAgICAgICBpZihlLT5kZWx0 YSgpID4gMCkKLSAgICAgICAgICAgIGFjdGlvbigidm9sdW1lVXAiKS0+YWN0aXZh dGUoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgYWN0aW9uKCJ2b2x1bWVE b3duIiktPmFjdGl2YXRlKCk7Ci0gICAgICAgIGJyZWFrOwotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIGlmKGUtPmRlbHRhKCkgPiAwKQotICAgICAgICAgICAgYWN0aW9u KCJmb3J3YXJkIiktPmFjdGl2YXRlKCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIGFjdGlvbigiYmFjayIpLT5hY3RpdmF0ZSgpOwotICAgICAgICBicmVhazsK LSAgICB9CiAgICAgZS0+YWNjZXB0KCk7CiB9CiAK ------------gyW1HpZkQZhtBnSakiyUsC Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kde-multimedia mailing list kde-multimedia@kde.org https://mail.kde.org/mailman/listinfo/kde-multimedia ------------gyW1HpZkQZhtBnSakiyUsC--