Check-in [4298cc4385]
Overview
Comment: | windows patches from Vincent |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4298cc4385dfa6c18ec5183f15ebae55 |
User & Date: | mario on 2012-01-10 03:47:54 |
Other Links: | manifest | tags |
Context
2012-01-10
| ||
03:49 | minor gui tweaks check-in: f2592fc1e4 user: mario tags: trunk | |
03:47 | windows patches from Vincent check-in: 4298cc4385 user: mario tags: trunk | |
00:09 | Updated win_config dialog, made it resizable. mini-help is disabled (tooltip became tooltip_text in preparation for Gtk3), glade-3.10 killed the "theme" dropdown. check-in: d5904985a0 user: mario tags: trunk | |
Changes
Modified action.py from [a384a5d7ee] to [f63b7b9614].
︙ | |||
44 45 46 47 48 49 50 | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | - - + + - + + + + + + - + - + + + - - + + + + | # class action: # streamlink formats lt = {"asx":"video/x-ms-asf", "pls":"audio/x-scpls", "m3u":"audio/x-mpegurl", "xspf":"application/xspf+xml", "href":"url/http", "ram":"audio/x-pn-realaudio", "smil":"application/smil"} # media formats mf = {"mp3":"audio/mp3", "ogg":"audio/ogg", "aac":"audio/aac"} |
︙ | |||
219 220 221 222 223 224 225 | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | - - + + | # use shoutcast unique stream id if available stream_id = re.search("http://.+?/.*?(\d+)", pls, re.M) stream_id = stream_id and stream_id.group(1) or "XXXXXX" try: channelname = main.current_channel except: channelname = "unknown" |
︙ | |||
260 261 262 263 264 265 266 | 269 270 271 272 273 274 275 276 277 278 279 280 281 | - + | __print__( "error, there were no URLs in ", pls ) raise "Empty PLS" # open help browser @staticmethod def help(*args): |
Modified config.py from [791971aff7] to [3cd51eb7d8].
︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | + | # import os import sys import pson import gzip import platform #-- create a single instance of config object conf = object() |
︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | + - + - + | self.retain_deleted = 1 self.auto_save_appstate = 1 self.theme = "" #"MountainDew" self.debug = False self.channel_order = "shoutcast, xiph, internet_radio_org_uk, jamendo, myoggradio, .." self.reuse_m3u = 1 self.google_homepage = 1 self.windows = platform.system()=="Windows" # each plugin has a .config dict list, we add defaults here def add_plugin_defaults(self, config, module=""): # options for opt in config: if ("name" in opt) and ("value" in opt) and (opt["name"] not in vars(self)): self.__dict__[opt["name"]] = opt["value"] # plugin state if module and module not in conf.plugins: conf.plugins[module] = 1 # http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html def xdg(self): home = os.environ.get("HOME", self.tmp) |
︙ |