rm factory method

Picovoice · Sep 11, 2024 · ce98fa8 · ce98fa8
1 parent 55bc839
commit ce98fa8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/binding/dotnet/PvSpeaker/PvSpeaker.cs b/binding/dotnet/PvSpeaker/PvSpeaker.cs
@@ -107,28 +107,6 @@ private static IntPtr ImportResolver(string libraryName, Assembly assembly, DllI
         [DllImport(LIBRARY, CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr pv_speaker_version();
 
-        /// <summary>
-        /// Factory method for creating instances of PvSpeaker.
-        /// </summary>
-        /// <param name="sampleRate">
-        /// The sample rate of the audio to be played.
-        /// </param>
-        /// <param name="bitsPerSample">
-        /// The number of bits per sample of the audio to be played.
-        /// </param>
-        /// <param name="bufferSizeSecs">
-        /// The size in seconds of the internal buffer used to buffer PCM data
-        /// - i.e. internal circular buffer will be of size `sampleRate` * `bufferSizeSecs`.
-        /// </param>
-        /// <param name="deviceIndex">
-        /// The index of the audio device to play audio from. A value of (-1) will use the default audio device.
-        /// </param>
-        /// <returns>An instance of PvSpeaker.</returns>
-        public static PvSpeaker Create(int sampleRate, int bitsPerSample, int bufferSizeSecs = 20, int deviceIndex = -1)
-        {
-            return new PvSpeaker(sampleRate, bitsPerSample, bufferSizeSecs, deviceIndex);
-        }
-
         /// <summary>
         /// Constructor for PvSpeaker.
         /// </summary>
@@ -145,7 +123,7 @@ public static PvSpeaker Create(int sampleRate, int bitsPerSample, int bufferSize
         /// <param name="deviceIndex">
         /// The index of the audio device to play audio from. A value of (-1) will use the default audio device.
         /// </param>
-        private PvSpeaker(int sampleRate, int bitsPerSample, int bufferSizeSecs, int deviceIndex)
+        public PvSpeaker(int sampleRate, int bitsPerSample, int bufferSizeSecs = 20, int deviceIndex = -1)
         {
             if (sampleRate <= 0)
             {
@@ -213,7 +191,6 @@ public void Stop()
         /// <returns>Number of samples that were successfully written.</returns>
         public int Write(byte[] pcm)
         {
-            // Create a pointer to the byte array to pass to `pv_speaker_write` .
             GCHandle pinnedArray = GCHandle.Alloc(pcm, GCHandleType.Pinned);
             IntPtr pcmPtr = pinnedArray.AddrOfPinnedObject();
 
@@ -236,8 +213,6 @@ public int Write(byte[] pcm)
         public int Flush(byte[] pcm = null)
         {
             pcm = pcm ?? Array.Empty<byte>();
-
-            // Create a pointer to the byte array to pass to `pv_speaker_flush`.
             GCHandle pinnedArray = GCHandle.Alloc(pcm, GCHandleType.Pinned);
             IntPtr pcmPtr = pinnedArray.AddrOfPinnedObject();
 

diff --git a/binding/dotnet/PvSpeakerTest/MainTest.cs b/binding/dotnet/PvSpeakerTest/MainTest.cs
@@ -27,7 +27,7 @@ public class MainTest
         [TestMethod]
         public void TestInit()
         {
-            PvSpeaker speaker = PvSpeaker.Create(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0);
+            var speaker = new PvSpeaker(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0);
             Assert.IsNotNull(speaker);
             Assert.IsTrue(speaker.SampleRate == SAMPLE_RATE);
             Assert.IsTrue(speaker.BitsPerSample == BITS_PER_SAMPLE);
@@ -40,7 +40,7 @@ public void TestInit()
         [TestMethod]
         public void TestStartStop()
         {
-            using (PvSpeaker speaker = PvSpeaker.Create(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0))
+            using (var speaker = new PvSpeaker(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0))
             {
                 Assert.IsFalse(speaker.IsStarted);
                 speaker.Start();
@@ -72,7 +72,7 @@ public void TestStartStop()
         [TestMethod]
         public void TestWriteFlush()
         {
-            using (PvSpeaker speaker = PvSpeaker.Create(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0))
+            using (var speaker = new PvSpeaker(SAMPLE_RATE, BITS_PER_SAMPLE, BUFFER_SIZE_SECS, deviceIndex: 0))
             {
                 speaker.Start();
 

diff --git a/demo/dotnet/PvSpeakerDemo/PvSpeakerDemo.cs b/demo/dotnet/PvSpeakerDemo/PvSpeakerDemo.cs
@@ -214,7 +214,7 @@ static void Main(string[] args)
             {
                 WavFileInfo wavInfo = GetWavFileInfo(inputWavPath);
 
-                using (PvSpeaker speaker = PvSpeaker.Create(
+                using (var speaker = new PvSpeaker(
                         sampleRate: wavInfo.SampleRate,
                         bitsPerSample: wavInfo.BitsPerSample,
                         bufferSizeSecs: bufferSizeSecs,