From b1d326c6ddaba37a1e7e927aac11e12d1d3fa07e Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 10 May 2013 14:17:15 +0000 Subject: [PATCH] reformat --- pandora/archive/extract.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index 336bf75d..871a2adb 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -217,7 +217,8 @@ def stream(video, target, profile, info): if info['audio']: audio_settings = ['-ar', str(audiorate), '-aq', str(audioquality)] - if audiochannels and 'channels' in info['audio'][0] and info['audio'][0]['channels'] > audiochannels: + if audiochannels and 'channels' in info['audio'][0] \ + and info['audio'][0]['channels'] > audiochannels: audio_settings += ['-ac', str(audiochannels)] if audiobitrate: audio_settings += ['-ab', audiobitrate] @@ -284,7 +285,8 @@ def frame(videoFile, frame, position, height=128, redo=False): frameFolder = os.path.dirname(frame) if redo or not exists(frame): ox.makedirs(frameFolder) - cmd = ['oxframe', '-i', videoFile, '-o', frame, '-p', str(position), '-y', str(height)] + cmd = ['oxframe', '-i', videoFile, '-o', frame, + '-p', str(position), '-y', str(height)] run_command(cmd) @@ -331,7 +333,8 @@ def timeline(video, prefix, modes=None, size=None): '-o', prefix, '-c', os.path.join(prefix, 'cuts.json'), ] + video - p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p = subprocess.Popen(cmd, stdin=subprocess.PIPE, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) #print cmd #p = subprocess.Popen(cmd) p.wait()