enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

mixer: replace struct channel_info with E_Mixer_Channel_Info 

E_Mixer_Channel_Info is defined in e_mod_mixer.h
subsystems will allocte it returning Eina_List
generic functions in e_mod_mixer will free the structs
This commit is contained in:
Jérémy Zurcher 2013-02-24 00:53:31 +01:00
parent a67cc20580
commit 03b9522b04
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/mixer/app_mixer.c
View File

@ -10,7 +10,7 @@ typedef struct E_Mixer_App_Dialog_Data
int lock_sliders; int lock_sliders;
Eina_List *cards; Eina_List *cards;
Eina_List *channels_infos; Eina_List *channels_infos;
struct channel_info *channel_info; E_Mixer_Channel_Info *channel_info;
E_Mixer_Channel_State state; E_Mixer_Channel_State state;
struct e_mixer_app_ui struct e_mixer_app_ui
@ -51,14 +51,6 @@ typedef struct E_Mixer_App_Dialog_Data
} del; } del;
} E_Mixer_App_Dialog_Data; } E_Mixer_App_Dialog_Data;
struct channel_info
{
int has_capture;
const char *name;
E_Mixer_Channel *id;
E_Mixer_App_Dialog_Data *app;
};
static void static void
_cb_changed_left(void *data, Evas_Object *obj __UNUSED__) _cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
{ {
@ -203,7 +195,7 @@ _populate_channel_editor(E_Mixer_App_Dialog_Data *app)
static void static void
_cb_channel_selected(void *data) _cb_channel_selected(void *data)
{ {
struct channel_info *info = data; E_Mixer_Channel_Info *info = data;
E_Mixer_App_Dialog_Data *app; E_Mixer_App_Dialog_Data *app;
app = info->app; app = info->app;
@ -214,7 +206,7 @@ _cb_channel_selected(void *data)
static int static int
_channel_info_cmp(const void *data_a, const void *data_b) _channel_info_cmp(const void *data_a, const void *data_b)
{ {
const struct channel_info *a = data_a, *b = data_b; const E_Mixer_Channel_Info *a = data_a, *b = data_b;
if (a->has_capture < b->has_capture) if (a->has_capture < b->has_capture)
return -1; return -1;
@ -233,7 +225,7 @@ _channels_info_new(E_Mixer_System *sys)
channels_infos = NULL; channels_infos = NULL;
for (l = channels; l; l = l->next) for (l = channels; l; l = l->next)
{ {
struct channel_info *info; E_Mixer_Channel_Info *info;
info = malloc(sizeof(*info)); info = malloc(sizeof(*info));
info->id = l->data; info->id = l->data;
@ -250,7 +242,7 @@ _channels_info_new(E_Mixer_System *sys)
static void static void
_channels_info_free(Eina_List *list) _channels_info_free(Eina_List *list)
{ {
struct channel_info *info; E_Mixer_Channel_Info *info;
EINA_LIST_FREE(list, info) EINA_LIST_FREE(list, info)
{ {
@ -302,7 +294,7 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
if (app->channels_infos) if (app->channels_infos)
{ {
struct channel_info *info = app->channels_infos->data; E_Mixer_Channel_Info *info = app->channels_infos->data;
if (info->has_capture) if (info->has_capture)
{ {
e_widget_ilist_header_append(ilist, NULL, _("Input")); e_widget_ilist_header_append(ilist, NULL, _("Input"));
@ -319,7 +311,7 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
for (l = app->channels_infos; l; l = l->next, i++) for (l = app->channels_infos; l; l = l->next, i++)
{ {
struct channel_info *info = l->data; E_Mixer_Channel_Info *info = l->data;
if ((!header_input) && info->has_capture) if ((!header_input) && info->has_capture)
{ {
@ -577,7 +569,7 @@ _find_card_by_name(E_Mixer_App_Dialog_Data *app, const char *card_name)
static inline int static inline int
_find_channel_by_name(E_Mixer_App_Dialog_Data *app, const char *channel_name) _find_channel_by_name(E_Mixer_App_Dialog_Data *app, const char *channel_name)
{ {
struct channel_info *info; E_Mixer_Channel_Info *info;
Eina_List *l; Eina_List *l;
int i = 0; int i = 0;
int header_input; int header_input;

9
src/modules/mixer/e_mod_mixer.h
View File

@ -3,6 +3,7 @@
#include "e.h" #include "e.h"
typedef void E_Mixer_App;
typedef void E_Mixer_System; typedef void E_Mixer_System;
typedef void E_Mixer_Channel; typedef void E_Mixer_Channel;
@ -13,6 +14,14 @@ typedef struct _E_Mixer_Channel_State
int right; int right;
} E_Mixer_Channel_State; } E_Mixer_Channel_State;
typedef struct _E_Mixer_Channel_Info
{
int has_capture;
const char *name;
E_Mixer_Channel *id;
E_Mixer_App *app;
} E_Mixer_Channel_Info;
typedef int (*E_Mixer_Volume_Set_Cb)(E_Mixer_System *, E_Mixer_Channel *, int, int); typedef int (*E_Mixer_Volume_Set_Cb)(E_Mixer_System *, E_Mixer_Channel *, int, int);
typedef int (*E_Mixer_Volume_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *, int *); typedef int (*E_Mixer_Volume_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *, int *);
typedef int (*E_Mixer_Mute_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *); typedef int (*E_Mixer_Mute_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *);