DMC/play-daemon
13
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fixes Issue #2 #4

Merged
dafo5502 merged 59 commits from developer into master 2021-10-25 14:41:37 +02:00
Conversation 0 Commits 59 Files Changed 3 +8 -5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 84c94ca6c5 - Show all commits

13
daemon/packager.py
View File

@ -65,17 +65,20 @@ class Mediasite:
os.mkdir(slides_path) os.mkdir(slides_path)
slides = [] slides = []
demux_file = os.path.join(slides_path, 'demux.txt') demux_file = os.path.join(slides_path, 'demux.txt')
offset = data['duration'] - int(data['slides'][-1]['duration'])
#offset = data['duration'] - int(data['slides'][-1]['duration'])
with open(demux_file, 'w') as f: with open(demux_file, 'w') as f:
myslide = {} myslide = {}
f.write('ffconcat version 1.0\n') f.write('ffconcat version 1.0\n')
for i in range(len(data['slides'])): num_slides = len(data['slides'])
for i in range(num_slides):
myslide['url'] = os.path.join(slides_path, self._download(slides_path, data['slides'][i]['url'], session)) myslide['url'] = os.path.join(slides_path, self._download(slides_path, data['slides'][i]['url'], session))
if i == 0: if i == num_slides - 1:
myslide['duration'] = '{}ms'.format(offset + int(data['slides'][i]['duration'])) myslide['duration'] = '{}ms'.format(data['duration'] - int(slides['data'][i]['duration']))
else: else:
myslide['duration'] = '{}ms'.format(int(data['slides'][i]['duration']) - int(data['slides'][i-1]['duration'])) myslide['duration'] = '{}ms'.format(int(data['slides'][i+1]['duration']) - int(data['slides'][i]['duration']))
#offset += int(data[['slides'][i]['duration']])
f.write('file \'{}\'\n'.format(myslide['url'])) f.write('file \'{}\'\n'.format(myslide['url']))
f.write('duration {}\n'.format(myslide['duration'])) f.write('duration {}\n'.format(myslide['duration']))
slides.append(myslide) slides.append(myslide)