DeforaOS/Mixer
DeforaOS/Mixer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support updating channels again

Browse Source
This commit is contained in:
Pierre Pronchery 2017-05-29 00:53:53 +02:00
parent df3b2fbf93
commit d5c839e321
11 changed files with 549 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Mixer/control.h
View File

@ -37,8 +37,17 @@
/* MixerControlPlugin */
typedef struct _MixerControl MixerControl;
typedef struct _MixerControlPlugin MixerControlPlugin;
typedef struct _MixerControlPluginHelper
{
MixerControl * control;
int (*mixercontrol_set)(MixerControl * control);
} MixerControlPluginHelper;
typedef struct _MixerControlDefinition
{
String const * icon;
@ -46,9 +55,11 @@ typedef struct _MixerControlDefinition
String const * description;
/* callbacks */
MixerControlPlugin * (*init)(String const * type, va_list properties);
MixerControlPlugin * (*init)(MixerControlPluginHelper * helper,
String const * type, va_list properties);
void (*destroy)(MixerControlPlugin * plugin);
int (*get)(MixerControlPlugin * plugin, va_list properties);
String const * (*get_type)(MixerControlPlugin * plugin);
GtkWidget * (*get_widget)(MixerControlPlugin * plugin);
int (*set)(MixerControlPlugin * plugin, va_list properties);

42
src/common.h Normal file
View File

@ -0,0 +1,42 @@
/* $Id$ */
/* Copyright (c) 2017 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS Desktop Mixer */
/* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
* TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
#ifndef MIXER_COMMON_H
# define MIXER_COMMON_H
/* types */
typedef struct _Mixer Mixer;
/* constants */
#define MIXER_DEFAULT_DEVICE "/dev/mixer"
#endif /* !MIXER_COMMON_H */

56
src/control.c
View File

@ -28,9 +28,13 @@
#ifdef DEBUG
# include <stdio.h>
#endif
#include <System/object.h>
#include <System/plugin.h>
#include "Mixer/control.h"
#include "mixer.h"
#include "control.h"
#include "../config.h"
@ -39,6 +43,10 @@
/* types */
struct _MixerControl
{
Mixer * mixer;
MixerControlPluginHelper helper;
String * id;
Plugin * handle;
MixerControlDefinition * definition;
@ -52,11 +60,17 @@ struct _MixerControl
};
/* prototypes */
/* helper */
static int _mixercontrol_helper_set(MixerControl * control);
/* public */
/* functions */
/* mixercontrol_new */
MixerControl * mixercontrol_new(String const * id, String const * icon,
String const * name, String const * type, ...)
MixerControl * mixercontrol_new(Mixer * mixer, String const * id,
String const * icon, String const * name,
String const * type, ...)
{
MixerControl * control;
va_list ap;
@ -68,6 +82,9 @@ MixerControl * mixercontrol_new(String const * id, String const * icon,
#endif
if((control = object_new(sizeof(*control))) == NULL)
return NULL;
control->mixer = mixer;
control->helper.control = control;
control->helper.mixercontrol_set = _mixercontrol_helper_set;
control->id = string_new(id);
control->handle = plugin_new(LIBDIR, PACKAGE, "controls", type);
control->definition = NULL;
@ -80,8 +97,8 @@ MixerControl * mixercontrol_new(String const * id, String const * icon,
"control")) == NULL
|| control->definition->init == NULL
|| control->definition->destroy == NULL
|| (control->plugin = control->definition->init(type,
ap)) == NULL
|| (control->plugin = control->definition->init(
&control->helper, type, ap)) == NULL
|| control->definition->get_widget == NULL
|| (control->widget = control->definition->get_widget(
control->plugin)) == NULL)
@ -129,6 +146,24 @@ void mixercontrol_delete(MixerControl * control)
/* accessors */
/* mixercontrol_get */
int mixercontrol_get(MixerControl * control, ...)
{
int ret;
va_list ap;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
if(control->definition->get == NULL)
return -1;
va_start(ap, control);
ret = control->definition->get(control->plugin, ap);
va_end(ap);
return ret;
}
/* mixercontrol_get_id */
String const * mixercontrol_get_id(MixerControl * control)
{
@ -157,6 +192,8 @@ int mixercontrol_set(MixerControl * control, ...)
int ret;
va_list ap;
if(control->definition->set == NULL)
return -1;
va_start(ap, control);
ret = control->definition->set(control->plugin, ap);
va_end(ap);
@ -170,3 +207,14 @@ void mixercontrol_set_icon(MixerControl * control, String const * icon)
gtk_image_set_from_icon_name(GTK_IMAGE(control->icon), icon,
GTK_ICON_SIZE_MENU);
}
/* private */
/* mixercontrol_helper_set */
static int _mixercontrol_helper_set(MixerControl * control)
{
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p)\n", __func__, (void *)control);
#endif
return mixer_set(control->mixer, control);
}

10
src/control.h
View File

@ -33,6 +33,7 @@
# include <gtk/gtk.h>
# include <System/string.h>
# include "common.h"
/* MixerControl */
@ -41,16 +42,19 @@ typedef struct _MixerControl MixerControl;
/* functions */
MixerControl * mixercontrol_new(String const * id, String const * icon,
String const * name, String const * type, ...);
MixerControl * mixercontrol_new(Mixer * mixer, String const * id,
String const * icon, String const * name,
String const * type, ...);
void mixercontrol_delete(MixerControl * control);
/* accessors */
int mixercontrol_get(MixerControl * control, ...);
int mixercontrol_set(MixerControl * control, ...);
String const * mixercontrol_get_id(MixerControl * control);
String const * mixercontrol_get_type(MixerControl * control);
GtkWidget * mixercontrol_get_widget(MixerControl * control);
int mixercontrol_set(MixerControl * control, ...);
void mixercontrol_set_icon(MixerControl * control, String const * icon);
#endif /* !MIXER_CONTROL_H */

95
src/controls/channels.c
View File

@ -29,6 +29,9 @@
#include <stdlib.h>
#ifdef DEBUG
# include <stdio.h>
#endif
#include <libintl.h>
#include <System/object.h>
#include "Mixer/control.h"
@ -47,6 +50,8 @@ typedef struct _MixerControlChannel
struct _MixerControlPlugin
{
MixerControlPluginHelper * helper;
GtkWidget * widget;
unsigned int delta;
@ -67,15 +72,19 @@ struct _MixerControlPlugin
#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget * mute_image;
#endif
gboolean signal;
};
/* prototypes */
/* control */
static MixerControlPlugin * _channels_init(String const * type,
va_list properties);
static MixerControlPlugin * _channels_init(MixerControlPluginHelper * helper,
String const * type, va_list properties);
static void _channels_destroy(MixerControlPlugin * channels);
static int _channels_get(MixerControlPlugin * channels, va_list properties);
static String const * _channels_get_type(MixerControlPlugin * channels);
static GtkWidget * _channels_get_widget(MixerControlPlugin * channels);
@ -102,6 +111,7 @@ MixerControlDefinition control =
NULL,
_channels_init,
_channels_destroy,
_channels_get,
_channels_get_type,
_channels_get_widget,
_channels_set
@ -111,8 +121,8 @@ MixerControlDefinition control =
/* private */
/* functions */
/* channels_init */
static MixerControlPlugin * _channels_init(String const * type,
va_list properties)
static MixerControlPlugin * _channels_init(MixerControlPluginHelper * helper,
String const * type, va_list properties)
{
MixerControlPlugin * channels;
GtkWidget * hbox;
@ -124,6 +134,7 @@ static MixerControlPlugin * _channels_init(String const * type,
if((channels = object_new(sizeof(*channels))) == NULL)
return NULL;
channels->helper = helper;
channels->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(channels->widget), 4);
channels->delta = 1;
@ -181,6 +192,7 @@ static MixerControlPlugin * _channels_init(String const * type,
gtk_box_pack_end(GTK_BOX(channels->bbox), hbox, FALSE, TRUE, 0);
gtk_box_pack_end(GTK_BOX(channels->widget), channels->bbox, FALSE, TRUE,
0);
channels->signal = FALSE;
if(_channels_set(channels, properties) != 0)
{
_channels_destroy(channels);
@ -199,6 +211,50 @@ static void _channels_destroy(MixerControlPlugin * channels)
/* accessors */
static int _channels_get(MixerControlPlugin * channels, va_list properties)
{
String const * p;
gboolean * b;
double * value;
size_t i;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
while((p = va_arg(properties, String const *)) != NULL)
if(string_compare(p, "bind") == 0)
{
b = va_arg(properties, gboolean *);
*b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
channels->bind));
}
else if(string_compare(p, "value") == 0)
{
if(channels->channels_cnt == 0)
return -1;
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
channels->bind))
== FALSE)
return -1;
value = va_arg(properties, double *);
*value = gtk_range_get_value(GTK_RANGE(
channels->channels[0].widget));
}
else if(sscanf(p, "value%zu", &i) == 1)
{
if(i >= channels->channels_cnt)
return -1;
value = va_arg(properties, double *);
*value = gtk_range_get_value(GTK_RANGE(
channels->channels[i].widget));
}
/* FIXME implement the rest */
else
return -1;
return 0;
}
/* channels_get_type */
static String const * _channels_get_type(MixerControlPlugin * channels)
{
@ -393,13 +449,24 @@ static void _channels_on_changed(GtkWidget * widget, gpointer data)
gdouble value;
size_t i;
value = gtk_range_get_value(GTK_RANGE(widget));
if(channels->bind)
for(i = 0; i < channels->channels_cnt; i++)
gtk_range_set_value(
GTK_RANGE(channels->channels[i].widget),
value);
/* FIXME really implement */
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
if(channels->signal == TRUE)
return;
channels->signal = TRUE;
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(channels->bind)))
{
value = gtk_range_get_value(GTK_RANGE(widget));
if(channels->bind)
for(i = 0; i < channels->channels_cnt; i++)
{
widget = channels->channels[i].widget;
gtk_range_set_value(GTK_RANGE(widget), value);
}
}
channels->helper->mixercontrol_set(channels->helper->control);
channels->signal = FALSE;
}
@ -408,10 +475,8 @@ static void _channels_on_changed(GtkWidget * widget, gpointer data)
static void _channels_on_mute_notify_active(gpointer data)
{
MixerControlPlugin * channels = data;
gboolean active;
active = gtk_switch_get_active(GTK_SWITCH(channels->mute));
/* FIXME implement */
channels->helper->mixercontrol_set(channels->helper->control);
}
#else
/* channels_on_mute_toggled */
@ -425,6 +490,6 @@ static void _channels_on_mute_toggled(gpointer data)
gtk_image_set_from_icon_name(GTK_IMAGE(channels->mute_image),
active ? "audio-volume-muted" : "audio-volume-high",
GTK_ICON_SIZE_BUTTON);
/* FIXME implement */
channels->helper->mixercontrol_set(channels->helper->control);
}
#endif

44
src/controls/mute.c
View File

@ -39,6 +39,8 @@
/* types */
struct _MixerControlPlugin
{
MixerControlPluginHelper * helper;
GtkWidget * widget;
GtkWidget * mute;
@ -50,9 +52,12 @@ struct _MixerControlPlugin
/* prototypes */
/* control */
static MixerControlPlugin * _mute_init(String const * type, va_list properties);
static MixerControlPlugin * _mute_init(MixerControlPluginHelper * helper,
String const * type, va_list properties);
static void _mute_destroy(MixerControlPlugin * mute);
static int _mute_get(MixerControlPlugin * mute, va_list properties);
static String const * _mute_get_type(MixerControlPlugin * mute);
static GtkWidget * _mute_get_widget(MixerControlPlugin * mute);
@ -75,6 +80,7 @@ MixerControlDefinition control =
NULL,
_mute_init,
_mute_destroy,
_mute_get,
_mute_get_type,
_mute_get_widget,
_mute_set
@ -84,7 +90,8 @@ MixerControlDefinition control =
/* private */
/* functions */
/* mute_init */
static MixerControlPlugin * _mute_init(String const * type, va_list properties)
static MixerControlPlugin * _mute_init(MixerControlPluginHelper * helper,
String const * type, va_list properties)
{
MixerControlPlugin * mute;
#if !GTK_CHECK_VERSION(3, 0, 0)
@ -95,6 +102,7 @@ static MixerControlPlugin * _mute_init(String const * type, va_list properties)
if((mute = object_new(sizeof(*mute))) == NULL)
return NULL;
mute->helper = helper;
mute->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_container_set_border_width(GTK_CONTAINER(mute->widget), 4);
#if GTK_CHECK_VERSION(3, 0, 0)
@ -132,6 +140,32 @@ static void _mute_destroy(MixerControlPlugin * mute)
/* accessors */
/* mute_get */
static int _mute_get(MixerControlPlugin * mute, va_list properties)
{
String const * p;
gboolean * b;
while((p = va_arg(properties, String const *)) != NULL)
if(string_compare(p, "value") == 0)
{
b = va_arg(properties, gboolean *);
# if GTK_CHECK_VERSION(3, 0, 0)
*b = gtk_switch_get_active(GTK_SWITCH(mute->mute))
? 0 : 1; /* XXX assumes 1 is "off" */
# else
*b = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(mute->mute))
? 1 : 0; /* XXX assumes 0 is "off" */
# endif
}
/* FIXME implement the rest */
else
return -1;
return 0;
}
/* mute_get_type */
static String const * _mute_get_type(MixerControlPlugin * mute)
{
@ -178,10 +212,8 @@ static int _mute_set(MixerControlPlugin * mute, va_list properties)
static void _mute_on_notify_active(gpointer data)
{
MixerControlPlugin * mute = data;
gboolean active;
active = gtk_switch_get_active(GTK_SWITCH(mute->mute));
/* FIXME implement */
mute->helper->mixercontrol_set(mute->helper->control);
}
#else
/* mute_on_toggled */
@ -195,6 +227,6 @@ static void _mute_on_toggled(gpointer data)
gtk_image_set_from_icon_name(GTK_IMAGE(mute->mute_image),
active ? "audio-volume-muted" : "audio-volume-high",
GTK_ICON_SIZE_BUTTON);
/* FIXME implement */
mute->helper->mixercontrol_set(mute->helper->control);
}
#endif

21
src/controls/radio.c
View File

@ -47,6 +47,8 @@ typedef struct _MixerControlRadio
struct _MixerControlPlugin
{
MixerControlPluginHelper * helper;
GtkWidget * widget;
GSList * group;
@ -57,10 +59,12 @@ struct _MixerControlPlugin
/* prototypes */
/* control */
static MixerControlPlugin * _radio_init(String const * type,
va_list properties);
static MixerControlPlugin * _radio_init(MixerControlPluginHelper * helper,
String const * type, va_list properties);
static void _radio_destroy(MixerControlPlugin * radio);
static int _radio_get(MixerControlPlugin * radio, va_list properties);
static String const * _radio_get_type(MixerControlPlugin * radio);
static GtkWidget * _radio_get_widget(MixerControlPlugin * radio);
@ -78,6 +82,7 @@ MixerControlDefinition control =
NULL,
_radio_init,
_radio_destroy,
_radio_get,
_radio_get_type,
_radio_get_widget,
_radio_set
@ -87,13 +92,15 @@ MixerControlDefinition control =
/* private */
/* functions */
/* radio_init */
static MixerControlPlugin * _radio_init(String const * type, va_list properties)
static MixerControlPlugin * _radio_init(MixerControlPluginHelper * helper,
String const * type, va_list properties)
{
MixerControlPlugin * radio;
(void) type;
if((radio = object_new(sizeof(*radio))) == NULL)
return NULL;
radio->helper = helper;
radio->widget = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(radio->widget),
GTK_BUTTONBOX_SPREAD);
@ -120,6 +127,14 @@ static void _radio_destroy(MixerControlPlugin * radio)
/* accessors */
/* radio_get */
static int _radio_get(MixerControlPlugin * radio, va_list properties)
{
/* FIXME implement */
return -1;
}
/* radio_get_type */
static String const * _radio_get_type(MixerControlPlugin * radio)
{

20
src/controls/set.c
View File

@ -47,6 +47,8 @@ typedef struct _MixerControlSet
struct _MixerControlPlugin
{
MixerControlPluginHelper * helper;
GtkWidget * widget;
MixerControlSet * sets;
@ -55,9 +57,12 @@ struct _MixerControlPlugin
/* prototypes */
static MixerControlPlugin * _set_init(String const * type, va_list properties);
static MixerControlPlugin * _set_init(MixerControlPluginHelper * helper,
String const * type, va_list properties);
static void _set_destroy(MixerControlPlugin * set);
static int _set_get(MixerControlPlugin * set, va_list properties);
static String const * _set_get_type(MixerControlPlugin * set);
static GtkWidget * _set_get_widget(MixerControlPlugin * set);
@ -73,6 +78,7 @@ MixerControlDefinition control =
NULL,
_set_init,
_set_destroy,
_set_get,
_set_get_type,
_set_get_widget,
_set_set
@ -82,13 +88,15 @@ MixerControlDefinition control =
/* private */
/* functions */
/* set_init */
static MixerControlPlugin * _set_init(String const * type, va_list properties)
static MixerControlPlugin * _set_init(MixerControlPluginHelper * helper,
String const * type, va_list properties)
{
MixerControlPlugin * set;
(void) type;
if((set = object_new(sizeof(*set))) == NULL)
return NULL;
set->helper = helper;
set->widget = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(set->widget),
GTK_BUTTONBOX_SPREAD);
@ -114,6 +122,14 @@ static void _set_destroy(MixerControlPlugin * set)
/* accessors */
/* set_get */
static int _set_get(MixerControlPlugin * set, va_list properties)
{
/* FIXME implement */
return -1;
}
/* set_get_type */
static String const * _set_get_type(MixerControlPlugin * set)
{

493
src/mixer.c
View File

@ -49,6 +49,7 @@
#include <gtk/gtk.h>
#include <Desktop.h>
#include "control.h"
#include "common.h"
#include "mixer.h"
#include "../config.h"
#define _(string) gettext(string)
@ -80,7 +81,10 @@ typedef struct _MixerLevel
size_t channels_cnt;
} MixerLevel;
typedef struct _MixerControl
/* FIXME there are two different MixerControl types */
typedef struct _MixerControl MixerControl;
struct _MixerControl
{
int index;
int type;
@ -89,7 +93,9 @@ typedef struct _MixerControl
int mask;
MixerLevel level;
} un;
} MixerControl;
MixerControl * control;
};
struct _Mixer
{
@ -105,27 +111,23 @@ struct _Mixer
#ifdef AUDIO_MIXER_DEVINFO
int fd;
MixerClass * mc;
size_t mc_cnt;
MixerClass * classes;
size_t classes_cnt;
#else
int fd;
#endif
MixerControl ** controls;
MixerControl * controls;
size_t controls_cnt;
};
/* constants */
#define MIXER_DEFAULT_DEVICE "/dev/mixer"
/* prototypes */
static int _mixer_error(Mixer * mixer, char const * message, int ret);
/* accessors */
static int _mixer_get_control(Mixer * mixer, int index, MixerControl * control);
static int _mixer_set_control(Mixer * mixer, int index, MixerControl * control);
static int _mixer_get_control(Mixer * mixer, MixerControl * control);
static int _mixer_set_control(Mixer * mixer, MixerControl * control);
static String const * _mixer_get_icon(String const * id);
@ -140,10 +142,10 @@ static void _mixer_show_view(Mixer * mixer, int view);
static GtkWidget * _new_frame_label(GdkPixbuf * pixbuf, char const * name,
char const * label);
#ifdef AUDIO_MIXER_DEVINFO
static MixerControl * _new_enum(Mixer * mixer, int dev,
static MixerControl * _new_enum(Mixer * mixer, int index,
struct audio_mixer_enum * e, String const * id,
String const * icon, String const * name);
static MixerControl * _new_set(Mixer * mixer, int dev,
static MixerControl * _new_set(Mixer * mixer, int index,
struct audio_mixer_set * s, String const * id,
String const * icon, String const * name);
#endif
@ -162,6 +164,7 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
GtkWidget * hvbox = NULL;
GtkWidget * hbox;
MixerControl * control;
MixerControl * q;
int i;
#ifdef AUDIO_MIXER_DEVINFO
mixer_devinfo_t md;
@ -186,8 +189,8 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
mixer->properties = NULL;
mixer->bold = NULL;
#ifdef AUDIO_MIXER_DEVINFO
mixer->mc = NULL;
mixer->mc_cnt = 0;
mixer->classes = NULL;
mixer->classes_cnt = 0;
#endif
mixer->controls = NULL;
mixer->controls_cnt = 0;
@ -228,15 +231,16 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
break;
if(md.type != AUDIO_MIXER_CLASS)
continue;
if((p = realloc(mixer->mc, sizeof(*mixer->mc)
* (mixer->mc_cnt + 1))) == NULL)
if((p = realloc(mixer->classes, sizeof(*p)
* (mixer->classes_cnt + 1)))
== NULL)
{
_mixer_error(NULL, "realloc", 1);
mixer_delete(mixer);
return NULL;
}
mixer->mc = p;
p = &mixer->mc[mixer->mc_cnt++];
mixer->classes = p;
p = &mixer->classes[mixer->classes_cnt++];
p->mixer_class = md.mixer_class;
memcpy(&p->label, &md.label, sizeof(md.label));
p->hbox = NULL;
@ -270,12 +274,12 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
break;
if(md.type == AUDIO_MIXER_CLASS)
continue;
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].mixer_class == md.mixer_class)
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].mixer_class == md.mixer_class)
break;
if(u == mixer->mc_cnt)
if(u == mixer->classes_cnt)
continue;
hbox = mixer->mc[u].hbox;
hbox = mixer->classes[u].hbox;
control = NULL;
switch(md.type)
{
@ -300,23 +304,37 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
}
if(control == NULL)
continue;
if((q = realloc(mixer->controls, sizeof(*q)
* (mixer->controls_cnt + 1)))
== NULL)
{
mixercontrol_delete(control);
/* FIXME report error */
continue;
}
mixer->controls = q;
q = &mixer->controls[mixer->controls_cnt++];
q->index = md.index;
q->type = md.type;
q->control = control;
widget = mixercontrol_get_widget(control);
vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_box_pack_start(GTK_BOX(vbox2), widget, TRUE, TRUE, 0);
gtk_size_group_add_widget(hgroup, widget);
if(hbox == NULL)
{
mixer->mc[u].hbox = gtk_box_new(
GTK_ORIENTATION_HORIZONTAL, 4);
hbox = mixer->mc[u].hbox;
p = &mixer->classes[u];
p->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
hbox = p->hbox;
if(mixer->notebook != NULL)
{
if((name = strdup(mixer->mc[u].label.name))
if((name = strdup(mixer->classes[u].label.name))
!= NULL)
name[0] = toupper(
(unsigned char)name[0]);
label = _new_frame_label(NULL,
mixer->mc[u].label.name, name);
mixer->classes[u].label.name,
name);
free(name);
gtk_widget_show_all(label);
scrolled = gtk_scrolled_window_new(NULL, NULL);
@ -324,14 +342,14 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_NEVER);
_mixer_scrolled_window_add(scrolled, hbox);
mixer->mc[u].page = gtk_notebook_append_page(
_mixer_scrolled_window_add(scrolled, p->hbox);
p->page = gtk_notebook_append_page(
GTK_NOTEBOOK(mixer->notebook),
scrolled, label);
}
else if(hvbox != NULL)
gtk_box_pack_start(GTK_BOX(hvbox), hbox, FALSE,
TRUE, 0);
gtk_box_pack_start(GTK_BOX(hvbox), p->hbox,
FALSE, TRUE, 0);
}
gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, TRUE, 0);
/* add a mute button if relevant */
@ -342,10 +360,10 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
break;
if(md2.type == AUDIO_MIXER_CLASS)
continue;
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].mixer_class == md2.mixer_class)
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].mixer_class == md2.mixer_class)
break;
if(u == mixer->mc_cnt)
if(u == mixer->classes_cnt)
continue;
u = strlen(md.label.name);
if(md2.type != AUDIO_MIXER_ENUM || strncmp(md.label.name,
@ -361,11 +379,22 @@ Mixer * mixer_new(GtkWidget * window, String const * device, MixerLayout layout)
break;
if(ioctl(mixer->fd, MIXER_READ(i), &value) != 0)
continue;
if((q = realloc(mixer->controls, sizeof(*q)
* (mixer->controls_cnt + 1)))
== NULL)
/* FIXME report error */
continue;
mixer->controls = q;
q = &mixer->controls[mixer->controls_cnt];
if((control = _new_value(mixer, i, vgroup, names[i],
_mixer_get_icon(names[i]),
labels[i]))
== NULL)
continue;
q->index = i;
q->type = 0;
q->control = control;
mixer->controls_cnt++;
widget = mixercontrol_get_widget(control);
gtk_size_group_add_widget(hgroup, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
@ -411,25 +440,24 @@ static GtkWidget * _new_frame_label(GdkPixbuf * pixbuf, char const * name,
}
#ifdef AUDIO_MIXER_DEVINFO
static MixerControl * _new_enum(Mixer * mixer, int dev,
static MixerControl * _new_enum(Mixer * mixer, int index,
struct audio_mixer_enum * e, String const * id,
String const * icon, String const * name)
{
MixerControl * mc;
MixerControl mc;
MixerControl * control;
int i;
char label[16];
char value[16];
if(e->num_mem <= 0 || (mc = malloc(sizeof(*mc))) == NULL)
if(e->num_mem <= 0)
return NULL;
if(_mixer_get_control(mixer, dev, mc) != 0
|| (control = mixercontrol_new(id, icon, name, "radio",
"members", e->num_mem, NULL)) == NULL)
{
free(mc);
mc.index = index;
if(_mixer_get_control(mixer, &mc) != 0
|| (control = mixercontrol_new(mixer, id, icon, name,
"radio", "members", e->num_mem, NULL))
== NULL)
return NULL;
}
for(i = 0; i < e->num_mem; i++)
{
snprintf(label, sizeof(label), "label%d", i);
@ -441,7 +469,7 @@ static MixerControl * _new_enum(Mixer * mixer, int dev,
return NULL;
}
}
if(mixercontrol_set(control, "value", mc->un.mask, NULL) != 0)
if(mixercontrol_set(control, "value", mc.un.mask, NULL) != 0)
{
mixercontrol_delete(control);
return NULL;
@ -449,25 +477,24 @@ static MixerControl * _new_enum(Mixer * mixer, int dev,
return control;
}
static MixerControl * _new_set(Mixer * mixer, int dev,
static MixerControl * _new_set(Mixer * mixer, int index,
struct audio_mixer_set * s, String const * id,
String const * icon, String const * name)
{
MixerControl * mc;
MixerControl mc;
MixerControl * control;
int i;
char label[16];
char value[16];
if(s->num_mem <= 0 || (mc = malloc(sizeof(*mc))) == NULL)
if(s->num_mem <= 0)
return NULL;
if(_mixer_get_control(mixer, dev, mc) != 0
|| (control = mixercontrol_new(id, icon, name, "set",
"members", s->num_mem, NULL)) == NULL)
{
free(mc);
mc.index = index;
if(_mixer_get_control(mixer, &mc) != 0
|| (control = mixercontrol_new(mixer, id, icon, name,
"set", "members", s->num_mem, NULL))
== NULL)
return NULL;
}
for(i = 0; i < s->num_mem; i++)
{
snprintf(label, sizeof(label), "label%d", i);
@ -479,7 +506,7 @@ static MixerControl * _new_set(Mixer * mixer, int dev,
return NULL;
}
}
if(mixercontrol_set(control, "value", mc->un.mask, NULL) != 0)
if(mixercontrol_set(control, "value", mc.un.mask, NULL) != 0)
{
mixercontrol_delete(control);
return NULL;
@ -492,36 +519,32 @@ static MixerControl * _new_value(Mixer * mixer, int index,
GtkSizeGroup * vgroup, String const * id, String const * icon,
String const * name)
{
MixerControl * mc;
MixerControl mc;
MixerControl * control;
size_t i;
gboolean bind = TRUE;
char buf[16];
gdouble value;
if((mc = malloc(sizeof(*mc))) == NULL
|| _mixer_get_control(mixer, index, mc) != 0
|| mc->un.level.channels_cnt <= 0
|| (control = mixercontrol_new(id, icon, name,
mc.index = index;
if(_mixer_get_control(mixer, &mc) != 0
|| mc.un.level.channels_cnt <= 0
|| (control = mixercontrol_new(mixer, id, icon, name,
"channels",
"channels", mc->un.level.channels_cnt,
"delta", mc->un.level.delta,
"channels", mc.un.level.channels_cnt,
"delta", mc.un.level.delta,
"vgroup", vgroup, NULL)) == NULL)
{
free(mc);
return NULL;
}
free(mc);
/* detect if binding is in place */
for(i = 1; i < mc->un.level.channels_cnt; i++)
if(mc->un.level.channels[i] != mc->un.level.channels[0])
for(i = 1; i < mc.un.level.channels_cnt; i++)
if(mc.un.level.channels[i] != mc.un.level.channels[0])
{
bind = FALSE;
break;
}
if(bind)
{
value = mc->un.level.channels[0];
value = mc.un.level.channels[0];
if(mixercontrol_set(control, "value", value, "bind", bind, NULL)
!= 0)
{
@ -536,10 +559,10 @@ static MixerControl * _new_value(Mixer * mixer, int index,
mixercontrol_delete(control);
return NULL;
}
for(i = 0; i < mc->un.level.channels_cnt; i++)
for(i = 0; i < mc.un.level.channels_cnt; i++)
{
snprintf(buf, sizeof(buf), "value%zu", i);
value = mc->un.level.channels[i];
value = mc.un.level.channels[i];
if(mixercontrol_set(control, buf, value, NULL) != 0)
{
mixercontrol_delete(control);
@ -608,133 +631,163 @@ GtkWidget * mixer_get_widget(Mixer * mixer)
}
/* mixer_set_enum */
int mixer_set_enum(Mixer * mixer, GtkWidget * widget)
{
#ifdef AUDIO_MIXER_DEVINFO
mixer_ctrl_t * p;
int * q;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d\n", __func__, (void *)mixer,
mixer->fd);
# endif
p = g_object_get_data(G_OBJECT(widget), "ctrl");
q = g_object_get_data(G_OBJECT(widget), "ord");
if(p == NULL || q == NULL)
return 1;
p->un.ord = *q;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d ord=%d\n", __func__, (void *)mixer,
mixer->fd, p->un.ord);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
#else
/* FIXME implement */
/* mixer_set */
static int _set_channels(Mixer * mixer, MixerControl * control);
#if defined(AUDIO_MIXER_DEVINFO)
static int _set_mute(Mixer * mixer, MixerControl * control);
static int _set_radio(Mixer * mixer, MixerControl * control);
static int _set_set(Mixer * mixer, MixerControl * control);
#endif
return 0;
}
/* mixer_set_mute */
int mixer_set_mute(Mixer * mixer, GtkWidget * widget)
int mixer_set(Mixer * mixer, MixerControl * control)
{
#ifdef AUDIO_MIXER_DEVINFO
mixer_ctrl_t * p;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d\n", __func__, (void *)mixer,
mixer->fd);
# endif
if((p = g_object_get_data(G_OBJECT(widget), "ctrl")) == NULL)
return -1;
#if GTK_CHECK_VERSION(3, 0, 0)
p->un.ord = gtk_switch_get_active(GTK_SWITCH(widget))
? 0 : 1; /* XXX assumes 1 is "off" */
#else
p->un.ord = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))
? 1 : 0; /* XXX assumes 0 is "off" */
#endif
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d ord=%d\n", __func__, (void *)mixer,
mixer->fd, p->un.ord);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
#else
/* FIXME implement */
#endif
return 0;
}
/* mixer_set_set */
int mixer_set_set(Mixer * mixer, GtkWidget * widget)
{
gboolean active;
#ifdef AUDIO_MIXER_DEVINFO
mixer_ctrl_t * p;
int * q;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d\n", __func__, (void *)mixer,
mixer->fd);
# endif
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
p = g_object_get_data(G_OBJECT(widget), "ctrl");
q = g_object_get_data(G_OBJECT(widget), "mask");
if(p == NULL || q == NULL)
return 1;
if(ioctl(mixer->fd, AUDIO_MIXER_READ, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_READ", 1);
p->un.mask = (active) ? (p->un.mask | *q)
: (p->un.mask - (p->un.mask & *q));
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d mask=%d\n", __func__,
(void *)mixer, mixer->fd, p->un.mask);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
#else
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
/* FIXME implement */
#endif
return 0;
}
/* mixer_set_value */
int mixer_set_value(Mixer * mixer, GtkWidget * widget, gdouble value)
{
GtkWidget * b;
MixerControl * mc;
uint8_t * channel;
size_t i;
GSList * q;
String const * type;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %f) fd=%d\n", __func__, (void *)mixer,
value, mixer->fd);
fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif
b = g_object_get_data(G_OBJECT(widget), "bind");
mc = g_object_get_data(G_OBJECT(widget), "ctrl");
channel = g_object_get_data(G_OBJECT(widget), "channel");
if(mc == NULL || channel == NULL)
return 1;
*channel = (value / 100.0) * 255;
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b)))
{
for(i = 0; i < mc->un.level.channels_cnt; i++)
mc->un.level.channels[i] = *channel;
if(b != NULL)
for(q = g_object_get_data(G_OBJECT(b), "list");
q != NULL; q = q->next)
gtk_range_set_value(GTK_RANGE(q->data), value);
}
return _mixer_set_control(mixer, mc->index, mc);
if((type = mixercontrol_get_type(control)) == NULL)
return -1;
else if(string_compare(type, "channels") == 0)
return _set_channels(mixer, control);
#if defined(AUDIO_MIXER_DEVINFO)
else if(string_compare(type, "mute") == 0)
return _set_mute(mixer, control);
else if(string_compare(type, "radio") == 0)
return _set_radio(mixer, control);
else if(string_compare(type, "set") == 0)
return _set_set(mixer, control);
#endif
return -1;
}
static int _set_channels(Mixer * mixer, MixerControl * control)
{
size_t i;
double value;
uint8_t channel;
MixerControl mc;
char buf[16];
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %p) fd=%d\n", __func__, (void *)mixer,
(void *)control, mixer->fd);
#endif
for(i = 0; i < mixer->controls_cnt; i++)
if(mixer->controls[i].control == control)
break;
if(i == mixer->controls_cnt)
return -1;
mc.index = mixer->controls[i].index;
if(_mixer_get_control(mixer, &mc) != 0)
return -1;
for(i = 0; i < mc.un.level.channels_cnt; i++)
{
snprintf(buf, sizeof(buf), "value%zu", i);
if(mixercontrol_get(control, buf, &value, NULL) != 0)
return -1;
channel = (value * 255.0) / 100.0;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s() value%zu=%f\n", __func__, i,
value);
#endif
mc.un.level.channels[i] = channel;
}
return _mixer_set_control(mixer, &mc);
}
#if defined(AUDIO_MIXER_DEVINFO)
static int _set_mute(Mixer * mixer, MixerControl * control)
{
size_t i;
gboolean value;
MixerControl * mc;
mixer_ctrl_t p;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %p) fd=%d\n", __func__, (void *)mixer,
(void *)control, mixer->fd);
# endif
for(i = 0; i < mixer->controls_cnt; i++)
if(mixer->controls[i].control == control)
break;
if(i == mixer->controls_cnt)
return -1;
mc = &mixer->controls[i];
p.dev = mc->index;
p.type = mc->type;
if(mixercontrol_get(control, "value", &value, NULL) != 0)
return -1;
p.un.ord = value;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s() ord=%d\n", __func__, p.un.ord);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, &p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
return 0;
}
static int _set_radio(Mixer * mixer, MixerControl * control)
{
size_t i;
MixerControl * mc;
mixer_ctrl_t p;
unsigned int value;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d\n", __func__, (void *)mixer,
mixer->fd);
# endif
for(i = 0; i < mixer->controls_cnt; i++)
if(mixer->controls[i].control == control)
break;
if(i == mixer->controls_cnt)
return -1;
mc = &mixer->controls[i];
p.dev = mc->index;
p.type = mc->type;
if(mixercontrol_get(control, "value", &value, NULL) != 0)
return -1;
p.un.ord = value;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s() ord=%d\n", __func__, p.un.ord);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
return 0;
}
static int _set_set(Mixer * mixer, MixerControl * control)
{
size_t i;
unsigned int value;
MixerControl * mc;
mixer_ctrl_t p;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p) fd=%d\n", __func__, (void *)mixer,
mixer->fd);
# endif
for(i = 0; i < mixer->controls_cnt; i++)
if(mixer->controls[i].control == control)
break;
if(i == mixer->controls_cnt)
return -1;
mc = &mixer->controls[i];
p.dev = mc->index;
p.type = mc->type;
if(mixercontrol_get(control, "value", &value, NULL) != 0)
return -1;
p.un.mask = value;
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s() mask=%d\n", __func__, p.un.mask);
# endif
if(ioctl(mixer->fd, AUDIO_MIXER_WRITE, p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_WRITE", 1);
return 0;
}
#endif
/* useful */
/* mixer_properties */
@ -849,26 +902,27 @@ void mixer_show_class(Mixer * mixer, String const * name)
if(mixer->notebook != NULL && name != NULL)
{
for(u = 0; u < mixer->mc_cnt; u++)
for(u = 0; u < mixer->classes_cnt; u++)
{
if(mixer->mc[u].hbox == NULL)
if(mixer->classes[u].hbox == NULL)
continue;
if(strcmp(mixer->mc[u].label.name, name) != 0)
if(strcmp(mixer->classes[u].label.name, name) != 0)
continue;
gtk_notebook_set_current_page(GTK_NOTEBOOK(
mixer->notebook),
mixer->mc[u].page);
mixer->classes[u].page);
}
return;
}
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].hbox == NULL)
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].hbox == NULL)
continue;
else if(name == NULL
|| strcmp(mixer->mc[u].label.name, name) == 0)
gtk_widget_show(mixer->mc[u].hbox);
|| strcmp(mixer->classes[u].label.name, name)
== 0)
gtk_widget_show(mixer->classes[u].hbox);
else
gtk_widget_hide(mixer->mc[u].hbox);
gtk_widget_hide(mixer->classes[u].hbox);
#endif
}
@ -911,7 +965,7 @@ static int _error_text(char const * message, int ret)
/* accessors */
/* mixer_get_control */
static int _mixer_get_control(Mixer * mixer, int index, MixerControl * control)
static int _mixer_get_control(Mixer * mixer, MixerControl * control)
{
#ifdef AUDIO_MIXER_DEVINFO
mixer_ctrl_t p;
@ -922,21 +976,20 @@ static int _mixer_get_control(Mixer * mixer, int index, MixerControl * control)
char * sep = "";
# endif
md.index = index;
md.index = control->index;
if(ioctl(mixer->fd, AUDIO_MIXER_DEVINFO, &md) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_DEVINFO", 1);
p.dev = index;
p.dev = control->index;
/* XXX this is necessary for some drivers and I don't like it */
if((p.type = md.type) == AUDIO_MIXER_VALUE)
p.un.value.num_channels = md.un.v.num_channels;
if(ioctl(mixer->fd, AUDIO_MIXER_READ, &p) != 0)
return -_mixer_error(mixer, "AUDIO_MIXER_READ", 1);
control->index = index;
control->type = p.type;
# ifdef DEBUG
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].mixer_class == md.mixer_class)
printf("%s", mixer->mc[u].label.name);
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].mixer_class == md.mixer_class)
printf("%s", mixer->classes[u].label.name);
printf(".%s=", md.label.name);
# endif
switch(p.type)
@ -997,8 +1050,7 @@ static int _mixer_get_control(Mixer * mixer, int index, MixerControl * control)
#else
int value;
control->index = index;
if(ioctl(mixer->fd, MIXER_READ(index), &value) != 0)
if(ioctl(mixer->fd, MIXER_READ(control->index), &value) != 0)
return -_mixer_error(NULL, "MIXER_READ", 1);
control->type = 0;
control->un.level.delta = 1;
@ -1049,13 +1101,13 @@ static String const * _mixer_get_icon(String const * id)
/* mixer_set_control */
static int _mixer_set_control(Mixer * mixer, int index, MixerControl * control)
static int _mixer_set_control(Mixer * mixer, MixerControl * control)
{
#ifdef AUDIO_MIXER_DEVINFO
mixer_ctrl_t p;
int i;
p.dev = index;
p.dev = control->index;
p.type = control->type;
p.un.value.num_channels = control->un.level.channels_cnt;
for(i = 0; i < p.un.value.num_channels; i++)
@ -1067,7 +1119,10 @@ static int _mixer_set_control(Mixer * mixer, int index, MixerControl * control)
level |= (control->un.level.channels[0] * 100) / 255;
level |= ((control->un.level.channels[1] * 100) / 255) << 8;
if(ioctl(mixer->fd, MIXER_WRITE(index), &level) != 0)
# ifdef DEBUG
fprintf(stderr, "DEBUG: %s() level=0x%04x\n", __func__, level);
# endif
if(ioctl(mixer->fd, MIXER_WRITE(control->index), &level) != 0)
return -_mixer_error(mixer, "MIXER_WRITE", 1);
#endif
return 0;
@ -1095,20 +1150,20 @@ static void _mixer_show_view(Mixer * mixer, int view)
if(view < 0)
{
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].hbox != NULL)
gtk_widget_show(mixer->mc[u].hbox);
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].hbox != NULL)
gtk_widget_show(mixer->classes[u].hbox);
return;
}
u = view;
if(u >= mixer->mc_cnt)
if(u >= mixer->classes_cnt)
return;
for(u = 0; u < mixer->mc_cnt; u++)
if(mixer->mc[u].hbox == NULL)
for(u = 0; u < mixer->classes_cnt; u++)
if(mixer->classes[u].hbox == NULL)
continue;
else if(u == (size_t)view)
gtk_widget_show(mixer->mc[u].hbox);
gtk_widget_show(mixer->classes[u].hbox);
else
gtk_widget_hide(mixer->mc[u].hbox);
gtk_widget_hide(mixer->classes[u].hbox);
#endif
}

9
src/mixer.h
View File

@ -33,6 +33,8 @@
# include <gtk/gtk.h>
# include <System/string.h>
# include "control.h"
# include "common.h"
/* Mixer */
@ -51,8 +53,6 @@ typedef struct _MixerProperties
char device[16];
} MixerProperties;
typedef struct _Mixer Mixer;
/* functions */
Mixer * mixer_new(GtkWidget * window, String const * device,
@ -63,10 +63,7 @@ void mixer_delete(Mixer * mixer);
int mixer_get_properties(Mixer * mixer, MixerProperties * properties);
GtkWidget * mixer_get_widget(Mixer * mixer);
int mixer_set_enum(Mixer * mixer, GtkWidget * widget);
int mixer_set_mute(Mixer * mixer, GtkWidget * widget);
int mixer_set_set(Mixer * mixer, GtkWidget * widget);
int mixer_set_value(Mixer * mixer, GtkWidget * widget, gdouble value);
int mixer_set(Mixer * mixer, MixerControl * control);
/* useful */
void mixer_properties(Mixer * mixer);

10
src/project.conf
View File

@ -6,7 +6,7 @@ cflags_force=`pkg-config --cflags libDesktop`
cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector-all
ldflags_force=`pkg-config --libs libDesktop` -lintl
ldflags=-pie -Wl,-z,relro -Wl,-z,now
dist=Makefile,mixer.h,window.h,callbacks.h
dist=Makefile,common.h,mixer.h,window.h,callbacks.h
[mixer]
type=binary
@ -14,16 +14,16 @@ sources=control.c,mixer.c,window.c,callbacks.c,main.c
install=$(BINDIR)
[control.c]
depends=control.h,../config.h
depends=../include/Mixer/control.h,common.h,control.h,../config.h
[mixer.c]
depends=callbacks.h,mixer.h,../config.h
depends=callbacks.h,common.h,mixer.h,../config.h
[window.c]
depends=mixer.h,window.h
[callbacks.c]
depends=mixer.h,callbacks.h,../config.h
depends=mixer.h,common.h,callbacks.h,../config.h
[main.c]
depends=mixer.h,window.h,../config.h
depends=mixer.h,window.h,common.h,../config.h