Merge pull request #1174 from oxygen-dioxide/midi

stakira · web-flow · commit 3a2ad5ef6e81 · 2024-07-21T18:23:23.000-07:00
Remove NAudio midi importer
diff --git a/OpenUtau.Core/Format/Midi.cs b/OpenUtau.Core/Format/Midi.cs
diff --git a/OpenUtau.Core/OpenUtau.Core.csproj b/OpenUtau.Core/OpenUtau.Core.csproj
@@ -14,7 +14,6 @@
     <PackageReference Include="K4os.Hash.xxHash" Version="1.0.8" />
     <PackageReference Include="Melanchall.DryWetMidi" Version="7.0.2" />
     <PackageReference Include="NAudio.Core" Version="2.2.1" />
-    <PackageReference Include="NAudio.Midi" Version="2.2.1" />
     <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLayer.NAudioSupport" Version="1.4.0" />
diff --git a/OpenUtau/ViewModels/MainWindowViewModel.cs b/OpenUtau/ViewModels/MainWindowViewModel.cs
@@ -181,12 +181,12 @@ public void ImportAudio(string file) {
             DocManager.Inst.EndUndoGroup();
         }
 
-        public void ImportMidi(string file, bool UseDrywetmidi = true) {
+        public void ImportMidi(string file) {
             if (file == null) {
                 return;
             }
             var project = DocManager.Inst.Project;
-            var parts = UseDrywetmidi ? Core.Format.MidiWriter.Load(file, project) : Core.Format.Midi.Load(file, project);
+            var parts = Core.Format.MidiWriter.Load(file, project);
             DocManager.Inst.StartUndoGroup();
             foreach (var part in parts) {
                 var track = new UTrack(project);
diff --git a/OpenUtau/Views/MainWindow.axaml b/OpenUtau/Views/MainWindow.axaml
@@ -48,9 +48,7 @@
             <MenuItem Header="-" Height="1"/>
             <MenuItem Header="{DynamicResource menu.file.importtracks}" Click="OnMenuImportTracks"/>
             <MenuItem Header="{DynamicResource menu.file.importaudio}" Click="OnMenuImportAudio"/>
-            <MenuItem Header="{DynamicResource menu.file.importmidi}">
-              <MenuItem Header="{DynamicResource menu.file.importmidi.naudio}" Click="OnMenuImportMidiNaudio"/>
-              <MenuItem Header="{DynamicResource menu.file.importmidi.drywetmidi}" Click="OnMenuImportMidiDrywetmidi"/>
+            <MenuItem Header="{DynamicResource menu.file.importmidi}" Click="OnMenuImportMidi">
             </MenuItem>
             <MenuItem Header="-" Height="1"/>
             <MenuItem Header="{DynamicResource menu.file.exportaudio}">
diff --git a/OpenUtau/Views/MainWindow.axaml.cs b/OpenUtau/Views/MainWindow.axaml.cs
@@ -370,28 +370,20 @@ async void OnMenuImportAudio(object sender, RoutedEventArgs args) {
             }
         }
 
-        async void OnMenuImportMidi(bool UseDrywetmidi = false) {
+        async void OnMenuImportMidi(object sender, RoutedEventArgs args) {
             var file = await FilePicker.OpenFileAboutProject(
                 this, "menu.file.importmidi", FilePicker.MIDI);
             if (file == null) {
                 return;
             }
             try {
-                viewModel.ImportMidi(file, UseDrywetmidi);
+                viewModel.ImportMidi(file);
             } catch (Exception e) {
                 Log.Error(e, "Failed to import midi");
                 _ = await MessageBox.ShowError(this, new MessageCustomizableException("Failed to import midi", "<translate:errors.failed.importmidi>", e));
             }
         }
 
-        void OnMenuImportMidiNaudio(object sender, RoutedEventArgs args) {
-            OnMenuImportMidi(false);
-        }
-
-        void OnMenuImportMidiDrywetmidi(object sender, RoutedEventArgs args) {
-            OnMenuImportMidi(true);
-        }
-
         async void OnMenuExportMixdown(object sender, RoutedEventArgs args) {
             var project = DocManager.Inst.Project;
             var file = await FilePicker.SaveFileAboutProject(

Original file line number	Diff line number	Diff line change
`@@ -181,12 +181,12 @@ public void ImportAudio(string file) {`
`181`	`181`	`DocManager.Inst.EndUndoGroup();`
`182`	`182`	`}`
`183`	`183`
`184`		`- public void ImportMidi(string file, bool UseDrywetmidi = true) {`
	`184`	`+ public void ImportMidi(string file) {`
`185`	`185`	`if (file == null) {`
`186`	`186`	`return;`
`187`	`187`	`}`
`188`	`188`	`var project = DocManager.Inst.Project;`
`189`		`- var parts = UseDrywetmidi ? Core.Format.MidiWriter.Load(file, project) : Core.Format.Midi.Load(file, project);`
	`189`	`+ var parts = Core.Format.MidiWriter.Load(file, project);`
`190`	`190`	`DocManager.Inst.StartUndoGroup();`
`191`	`191`	`foreach (var part in parts) {`
`192`	`192`	`var track = new UTrack(project);`
Original file line number	Diff line number	Diff line change
`@@ -370,28 +370,20 @@ async void OnMenuImportAudio(object sender, RoutedEventArgs args) {`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- async void OnMenuImportMidi(bool UseDrywetmidi = false) {`
	`373`	`+ async void OnMenuImportMidi(object sender, RoutedEventArgs args) {`
`374`	`374`	`var file = await FilePicker.OpenFileAboutProject(`
`375`	`375`	`this, "menu.file.importmidi", FilePicker.MIDI);`
`376`	`376`	`if (file == null) {`
`377`	`377`	`return;`
`378`	`378`	`}`
`379`	`379`	`try {`
`380`		`- viewModel.ImportMidi(file, UseDrywetmidi);`
	`380`	`+ viewModel.ImportMidi(file);`
`381`	`381`	`} catch (Exception e) {`
`382`	`382`	`Log.Error(e, "Failed to import midi");`
`383`	`383`	`_ = await MessageBox.ShowError(this, new MessageCustomizableException("Failed to import midi", "<translate:errors.failed.importmidi>", e));`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`
`387`		`- void OnMenuImportMidiNaudio(object sender, RoutedEventArgs args) {`
`388`		`- OnMenuImportMidi(false);`
`389`		`- }`
`390`		`-`
`391`		`- void OnMenuImportMidiDrywetmidi(object sender, RoutedEventArgs args) {`
`392`		`- OnMenuImportMidi(true);`
`393`		`- }`
`394`		`-`
`395`	`387`	`async void OnMenuExportMixdown(object sender, RoutedEventArgs args) {`
`396`	`388`	`var project = DocManager.Inst.Project;`
`397`	`389`	`var file = await FilePicker.SaveFileAboutProject(`