mirror of
https://github.com/alsa-project/alsa-tools.git
synced 2026-02-20 01:40:15 -05:00
Completed mixer API. Improved iterators. Renamed control values struct. Rewritten simple elements implementation
This commit is contained in:
parent
f7fbb6ce1a
commit
a189f2d0ec
5 changed files with 12 additions and 12 deletions
|
|
@ -1029,7 +1029,7 @@ int main(int argc, char **argv)
|
||||||
char name[32], title[128];
|
char name[32], title[128];
|
||||||
int err;
|
int err;
|
||||||
unsigned int cards_mask;
|
unsigned int cards_mask;
|
||||||
snd_ctl_elem_t ctl;
|
snd_ctl_elem_value_t ctl;
|
||||||
// snd_mixer_filter_t filter;
|
// snd_mixer_filter_t filter;
|
||||||
|
|
||||||
/* Go through gtk initialization */
|
/* Go through gtk initialization */
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,11 @@
|
||||||
|
|
||||||
#include "envy24control.h"
|
#include "envy24control.h"
|
||||||
|
|
||||||
static snd_ctl_elem_t spdif_master;
|
static snd_ctl_elem_value_t spdif_master;
|
||||||
static snd_ctl_elem_t word_clock_sync;
|
static snd_ctl_elem_value_t word_clock_sync;
|
||||||
static snd_ctl_elem_t volume_rate;
|
static snd_ctl_elem_value_t volume_rate;
|
||||||
static snd_ctl_elem_t spdif_input;
|
static snd_ctl_elem_value_t spdif_input;
|
||||||
static snd_ctl_elem_t spdif_output;
|
static snd_ctl_elem_value_t spdif_output;
|
||||||
|
|
||||||
#define toggle_set(widget, state) \
|
#define toggle_set(widget, state) \
|
||||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state);
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state);
|
||||||
|
|
@ -96,7 +96,7 @@ void master_clock_toggled(GtkWidget *togglebutton, gpointer data)
|
||||||
|
|
||||||
gint master_clock_status_timeout_callback(gpointer data)
|
gint master_clock_status_timeout_callback(gpointer data)
|
||||||
{
|
{
|
||||||
snd_ctl_elem_t sw;
|
snd_ctl_elem_value_t sw;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (card_eeprom.subvendor != ICE1712_SUBDEVICE_DELTA1010)
|
if (card_eeprom.subvendor != ICE1712_SUBDEVICE_DELTA1010)
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ static GdkGC *penOrangeLight[21] = { NULL, };
|
||||||
static GdkGC *penRedShadow[21] = { NULL, };
|
static GdkGC *penRedShadow[21] = { NULL, };
|
||||||
static GdkGC *penRedLight[21] = { NULL, };
|
static GdkGC *penRedLight[21] = { NULL, };
|
||||||
static GdkPixmap *pixmap[21] = { NULL, };
|
static GdkPixmap *pixmap[21] = { NULL, };
|
||||||
static snd_ctl_elem_t peaks;
|
static snd_ctl_elem_value_t peaks;
|
||||||
|
|
||||||
static void update_peak_switch(void)
|
static void update_peak_switch(void)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ static int is_active(GtkWidget *widget)
|
||||||
|
|
||||||
void mixer_update_stream(int stream, int vol_flag, int sw_flag)
|
void mixer_update_stream(int stream, int vol_flag, int sw_flag)
|
||||||
{
|
{
|
||||||
snd_ctl_elem_t vol, sw;
|
snd_ctl_elem_value_t vol, sw;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (vol_flag) {
|
if (vol_flag) {
|
||||||
|
|
@ -62,7 +62,7 @@ void mixer_update_stream(int stream, int vol_flag, int sw_flag)
|
||||||
|
|
||||||
static void set_switch1(int stream, int left, int right)
|
static void set_switch1(int stream, int left, int right)
|
||||||
{
|
{
|
||||||
snd_ctl_elem_t sw;
|
snd_ctl_elem_value_t sw;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
memset(&sw, 0, sizeof(sw));
|
memset(&sw, 0, sizeof(sw));
|
||||||
|
|
@ -147,7 +147,7 @@ void mixer_toggled_mute(GtkWidget *togglebutton, gpointer data)
|
||||||
|
|
||||||
static void set_volume1(int stream, int left, int right)
|
static void set_volume1(int stream, int left, int right)
|
||||||
{
|
{
|
||||||
snd_ctl_elem_t vol;
|
snd_ctl_elem_value_t vol;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
memset(&vol, 0, sizeof(vol));
|
memset(&vol, 0, sizeof(vol));
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "envy24control.h"
|
#include "envy24control.h"
|
||||||
|
|
||||||
static snd_ctl_elem_t routes;
|
static snd_ctl_elem_value_t routes;
|
||||||
|
|
||||||
#define toggle_set(widget, state) \
|
#define toggle_set(widget, state) \
|
||||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state);
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), state);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue