Skip to content

Commit c61ca25

Browse files
NeoCoderMatrix86NeoCoderMatrix86
committed
removed audio recording
1 parent 2080130 commit c61ca25

13 files changed

Lines changed: 15 additions & 688 deletions

File tree

‎AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -555,22 +555,6 @@ public void IsRecordingPossible_WhenCuesheetContainsTracks_ReturnsError()
555555
Assert.Contains("Cuesheet already contains tracks!", errors);
556556
}
557557

558-
[TestMethod()]
559-
public void IsRecordingPossible_WhenRecordingIsAlreadyAvailable_ReturnsError()
560-
{
561-
// Arrange
562-
var cuesheet = new Cuesheet
563-
{
564-
Audiofile = new Audiofile("test", isRecorded: true)
565-
};
566-
567-
// Act
568-
var errors = cuesheet.IsRecordingPossible.ToList();
569-
570-
// Assert
571-
Assert.Contains("A recording is already available!", errors);
572-
}
573-
574558
[TestMethod()]
575559
public void IsRecordingPossible_WhenNoErrors_ReturnsEmpty()
576560
{
@@ -915,19 +899,19 @@ public void StartRecording_WithTrackAlreadyAdded_ShouldNotStartRecording()
915899
}
916900

917901
[TestMethod]
918-
public void StartRecording_WithAudiofile_ShouldNotStartRecording()
902+
public void StartRecording_WithAudiofile_ShouldStartRecording()
919903
{
920904
// Arrange
921905
var cuesheet = new Cuesheet
922906
{
923-
Audiofile = new Audiofile("test", isRecorded: true)
907+
Audiofile = new Audiofile("test")
924908
};
925909

926910
// Act
927911
cuesheet.StartRecording();
928912

929913
// Assert
930-
Assert.IsFalse(cuesheet.IsRecording);
914+
Assert.IsTrue(cuesheet.IsRecording);
931915
}
932916

933917
[TestMethod]

‎AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public void ImportFile_ValidProjectfile_ShouldImportFile()
140140
Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
141141
Assert.AreEqual("CuesheetTitle", cuesheet.Title);
142142
Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
143-
Assert.IsFalse(cuesheet.Audiofile?.IsRecorded);
144143
Assert.AreEqual("A123", cuesheet.Cataloguenumber);
145144
Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
146145
Assert.AreEqual(10, cuesheet.Tracks.Count);
@@ -166,7 +165,6 @@ public void ImportFile_ValidProjectfileWithSections_ShouldImportFile()
166165
Assert.AreEqual("CuesheetArtist", cuesheet.Artist);
167166
Assert.AreEqual("CuesheetTitle", cuesheet.Title);
168167
Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
169-
Assert.IsFalse(cuesheet.Audiofile?.IsRecorded);
170168
Assert.AreEqual("A123", cuesheet.Cataloguenumber);
171169
Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
172170
Assert.AreEqual(10, cuesheet.Tracks.Count);

‎AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ public IEnumerable<String> IsRecordingPossible
145145
{
146146
errors.Add("Cuesheet already contains tracks!");
147147
}
148-
if (Audiofile?.IsRecorded == true)
149-
{
150-
errors.Add("A recording is already available!");
151-
}
152148
return errors;
153149
}
154150
}

‎AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
namespace AudioCuesheetEditor.Model.IO.Audio
1919
{
2020
[method: JsonConstructor]
21-
public class Audiofile(String name, Boolean isRecorded = false) : IDisposable, IAudiofile
21+
public class Audiofile(String name) : IDisposable, IAudiofile
2222
{
23-
public static readonly String RecordingFileName = $"Recording-{Guid.NewGuid()}.webm";
2423
public static readonly AudioCodec AudioCodecWEBM = new("audio/webm", ".webm", "AudioCodec WEBM");
2524

2625
public static readonly List<AudioCodec> AudioCodecs =
@@ -42,7 +41,7 @@ public class Audiofile(String name, Boolean isRecorded = false) : IDisposable, I
4241

4342
public event EventHandler? ContentStreamLoaded;
4443

45-
public Audiofile(String name, String objectURL, AudioCodec? audioCodec, Boolean isRecorded = false) : this(name, isRecorded)
44+
public Audiofile(String name, String objectURL, AudioCodec? audioCodec) : this(name)
4645
{
4746
if (String.IsNullOrEmpty(objectURL))
4847
{
@@ -80,7 +79,7 @@ public Boolean IsContentStreamLoaded
8079
get { return ContentStream != null; }
8180
}
8281
/// <summary>
83-
/// File content stream. Be carefull, this stream is loaded asynchronously. Connect to the StreamLoaded for checking if loading has already been done!
82+
/// File content stream. Be carefully, this stream is loaded asynchronously. Connect to the StreamLoaded for checking if loading has already been done!
8483
/// </summary>
8584
[JsonIgnore]
8685
public Stream? ContentStream
@@ -97,8 +96,6 @@ public Stream? ContentStream
9796
}
9897
}
9998
}
100-
[JsonIgnore]
101-
public Boolean IsRecorded { get; private set; } = isRecorded;
10299
/// <summary>
103100
/// Duration of the audio file
104101
/// </summary>

‎AudioCuesheetEditor/Model/IO/Audio/IAudiofile.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public interface IAudiofile
2222
Stream? ContentStream { get; set; }
2323
TimeSpan? Duration { get; }
2424
bool IsContentStreamLoaded { get; }
25-
bool IsRecorded { get; }
2625
string Name { get; set; }
2726
string? ObjectURL { get; }
2827
bool PlaybackPossible { get; }

‎AudioCuesheetEditor/Services/IO/FileInputManager.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,23 +96,6 @@ public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, String file
9696
return audiofile;
9797
}
9898

99-
public Audiofile? CreateRecordedAudiofile(String objectUrl, Action<Task<Stream>>? afterContentStreamLoaded = null)
100-
{
101-
Audiofile? audiofile = null;
102-
if (String.IsNullOrEmpty(objectUrl) == false)
103-
{
104-
audiofile = new Audiofile(Audiofile.RecordingFileName, objectUrl, Audiofile.AudioCodecWEBM, true);
105-
var loadContentStreamTask = _httpClient.GetStreamAsync(objectUrl)
106-
.ContinueWith(x => audiofile.ContentStream = x.Result);
107-
if (afterContentStreamLoaded != null)
108-
{
109-
_ = loadContentStreamTask
110-
.ContinueWith(afterContentStreamLoaded);
111-
}
112-
}
113-
return audiofile;
114-
}
115-
11699
public CDTextfile? CreateCDTextfile(IBrowserFile? browserFile)
117100
{
118101
CDTextfile? cdTextfile = null;

‎AudioCuesheetEditor/Services/IO/IFileInputManager.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ public interface IFileInputManager
2525
bool CheckFileMimeType(IBrowserFile file, string mimeType, string fileExtension);
2626
Task<Audiofile?> CreateAudiofileAsync(string? fileInputId, IBrowserFile? browserFile, Action<Task<Stream>>? afterContentStreamLoaded = null);
2727
CDTextfile? CreateCDTextfile(IBrowserFile? browserFile);
28-
Audiofile? CreateRecordedAudiofile(string objectUrl, Action<Task<Stream>>? afterContentStreamLoaded = null);
2928
}
3029
}

‎AudioCuesheetEditor/Shared/Record/ControlRecording.de.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="A recording is already available!" xml:space="preserve">
121-
<value>Eine Aufnahme ist bereits verfügbar!</value>
122-
</data>
123120
<data name="Cuesheet already contains tracks!" xml:space="preserve">
124121
<value>Das Cuesheet enthält bereits Titel!</value>
125122
</data>

‎AudioCuesheetEditor/Shared/Record/ControlRecording.razor‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ along with Foobar. If not, see
1818
@inherits BaseLocalizedComponent
1919

2020
@inject IStringLocalizer<ControlRecording> _localizer
21-
@inject IJSRuntime _jsRuntime
2221
@inject IDialogService _dialogService
2322
@inject IBlazorDownloadFileService _blazorDownloadFileService
2423

@@ -53,10 +52,10 @@ along with Foobar. If not, see
5352
<MudStack Row AlignItems="AlignItems.Baseline" Justify="Justify.SpaceBetween">
5453
<MudButtonGroup Color="Color.Primary" Variant="Variant.Filled">
5554
<MudHidden Breakpoint="Breakpoint.SmAndUp" Invert>
56-
<MudButton StartIcon="@Icons.Material.Outlined.Mic" Disabled="StartRecordingDisabled" OnClick="StartRecordingAsync">@_localizer["Start recording"]</MudButton>
55+
<MudButton StartIcon="@Icons.Material.Outlined.Mic" Disabled="StartRecordingDisabled" OnClick="StartRecording">@_localizer["Start recording"]</MudButton>
5756
</MudHidden>
5857
<MudHidden Breakpoint="Breakpoint.SmAndUp">
59-
<MudIconButton Icon="@Icons.Material.Outlined.Mic" Disabled="StartRecordingDisabled" OnClick="StartRecordingAsync" />
58+
<MudIconButton Icon="@Icons.Material.Outlined.Mic" Disabled="StartRecordingDisabled" OnClick="StartRecording" />
6059
</MudHidden>
6160
<MudMenu Icon="@Icons.Material.Outlined.ArrowRight" Disabled="StartRecordingDisabled" AnchorOrigin="Origin.TopRight">
6261
<MudMenuItem Disabled="StartRecordingDisabled" OnClick="DisplayStartCountdownDialog">@_localizer["Enter countdown timer"]</MudMenuItem>
@@ -73,19 +72,12 @@ along with Foobar. If not, see
7372
<MudText Typo="Typo.h5">@String.Format("--{0}--{1}--", CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator, CultureInfo.CurrentCulture.DateTimeFormat.TimeSeparator)</MudText>
7473
}
7574
<MudHidden Breakpoint="Breakpoint.SmAndUp" Invert>
76-
<MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecordingAsync">@_localizer["Stop recording"]</MudButton>
75+
<MudButton Color="Color.Warning" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording">@_localizer["Stop recording"]</MudButton>
7776
</MudHidden>
7877
<MudHidden Breakpoint="Breakpoint.SmAndUp">
79-
<MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecordingAsync" />
78+
<MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Stop" Disabled="Cuesheet?.IsRecording == false" OnClick="StopRecording" />
8079
</MudHidden>
8180
</MudStack>
82-
@if (Cuesheet?.Audiofile?.IsRecorded == true)
83-
{
84-
<br />
85-
<MudStack Row Justify="Justify.FlexEnd">
86-
<MudButton Color="Color.Success" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.AudioFile" OnClick="DownloadAudio">@_localizer["Download recorded audio file"]</MudButton>
87-
</MudStack>
88-
}
8981
</MudCardContent>
9082
</MudCard>
9183

@@ -118,18 +110,16 @@ along with Foobar. If not, see
118110
};
119111
}
120112

121-
async Task StartRecordingAsync()
113+
void StartRecording()
122114
{
123115
Cuesheet?.StartRecording();
124116
updateGUITimer.Start();
125-
await _jsRuntime.InvokeVoidAsync("startAudioRecording");
126117
Cuesheet!.Audiofile = null;
127118
}
128119

129-
async Task StopRecordingAsync()
120+
void StopRecording()
130121
{
131122
Cuesheet?.StopRecording();
132-
await _jsRuntime.InvokeVoidAsync("stopAudioRecording");
133123
}
134124

135125
async Task DisplayStartCountdownDialog()
@@ -140,9 +130,9 @@ along with Foobar. If not, see
140130
if (result?.Canceled == false)
141131
{
142132
startRecordTimer = new Timer(ApplicationOptions!.RecordCountdownTimer * 1000);
143-
startRecordTimer.Elapsed += async delegate
133+
startRecordTimer.Elapsed += delegate
144134
{
145-
await StartRecordingAsync();
135+
StartRecording();
146136
startRecordTimer.Stop();
147137
startRecordTimer.Dispose();
148138
};

‎AudioCuesheetEditor/Shared/Record/ControlRecording.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="A recording is already available!" xml:space="preserve">
121-
<value>A recording is already available!</value>
122-
</data>
123120
<data name="Cuesheet already contains tracks!" xml:space="preserve">
124121
<value>Cuesheet already contains tracks!</value>
125122
</data>

0 commit comments

Comments
 (0)