copy back data from sound viewmodel to sound object

Author: LeftofZen

Gui/ViewModels/DatTypes/BaseLocoFileViewModel.cs

@@ -41,9 +41,10 @@ public virtual void Delete() { }
 
 		async Task SaveWrapper()
 		{
+			// note - this is the DAT file source, not the true source...
 			if (CurrentFile is FileSystemItemObject fsio && fsio.ObjectSource is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)
 			{
-				var box = MessageBoxManager.GetMessageBoxStandard("Confirm Save", "This is a vanilla loco file - are you sure you want to overwrite it?", ButtonEnum.YesNo);
+				var box = MessageBoxManager.GetMessageBoxStandard("Confirm Save", $"{CurrentFile.Filename} is a vanilla Locomotion file - are you sure you want to overwrite it?", ButtonEnum.YesNo);
 				var result = await box.ShowAsync();
 
 				if (result != ButtonResult.Yes)
@@ -57,7 +58,7 @@ async Task SaveWrapper()
 
 		async Task DeleteWrapper()
 		{
-			var box = MessageBoxManager.GetMessageBoxStandard("Confirm Delete", "Are you sure you would like to delete?", ButtonEnum.YesNo);
+			var box = MessageBoxManager.GetMessageBoxStandard("Confirm Delete", $"Are you sure you would like to delete {CurrentFile.Filename}?", ButtonEnum.YesNo);
 			var result = await box.ShowAsync();
 
 			if (result == ButtonResult.Yes)

Gui/ViewModels/DatTypes/DatObjectEditorViewModel.cs

@@ -111,7 +111,7 @@ public static IObjectViewModel<ILocoStruct> GetViewModelFromStruct(ILocoStruct l
 		public override void Load()
 		{
 			// this stops any currently-playing sounds
-			if (ExtraContentViewModel is SoundViewModel svm)
+			if (ExtraContentViewModel is AudioViewModel svm)
 			{
 				svm.Dispose();
 			}
@@ -132,7 +132,7 @@ public override void Load()
 						: new DefaultImageTableNameProvider();
 
 					ExtraContentViewModel = CurrentObject.LocoObject.Object is SoundObject soundObject
-						? new SoundViewModel(CurrentObject.DatFileInfo.S5Header.Name, soundObject.SoundObjectData.PcmHeader, soundObject.PcmData)
+						? new AudioViewModel(CurrentObject.DatFileInfo.S5Header.Name, soundObject.SoundObjectData.PcmHeader, soundObject.PcmData)
 						: new ImageTableViewModel(CurrentObject.LocoObject, imageNameProvider, Model.PaletteMap, CurrentObject.Images, Model.Logger);
 				}
 				else
@@ -226,6 +226,20 @@ void SaveCore(string filename)
 				CurrentObject.LocoObject.Object = CurrentObjectViewModel.GetAsUnderlyingType(CurrentObject.LocoObject.Object);
 			}
 
+			// this is hacky but it should work
+			if (ExtraContentViewModel is AudioViewModel avm && CurrentObject.LocoObject.Object is SoundObject so)
+			{
+				CurrentObject.LocoObject.Object = so with
+				{
+					PcmData = avm.Data,
+					SoundObjectData = so.SoundObjectData with
+					{
+						PcmHeader = SawyerStreamWriter.RiffToWaveFormatEx(avm.Header),
+						Length = (uint)avm.Data.Length
+					}
+				};
+			}
+
 			SawyerStreamWriter.Save(filename,
 				S5HeaderViewModel?.Name ?? CurrentObject.DatFileInfo.S5Header.Name,
 				S5HeaderViewModel?.SourceGame ?? CurrentObject.DatFileInfo.S5Header.SourceGame,

Gui/ViewModels/DatTypes/MusicViewModel.cs

@@ -16,7 +16,7 @@ public MusicViewModel(FileSystemItem currentFile, ObjectEditorModel model)
 		public override void Load()
 		{
 			var (header, data) = SawyerStreamReader.LoadWavFile(CurrentFile.Filename);
-			SoundViewModel = new SoundViewModel(
+			SoundViewModel = new AudioViewModel(
 				GetDisplayName(CurrentFile.DisplayName),
 				header,
 				data);
@@ -38,7 +38,7 @@ static string GetDisplayName(string filename)
 		}
 
 		[Reactive]
-		public SoundViewModel SoundViewModel { get; set; }
+		public AudioViewModel SoundViewModel { get; set; }
 
 		public override void Save()
 		{

Gui/ViewModels/DatTypes/SoundEffectsViewModel.cs

@@ -20,12 +20,12 @@ public override void Load()
 		{
 			var soundIdNames = Enum.GetValues<SoundId>();
 			SoundViewModels = SawyerStreamReader.LoadSoundEffectsFromCSS(CurrentFile.Filename)
-				.Select((x, i) => new SoundViewModel(soundIdNames[i].ToString(), x.header, x.data))
+				.Select((x, i) => new AudioViewModel(soundIdNames[i].ToString(), x.header, x.data))
 				.ToBindingList();
 		}
 
 		[Reactive]
-		public BindingList<SoundViewModel> SoundViewModels { get; set; } = [];
+		public BindingList<AudioViewModel> SoundViewModels { get; set; } = [];
 
 		public override void Save()
 		{

Gui/ViewModels/SubObjectTypes/SoundViewModel.cs renamed to Gui/ViewModels/SubObjectTypes/AudioViewModel.cs

@@ -14,14 +14,14 @@
 
 namespace OpenLoco.Gui.ViewModels
 {
-	public class SoundViewModel : ReactiveObject, IExtraContentViewModel, IDisposable
+	public class AudioViewModel : ReactiveObject, IExtraContentViewModel, IDisposable
 	{
 		WaveOutEvent? CurrentWOEvent { get; set; }
 
-		public SoundViewModel(string soundName, WaveFormatEx pcmHeader, byte[] pcmData)
+		public AudioViewModel(string soundName, WaveFormatEx pcmHeader, byte[] pcmData)
 			: this(soundName, SawyerStreamWriter.WaveFormatExToRiff(pcmHeader, pcmData.Length), pcmData) { }
 
-		public SoundViewModel(string soundName, RiffWavHeader riffHeader, byte[] pcmData)
+		public AudioViewModel(string soundName, RiffWavHeader riffHeader, byte[] pcmData)
 		{
 			Name = soundName;
 			Header = riffHeader;

Gui/Views/MainWindow.axaml

@@ -195,7 +195,7 @@
 			</ScrollViewer>
 		</DataTemplate>
 
-		<DataTemplate DataType="vm:SoundViewModel">
+		<DataTemplate DataType="vm:AudioViewModel">
 			<Border BorderThickness="1">
 				<StackPanel Orientation="Vertical" Background="{DynamicResource ScrollBarTrackFill}">
 					<StackPanel Margin="4" Orientation="Horizontal">