Check-in [3dd41a0668]
Overview
| Comment: | Remove default %m3u placeholders. (Now defaulting to PLS, as supported by pretty much all players.) | 
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive | 
| Timelines: | family | ancestors | descendants | both | trunk | 2.1.6 | 
| Files: | files | file ages | folders | 
| SHA1: | 3dd41a0668bce7b395380ffebec951ba | 
| User & Date: | mario on 2015-04-13 00:32:37 | 
| Other Links: | manifest | tags | 
Context
| 2015-04-14 | ||
| 15:47 | Move NEWS->changelog.gz conversion into xpm Packfile. check-in: b1eb48cafd user: mario tags: trunk | |
| 2015-04-13 | ||
| 00:32 | Remove default %m3u placeholders. (Now defaulting to PLS, as supported by pretty much all players.) check-in: 3dd41a0668 user: mario tags: trunk, 2.1.6 | |
| 2015-04-12 | ||
| 18:02 | Optional plugin, retrieves raw Wiki content from Wiki.UbuntuUsers.de with country-grouped radio stations. (Will be bundled in another release.) check-in: 0f7bc40c16 user: mario tags: trunk | |
Changes
Modified channels/file.py from [84d7cd76cd] to [76d2506448].
| ︙ | ︙ | |||
| 114 115 116 117 118 119 120 | 
        path = os.path.expandvars(path)
        return os.path.expanduser(path)
    # Read user-dirs config
    def fvars(self, fn="$HOME/.config/user-dirs.dirs"):
        fn = os.path.expandvars(fn)
        src = open(fn, "r").read() if os.path.exists(fn) else ""
 | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | 
        path = os.path.expandvars(path)
        return os.path.expanduser(path)
    # Read user-dirs config
    def fvars(self, fn="$HOME/.config/user-dirs.dirs"):
        fn = os.path.expandvars(fn)
        src = open(fn, "r").read() if os.path.exists(fn) else ""
        env = re.findall('^(\w+)=[\"\']?(.+?)[\"\']?', src, re.M)  # pyxdg: Your move.
        return dict(env)
    
    # don't load cache file
    cache = lambda *x: None
 | 
| ︙ | ︙ | 
Modified config.py from [d7b33fd59d] to [d8d4d07b70].
| ︙ | ︙ | |||
| 143 144 145 146 147 148 149 | 
        if module and module not in conf.plugins:
             conf.plugins[module] = meta.get("priority") in ("core", "builtin", "always", "default", "standard")
    # look at system binaries for standard audio players
    def find_player(self, typ="audio", default="xdg-open"):
        players = {
 | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | 
        if module and module not in conf.plugins:
             conf.plugins[module] = meta.get("priority") in ("core", "builtin", "always", "default", "standard")
    # look at system binaries for standard audio players
    def find_player(self, typ="audio", default="xdg-open"):
        players = {
           "audio": ["audacious %m3u", "audacious2", "exaile %pls", "xmms2", "banshee", "amarok %pls", "clementine", "qmmp", "quodlibet", "aqualung", "mp3blaster %m3u", "vlc --one-instance", "totem"],
           "video": ["parole", "umplayer", "xnoise", "gxine", "totem", "vlc --one-instance", "smplayer", "gnome-media-player", "xine", "bangarang"],
           "browser": ["opera", "midori", "sensible-browser"],
           "xterm": ["xfce4-terminal", "x-termina-emulator", "gnome-terminal", "xterm", "rxvt"],
        }
        for bin in players[typ]:
            if find_executable(bin.split()[0]):
                return bin
 | 
| ︙ | ︙ |