指定した出力デバイスで再生する機能を削除

OBS Studioのアプリケーション音声キャプチャとモニタリングデバイスの設定で同様のことが可能であるため。
esperecyan · Sep 4, 2023 · feb8224 · feb8224
1 parent 43315c4
commit feb8224
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 288 deletions.
diff --git a/App.config b/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
@@ -14,12 +14,6 @@
             <setting name="VoicevoxPath" serializeAs="String">
                 <value />
             </setting>
-            <setting name="OuputDeviceName" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="Volume" serializeAs="String">
-                <value>1</value>
-            </setting>
         </Esperecyan.NCVVoicevox.Properties.Settings>
     </userSettings>
 <applicationSettings>
@@ -30,9 +24,6 @@
             <setting name="EngineFileRelativePath" serializeAs="String">
                 <value>./run.exe</value>
             </setting>
-            <setting name="ProxyServerPort" serializeAs="String">
-                <value>49430</value>
-            </setting>
             <setting name="EnginePort" serializeAs="String">
                 <value>50021</value>
             </setting>

diff --git a/App.xaml.cs b/App.xaml.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
 using Application = System.Windows.Application;
 using System.Windows.Forms;
-using NAudio.Wave;
 using Esperecyan.NCVVoicevox.Properties;
 
 namespace Esperecyan.NCVVoicevox;
@@ -16,7 +13,6 @@ namespace Esperecyan.NCVVoicevox;
 public partial class App : Application
 {
     internal static readonly string Title;
-    private static readonly int PossibleVolumeValueCount = 100;
 
     static App()
     {
@@ -25,75 +21,6 @@ static App()
                 + " " + assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
     }
 
-    /// <summary>
-    /// 音声出力デバイス名の一覧を取得します。
-    /// </summary>
-    /// <returns><see cref="WaveOut.DeviceNumber"/> へ指定するインデックス順で返します。</returns>
-    private static IEnumerable<string> GetOutputDeviceNames()
-    {
-        var indexNamePairs = new List<string>();
-        for (var i = 0; i < WaveOut.DeviceCount; i++)
-        {
-            indexNamePairs.Add(WaveOut.GetCapabilities(i).ProductName);
-        }
-        return indexNamePairs;
-    }
-
-    /// <summary>
-    /// ユーザー設定から、選択中の音声出力デバイス名を取得します。
-    /// </summary>
-    /// <returns>既定のデバイスが選択されていた場合、もしくは存在しないデバイス名が選択されていた場合は、<c>null</c> を返します。</returns>
-    private static string? GetCurrentOutputDeviceName()
-    {
-        var name = Settings.Default.OuputDeviceName;
-        return !string.IsNullOrEmpty(name) && App.GetOutputDeviceNames().Contains(name) ? name : null;
-    }
-
-    /// <summary>
-    /// ユーザー設定で選択中の音声出力デバイス名をもとに、<see cref="WaveOut.DeviceNumber"/> へ指定する値を取得します。
-    /// </summary>
-    /// <returns>既定のデバイスが選択されていた場合、もしくは存在しないデバイス名が選択されていた場合は、<c>-1</c> を返します。</returns>
-    private static int GetCurrentOutputDeviceIndex()
-    {
-        var name = App.GetCurrentOutputDeviceName();
-        return name == null ? -1 : App.GetOutputDeviceNames().ToList().IndexOf(name);
-    }
-
-    /// <summary>
-    /// メニュー内の音声出力デバイス選択アイテムを更新します。
-    /// </summary>
-    /// <param name="menuItems"></param>
-    private static void UpdateDeviceMenuItems(ToolStripItemCollection menuItems)
-    {
-        var currentDeviceName = App.GetCurrentOutputDeviceName();
-
-        foreach (var item
-            in menuItems.Cast<ToolStripItem>().Where(item => item.Name.StartsWith("output-device")).ToList())
-        {
-            menuItems.Remove(item);
-        }
-
-        var labels = new[] { "既定のデバイス" }.Concat(App.GetOutputDeviceNames());
-        for (var i = 0; i < labels.Count(); i++)
-        {
-            var name = labels.ElementAt(i);
-            var item = new ToolStripMenuItem(name)
-            {
-                Name = "output-device" + (i == 0 ? "-default" : ""),
-                Checked = currentDeviceName == (i == 0 ? null : name),
-            };
-            if (!item.Checked)
-            {
-                item.Click += (_, _) =>
-                {
-                    Settings.Default.OuputDeviceName = item.Name == "output-device-default" ? null : item.Text;
-                    Settings.Default.Save();
-                };
-            }
-            menuItems.Insert(menuItems.Count - 1, item);
-        }
-    }
-
     private App()
     {
         Settings.Default.Upgrade();
@@ -127,57 +54,15 @@ private App()
             return;
         }
 
-        var waveOut = new WaveOut();
-
         var engineServer = new EngineServer(Settings.Default.EnginePort);
-        var proxyServer = new ProxyServer(Settings.Default.ProxyServerPort, Settings.Default.EnginePort);
-
-        proxyServer.ProxyEvent += async (_, args) =>
-        {
-            if (!args.Response.IsSuccessStatusCode
-                || args.Response.RequestMessage?.RequestUri?.LocalPath != "/synthesis")
-            {
-                return null;
-            }
-
-            var reader = new WaveFileReader(await args.Response.Content.ReadAsStreamAsync());
-            waveOut.DeviceNumber = App.GetCurrentOutputDeviceIndex();
-            waveOut.Init(reader);
-            waveOut.Play();
-
-            // 同じ長さの無音のWAVデータを返却
-            var stream = new MemoryStream();
-            using var writer = new WaveFileWriter(stream, reader.WaveFormat);
-            await writer.WriteAsync(new byte[reader.Length]);
-            await writer.FlushAsync();
-            stream.Seek(0, SeekOrigin.Begin);
-            var responseEntity = new byte[stream.Length];
-            await stream.ReadAsync(responseEntity);
-            return responseEntity;
-        };
 
         var contextMenuStrip = new ContextMenuStrip()
         {
             Renderer = new VolumeIconRenderer(),
         };
         var menuItems = contextMenuStrip.Items;
-        var volumeBar = new TrackBar()
-        {
-            Maximum = App.PossibleVolumeValueCount,
-            Width = 200,
-            TickFrequency = 10,
-            Value = (int)((waveOut.Volume = Settings.Default.Volume) * App.PossibleVolumeValueCount),
-        };
-        volumeBar.ValueChanged += (_, _) =>
-        {
-            Settings.Default.Volume = waveOut.Volume = (float)volumeBar.Value / App.PossibleVolumeValueCount;
-            Settings.Default.Save();
-        };
-        menuItems.Add(new ToolStripControlHost(volumeBar, "volume"));
         menuItems.Add(new ToolStripMenuItem("終了", image: null, (sender, e) => this.Shutdown()));
 
-        contextMenuStrip.Opening += (_, _) => App.UpdateDeviceMenuItems(menuItems);
-
         var notifyIcon = new NotifyIcon()
         {
             Text = App.Title,

diff --git a/NAudio - license.txt b/NAudio - license.txt
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -8,9 +8,6 @@
     <Setting Name="EngineFileRelativePath" Type="System.String" Scope="Application">
       <Value Profile="(Default)">./run.exe</Value>
     </Setting>
-    <Setting Name="ProxyServerPort" Type="System.Int32" Scope="Application">
-      <Value Profile="(Default)">49430</Value>
-    </Setting>
     <Setting Name="EnginePort" Type="System.Int32" Scope="Application">
       <Value Profile="(Default)">50021</Value>
     </Setting>
@@ -20,11 +17,5 @@
     <Setting Name="VoicevoxPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="OuputDeviceName" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-    <Setting Name="Volume" Type="System.Single" Scope="User">
-      <Value Profile="(Default)">1</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/ProxyServer.cs b/ProxyServer.cs
diff --git a/ncv-voicevox.csproj b/ncv-voicevox.csproj
@@ -13,10 +13,6 @@
     <UseWindowsForms>True</UseWindowsForms>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NAudio.WinForms" Version="2.1.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -26,9 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="NAudio - license.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>