diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d0f70ca..a78d0cc 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,26 +12,30 @@ jobs:
- name: Set version number
shell: pwsh
run: |
- $version = "0.1.0"
- echo $version
- echo "VERSION_NUMBER=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+ $versionNumber = "2.0.0"
+ $versionSuffix = "beta.1"
+ $infoVersion = "$versionNumber-$versionSuffix"
+ echo $infoVersion
+ echo "VERSION_NUMBER=$versionNumber" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+ echo "VERSION_SUFFIX=$versionSuffix" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+ echo "INFO_VERSION=$infoVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
- name: Publish for win-x64
- run: dotnet publish KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj /p:Version=${{ env.VERSION_NUMBER }}.0 /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /p:PublishSingleFile=true /p:PublishDir=${{ github.workspace }}/publish
+ run: dotnet publish KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj /p:VersionPrefix=${{ env.VERSION_NUMBER }} /p:VersionSuffix=${{ env.VERSION_SUFFIX }} /p:Configuration=Release /p:RuntimeIdentifier=win-x64 /p:PublishSingleFile=true /p:PublishDir=${{ github.workspace }}/publish
- name: Zip for win-x64
shell: pwsh
- run: Compress-Archive -Path ${{ github.workspace }}/publish/* -DestinationPath KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip
+ run: Compress-Archive -Path ${{ github.workspace }}/publish/* -DestinationPath KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip
- name: Upload win-x64 Artifact
uses: actions/upload-artifact@v4
with:
- name: KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}
- path: KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip
+ name: KaddaOKTools_win-x64_${{ env.INFO_VERSION }}
+ path: KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip
- name: Create Release
uses: ncipollo/release-action@v1.13.0
with:
- artifacts: "KaddaOKTools_win-x64_${{ env.VERSION_NUMBER }}.zip"
- tag: ${{ env.VERSION_NUMBER }}
+ artifacts: "KaddaOKTools_win-x64_${{ env.INFO_VERSION }}.zip"
+ tag: ${{ env.INFO_VERSION }}
diff --git a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
index 0970b81..d0eee17 100644
--- a/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
+++ b/KaddaOK.AvaloniaApp.Tests/ViewModels/EditLinesViewModelTests.cs
@@ -1,7 +1,9 @@
using System.Collections.ObjectModel;
+using Avalonia.Input;
using FluentAvalonia.Core;
using KaddaOK.AvaloniaApp.Models;
using KaddaOK.AvaloniaApp.ViewModels;
+using KaddaOK.AvaloniaApp.Views;
using KaddaOK.Library;
using NAudio.Wave;
@@ -26,6 +28,13 @@ private static KaraokeProcess GetNewCurrentProcess() =>
}
};
+ public class DummyEditLinesView : IEditLinesView
+ {
+ public bool Focus(NavigationMethod method = NavigationMethod.Unspecified, KeyModifiers keyModifiers = KeyModifiers.None)
+ {
+ return true;
+ }
+ }
public class MoveLineToPrevious
{
[Fact]
@@ -33,7 +42,8 @@ public void ShouldMergeLines()
{
var currentProcess = GetNewCurrentProcess();
- var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
+ var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
+ { EditLinesView = new DummyEditLinesView() };
viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
@@ -47,7 +57,8 @@ public void ShouldAddSpaceToPreviousWordWhenMergingLines()
{
var currentProcess = GetNewCurrentProcess();
- var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler());
+ var viewModel = new EditLinesViewModel(currentProcess, new LineSplitter(), new WordMerger(), new MinMaxFloatWaveStreamSampler())
+ { EditLinesView = new DummyEditLinesView()};
viewModel.MoveLineToPrevious(currentProcess.ChosenLines!.Last());
diff --git a/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj b/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
index 0b7a8ef..d70fcf5 100644
--- a/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
+++ b/KaddaOK.AvaloniaApp.Windows/KaddaOK.AvaloniaApp.Windows.csproj
@@ -12,6 +12,8 @@
trueapp.manifestKaddaOKTools
+ 0.0.0
+ dev
diff --git a/KaddaOK.AvaloniaApp/App.axaml b/KaddaOK.AvaloniaApp/App.axaml
index f484f1a..5496234 100644
--- a/KaddaOK.AvaloniaApp/App.axaml
+++ b/KaddaOK.AvaloniaApp/App.axaml
@@ -123,11 +123,20 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/App.axaml.cs b/KaddaOK.AvaloniaApp/App.axaml.cs
index 3eeca92..34179c5 100644
--- a/KaddaOK.AvaloniaApp/App.axaml.cs
+++ b/KaddaOK.AvaloniaApp/App.axaml.cs
@@ -25,7 +25,7 @@ public override void Initialize()
KaraokeProcess = new KaraokeProcess
{
- KaraokeSource = InitialKaraokeSource.AzureSpeechService
+ KaraokeSource = InitialKaraokeSource.NotSelected
};
services.AddSingleton(KaraokeProcess);
@@ -53,6 +53,8 @@ public override void Initialize()
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
// Build the service provider
ServiceProvider = services.BuildServiceProvider();
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
index 166fb8e..d8ac381 100644
--- a/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/EditSyllableTextDialog.axaml
@@ -12,16 +12,17 @@
- Enter the new text for this timed syllable. (You may break it up into multiple words or syllables by using space or | characters,
- and the timing dialog will open automatically for you to check the new distribution.)
+ Enter the new text for this timed syllable. (You may break it up into multiple words or syllables by using space, /, or | characters.)
- (To separate syllables, use a | (pipe) character.)
+ (To separate syllables, use a / or | character.)
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml
new file mode 100644
index 0000000..0074a40
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml
@@ -0,0 +1,59 @@
+
+
+
+
+
+ Shift all the starts and stops in the entire song by an offset value in seconds.
+
+
+ Positive values will move everything later relative to the music, and should
+ be applied if the scroll is happening too early.
+
+
+ Negative values will move everything earlier relative to the music, and should
+ be applied if the scroll isn't happening early enough.
+
+
+ For instance, to move everything 100ms earlier in the song to give singers more
+ time to react, enter -0.1 in the input below.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs
new file mode 100644
index 0000000..37f7dcd
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/Dialogs/NudgeTimingsDialog.axaml.cs
@@ -0,0 +1,36 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using DialogHostAvalonia;
+
+namespace KaddaOK.AvaloniaApp.Controls.Dialogs
+{
+ public partial class NudgeTimingsDialog : UserControl
+ {
+ private DialogHost? dialogHost;
+
+ public NudgeTimingsDialog()
+ {
+ InitializeComponent();
+ }
+
+ private void TextBox_AttachedToVisualTree(object? sender, Avalonia.VisualTreeAttachmentEventArgs e)
+ {
+ (sender as TextBox)?.Focus();
+ dialogHost = this.FindAncestorOfType();
+ }
+
+ private void TextBox_KeyDown(object? sender, Avalonia.Input.KeyEventArgs e)
+ {
+ if (e.Key == Key.Enter)
+ {
+ dialogHost?.CloseDialogCommand.Execute(((TextBox)sender).Text);
+ }
+
+ if (e.Key == Key.Escape)
+ {
+ dialogHost?.CloseDialogCommand.Execute(null);
+ }
+ }
+ }
+}
diff --git a/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml
new file mode 100644
index 0000000..95b476b
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs
new file mode 100644
index 0000000..b2eb164
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Controls/InitialSyncOption.axaml.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.Input;
+
+namespace KaddaOK.AvaloniaApp.Controls;
+
+public partial class InitialSyncOption : UserControl
+{
+ public InitialSyncOption()
+ {
+ InitializeComponent();
+ MoreInfoContent = new List();
+ }
+
+ public static readonly StyledProperty ChooseCommandProperty = AvaloniaProperty.Register(nameof(ChooseCommand));
+ public static readonly StyledProperty OptionTitleProperty = AvaloniaProperty.Register(nameof(OptionTitle));
+ public static readonly StyledProperty OptionSummaryProperty = AvaloniaProperty.Register(nameof(OptionSummary));
+ public static readonly StyledProperty> MoreInfoContentProperty = AvaloniaProperty.Register>(nameof(MoreInfoContent));
+ public static readonly StyledProperty IconDrawingProperty = AvaloniaProperty.Register(nameof(IconDrawing));
+ public static readonly StyledProperty MoreInfoVisibleProperty = AvaloniaProperty.Register(nameof(MoreInfoVisible));
+
+ public ICommand ChooseCommand
+ {
+ get => GetValue(ChooseCommandProperty);
+ set => SetValue(ChooseCommandProperty, value);
+ }
+
+ public string OptionTitle
+ {
+ get => GetValue(OptionTitleProperty);
+ set => SetValue(OptionTitleProperty, value);
+ }
+
+ public string OptionSummary
+ {
+ get => GetValue(OptionSummaryProperty);
+ set => SetValue(OptionSummaryProperty, value);
+ }
+
+ public IEnumerable MoreInfoContent
+ {
+ get => GetValue(MoreInfoContentProperty);
+ set => SetValue(MoreInfoContentProperty, value);
+ }
+
+ public DrawingImage IconDrawing
+ {
+ get => GetValue(IconDrawingProperty);
+ set => SetValue(IconDrawingProperty, value);
+ }
+
+ // Encapsulated properties and commands
+ public bool MoreInfoVisible
+ {
+ get => GetValue(MoreInfoVisibleProperty);
+ set => SetValue(MoreInfoVisibleProperty, value);
+ }
+
+ [RelayCommand]
+ public void HideMoreInfo(object? parameter)
+ {
+ MoreInfoVisible = false;
+ }
+ [RelayCommand]
+ public void ShowMoreInfo(object? parameter)
+ {
+ MoreInfoVisible = true;
+ }
+}
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml b/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
index c380215..845d691 100644
--- a/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
+++ b/KaddaOK.AvaloniaApp/Controls/OverlayRectangle.axaml
@@ -1,22 +1,32 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
@@ -90,33 +91,24 @@
Classes.gettingFile="{Binding GettingFile}">
-
- To use the guided process for generating karaoke files, start here and follow
- the
- instructions on each screen, pushing the "Next Step" button to go through each
- tab,
- until you are satisfied with the content on the Edit tab.
+ Margin="20,0,20,20">
+
+ Audio
+
+ To get started, select the WAV or FLAC files to work on below.
+ To get started, select the WAV or FLAC files to work on below.
+ Classes="introText">
(Separate instruments from vocals first using a tool such as
-
- or whatever you prefer.) To proceed with the automatic process, only Vocals-only
- is mandatory, but for the best experience, all 3 should be selected.
-
- Alternately, to edit a file from YTMM or KBS, click the Import... button at the
- bottom and select it.
- The app will attempt to load it and the accompanying audio files, and jump
- directly to the Edit tab.
-
+ or whatever you prefer.)
+
+ The Vocals-only version is mandatory, but for the best experience, all 3 should be selected.
+
@@ -234,11 +226,6 @@
ColumnDefinitions="*,*"
Margin="0, 15">
-
+
+
+
+
+
+
+
+
@@ -106,6 +137,9 @@
+
+
+
+
+ Edit
+
On this screen you can make direct changes to the words and lines.
Click the ⤴ button to make a line part of its preceeding line.
@@ -176,17 +213,28 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs b/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs
new file mode 100644
index 0000000..ca4cb2c
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/StartView.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Notifications;
+using KaddaOK.AvaloniaApp.ViewModels;
+using KaddaOK.AvaloniaApp.ViewModels.DesignTime;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace KaddaOK.AvaloniaApp.Views
+{
+ public partial class StartView : UserControl
+ {
+ private StartViewModel _viewModel;
+ public StartView()
+ {
+ InitializeComponent();
+
+ _viewModel = Design.IsDesignMode
+ ? new DesignTimeStartViewModel()
+ : App.ServiceProvider.GetRequiredService();
+ DataContext = _viewModel;
+ }
+
+ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+ {
+ base.OnAttachedToVisualTree(e);
+ _viewModel.NotificationManager = new WindowNotificationManager(TopLevel.GetTopLevel(this)!);
+ }
+ }
+}
diff --git a/KaddaOK.AvaloniaApp/Views/TabIndexes.cs b/KaddaOK.AvaloniaApp/Views/TabIndexes.cs
new file mode 100644
index 0000000..6301905
--- /dev/null
+++ b/KaddaOK.AvaloniaApp/Views/TabIndexes.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KaddaOK.AvaloniaApp.Views
+{
+ public enum TabIndexes
+ {
+ Start = 0,
+ Audio = 1,
+ Lyrics = 2,
+ Recognize = 3,
+ Narrow = 4,
+ ManualAlign = 5,
+ Edit = 6,
+ Export = 7,
+ About = 8
+ }
+}
diff --git a/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs b/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
index 1faa7ea..fc8eed5 100644
--- a/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
+++ b/KaddaOK.AvaloniaApp/WaveformToPointConverter.cs
@@ -12,15 +12,16 @@ public class WaveformToPointConverter : IMultiValueConverter
{
public object? Convert(IList values, Type targetType, object? parameter, CultureInfo culture)
{
- /*
+
var sb = new StringBuilder();
- sb.AppendLine(nameof(WaveformToPointConverter));
+ sb.Append(nameof(WaveformToPointConverter));
for (int i = 0; i < values.Count; i++)
{
- sb.AppendLine($"[{i}]: {values[i]?.ToString() ?? "null"}");
+ sb.Append($"[{i}]: {values[i]?.ToString() ?? "null"}");
}
Debug.WriteLine(sb.ToString());
- */
+
+ double? returnValue = null;
// need to know the second of the point
// need to know the length of the waveform in seconds
@@ -39,10 +40,13 @@ public class WaveformToPointConverter : IMultiValueConverter
}
//Debug.WriteLine($"{pointSeconds} / {waveLengthSeconds} * {totalWidth}");
- return pointSeconds / waveLengthSeconds * totalWidth;
+ returnValue = pointSeconds / waveLengthSeconds * totalWidth;
}
- return null;
+ sb.Append($" = {returnValue}");
+ Debug.WriteLine(sb.ToString());
+
+ return returnValue;
}
}
}
diff --git a/KaddaOK.Library.Tests/NfaCtmImporterTests.cs b/KaddaOK.Library.Tests/NfaCtmImporterTests.cs
new file mode 100644
index 0000000..20e341f
--- /dev/null
+++ b/KaddaOK.Library.Tests/NfaCtmImporterTests.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KaddaOK.Library.Tests
+{
+ public class NfaCtmImporterTests
+ {
+ private List sampleCtmLines = new List
+ {
+ "resampledInput 1 0.00 10.56 ",
+ "resampledInput 1 10.56 0.08 ▁And",
+ "resampledInput 1 10.64 0.48 ",
+ "resampledInput 1 11.12 0.08 ▁after",
+ "resampledInput 1 11.20 0.64 ",
+ "resampledInput 1 11.84 0.08 ▁the",
+ "resampledInput 1 11.92 0.40 ",
+ "resampledInput 1 12.32 0.08 ▁sto",
+ "resampledInput 1 12.40 0.24 ",
+ "resampledInput 1 12.64 0.08 r",
+ "resampledInput 1 12.72 0.08 m",
+ "resampledInput 1 12.80 3.44 ",
+ "resampledInput 1 16.24 0.08 ▁I",
+ "resampledInput 1 16.32 0.08 ",
+ "resampledInput 1 16.40 0.08 ▁run",
+ "resampledInput 1 16.48 0.48 ",
+ "resampledInput 1 16.96 0.16 ▁and",
+ "resampledInput 1 17.12 0.16 ",
+ "resampledInput 1 17.28 0.08 ▁run",
+ "resampledInput 1 17.36 0.40 ",
+ "resampledInput 1 17.76 0.08 ▁as",
+ "resampledInput 1 17.84 0.32 ",
+ "resampledInput 1 18.16 0.08 ▁the",
+ "resampledInput 1 18.24 0.08 ",
+ "resampledInput 1 18.32 0.08 ▁ra",
+ "resampledInput 1 18.40 0.08 ",
+ "resampledInput 1 18.48 0.08 in",
+ "resampledInput 1 18.56 0.16 ",
+ "resampledInput 1 18.72 0.08 s",
+ "resampledInput 1 18.80 0.16 ",
+ "resampledInput 1 18.96 0.08 ▁come",
+ "resampledInput 1 19.04 0.40 "
+ };
+
+ [Fact]
+ public void ShouldParseCorrectly()
+ {
+ var importer = new NfaCtmImporter();
+ var inputLyrics = new List
+ {
+ "And after the storm",
+ "I run and run as the rains come"
+ };
+ var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+ Assert.Equal(2, resultingLines.Count);
+
+ var firstLine = resultingLines[0];
+ Assert.Equal(6, firstLine.Words.Count);
+ var firstLineFirstWord = firstLine.Words.First();
+ Assert.Equal("And ", firstLineFirstWord.Text);
+ Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+ Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+ var firstLineLastWord = firstLine.Words.Last();
+ Assert.Equal("m", firstLineLastWord.Text);
+ Assert.Equal(12.72, firstLineLastWord.StartSecond);
+ Assert.Equal(12.80, firstLineLastWord.EndSecond);
+
+ var secondLine = resultingLines[1];
+ Assert.Equal(10, secondLine.Words.Count);
+ var secondLineFirstWord = secondLine.Words.First();
+ Assert.Equal("I ", secondLineFirstWord.Text);
+ Assert.Equal(16.24, secondLineFirstWord.StartSecond);
+ Assert.Equal(16.32, secondLineFirstWord.EndSecond);
+ var secondLineLastWord = secondLine.Words.Last();
+ Assert.Equal("come", secondLineLastWord.Text);
+ Assert.Equal(18.8, secondLineLastWord.StartSecond);
+ Assert.Equal(19.04, secondLineLastWord.EndSecond);
+ }
+
+ [Fact]
+ public void ShouldOutputRemainingIfNoMoreLyrics()
+ {
+ var importer = new NfaCtmImporter();
+ var inputLyrics = new List
+ {
+ "And after the storm",
+ "I run"
+ };
+ var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+ Assert.Equal(2, resultingLines.Count);
+
+ var firstLine = resultingLines[0];
+ Assert.Equal(6, firstLine.Words.Count);
+ var firstLineFirstWord = firstLine.Words.First();
+ Assert.Equal("And ", firstLineFirstWord.Text);
+ Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+ Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+ var firstLineLastWord = firstLine.Words.Last();
+ Assert.Equal("m", firstLineLastWord.Text);
+ Assert.Equal(12.72, firstLineLastWord.StartSecond);
+ Assert.Equal(12.80, firstLineLastWord.EndSecond);
+
+ var secondLine = resultingLines[1];
+ Assert.Equal(10, secondLine.Words.Count);
+ var secondLineFirstWord = secondLine.Words.First();
+ Assert.Equal("I ", secondLineFirstWord.Text);
+ Assert.Equal(16.24, secondLineFirstWord.StartSecond);
+ Assert.Equal(16.32, secondLineFirstWord.EndSecond);
+ var secondLineLastWord = secondLine.Words.Last();
+ Assert.Equal("come", secondLineLastWord.Text);
+ Assert.Equal(18.8, secondLineLastWord.StartSecond);
+ Assert.Equal(19.04, secondLineLastWord.EndSecond);
+ }
+
+ [Fact]
+ public void ShouldOutputRemainingIfTextDifference()
+ {
+ var importer = new NfaCtmImporter();
+ var inputLyrics = new List
+ {
+ "And after the storm,",
+ "I run, and run, as the rains come"
+ };
+ var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, inputLyrics);
+
+ Assert.Single(resultingLines);
+
+ var firstLine = resultingLines[0];
+ Assert.Equal(16, firstLine.Words.Count);
+ var firstLineFirstWord = firstLine.Words.First();
+ Assert.Equal("And ", firstLineFirstWord.Text);
+ Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+ Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+ var firstLineLastWord = firstLine.Words.Last();
+ Assert.Equal("come", firstLineLastWord.Text);
+ Assert.Equal(18.8, firstLineLastWord.StartSecond);
+ Assert.Equal(19.04, firstLineLastWord.EndSecond);
+ }
+
+ [Fact]
+ public void ShouldOutputAllOnOneLineIfNoInput()
+ {
+ var importer = new NfaCtmImporter();
+
+ var resultingLines = importer.ImportNfaCtmAndLyrics(sampleCtmLines, null);
+
+ Assert.Single(resultingLines);
+
+ var firstLine = resultingLines[0];
+ Assert.Equal(16, firstLine.Words.Count);
+ var firstLineFirstWord = firstLine.Words.First();
+ Assert.Equal("And ", firstLineFirstWord.Text);
+ Assert.Equal(10.56, firstLineFirstWord.StartSecond);
+ Assert.Equal(10.64, firstLineFirstWord.EndSecond);
+ var firstLineLastWord = firstLine.Words.Last();
+ Assert.Equal("come", firstLineLastWord.Text);
+ Assert.Equal(18.8, firstLineLastWord.StartSecond);
+ Assert.Equal(19.04, firstLineLastWord.EndSecond);
+ }
+ }
+}
diff --git a/KaddaOK.Library/KnownOriginalLyrics.cs b/KaddaOK.Library/KnownOriginalLyrics.cs
index 9ddf214..e8c9096 100644
--- a/KaddaOK.Library/KnownOriginalLyrics.cs
+++ b/KaddaOK.Library/KnownOriginalLyrics.cs
@@ -4,16 +4,29 @@ namespace KaddaOK.Library
{
public class KnownOriginalLyrics
{
- public List? Lyrics { get; }
+ private static readonly string unguardedDashRegex = "(?<=[0-9A-Za-z])(?? SeparatorCleansedLines { get; }
+ public List? UncleansedLines { get; }
private KnownOriginalLyrics(string? lyrics)
{
- Lyrics = lyrics?.Split(Environment.NewLine).Where(l => !string.IsNullOrWhiteSpace(l)).Select(l => l.Trim()).ToList() ?? new List();
+ UncleansedLines = lyrics?
+ .Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(s => AdjustSeparators(s.Trim()))
+ .ToList()
+ ?? new List();
+ SeparatorCleansedLines = UncleansedLines.Select(s => s.Replace("|", "").Replace("/", "")).ToList();
+ }
+
+ private string AdjustSeparators(string input)
+ {
+ return Regex.Replace(input, unguardedDashRegex, unguardedDashReplacement);
}
public static KnownOriginalLyrics FromText(string? text)
{
- var lyrics = Regex.Replace(text?.Replace("/", "") ?? "", @"\r\n|\n\r|\n|\r", "\r\n");
- return new KnownOriginalLyrics(lyrics);
+ return new KnownOriginalLyrics(text);
}
public static KnownOriginalLyrics FromFilePath(string? filePath)
{
@@ -30,7 +43,7 @@ public static KnownOriginalLyrics FromFilePath(string? filePath)
return KnownOriginalLyrics.FromText(lyrics);
}
- public List? DistinctLines => Lyrics?.Distinct().ToList();
+ public List? DistinctLines => SeparatorCleansedLines?.Distinct().ToList();
public string? DistinctLinesAsText => DistinctLines != null ? string.Join(Environment.NewLine, DistinctLines) : null;
diff --git a/KaddaOK.Library/LineSplitter.cs b/KaddaOK.Library/LineSplitter.cs
index eb35121..3d2bcd6 100644
--- a/KaddaOK.Library/LineSplitter.cs
+++ b/KaddaOK.Library/LineSplitter.cs
@@ -4,15 +4,21 @@ namespace KaddaOK.Library
{
public interface ILineSplitter
{
- void SplitLineAt(ObservableCollection? allLines, LyricWord wordToSplit, bool splitBefore);
- void DeleteWord(ObservableCollection allLines, LyricWord wordToDelete);
+ void SplitLineAt(ObservableCollection? allLines, TItem wordToSplit, bool splitBefore)
+ where TItem : LyricWord
+ where TList : ILyricLine, new();
+ void DeleteWord(ObservableCollection allLines, TItem wordToDelete)
+ where TItem : LyricWord
+ where TList : ILyricLine, new();
}
public class LineSplitter : ILineSplitter
{
- public void SplitLineAt(ObservableCollection? allLines, LyricWord wordToSplit, bool splitBefore)
+ public void SplitLineAt(ObservableCollection? allLines, TItem wordToSplit, bool splitBefore)
+ where TItem : LyricWord
+ where TList : ILyricLine, new()
{
- var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToSplit));
+ var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToSplit));
if (originalLine != null)
{
var originalLineIndex = allLines!.IndexOf(originalLine);
@@ -25,20 +31,25 @@ public void SplitLineAt(ObservableCollection? allLines, LyricWord wor
return;
}
- var newLine = new LyricLine
+ var newLine = new TList
{
- IsSelected = originalLine.IsSelected,
- Words = new ObservableCollection(originalLine.Words.Skip(originalWordIndex + (splitBefore ? 0 : 1)))
+ Words = new ObservableCollection(originalLine.Words.Skip(originalWordIndex + (splitBefore ? 0 : 1)))
};
+ if (newLine is LyricLine newLyricLine && originalLine is LyricLine oldLyricLine)
+ {
+ newLyricLine.IsSelected = oldLyricLine.IsSelected;
+ }
- originalLine.Words = new ObservableCollection(originalLine.Words.Take(splitBefore ? originalWordIndex : originalWordIndex + 1));
+ originalLine.Words = new ObservableCollection(originalLine.Words.Take(splitBefore ? originalWordIndex : originalWordIndex + 1));
originalLine.Words.Last().Text = originalLine.Words.Last().Text?.TrimEnd();
allLines.Insert(originalLineIndex+1, newLine);
}
}
}
- public void DeleteWord(ObservableCollection allLines, LyricWord wordToDelete)
+ public void DeleteWord(ObservableCollection allLines, TItem wordToDelete)
+ where TItem : LyricWord
+ where TList : ILyricLine, new()
{
var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToDelete));
if (originalLine?.Words != null)
diff --git a/KaddaOK.Library/LyricLine.cs b/KaddaOK.Library/LyricLine.cs
index bedd8ba..1584b12 100644
--- a/KaddaOK.Library/LyricLine.cs
+++ b/KaddaOK.Library/LyricLine.cs
@@ -1,11 +1,17 @@
using Microsoft.CognitiveServices.Speech;
using System.Collections.ObjectModel;
+using System.Diagnostics;
using KaddaOK.Library.Kbs;
using KaddaOK.Library.Ytmm;
namespace KaddaOK.Library
{
- public class LyricLine : ObservableBase, IAudioSpan
+ public interface ILyricLine where T : LyricWord
+ {
+ ObservableCollection Words { get; set; }
+ }
+
+ public class LyricLine : ObservableBase, IAudioSpan, ILyricLine
{
public string? Text => string.Concat(Words.Select(w => w.Text));
@@ -48,11 +54,16 @@ public ObservableCollection Words
set
{
SetProperty(ref words, value);
- RaisePropertyChanged(nameof(StartSecond));
- RaisePropertyChanged(nameof(EndSecond));
+ RaiseTimingChanged();
}
}
+ public void RaiseTimingChanged()
+ {
+ RaisePropertyChanged(nameof(StartSecond));
+ RaisePropertyChanged(nameof(EndSecond));
+ }
+
public double StartSecond
{
get
@@ -121,6 +132,15 @@ public LyricLine()
words = new ObservableCollection();
}
+ public static LyricLine FromIncomingSeparatedText(string text, double songLength)
+ {
+ return new LyricLine
+ {
+ Words = new ObservableCollection(
+ LyricWord.GetLyricWordsAcrossTime(text, songLength, songLength))
+ };
+ }
+
public static void MoveSpacesToEndsOfWords(IList words)
{
for (int i = 0; i < words.Count; i++)
diff --git a/KaddaOK.Library/LyricWord.cs b/KaddaOK.Library/LyricWord.cs
index 3b4cecf..89f92bc 100644
--- a/KaddaOK.Library/LyricWord.cs
+++ b/KaddaOK.Library/LyricWord.cs
@@ -30,5 +30,32 @@ public LyricWord(WordLevelTimingResult fromAzure)
Text = fromAzure.Word;
}
public LyricWord() {}
+
+ public static List GetLyricWordsAcrossTime(string? enteredText, double startTime, double endTime)
+ {
+ var fullWords = enteredText?.Split(' ') ?? new[] { enteredText };
+ var syllables = fullWords
+ .SelectMany(f => (f + " ")
+ .Split('|', '/'))
+ .Where(w => !string.IsNullOrWhiteSpace(w))
+ .ToList();
+ var availableTime = endTime - startTime;
+ var eachSyllableGets = Math.Round(availableTime / (double)syllables.Count, 2);
+ var currentTime = Math.Round(startTime, 2);
+ var listOfNewWords = new List();
+ for (int i = 0; i < syllables.Count; i++)
+ {
+ var newWord = new LyricWord
+ {
+ Text = syllables[i],
+ StartSecond = currentTime
+ };
+ currentTime = Math.Round(currentTime + eachSyllableGets, 2);
+ newWord.EndSecond = currentTime;
+ listOfNewWords.Add(newWord);
+ }
+
+ return listOfNewWords;
+ }
}
}
diff --git a/KaddaOK.Library/NfaCtmImporter.cs b/KaddaOK.Library/NfaCtmImporter.cs
index a289a96..0d42aae 100644
--- a/KaddaOK.Library/NfaCtmImporter.cs
+++ b/KaddaOK.Library/NfaCtmImporter.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace KaddaOK.Library
+namespace KaddaOK.Library
{
public interface INfaCtmImporter
{
@@ -14,12 +8,8 @@ public class NfaCtmImporter : INfaCtmImporter
{
public List ImportNfaCtmAndLyrics(List ctmLines, List? originalLyrics)
{
- if (originalLyrics == null)
- {
- throw new InvalidOperationException(
- "System is not designed to parse NFA output without access to the lyric lines that fed it, sorry");
- }
var lines = new List();
+ originalLyrics ??= new List();
// constants that could change with CTM formatting versions:
var expectedPartsCount = 5;
@@ -30,25 +20,44 @@ public List ImportNfaCtmAndLyrics(List ctmLines, List
var currentExpectedLineIndex = 0;
var currentLine = new LyricLine();
+
+ var noMoreOriginalLyrics = !originalLyrics.Any();
+
for (var i = 0; i < ctmLines.Count(); i++)
{
- if (currentExpectedLineIndex > originalLyrics.Count() - 1)
- {
- // we must be at the end
- break;
- }
-
+ // we expect each row of a CTM to be expectedPartsCount space-separated values
var parts = ctmLines[i].Split(" ");
if (parts.Count() == expectedPartsCount)
{
+ // parse start, length, and rawContent out of the current CTM row
var start = Decimal.Parse(parts[onsetTimeIndex]);
var length = Decimal.Parse(parts[tokenLengthIndex]);
var rawContent = parts[tokenContentIndex];
- if (rawContent.Trim() != breakContent) // this doesn't provide us useful data; we'll reach back if we want it
+ // It seems like almost every row in the CTM has its own `` row following it, which if we
+ // actually honored as breaks, would be quite choppy. From experimenting with it a bit when I
+ // first wrote this importer, it seemed like I got results that were closer to what I'd expect
+ // if we let the *following* syllable absorb that extra time instead of adding it to the
+ // *preceding* one (but this should be played around with and verified a lot more, and honestly
+ // ideally we should accept a parameter to choose from a few diffrent modes of `` handling
+ // so people can experiment themselves, because I could be very wrong and it might give much
+ // better results handled some other way... )
+ // So we skip those as primary objects of the loop, and instead reach back for
+ // them by `index--` when we're processing a row that does have actual text.
+ // TODO: re-examine and/or make configurable the processing of `` rows
+ if (rawContent.Trim() != breakContent)
{
+ // Underscores is what CTM (at least, NeMo Forced Aligner in English) does with spaces
+ // (which we'll flip to the other side of words after we're finished parsing)
var cleanedContent = rawContent.Replace("▁", " ");
+
var startTime = start;
+ // If this isn't the first syllable in the line, we should check to see if the previous
+ // row was a `` and if so steal its startTime instead of using what this row claims.
+ // (we don't do it when this is the first syllable of a line, because that would pull
+ // in the gap between lines. And that's another problem with not having the original
+ // lines of lyrics to go off of. Maybe we should re-examine this algorithm's assumptions
+ // about the accuracy of ``'s, as this may turn out real bad in some cases...)
if (currentLine.Words.Any())
{
var previous = ctmLines[i - 1];
@@ -59,19 +68,46 @@ public List ImportNfaCtmAndLyrics(List ctmLines, List
startTime = Decimal.Parse(previousParts[onsetTimeIndex]);
}
}
- currentLine.Words.Add(new LyricWord { StartSecond = (double)startTime, EndSecond = (double)(start + length), Text = cleanedContent });
- if (currentLine.Text?.Trim().ToLowerInvariant() == originalLyrics[currentExpectedLineIndex].Trim().ToLowerInvariant())
+ // anyway, let's add the current syllable to the line we're constructing
+ currentLine.Words.Add(new LyricWord
+ {
+ StartSecond = (double)startTime,
+ EndSecond = (double)(start + length),
+ Text = cleanedContent
+ });
+
+ // If we've now constructed the full line (and there are any more of the line-break lyrics left) then we
+ // save the current line and start a new one.
+ // If we're out of line-broken lyrics, or never received any to begin with, then everything remaining
+ // in the CTM will continue to get added to the same line, which we'll add after the whole loop.
+ if (!noMoreOriginalLyrics
+ && currentLine.Text?.Trim().ToLowerInvariant() == originalLyrics[currentExpectedLineIndex].Trim().ToLowerInvariant())
{
currentExpectedLineIndex++;
lines.Add(currentLine);
- currentLine = new LyricLine();
+ if (currentExpectedLineIndex <= originalLyrics.Count() - 1)
+ {
+ currentLine = new LyricLine();
+ }
+ else
+ {
+ noMoreOriginalLyrics = true;
+ }
}
}
}
}
- // this results in spaces in front of the words, and I prefer them to be behind them so let's change that
+ // If we still have a line we haven't added to the parsed list yet (either because we ran out of lyrics, or
+ // the lyrics stopped matching up at some point) here's where we make sure we include it
+ if (currentLine.Words.Any() && !lines.Contains(currentLine))
+ {
+ lines.Add(currentLine);
+ }
+
+ // As mentioned above, this process results in spaces in front of the words, and everything else expects them
+ // to be on the end of words, so let's go through and flip that around.
foreach (var line in lines)
{
for (var i = 0; i < line.Words.Count; i++)
diff --git a/KaddaOK.Library/RzProjectGenerator.cs b/KaddaOK.Library/RzProjectGenerator.cs
index 14a74df..954dd9d 100644
--- a/KaddaOK.Library/RzProjectGenerator.cs
+++ b/KaddaOK.Library/RzProjectGenerator.cs
@@ -90,7 +90,7 @@ public RzProject GenerateProject(string rzlrcFileName,
eMediaType = 6,
eMediaTypeLine = (int)RzLinesSpec.Text0,
dxScale = 1,
- dyScale = 1,
+ dyScale = 1,
dzScale = 1,
source = rzlrcFileName
});
@@ -202,12 +202,12 @@ public RzProject GenerateProject(string rzlrcFileName,
}
public void InsertProgressBars(
- RzProject project,
- List lyrics,
+ RzProject project,
+ List lyrics,
decimal minimumGapLength,
- int width,
- int height,
- int yPosition,
+ int width,
+ int height,
+ int yPosition,
SKColor fill,
SKColor outline,
int screenWidth = 1920)
@@ -238,13 +238,13 @@ public void InsertProgressBars(
}
public RzLineItem GenerateProgressBar(
- decimal startTime,
- decimal endTime,
- int width,
- int height,
- int yPosition,
- SKColor fill,
- SKColor outline,
+ decimal startTime,
+ decimal endTime,
+ int width,
+ int height,
+ int yPosition,
+ SKColor fill,
+ SKColor outline,
int screenWidth = 1920)
{
var barMargin = (screenWidth - width) / 2;
@@ -273,7 +273,7 @@ public RzLineItem GenerateProgressBar(
nShapeType=1,
nOutlineWidth=4,
nOutlineType=0,
- bSmooth=1,
+ bSmooth=0,
Points = new List
{
new()
@@ -302,7 +302,7 @@ public RzLineItem GenerateProgressBar(
nShapeType=1,
nOutlineWidth=4,
nOutlineType=2,
- bSmooth=1,
+ bSmooth=0,
Points = new List
{
new()
diff --git a/KaddaOK.Library/WordMerger.cs b/KaddaOK.Library/WordMerger.cs
index 2bcba5e..24ee59d 100644
--- a/KaddaOK.Library/WordMerger.cs
+++ b/KaddaOK.Library/WordMerger.cs
@@ -4,31 +4,36 @@ namespace KaddaOK.Library
{
public interface IWordMerger
{
- LyricWord MergeWord(ObservableCollection? allLines, LyricWord wordToMerge, bool withWordBefore);
+ (TList? resultingLine, TItem? resultingWord) MergeWord(ObservableCollection allLines, TItem wordToMerge, bool withWordBefore)
+ where TItem : LyricWord, new()
+ where TList : ILyricLine, new();
}
public class WordMerger : IWordMerger
{
- public LyricWord? MergeWord(ObservableCollection? allLines, LyricWord wordToMerge, bool withWordBefore)
+ public (TList? resultingLine, TItem? resultingWord) MergeWord
+ (ObservableCollection allLines, TItem wordToMerge, bool withWordBefore)
+ where TItem : LyricWord, new()
+ where TList : ILyricLine, new()
{
- var originalLine = allLines?.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
+ var originalLine = allLines.SingleOrDefault(l => l.Words != null && l.Words.Contains(wordToMerge));
if (originalLine == null)
{
- return null;
+ return (default, default);
}
var originalLineIndex = allLines!.IndexOf(originalLine);
if (originalLine.Words == null)
{
- return null;
+ return (default, default);
}
var originalWordIndex = originalLine.Words.IndexOf(wordToMerge);
if ((withWordBefore && originalWordIndex < 1)
|| (!withWordBefore && originalWordIndex == originalLine.Words.Count - 1))
{
- return null; // I don't wanna. TODO: I guess this would move the word to the line in question?
+ return (default, default); // I don't wanna. TODO: I guess this would move the word to the previous line...
}
// either we're merging with the word with the previous index or the next index
@@ -37,18 +42,18 @@ public class WordMerger : IWordMerger
var firstWord = originalLine.Words[firstWordIndex];
var secondWord = originalLine.Words[secondWordIndex];
- var replacementWord = new LyricWord
+ var replacementWord = new TItem
{
StartSecond = firstWord.StartSecond,
EndSecond = secondWord.EndSecond,
Text = $"{firstWord.Text.TrimEnd()}{secondWord.Text.TrimStart()}"
};
- originalLine.Words = new ObservableCollection(
+ originalLine.Words = new ObservableCollection(
originalLine.Words.Take(firstWordIndex).Concat(new[] { replacementWord })
.Concat(originalLine.Words.Skip(secondWordIndex + 1)));
- return replacementWord;
+ return (originalLine, replacementWord);
}
}
}