Changeset aa91faa2cce73f966ccb3265a27177d58db24f8c

Show
Ignore:
Timestamp:
02/10/08 01:04:38 (1 year ago)
Author:
wgw <tjm1100@gmail.com>
git-committer:
wgw <tjm1100@gmail.com> 1202627078 -0600
git-parent:

[b469cf58a56f01b71ccdb1b4ebb73904dc39c8ba], [fdad6b3bf2123927ab8d6842dc5801700f427306]

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

Merge git://repo.or.cz/pyTivo/krkeegan

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/music/music.py

    rebc6b29 rfaf826f  
    11import subprocess, os, random, re, shutil, socket, sys, urllib, time 
    22import config 
    3 from plugins.video.transcode import kill 
    43from Cheetah.Template import Template 
    54from Cheetah.Filters import Filter 

  • plugins/video/video.py

    r74baafe rfaf826f  
    6262        # not a tivo 
    6363        if not tsn: 
    64             debug_write(['Hack this was not a TiVo request.\n']) 
    65             return query, None 
     64            debug_write(['Hack this was not a TiVo request. Using default tsn.', '\n']) 
     65            tsn = '123456789' 
    6666 
    6767        # this breaks up the anchor item request into seperate parts