jeyzu pushed a commit to branch devs/jeyzu/mixer.
commit 4ada276408c14b98c180ef2aace84b3f1c8f7468
Author: Jérémy Zurcher <[email protected]>
Date: Sun Feb 24 00:53:31 2013 +0100
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
---
src/modules/mixer/app_mixer.c | 24 ++++++++----------------
src/modules/mixer/e_mod_mixer.h | 9 +++++++++
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index 1405111..13abff2 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -10,7 +10,7 @@ typedef struct E_Mixer_App_Dialog_Data
int lock_sliders;
Eina_List *cards;
Eina_List *channels_infos;
- struct channel_info *channel_info;
+ E_Mixer_Channel_Info *channel_info;
E_Mixer_Channel_State state;
struct e_mixer_app_ui
@@ -51,14 +51,6 @@ typedef struct E_Mixer_App_Dialog_Data
} del;
} 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
_cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
{
@@ -203,7 +195,7 @@ _populate_channel_editor(E_Mixer_App_Dialog_Data *app)
static void
_cb_channel_selected(void *data)
{
- struct channel_info *info = data;
+ E_Mixer_Channel_Info *info = data;
E_Mixer_App_Dialog_Data *app;
app = info->app;
@@ -214,7 +206,7 @@ _cb_channel_selected(void *data)
static int
_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)
return -1;
@@ -233,7 +225,7 @@ _channels_info_new(E_Mixer_System *sys)
channels_infos = NULL;
for (l = channels; l; l = l->next)
{
- struct channel_info *info;
+ E_Mixer_Channel_Info *info;
info = malloc(sizeof(*info));
info->id = l->data;
@@ -250,7 +242,7 @@ _channels_info_new(E_Mixer_System *sys)
static void
_channels_info_free(Eina_List *list)
{
- struct channel_info *info;
+ E_Mixer_Channel_Info *info;
EINA_LIST_FREE(list, info)
{
@@ -302,7 +294,7 @@ _populate_channels(E_Mixer_App_Dialog_Data *app)
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)
{
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++)
{
- struct channel_info *info = l->data;
+ E_Mixer_Channel_Info *info = l->data;
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
_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;
int i = 0;
int header_input;
diff --git a/src/modules/mixer/e_mod_mixer.h b/src/modules/mixer/e_mod_mixer.h
index 916cab7..86655d9 100644
--- a/src/modules/mixer/e_mod_mixer.h
+++ b/src/modules/mixer/e_mod_mixer.h
@@ -3,6 +3,7 @@
#include "e.h"
+typedef void E_Mixer_App;
typedef void E_Mixer_System;
typedef void E_Mixer_Channel;
@@ -13,6 +14,14 @@ typedef struct _E_Mixer_Channel_State
int right;
} 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_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int
*, int *);
typedef int (*E_Mixer_Mute_Get_Cb)(E_Mixer_System *, E_Mixer_Channel *, int *);
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
