Changeset f1e76d8061669097cf6aae05d118690c87853181

Show
Ignore:
Timestamp:
03/01/08 16:50:27 (10 months ago)
Author:
KRKeegan <-NOSPAM-kevin@krkeegan.com>
git-committer:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1204411827 -0800
git-parent:

[9e1049b80cfb7d99386fcdf66c196ed23884e67a], [0c8728dbb57185c05add98f3cc24b630ea94e413]

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/photo/photo.py

    r6d7b782 r6989290  
    207207 
    208208        if not width: width = oldw 
    209         if not height: width = oldh 
     209        if not height: height = oldh 
    210210 
    211211        # Correct aspect ratio 

  • plugins/video/transcode.py

    r6009411 rf1e76d8  
    6868    codec = '-acodec mp2 -ac 2' 
    6969    type, width, height, fps, millisecs, kbps, akbps, acodec, afreq =  video_info(inFile) 
    70     if akbps == None and acodec in ('liba52', 'mp2'): 
     70    if akbps == None and acodec in ('ac3', 'liba52', 'mp2'): 
    7171        cmd_string = '-y -vcodec mpeg2video -r 29.97 -b 1000k -acodec copy -t 00:00:01 -f vob -' 
    7272        if video_check(inFile, cmd_string): 
    …… 
    7575        # Is HD Tivo, use ac3 
    7676        codec = '-acodec ac3' 
    77         if acodec == 'liba52' and not akbps == None and \ 
     77        if acodec in ('ac3', 'liba52') and not akbps == None and \ 
    7878            int(akbps) <= config.getMaxAudioBR(tsn): 
    7979            # compatible codec and bitrate, do not reencode audio 

  • plugins/video/video.py

    r9e1049b rf1e76d8  
    254254        metadata = {} 
    255255 
    256         default_file = os.path.join(os.path.split(full_path)[0], 'default.txt') 
    257         description_file = full_path + '.txt' 
    258         description_file2 = os.path.join(os.path.dirname(full_path), '.meta', 
    259                                          os.path.basename(full_path))  + '.txt' 
    260  
    261         metadata.update(self.__getMetadataFromFile(default_file)) 
    262         metadata.update(self.__getMetadataFromFile(description_file)) 
    263         metadata.update(self.__getMetadataFromFile(description_file2)) 
     256        default_meta = os.path.join(os.path.split(full_path)[0], 'default.txt') 
     257        standard_meta = full_path + '.txt' 
     258        subdir_meta = os.path.join(os.path.dirname(full_path), '.meta', 
     259                                   os.path.basename(full_path)) + '.txt' 
     260 
     261        for metafile in (default_meta, standard_meta, subdir_meta): 
     262            metadata.update(self.__getMetadataFromFile(metafile)) 
    264263 
    265264        return metadata