Protocol v4

- Updated to work with the rewritten server
- Updated kotlin
- Audio Session name is nicer now

Author: Wavesonics

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.darkrockstudios.apps.pcvolumemixer"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 9
-        versionName "0.06"
+        versionCode 10
+        versionName "0.07"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     compileOptions {

app/src/main/java/com/darkrockstudios/apps/pcvolumemixer/AudioSessionViewHolder.kt

@@ -44,7 +44,7 @@ class AudioSessionViewHolder(rootView: View, session: AudioSession, listener: Vo
 		}
 		m_volumeBar.max = 100
 
-		m_volumeBar.progress = (session.volume * 100).toInt()
+		m_volumeBar.progress = session.volume.toInt()
 
 		m_volumeBar.setOnSeekBarChangeListener(this)
 
@@ -66,7 +66,7 @@ class AudioSessionViewHolder(rootView: View, session: AudioSession, listener: Vo
 
 	override fun onStopTrackingTouch(seekBar: SeekBar?)
 	{
-		val volume = (m_volumeBar.progress / 100f)
+		val volume = m_volumeBar.progress.toFloat()
 		val isMuted = muteButton.isChecked
 
 		if (m_isMaster)
@@ -81,7 +81,7 @@ class AudioSessionViewHolder(rootView: View, session: AudioSession, listener: Vo
 
 	override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean)
 	{
-		val volume = (m_volumeBar.progress / 100f)
+		val volume = m_volumeBar.progress.toFloat()
 		val isMuted = muteButton.isChecked
 
 		if (m_isMaster)

app/src/main/java/com/darkrockstudios/apps/pcvolumemixer/MainActivity.kt

@@ -332,7 +332,7 @@ class MainActivity : AppCompatActivity(), TcpClient.ServerListener, AudioSession
 
 			// Add master control
 			val master = AudioSession(getString(R.string.master_audio_session_name),
-			                          pcAudio.defaultDevice.masterVolume ?: 1.0f,
+			                          pcAudio.defaultDevice.masterVolume ?: 100.0f,
 			                          pcAudio.defaultDevice.masterMuted ?: false)
 
 			val masterRootView = LayoutInflater.from(this).inflate(R.layout.audio_session_master, MIXER_container, false)
@@ -439,7 +439,7 @@ class MainActivity : AppCompatActivity(), TcpClient.ServerListener, AudioSession
 				{
 					if (pcAudio.defaultDevice.masterVolume != null)
 					{
-						val newVolume = Math.max(pcAudio.defaultDevice.masterVolume - 0.1f, 0.0f)
+						val newVolume = Math.max(pcAudio.defaultDevice.masterVolume - 10.0f, 0.0f)
 						onMasterVolumeChange(newVolume, pcAudio.defaultDevice.masterMuted ?: false)
 
 						m_pcAudio = pcAudio.copy(defaultDevice = pcAudio.defaultDevice.copy(masterVolume = newVolume))
@@ -451,7 +451,7 @@ class MainActivity : AppCompatActivity(), TcpClient.ServerListener, AudioSession
 				{
 					if (pcAudio.defaultDevice.masterVolume != null)
 					{
-						val newVolume = Math.min(pcAudio.defaultDevice.masterVolume + 0.1f, 1.0f)
+						val newVolume = Math.min(pcAudio.defaultDevice.masterVolume + 10.0f, 1.0f)
 						onMasterVolumeChange(newVolume, pcAudio.defaultDevice.masterMuted ?: false)
 
 						m_pcAudio = pcAudio.copy(defaultDevice = pcAudio.defaultDevice.copy(masterVolume = newVolume))

app/src/main/java/com/darkrockstudios/apps/pcvolumemixer/Version.kt

@@ -3,4 +3,4 @@ package com.darkrockstudios.apps.pcvolumemixer
 /**
  * Created by adamw on 11/19/2017.
  */
-val VERSION = 3
+val VERSION = 4

app/src/main/res/layout/audio_session.xml

@@ -18,6 +18,9 @@
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:maxWidth="150dp"
+		android:lines="2"
 		android:id="@+id/AUDIO_name"
 		tools:text="Channel"
 		android:textAppearance="@android:style/TextAppearance"/>

app/src/main/res/layout/audio_session_master.xml

@@ -18,6 +18,8 @@
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:lines="2"
 		android:id="@+id/AUDIO_name"
 		tools:text="Channel"
 		android:textStyle="bold"

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.60'
+    ext.kotlin_version = '1.2.0'
     repositories {
         google()
         jcenter()