robert/alsa-scarlett-gui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hard-coded values from widget-gain.c and widget-volume.c

Browse Source 
Update alsa-sim.c and alsa.c to read the TLV info, and update the gain
and volume widgets to use that info rather than hard-coding the
min/max values.
This commit is contained in:
Geoffrey D. Bennett
2023-11-30 23:57:47 +10:30
parent 197f469bd8
commit be458afcc4
5 changed files with 116 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/widget-gain.c
View File

@@ -4,11 +4,6 @@
#include "gtkdial.h"
#include "widget-gain.h"
// gain controls -80dB - +6dB, 0.5dB steps
#define DIAL_MIN_VALUE 0
#define DIAL_MAX_VALUE 172
#define DIAL_ZERO_DB_VALUE 160
static void gain_changed(GtkWidget *widget, struct alsa_elem *elem) {
int value = gtk_dial_get_value(GTK_DIAL(widget));
@@ -23,7 +18,10 @@ static void gain_updated(struct alsa_elem *elem) {
gtk_dial_set_value(GTK_DIAL(elem->widget), value);
char s[20];
snprintf(s, 20, "%.1f", (value / 2.0) - 80);
float scale = (float)(elem->max_dB - elem->min_dB) /
(elem->max_val - elem->min_val);
snprintf(s, 20, "%.1f", value * scale + elem->min_dB);
gtk_label_set_text(GTK_LABEL(elem->widget2), s);
}
@@ -32,9 +30,15 @@ GtkWidget *make_gain_alsa_elem(struct alsa_elem *elem) {
gtk_widget_set_hexpand(vbox, TRUE);
GtkWidget *dial = gtk_dial_new_with_range(
DIAL_MIN_VALUE, DIAL_MAX_VALUE, 1
elem->min_val, elem->max_val, 1
);
gtk_dial_set_zero_db(GTK_DIAL(dial), DIAL_ZERO_DB_VALUE);
// calculate 0dB value from min/max dB and min/max value
float scale = (float)(elem->max_dB - elem->min_dB) /
(elem->max_val - elem->min_val);
int zero_db_value = (int)((0 - elem->min_dB) / scale + elem->min_val);
gtk_dial_set_zero_db(GTK_DIAL(dial), zero_db_value);
gtk_widget_set_vexpand(dial, TRUE);