huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Fix crashes when the audio layer has no track

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-12-10 01:34:21 +02:00
parent 16c06bf9af
commit 04f5a162c0
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Autoload/Export.gd
View file

@ -537,7 +537,7 @@ func export_video(export_paths: PackedStringArray, project: Project) -> bool:
var max_audio_duration := 0 var max_audio_duration := 0
var adelay_string := "" var adelay_string := ""
for layer in project.layers: for layer in project.layers:
if layer is AudioLayer and layer.audio is AudioStreamMP3: if layer is AudioLayer and is_instance_valid(layer.audio) and layer.audio is AudioStreamMP3:
var temp_file_name := str(audio_layer_count + 1).pad_zeros(number_of_digits) + ".mp3" var temp_file_name := str(audio_layer_count + 1).pad_zeros(number_of_digits) + ".mp3"
var temp_file_path := temp_path_real.path_join(temp_file_name) var temp_file_path := temp_path_real.path_join(temp_file_name)
var temp_audio_file := FileAccess.open(temp_file_path, FileAccess.WRITE) var temp_audio_file := FileAccess.open(temp_file_path, FileAccess.WRITE)
@ -550,8 +550,8 @@ func export_video(export_paths: PackedStringArray, project: Project) -> bool:
"[%s]adelay=%s:all=1[%sa];" % [audio_layer_count, delay, audio_layer_count] "[%s]adelay=%s:all=1[%sa];" % [audio_layer_count, delay, audio_layer_count]
) )
audio_layer_count += 1 audio_layer_count += 1
if layer.audio.get_length() >= max_audio_duration: if layer.get_audio_length() >= max_audio_duration:
max_audio_duration = layer.audio.get_length() max_audio_duration = layer.get_audio_length()
if audio_layer_count > 0: if audio_layer_count > 0:
# If we have audio layers, merge them all into one file. # If we have audio layers, merge them all into one file.
for i in audio_layer_count: for i in audio_layer_count:

7
src/Classes/Layers/AudioLayer.gd
View file

@ -19,6 +19,13 @@ func _init(_project: Project, _name := "") -> void:
name = _name name = _name
func get_audio_length() -> float:
if is_instance_valid(audio):
return audio.get_length()
else:
return -1.0
# Overridden Methods: # Overridden Methods:
func serialize() -> Dictionary: func serialize() -> Dictionary:
var data := {"name": name, "type": get_layer_type()} var data := {"name": name, "type": get_layer_type()}

2
src/UI/Timeline/CelButton.gd
View file

@ -406,7 +406,7 @@ func _sort_cel_indices_by_frame(a: Array, b: Array) -> bool:
func _is_playing_audio() -> void: func _is_playing_audio() -> void:
var frame_class := Global.current_project.frames[frame] var frame_class := Global.current_project.frames[frame]
var layer_class := Global.current_project.layers[layer] as AudioLayer var layer_class := Global.current_project.layers[layer] as AudioLayer
var audio_length := layer_class.audio.get_length() var audio_length := layer_class.get_audio_length()
var frame_pos := frame_class.position_in_seconds( var frame_pos := frame_class.position_in_seconds(
Global.current_project, layer_class.playback_frame Global.current_project, layer_class.playback_frame
) )

2
src/UI/Timeline/LayerButton.gd
View file

@ -90,7 +90,7 @@ func _play_audio() -> void:
var layer := Global.current_project.layers[layer_index] as AudioLayer var layer := Global.current_project.layers[layer_index] as AudioLayer
if not layer.visible: if not layer.visible:
return return
var audio_length := audio_player.stream.get_length() var audio_length := layer.get_audio_length()
var frame := Global.current_project.frames[Global.current_project.current_frame] var frame := Global.current_project.frames[Global.current_project.current_frame]
var frame_pos := frame.position_in_seconds(Global.current_project, layer.playback_frame) var frame_pos := frame.position_in_seconds(Global.current_project, layer.playback_frame)
if frame_pos >= 0 and frame_pos < audio_length: if frame_pos >= 0 and frame_pos < audio_length: