Changeset bc0f2b6cc3bc79450732d1600cdbe11b83b0adbe

Show
Ignore:
Timestamp:
03/06/08 20:03:22 (10 months ago)
Author:
wgw <tjm1100@gmail.com>
git-committer:
wgw <tjm1100@gmail.com> 1204855402 -0600
git-parent:

[4dcb0e0db92c780255577d9a91195c64c781d6b8], [dbcc17c9e1e9e6218f1203d7f443bb1c0b3dd154]

git-author:
wgw <tjm1100@gmail.com> 1204855402 -0600
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/music/music.py

    r3f7f64b rbc0f2b6  
    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