Skip to content
Snippets Groups Projects
Commit c2b41e5c authored by Nicolas Pomepuy's avatar Nicolas Pomepuy
Browse files

Show the band value in the equalizer

Fixes #1238
parent 5421e6d2
No related branches found
No related tags found
Loading
Pipeline #15218 failed with stage
in 21 minutes and 46 seconds
......@@ -48,5 +48,15 @@
android:textSize="10sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/band_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif-medium"
android:textColor="?attr/font_audio_light"
android:gravity="center"
android:textSize="10sp" />
</LinearLayout>
\ No newline at end of file
......@@ -36,8 +36,9 @@ import org.videolan.vlc.interfaces.OnEqualizerBarChangeListener
class EqualizerBar : LinearLayout {
private lateinit var bandValueTextView: TextView
private lateinit var verticalSeekBar: VerticalSeekBar
private var bandTextView: TextView? = null
private lateinit var bandTextView: TextView
private var listener: OnEqualizerBarChangeListener? = null
override fun setNextFocusLeftId(nextFocusLeftId: Int) {
......@@ -63,6 +64,7 @@ class EqualizerBar : LinearLayout {
// fromUser will always be false
// So use custom getFromUser() instead of fromUser
listener?.onProgressChanged(value, isFromUser())
updateValueText()
}
}
......@@ -88,14 +90,22 @@ class EqualizerBar : LinearLayout {
verticalSeekBar.progress = RANGE
verticalSeekBar.setOnSeekBarChangeListener(seekListener)
bandTextView = findViewById(R.id.equalizer_band)
bandTextView!!.text = if (band < 999.5f)
bandValueTextView = findViewById(R.id.band_value)
bandTextView.text = if (band < 999.5f)
(band + 0.5f).toInt().toString() + "Hz"
else
(band / 1000.0f + 0.5f).toInt().toString() + "kHz"
updateValueText()
}
private fun updateValueText() {
val newValue = (verticalSeekBar.progress / 10) - 20
bandValueTextView.text = if (newValue > 0) "+${newValue}dB" else "${newValue}dB"
}
fun setValue(value: Float) {
verticalSeekBar.progress = (value * PRECISION + RANGE).toInt()
updateValueText()
}
fun setListener(listener: OnEqualizerBarChangeListener?) {
......@@ -104,6 +114,7 @@ class EqualizerBar : LinearLayout {
fun setProgress(fl: Int) {
verticalSeekBar.progress = fl
updateValueText()
}
fun getProgress(): Int = verticalSeekBar.progress
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment