jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e_mixer: remove unused e_mod_mixer_channel_name_get from mixer API and comment subsys code 

SVN revision: 83921
This commit is contained in:
Jérémy Zurcher 2013-02-14 20:28:40 +00:00
parent 577019db54
commit 37ea5886c1
5 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/mixer/e_mod_mixer.c
View File

@ -10,7 +10,6 @@ E_Mixer_Cb e_mod_mixer_new;
E_Mixer_Cb e_mod_mixer_del;
E_Mixer_Cb e_mod_mixer_channel_default_name_get;
E_Mixer_Cb e_mod_mixer_channel_info_get_by_name;
E_Mixer_Cb e_mod_mixer_channel_name_get;
E_Mixer_Cb e_mod_mixer_channels_get;
E_Mixer_Cb e_mod_mixer_channel_names_get;
E_Mixer_Cb e_mod_mixer_card_name_get;
@ -29,7 +28,6 @@ e_mixer_default_setup(void)
e_mod_mixer_del = (void *)e_mixer_alsa_del;
e_mod_mixer_channel_default_name_get = (void *)e_mixer_alsa_get_default_channel_name;
e_mod_mixer_channel_info_get_by_name = (void *)e_mixer_alsa_get_channel_by_name;
e_mod_mixer_channel_name_get = (void *)e_mixer_alsa_get_channel_name;
e_mod_mixer_channels_get = (void *)e_mixer_alsa_get_channels;
e_mod_mixer_channel_names_get = (void *)e_mixer_alsa_get_channel_names;
e_mod_mixer_card_name_get = (void *)e_mixer_alsa_get_card_name;
@ -50,7 +48,6 @@ e_mixer_pulse_setup()
e_mod_mixer_del = (void *)e_mixer_pulse_del;
e_mod_mixer_channel_default_name_get = (void *)e_mixer_pulse_get_default_channel_name;
e_mod_mixer_channel_info_get_by_name = (void *)e_mixer_pulse_get_channel_by_name;
e_mod_mixer_channel_name_get = (void *)e_mixer_pulse_get_channel_name;
e_mod_mixer_channels_get = (void *)e_mixer_pulse_get_channels;
e_mod_mixer_channel_names_get = (void *)e_mixer_pulse_get_channel_names;
e_mod_mixer_card_name_get = (void *)e_mixer_pulse_get_card_name;

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

@ -66,7 +66,6 @@ extern E_Mixer_Cb e_mod_mixer_new;
extern E_Mixer_Cb e_mod_mixer_del;
extern E_Mixer_Cb e_mod_mixer_channel_default_name_get;
extern E_Mixer_Cb e_mod_mixer_channel_info_get_by_name;
extern E_Mixer_Cb e_mod_mixer_channel_name_get;
extern E_Mixer_Cb e_mod_mixer_channel_names_get;
extern E_Mixer_Cb e_mod_mixer_card_name_get;
extern E_Mixer_Cb e_mod_mixer_card_names_get;
@ -90,7 +89,6 @@ void e_mixer_alsa_del(E_Mixer_System *self);
Eina_List *e_mixer_alsa_get_cards(void);
const char *e_mixer_alsa_get_default_card(void);
const char *e_mixer_alsa_get_card_name(const char *card);
const char *e_mixer_alsa_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel);
Eina_List *e_mixer_alsa_get_channels(E_Mixer_System *self);
Eina_List *e_mixer_alsa_get_channel_names(E_Mixer_System *self);
@ -115,7 +113,6 @@ void e_mixer_pulse_del(E_Mixer_System *self);
Eina_List *e_mixer_pulse_get_cards(void);
const char *e_mixer_pulse_get_default_card(void);
const char *e_mixer_pulse_get_card_name(const char *card);
const char *e_mixer_pulse_get_channel_name(E_Mixer_System *self, E_Mixer_Channel *channel);
Eina_List *e_mixer_pulse_get_channels(E_Mixer_System *self);
Eina_List *e_mixer_pulse_get_channel_names(E_Mixer_System *self);

32
src/modules/mixer/sys_alsa.c
View File

@ -461,22 +461,22 @@ e_mixer_alsa_get_channel_by_name(E_Mixer_System *self,
return NULL;
}
const char *
e_mixer_alsa_get_channel_name(E_Mixer_System *self,
E_Mixer_Channel *channel)
{
snd_mixer_selem_id_t *sid;
const char *name;
if ((!self) || (!channel))
return NULL;
snd_mixer_selem_id_alloca(&sid);
snd_mixer_selem_get_id(channel, sid);
name = eina_stringshare_add(snd_mixer_selem_id_get_name(sid));
return name;
}
/* const char * */
/* e_mixer_alsa_get_channel_name(E_Mixer_System *self, */
/* E_Mixer_Channel_Info *channel) */
/* { */
/* snd_mixer_selem_id_t *sid; */
/* const char *name; */
/**/
/* if ((!self) || (!channel)) */
/* return NULL; */
/**/
/* snd_mixer_selem_id_alloca(&sid); */
/* snd_mixer_selem_get_id(channel->id, sid); */
/* name = eina_stringshare_add(snd_mixer_selem_id_get_name(sid)); */
/**/
/* return name; */
/* } */
int
e_mixer_alsa_get_volume(E_Mixer_System *self,

20
src/modules/mixer/sys_dummy.c
View File

@ -110,16 +110,16 @@ e_mixer_system_get_channel_by_name(E_Mixer_System *self __UNUSED__, const char *
return NULL;
}
const char *
e_mixer_system_get_channel_name(E_Mixer_System *self __UNUSED__, E_Mixer_Channel *channel)
{
_e_mixer_dummy_set();
if (channel == (E_Mixer_Channel *)-2)
return eina_stringshare_ref(_name);
else
return NULL;
}
/* const char * */
/* e_mixer_system_get_channel_name(E_Mixer_System *self __UNUSED__, E_Mixer_Channel_Info *channel) */
/* { */
/* _e_mixer_dummy_set(); */
/**/
/* if (channel == (E_Mixer_Channel *)-2) */
/* return eina_stringshare_ref(_name); */
/* else */
/* return NULL; */
/* } */
int
e_mixer_system_get_volume(E_Mixer_System *self __UNUSED__, E_Mixer_Channel *channel __UNUSED__, int *left, int *right)

12
src/modules/mixer/sys_pulse.c
View File

@ -517,12 +517,12 @@ e_mixer_pulse_get_channel_by_name(E_Mixer_System *self EINA_UNUSED, const char *
return ch_info;
}
const char *
e_mixer_pulse_get_channel_name(E_Mixer_System *self EINA_UNUSED, E_Mixer_Channel *channel)
{
if (!channel) return NULL;
return eina_stringshare_ref(_name);
}
/* const char * */
/* e_mixer_pulse_get_channel_name(E_Mixer_System *self EINA_UNUSED, E_Mixer_Channel_Info *channel) */
/* { */
/* if (!channel) return NULL; */
/* return eina_stringshare_ref(_name); */
/* } */
int
e_mixer_pulse_get_volume(E_Mixer_System *self, E_Mixer_Channel_Info *channel, int *left, int *right)