Changeset 9181fdc59b81e2b2ba4ce1399eba2997d24b6f65

Show
Ignore:
Timestamp:
03/07/08 20:47:03 (9 months ago)
Author:
KRKeegan <-NOSPAM-kevin@krkeegan.com>
git-committer:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1204944423 -0800
git-parent:

[ae4dbbea29a9d3ceb84ace30d35d0d18f829df32], [dbcc17c9e1e9e6218f1203d7f443bb1c0b3dd154]

git-author:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1204944423 -0800
Message:

Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/music/music.py

    r3f7f64b r9181fdc  
    11import subprocess, os, random, re, shutil, socket, sys, urllib, time, cgi 
    22import config 
     3from plugins.video.transcode import kill 
    34from Cheetah.Template import Template 
    45from Cheetah.Filters import Filter 
    …… 
    2021 
    2122TRANSCODE = ('.mp4', '.m4a', '.flc', '.ogg', '.wma', '.aac', '.wav', 
    22              '.aif', '.aiff', '.au') 
     23             '.aif', '.aiff', '.au', '.flac') 
    2324 
    2425# Search strings for different playlist types