bucket/Simplaudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threading for Loading songs(wip)

Browse Source
This commit is contained in:
Bucket Of Chicken
2025-08-30 00:49:59 +02:00
parent 89ba4790da
commit 702013f9f8
28 changed files with 251 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Icons/BackOne.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

Icons/BackOne.png.import
+40
View File
@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://df2e70jxwrmjs"
path="res://.godot/imported/BackOne.png-420a39df0abee2599d5df56efa24c072.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Icons/BackOne.png"
dest_files=["res://.godot/imported/BackOne.png-420a39df0abee2599d5df56efa24c072.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Icons/Download.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Dropdown.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal=""
Icons/File.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Headphones.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Loding.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Logo.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Logo2.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Loop.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/LoopPressed.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Pause.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Play.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/Skip.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Icons/Skip.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/X.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/XSmall.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/gear.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/search.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Icons/settingscog.png.import
+1 -1
View File
@@ -23,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
Images/BigLogo.png.import
+7 -1
View File
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/BigLogo.png-5bca373df344b6475370cc45bf707716.
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Images/Eveningsmall.jpg.import
+7 -1
View File
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/Eveningsmall.jpg-61c25a9a71bfd3fb3f9b3fde2977
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Images/Nightsmall.jpg.import
+7 -1
View File
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/Nightsmall.jpg-53aa776f406c86c646063ceda059e4
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Images/pole2.jpg.import
+7 -1
View File
@@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/pole2.jpg-1cce1e6b49f1c3dda6d93de5714565ac.ct
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Scenes/main.tscn
+133 -24
View File
@@ -1,7 +1,14 @@
[gd_scene load_steps=4 format=3 uid="uid://mfcbf2sfino6"]
[gd_scene load_steps=12 format=3 uid="uid://mfcbf2sfino6"]
[ext_resource type="Texture2D" uid="uid://0jo87vtoeheu" path="res://Images/pole2.jpg" id="1_6bp64"]
[ext_resource type="Texture2D" uid="uid://df2e70jxwrmjs" path="res://Icons/BackOne.png" id="1_8gbba"]
[ext_resource type="Texture2D" uid="uid://0r1tx6l1lc6x" path="res://Icons/settingscog.png" id="2_344ge"]
[ext_resource type="Texture2D" uid="uid://daq8wnhtscpjl" path="res://Icons/Skip.png" id="2_bo1nx"]
[ext_resource type="Texture2D" uid="uid://ctb4s2nks73rx" path="res://Icons/Play.png" id="2_jjvhh"]
[ext_resource type="Texture2D" uid="uid://myq6n4bshduj" path="res://Icons/search.png" id="2_ynf5e"]
[ext_resource type="Script" uid="uid://bq55jftgugexl" path="res://Scripts/Context.cs" id="3_8gbba"]
[ext_resource type="Texture2D" uid="uid://38c8dfym0svn" path="res://Icons/Loop.png" id="4_21xkr"]
[ext_resource type="Texture2D" uid="uid://cekkhyppj88xi" path="res://Icons/Headphones.png" id="4_kry3j"]
[sub_resource type="GDScript" id="GDScript_bo1nx"]
resource_name = "OpenDirGlue"
@@ -19,6 +26,20 @@ func dirsel(dir:String):
Context.call(\"LoadDirectory\",dir)
"
[sub_resource type="GDScript" id="GDScript_ynf5e"]
resource_name = "Toggle"
script/source = "extends Button
@export var searchbar:LineEdit
@export var showbutton:Button
func _ready() -> void:
toggled.connect(update)
func update(on:bool):
searchbar.visible = on == true
showbutton.visible = on != true
"
[node name="Main" type="Control"]
layout_mode = 3
anchors_preset = 15
@@ -27,16 +48,25 @@ anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="Background" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("1_6bp64")
expand_mode = 5
stretch_mode = 6
[node name="Padding" type="Control" parent="."]
layout_mode = 1
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -547.0
offset_top = -293.0
offset_right = 547.0
offset_bottom = 293.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 29.0
offset_top = 31.0
offset_right = -29.0
offset_bottom = -31.0
grow_horizontal = 2
grow_vertical = 2
@@ -49,26 +79,66 @@ grow_horizontal = 2
grow_vertical = 2
[node name="Top" type="Control" parent="Padding/VBoxContainer"]
custom_minimum_size = Vector2(0, 50)
custom_minimum_size = Vector2(0, 42)
layout_mode = 2
size_flags_vertical = 0
[node name="Button" type="Button" parent="Padding/VBoxContainer/Top" node_paths=PackedStringArray("file_dialog", "Context")]
[node name="HBoxContainer" type="HBoxContainer" parent="Padding/VBoxContainer/Top"]
layout_mode = 1
anchors_preset = -1
offset_right = 76.0
offset_bottom = 31.0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="Button" type="Button" parent="Padding/VBoxContainer/Top/HBoxContainer" node_paths=PackedStringArray("file_dialog", "Context")]
layout_mode = 2
text = "Open dir"
script = SubResource("GDScript_bo1nx")
file_dialog = NodePath("../../../../FileDialog")
Context = NodePath("../../../../Context")
file_dialog = NodePath("../../../../../FileDialog")
Context = NodePath("../../../../../Context")
[node name="Control" type="HBoxContainer" parent="Padding/VBoxContainer/Top/HBoxContainer"]
clip_contents = true
layout_mode = 2
size_flags_horizontal = 3
alignment = 1
[node name="SearchBar" type="LineEdit" parent="Padding/VBoxContainer/Top/HBoxContainer/Control"]
visible = false
layout_mode = 2
size_flags_horizontal = 4
placeholder_text = "Search..."
max_length = 50
expand_to_text_length = true
[node name="ShowSongs" type="Button" parent="Padding/VBoxContainer/Top/HBoxContainer/Control"]
layout_mode = 2
size_flags_horizontal = 4
text = "show songs"
[node name="SearchToggle" type="Button" parent="Padding/VBoxContainer/Top/HBoxContainer/Control" node_paths=PackedStringArray("searchbar", "showbutton")]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
toggle_mode = true
icon = ExtResource("2_ynf5e")
alignment = 0
expand_icon = true
script = SubResource("GDScript_ynf5e")
searchbar = NodePath("../SearchBar")
showbutton = NodePath("../ShowSongs")
[node name="Settings" type="Button" parent="Padding/VBoxContainer/Top/HBoxContainer"]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("2_344ge")
expand_icon = true
[node name="Control" type="Control" parent="Padding/VBoxContainer"]
layout_mode = 2
size_flags_vertical = 3
[node name="Bottom" type="Control" parent="Padding/VBoxContainer"]
custom_minimum_size = Vector2(0, 50)
custom_minimum_size = Vector2(0, 42)
layout_mode = 2
[node name="HBoxContainer" type="HBoxContainer" parent="Padding/VBoxContainer/Bottom"]
@@ -80,19 +150,45 @@ grow_horizontal = 2
grow_vertical = 2
[node name="BackButton" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(50, 0)
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("1_8gbba")
expand_icon = true
[node name="PlayButton" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("2_jjvhh")
expand_icon = true
[node name="SkipButton" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("2_bo1nx")
expand_icon = true
[node name="PlayButton" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
[node name="HSlider" type="HSlider" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
layout_mode = 2
text = "play"
size_flags_horizontal = 3
size_flags_vertical = 4
tick_count = 5
ticks_position = 3
[node name="SkipButton" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(50, 0)
[node name="Loop" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("2_bo1nx")
toggle_mode = true
icon = ExtResource("4_21xkr")
expand_icon = true
[node name="Shuffle" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
layout_mode = 2
text = "shuffle"
[node name="Volume" type="Button" parent="Padding/VBoxContainer/Bottom/HBoxContainer"]
custom_minimum_size = Vector2(42, 0)
layout_mode = 2
icon = ExtResource("4_kry3j")
expand_icon = true
[node name="FileDialog" type="FileDialog" parent="."]
@@ -105,3 +201,16 @@ use_native_dialog = true
[node name="Context" type="Node" parent="."]
script = ExtResource("3_8gbba")
[node name="Label" type="Label" parent="."]
layout_mode = 1
anchors_preset = -1
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -40.0
offset_top = -23.0
grow_horizontal = 0
grow_vertical = 0
text = "v2.0"
Scripts/Context.cs
+9 -3
View File
@@ -4,13 +4,19 @@ using System;
public partial class Context : Node
{
String[] Songs;
Song[] Songs;
AudioStreamPlayer[] StreamPlayers;
DirectoryManager manager = new();
public void LoadDirectory(String path){
GD.Print(path);
manager.LoadDirectory(path);
Songs = manager.LoadDirectory(path);
GD.Print("got here");
foreach (Song song in Songs){
GD.Print("got ", song.Name);
}
}
}
Scripts/Data.cs
+24 -9
View File
@@ -2,6 +2,8 @@ using System;
using System.Collections;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Godot;
using TagLib;
using TagLib.Riff;
@@ -16,7 +18,18 @@ public class Song{
public String Directory;
}
public class DirectoryManager{
Task LoadTask;
Song[] LoadedSongs;
public Song[] LoadDirectory(String Path){
LoadTask = new Task(() => ParseDirectory(Path));
LoadTask.Start();
Task.WhenAll([LoadTask]).Wait();
GD.Print("Finished");
return LoadedSongs;
//if (file.EndsWith(".mp3"))
}
private void ParseDirectory(String Path){
System.Collections.Generic.IEnumerable<string> Files = Directory.EnumerateFiles(Path);
Song[] Songs = [];
foreach (String file in Files){
@@ -25,25 +38,27 @@ public class DirectoryManager{
}
var TLfile = TagLib.File.Create(file);
Song song = new();
song.Album = TLfile.Tag.Album;
song.Artists = TLfile.Tag.Performers;
song.Name = TLfile.Tag.Title;
song.Length = TLfile.Length;
song.Directory = file;
song.Comment = TLfile.Tag.Comment;
Song song = new()
{
Album = TLfile.Tag.Album,
Artists = TLfile.Tag.Performers,
Name = TLfile.Tag.Title,
Length = TLfile.Length,
Directory = file,
Comment = TLfile.Tag.Comment
};
if (file.EndsWith(".mp3")){
song.Comment = TLfile.GetTag(TagLib.TagTypes.Id3v2, true).Comment;
}
//TLfile.Tag.CopyTo(Tag)
GD.Print("File Valid, file path ",song.Directory);
//GD.Print("File Valid, file path ",song.Directory);
Songs.Append(song);
//if (file.EndsWith(".mp3"))
}
return Songs;
LoadedSongs = Songs;
}
}
project.godot
-1
View File
@@ -61,5 +61,4 @@ textures/canvas_textures/default_texture_filter=2
renderer/rendering_method="gl_compatibility"
renderer/rendering_method.mobile="gl_compatibility"
textures/vram_compression/import_etc2_astc=true
textures/default_filters/texture_mipmap_bias=2.0
environment/defaults/default_clear_color=Color(0.147672, 0.147672, 0.147672, 1)