release 1.6.0

teamclouday · May 4, 2022 · 33c4b90 · 33c4b90
1 parent ab70291
commit 33c4b90
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 21 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 30
         versionCode 6
-        versionName "1.5"
+        versionName "1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/Android/app/src/main/java/com/example/microphone/audio/AudioBuffer.kt b/Android/app/src/main/java/com/example/microphone/audio/AudioBuffer.kt
@@ -6,7 +6,7 @@ import kotlinx.coroutines.sync.withLock
 class AudioBuffer
 {
     // set buffer size for latency
-    private val BUFFER_SIZE = 3
+    private val BUFFER_SIZE = 5
     // actual buffer of byte arrays (FIFO with queue)
     private val buffer = ArrayDeque<ByteArray>()
     // mutex for coroutines

diff --git a/Windows/AndroidMic/AndroidMic.csproj b/Windows/AndroidMic/AndroidMic.csproj
@@ -29,8 +29,8 @@
     <TargetCulture>en</TargetCulture>
     <ProductName>AndroidMic</ProductName>
     <PublisherName>Teamclouday</PublisherName>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.5.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.6.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -47,12 +47,13 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>icon.ico</ApplicationIcon>

diff --git a/Windows/AndroidMic/AndroidMic.csproj.user b/Windows/AndroidMic/AndroidMic.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
-    <SupportUrlHistory />
+    <SupportUrlHistory>https://github.com/teamclouday/AndroidMic</SupportUrlHistory>
     <UpdateUrlHistory />
     <BootstrapperUrlHistory />
     <ErrorReportUrlHistory />

diff --git a/Windows/AndroidMic/Library/Audio/AudioBuffer.cs b/Windows/AndroidMic/Library/Audio/AudioBuffer.cs
@@ -4,7 +4,7 @@ namespace AndroidMic.Audio
 {
     public class AudioBuffer
     {
-        public const int MAX_BUFFER_SIZE = 3;
+        public const int MAX_BUFFER_SIZE = 5;
         private readonly Queue<byte[]> buffer = new Queue<byte[]>();
         private readonly object toLock = new object();
 

diff --git a/Windows/AndroidMic/Library/Audio/AudioManager.cs b/Windows/AndroidMic/Library/Audio/AudioManager.cs
@@ -20,7 +20,7 @@ public class AudioManager
         private WaveOutCapabilities[] devices;
         private int selectedDeviceIdx;
         private IWavePlayer player;
-        private readonly int playerDesiredLatency = 50;
+        private readonly int playerDesiredLatency = 100;
         private readonly int playerNumberOfBuffers = 3;
         private readonly WaveFormat format;
 

diff --git a/Windows/AndroidMic/Library/Streaming/StreamManager.cs b/Windows/AndroidMic/Library/Streaming/StreamManager.cs
@@ -70,18 +70,8 @@ public void Start()
             AddLog("Server Starts Listening...\n" + server.GetServerInfo());
         }
 
-        // stop server
-        public void Stop()
-        {
-            processAllowed = false;
-            if (processThread != null && processThread.IsAlive)
-                processThread.Join();
-            server?.Shutdown();
-            AddLog("Server Stopped");
-        }
-
         // shutdown server
-        public void Shutdown()
+        public void Stop()
         {
             processAllowed = false;
             Thread.Sleep(MAX_WAIT_TIME);

diff --git a/Windows/AndroidMic/MainWindow.xaml.cs b/Windows/AndroidMic/MainWindow.xaml.cs
@@ -90,7 +90,7 @@ protected override void OnStateChanged(EventArgs e)
         // close event for main window
         private void MainWindow_Closing(object sender, CancelEventArgs e)
         {
-            streamM?.Shutdown();
+            streamM?.Stop();
             audioM?.Shutdown();
             notifyIcon?.Dispose();
         }

diff --git a/Windows/AndroidMic/Properties/AssemblyInfo.cs b/Windows/AndroidMic/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Teamclouday")]
 [assembly: AssemblyProduct("AndroidMic")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]