Index: README ================================================================== --- README +++ README @@ -76,11 +76,11 @@ in development, and it has a working Shoutcast+Xiph reader. http://tunapie.sourceforge.net/ Streamtuner2 CLI can also be used as proxy server for streamtuner1. There is a wrapper available. But there was nobody yet to be found who -wanted set it up globally. (Else streamtuner1 would just require a patch +wanted it set up globally. (Else streamtuner1 would just require a patch in /etc/hosts to work again.) It's available as st1proxy.tgz and cli-mode-only.tgz from http://milki.include-once.org/streamtuner2/ext/ Contact me for setup help. Requires a webserver with unrestrained vhost support. @@ -100,10 +100,12 @@ - sys.path patch (less py module conflicts) from Stefan Talpalaru - fixed main_quit signal slot, so window size saving works - added [new] button in streamedit window - prepared remaining print syntax for python3 (still needs 2to3 though) - fix for https://bugzilla.redhat.com/show_bug.cgi?id=655596 array error +- transitioned glade file to gtk.Builder, just a few things broke +- made configuration window resizable - 2.0.8 - configuration files use prettified json Index: _pack ================================================================== --- _pack +++ _pack @@ -1,12 +1,12 @@ #"bsd" "osx" # "rpm -a noarch" #-- meta data -VERSION=$(./version st2.py) -perl -n -i -e "if (/^[%]version/m) { print \"%version $VERSION\n\" } else { print }" _package.epm +VERSION=$(get_version st2.py) +epm_set_version _package.epm $VERSION perl -n -i -e 'if (/^(\s+a.set_version)[\d.(\")]+/m) { print "$1(\"'$VERSION'\")\n" } else { print }' st2.py #-- linux for pkg in "rpm" "deb DEP=deb" "slackware" "portable -s streamtuner2.png" @@ -26,10 +26,10 @@ #-- src.tgz cd .. pax -wzf streamtuner2-$VERSION.src.tgz \ - streamtuner2/*.py streamtuner2/*.glade streamtuner2/channels/*.{py,png} \ + streamtuner2/*.py streamtuner2/*.xml streamtuner2/channels/*.{py,png} \ streamtuner2/*.png streamtuner2/*.svg streamtuner2/*.desktop \ streamtuner2/README streamtuner2/help/* streamtuner2/contrib/* \ streamtuner2/PKG-INFO streamtuner2/version streamtuner2/_pack streamtuner2/*.epm # streamtuner2/scripts Index: _package.epm ================================================================== --- _package.epm +++ _package.epm @@ -1,7 +1,7 @@ %product streamtuner2 - internet radio browser -%version 2.0.8 +%version 2.0.8.5 %vendor Mario Salzer %license %copyright Placed into the Public Domain, 2009/2010 %readme README Index: st2.py ================================================================== --- st2.py +++ st2.py @@ -3,11 +3,11 @@ # api: python # type: application # title: streamtuner2 # description: directory browser for internet radio / audio streams # depends: gtk, pygtk, xml.dom.minidom, threading, lxml, pyquery, kronos -# version: 2.0.9 +# version: 2.0.8.5 # author: mario salzer # license: public domain # url: http://freshmeat.net/projects/streamtuner2 # config: # category: multimedia @@ -519,11 +519,11 @@ # auxiliary window: about dialog class AboutStreamtuner2: # about us def __init__(self): a = gtk.AboutDialog() - a.set_version("2.0.9") + a.set_version("2.0.8.5") a.set_name("streamtuner2") a.set_license("Public Domain\n\nNo Strings Attached.\nUnrestricted distribution,\nmodification, use.") a.set_authors(["Mario Salzer \n\nConcept based on streamtuner 0.99.99 from\nJean-Yves Lefort, of which some code remains\nin the Google stations plugin.\n\n\nMyOggRadio plugin based on cooperation\nwith Christian Ehm. "]) a.set_website("http://milki.include-once.org/streamtuner2/") a.connect("response", lambda a, ok: ( a.hide(), a.destroy() ) ) Index: ui.xml ================================================================== --- ui.xml +++ ui.xml @@ -689,11 +689,11 @@ False 0 none - 333 + 500 True False 520 @@ -860,16 +860,13 @@ True False - Here %u or %pls return a direct URL to -the shoutcast link. - -And %g or %m3u provide a local .m3u file -for the audio player, what's usually better. - + Shoutcast links are %u or %pls, parsed m3u files +are available with %g or %m3u, while %d or %srv +represent direct URLs to the streaming servers. True 1 2 @@ -1050,11 +1047,21 @@ 1 2 - + + True + False + placeholder +<a href="file:///usr/share/doc/streamtuner2/help/configuration.page">see help</a> + True + + + 7 + 8 + @@ -1315,13 +1322,13 @@ False True False + needs restart 11 - use Gtk+ theme -(needs restart) + use Gtk+ theme True True 0 @@ -1476,10 +1483,66 @@ 2 1 2 + + + True + False + 0.10000000149011612 + 1 + Start streamtuner2 with <b>http_proxy=</b> +as environment variable. This will +get picked up by Python and urllib. + True + + + 1 + 2 + 9 + 10 + + + + + True + False + HTTP proxy + + + 9 + 10 + + + + + True + False + 0.10000000149011612 + You can only influence this by +setting XDG_CONFIG_HOME to a +different location. + + + 1 + 2 + 5 + 6 + + + + + True + False + .config dir + + + 4 + 5 + + 200 20 True @@ -1493,68 +1556,12 @@ True 1 2 - 2 - 3 - - - - - True - False - .config dir - - - 2 - 3 - - - - - True - False - 0.10000000149011612 - You can only influence this by -setting XDG_CONFIG_HOME to a -different location. - - - 1 - 2 - 3 - 4 - - - - - True - False - HTTP proxy - - - 5 - 6 - - - - - True - False - 0.10000000149011612 - 1 - Start streamtuner2 with <b>http_proxy=</b> -as environment variable. This will -get picked up by Python and urllib. - True - - - 1 - 2 - 5 - 6 + 4 + 5 reuse temporary .m3u files @@ -1565,12 +1572,12 @@ True 1 2 - 7 - 8 + 2 + 3 @@ -1905,12 +1912,14 @@ False + 5 inspect/edit stream data center-on-parent + True False 0.94999999999999996 @@ -2294,12 +2303,12 @@ True False False bookmark True - + @@ -2307,12 +2316,12 @@ True False False True True - + @@ -2320,13 +2329,13 @@ True False False True True - + - + @@ -2400,12 +2409,12 @@ True False False True True - +