diff --git a/.chatgpt_config.yaml b/.chatgpt_config.yaml index a4d370c..01e37a9 100644 --- a/.chatgpt_config.yaml +++ b/.chatgpt_config.yaml @@ -2,3 +2,5 @@ project_name: "soundscape-sync" default_prompt_blocks: - "basic-prompt" - "go-development" +initial_files: + - "README.md" diff --git a/.gitignore b/.gitignore index f8c8ca3..2e5c3d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -./fyne-cross +fyne-cross ./soundscape-sync diff --git a/FyneApp.toml b/FyneApp.toml index 2d8cc27..e138606 100644 --- a/FyneApp.toml +++ b/FyneApp.toml @@ -1,6 +1,6 @@ [Details] -Icon = "Icon.png" -Name = "SoundscapeSync" -ID = "com.cloonar.soundscape-sync" -Version = "0.0.1" -Build = 1 + Icon = "Icon.png" + Name = "SoundscapeSync" + ID = "com.cloonar.soundscape-sync" + Version = "0.0.1" + Build = 2 diff --git a/README.md b/README.md index aa34a4a..211e123 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,6 @@ It is important that both folders have the same amount of Files and that the fil - [x] Make it possible to Sync with spatial Audio Soundscapes - [ ] Make it usable with Mac - [ ] Generate a package for Ubuntu -- [ ] Better handling of file mapping -- [x] add cover art for mp3 -- [x] add cover art for m4b - [x] load metadata from audiobook ## Support Me diff --git a/internal/logic/sync-5.1.go b/internal/logic/sync-5.1.go index d678421..c91f636 100644 --- a/internal/logic/sync-5.1.go +++ b/internal/logic/sync-5.1.go @@ -1,12 +1,10 @@ package logic -func get5_1Arguments() []string { +import "fmt" + +func get5_1Arguments(volume float64) []string { return []string{ - // best audio format so far on ios - "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2[out]", + "-filter_complex", fmt.Sprintf("[0:a]volume=%f,apad[a2];[1:a][a2]amerge=inputs=2[out]", volume), "-c:a", "aac", "-b:a", "654k", - // mp4 output - // "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=5.1|c0=c0+c6|c1=c1+c7|c2=c2|c3=c3|c4=c4|c5=c5[out]", - // "-c:a", "eac3", "-ac", "6", } } diff --git a/internal/logic/sync-7.1.2.go b/internal/logic/sync-7.1.2.go index 5b852d7..55ab759 100644 --- a/internal/logic/sync-7.1.2.go +++ b/internal/logic/sync-7.1.2.go @@ -1,8 +1,10 @@ package logic -func get7_1_2Arguments() []string { +import "fmt" + +func get7_1_2Arguments(volume float64) []string { return []string{ "-filter_complex", - "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=7.1.2|FL=c0+c10|FR=c1+c11|FC=c2|LFE=c3|BL=c6|BR=c7|SL=c4|SR=c5|TFL=c8|TFR=c9[out]", + fmt.Sprintf("[0:a]volume=%f,apad[a2];[1:a][a2]amerge=inputs=2,pan=7.1.2|FL=c0+c10|FR=c1+c11|FC=c2|LFE=c3|BL=c6|BR=c7|SL=c4|SR=c5|TFL=c8|TFR=c9[out]", volume), } } diff --git a/internal/logic/sync-7.1.4.go b/internal/logic/sync-7.1.4.go index 2906f3c..8259109 100644 --- a/internal/logic/sync-7.1.4.go +++ b/internal/logic/sync-7.1.4.go @@ -1,8 +1,10 @@ package logic -func get7_1_4Arguments() []string { +import "fmt" + +func get7_1_4Arguments(volume float64) []string { return []string{ "-filter_complex", - "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=7.1.4|FL=c0+c12|FR=c1+c13|FC=c2|LFE=c3|BL=c6|BR=c7|SL=c4|SR=c5|TFL=c8|TFR=c9|TBL=c10|TBR=c11[out]", + fmt.Sprintf("[0:a]volume=%f,apad[a2];[1:a][a2]amerge=inputs=2,pan=7.1.4|FL=c0+c12|FR=c1+c13|FC=c2|LFE=c3|BL=c6|BR=c7|SL=c4|SR=c5|TFL=c8|TFR=c9|TBL=c10|TBR=c11[out]", volume), } } diff --git a/internal/logic/sync-stereo.go b/internal/logic/sync-stereo.go index 1a4e588..ceef83e 100644 --- a/internal/logic/sync-stereo.go +++ b/internal/logic/sync-stereo.go @@ -1,7 +1,9 @@ package logic -func getStereoArguments() []string { +import "fmt" + +func getStereoArguments(volume float64) []string { return []string{ - "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=stereo|c0 {} }: -# with import { -# crossSystem = { -# config = "x86_64-w64-mingw32"; -# }; -# }; -# let -# # pkgs = (import { crossSystem = {config = "x86_64-w64-mingw32";}; }); -# pkgs = import { -# localSystem = "x86_64-linux"; # buildPlatform -# crossSystem = "x86_64-w64-mingw32"; # Note the `config` part! -# }; -# in pkgs.mkShell { buildInputs = with pkgs; [ go @@ -24,7 +12,7 @@ pkgs.mkShell { delve pkg-config clang - pkg-config + gcc glib cairo pango @@ -39,6 +27,7 @@ pkgs.mkShell { xorg.libXi xorg.libXrandr xorg.libXinerama + xorg.libXxf86vm libxkbcommon libGL mesa @@ -53,6 +42,8 @@ pkgs.mkShell { pkgs.xorg.libXcursor pkgs.xorg.libXi pkgs.xorg.libXrandr + pkgs.xorg.libXinerama + pkgs.xorg.libXxf86vm pkgs.libxkbcommon ]}:$LD_LIBRARY_PATH export GOPATH=$HOME/go