luna/devedeng-extended
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a float value used for volume where it expected an integer

Browse source
This commit is contained in:
Sergio Costas 2016-09-05 23:43:13 +02:00
parent 177f0de758
commit 361240adc4
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
HISTORY.md
View file

@ -1,4 +1,7 @@
## History of versions ## ## History of versions ##
* version 4.8.1 (2016-09-05)
* Fixed a float value used for volume where it expected an integer
* version 4.8.0 (2016-08-12) * version 4.8.0 (2016-08-12)
* Fixed a division by zero when a clip has a duration of less than one second * Fixed a division by zero when a clip has a duration of less than one second

2
setup.py
View file

@ -64,7 +64,7 @@ except:
setup( setup(
name='devedeng', name='devedeng',
version='4.8.0', version='4.8.1',
description='A video DVD creator', description='A video DVD creator',
long_description = "A program that allows to create video DVDs", long_description = "A program that allows to create video DVDs",

6
src/devedeng/avconv.py
View file

@ -130,7 +130,7 @@ class avconv(devedeng.avbase.avbase):
second_pass = False second_pass = False
else: else:
# second_pass is TRUE in the second pass of a 2-pass codification, and also when not doing 2-pass codification # second_pass is TRUE in the second pass of a 2-pass codification, and also when not doing 2-pass codification
# It is used to remove unnecessary steps during the first pass, but that are needed on the second pass, or when not using 2-pass codification # It is used to remove unnecessary steps during the first pass, but that are needed on the second pass, or when not using 2-pass codification
second_pass = True second_pass = True
if (video_length == 0): if (video_length == 0):
@ -144,7 +144,7 @@ class avconv(devedeng.avbase.avbase):
if (file_project.volume!=100) and second_pass: if (file_project.volume!=100) and second_pass:
self.command_var.append("-vol") self.command_var.append("-vol")
self.command_var.append(str((256*file_project.volume)/100)) self.command_var.append(str(int((256*file_project.volume)/100)))
if (file_project.audio_delay != 0.0) and (file_project.copy_sound==False) and (file_project.no_reencode_audio_video==False) and second_pass: if (file_project.audio_delay != 0.0) and (file_project.copy_sound==False) and (file_project.no_reencode_audio_video==False) and second_pass:
self.command_var.append("-itsoffset") self.command_var.append("-itsoffset")
@ -433,4 +433,4 @@ class avconv(devedeng.avbase.avbase):
t += float(e) t += float(e)
t /= self.final_length t /= self.final_length
self.progress_bar[1].set_fraction(t) self.progress_bar[1].set_fraction(t)
self.progress_bar[1].set_text("%.1f%%" % (100.0 * t)) self.progress_bar[1].set_text("%.1f%%" % (100.0 * t))

6
src/devedeng/ffmpeg.py
View file

@ -126,7 +126,7 @@ class ffmpeg(devedeng.executor.executor):
second_pass = False second_pass = False
else: else:
# second_pass is TRUE in the second pass of a 2-pass codification, and also when not doing 2-pass codification # second_pass is TRUE in the second pass of a 2-pass codification, and also when not doing 2-pass codification
# It is used to remove unnecessary steps during the first pass, but that are needed on the second pass, or when not using 2-pass codification # It is used to remove unnecessary steps during the first pass, but that are needed on the second pass, or when not using 2-pass codification
second_pass = True second_pass = True
if (video_length == 0): if (video_length == 0):
@ -140,7 +140,7 @@ class ffmpeg(devedeng.executor.executor):
if (file_project.volume!=100) and second_pass: if (file_project.volume!=100) and second_pass:
self.command_var.append("-vol") self.command_var.append("-vol")
self.command_var.append(str((256*file_project.volume)/100)) self.command_var.append(str(int((256*file_project.volume)/100)))
if (file_project.audio_delay != 0.0) and (file_project.copy_sound==False) and (file_project.no_reencode_audio_video==False) and second_pass: if (file_project.audio_delay != 0.0) and (file_project.copy_sound==False) and (file_project.no_reencode_audio_video==False) and second_pass:
self.command_var.append("-itsoffset") self.command_var.append("-itsoffset")
@ -424,4 +424,4 @@ class ffmpeg(devedeng.executor.executor):
t += float(e) t += float(e)
t /= self.final_length t /= self.final_length
self.progress_bar[1].set_fraction(t) self.progress_bar[1].set_fraction(t)
self.progress_bar[1].set_text("%.1f%%" % (100.0 * t)) self.progress_bar[1].set_text("%.1f%%" % (100.0 * t))