projects
/
framework
/
api
/
sound-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d14d6bf
)
add static
author
SeungKeun Lee
<sngn.lee@samsung.com>
Tue, 21 Feb 2012 02:25:57 +0000
(11:25 +0900)
committer
SeungKeun Lee
<sngn.lee@samsung.com>
Tue, 21 Feb 2012 02:25:57 +0000
(11:25 +0900)
src/sound_manager.c
patch
|
blob
|
history
diff --git
a/src/sound_manager.c
b/src/sound_manager.c
index
9506da7
..
1999079
100755
(executable)
--- a/
src/sound_manager.c
+++ b/
src/sound_manager.c
@@
-49,7
+49,7
@@
static _changed_volume_info_s g_volume_changed_cb_table;
static _changed_policy_info_s g_policy_changed_cb_table;
static _session_notify_info_s g_session_notify_cb_table = {0, NULL, NULL };
static _changed_policy_info_s g_policy_changed_cb_table;
static _session_notify_info_s g_session_notify_cb_table = {0, NULL, NULL };
-static void _volume_changed_cb(void *user_data)
+static void _
_
volume_changed_cb(void *user_data)
{
sound_type_e type = (sound_type_e)user_data;
{
sound_type_e type = (sound_type_e)user_data;
@@
-59,19
+59,19
@@
static void _volume_changed_cb(void *user_data)
(g_volume_changed_cb_table.user_cb)(type, new_volume, g_volume_changed_cb_table.user_data);
}
(g_volume_changed_cb_table.user_cb)(type, new_volume, g_volume_changed_cb_table.user_data);
}
-static void _policy_changed_cb(void *user_data, system_audio_route_t policy){
+static void _
_
policy_changed_cb(void *user_data, system_audio_route_t policy){
if( g_policy_changed_cb_table.user_cb)
g_policy_changed_cb_table.user_cb(policy, g_policy_changed_cb_table.user_data);
}
if( g_policy_changed_cb_table.user_cb)
g_policy_changed_cb_table.user_cb(policy, g_policy_changed_cb_table.user_data);
}
-static void _session_notify_cb(session_msg_t msg, void *user_data){
+static void _
_
session_notify_cb(session_msg_t msg, void *user_data){
if( g_session_notify_cb_table.user_cb ){
g_session_notify_cb_table.user_cb(msg, g_session_notify_cb_table.user_data);
}
}
if( g_session_notify_cb_table.user_cb ){
g_session_notify_cb_table.user_cb(msg, g_session_notify_cb_table.user_data);
}
}
-
int
_convert_sound_manager_error_code(const char *func, int code){
+
static int _
_convert_sound_manager_error_code(const char *func, int code){
int ret = SOUND_MANAGER_ERROR_NONE;
char *errorstr = NULL;
int ret = SOUND_MANAGER_ERROR_NONE;
char *errorstr = NULL;
@@
-111,95
+111,95
@@
int sound_manager_get_max_volume(sound_type_e type, int *max)
{
int volume;
if( max == NULL )
{
int volume;
if( max == NULL )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
if( type > MAX_VOLUME_TYPE || type < 0 )
if( type > MAX_VOLUME_TYPE || type < 0 )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret = mm_sound_volume_get_step(type, &volume);
if( ret == 0 )
*max = volume -1; // actual volume step can be max step - 1
int ret = mm_sound_volume_get_step(type, &volume);
if( ret == 0 )
*max = volume -1; // actual volume step can be max step - 1
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_set_volume(sound_type_e type, int volume)
{
if( type > MAX_VOLUME_TYPE || type < 0 )
}
int sound_manager_set_volume(sound_type_e type, int volume)
{
if( type > MAX_VOLUME_TYPE || type < 0 )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
if( volume < 0 )
if( volume < 0 )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret = mm_sound_volume_set_value(type, volume);
int ret = mm_sound_volume_set_value(type, volume);
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_get_volume(sound_type_e type, int *volume)
{
unsigned int uvolume;
if( type > MAX_VOLUME_TYPE || type < 0 )
}
int sound_manager_get_volume(sound_type_e type, int *volume)
{
unsigned int uvolume;
if( type > MAX_VOLUME_TYPE || type < 0 )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
if( volume == NULL)
if( volume == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret = mm_sound_volume_get_value(type, &uvolume);
if( ret == 0)
*volume = uvolume;
int ret = mm_sound_volume_get_value(type, &uvolume);
if( ret == 0)
*volume = uvolume;
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_set_route_policy (sound_route_policy_e route)
{
if( route < 0 || route > SOUND_ROUTE_HANDSET_ONLY)
}
int sound_manager_set_route_policy (sound_route_policy_e route)
{
if( route < 0 || route > SOUND_ROUTE_HANDSET_ONLY)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret;
ret = mm_sound_route_set_system_policy(route);
int ret;
ret = mm_sound_route_set_system_policy(route);
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_get_route_policy (sound_route_policy_e *route)
{
if( route == NULL)
}
int sound_manager_get_route_policy (sound_route_policy_e *route)
{
if( route == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret;
ret= mm_sound_route_get_system_policy((system_audio_route_t *)route);
int ret;
ret= mm_sound_route_get_system_policy((system_audio_route_t *)route);
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_get_current_sound_type(sound_type_e *type)
{
if( type == NULL)
}
int sound_manager_get_current_sound_type(sound_type_e *type)
{
if( type == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret;
ret = mm_sound_volume_get_current_playing_type((volume_type_t *)type);
int ret;
ret = mm_sound_volume_get_current_playing_type((volume_type_t *)type);
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_get_current_sound_device(sound_device_e *device)
{
if( device == NULL)
}
int sound_manager_get_current_sound_device(sound_device_e *device)
{
if( device == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int ret;
ret = mm_sound_route_get_playing_device((system_audio_route_device_t*)device);
int ret;
ret = mm_sound_route_get_playing_device((system_audio_route_device_t*)device);
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_set_volume_changed_cb(sound_manager_volume_changed_cb callback, void* user_data)
{
if( callback == NULL )
}
int sound_manager_set_volume_changed_cb(sound_manager_volume_changed_cb callback, void* user_data)
{
if( callback == NULL )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
int i;
g_volume_changed_cb_table.user_cb = callback;
g_volume_changed_cb_table.user_data = user_data;
for(i = 0 ; i <= MAX_VOLUME_TYPE ; i++)
{
int i;
g_volume_changed_cb_table.user_cb = callback;
g_volume_changed_cb_table.user_data = user_data;
for(i = 0 ; i <= MAX_VOLUME_TYPE ; i++)
{
- mm_sound_volume_add_callback( i , _volume_changed_cb ,(void*) i);
+ mm_sound_volume_add_callback( i , _
_
volume_changed_cb ,(void*) i);
}
return 0;
}
}
return 0;
}
@@
-218,10
+218,10
@@
void sound_manager_unset_volume_changed_cb(void)
int sound_manager_set_route_policy_changed_cb(sound_manager_route_policy_changed_cb callback, void* user_data)
{
if( callback == NULL)
int sound_manager_set_route_policy_changed_cb(sound_manager_route_policy_changed_cb callback, void* user_data)
{
if( callback == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
g_policy_changed_cb_table.user_cb = callback;
g_policy_changed_cb_table.user_data = user_data;
g_policy_changed_cb_table.user_cb = callback;
g_policy_changed_cb_table.user_data = user_data;
- mm_sound_route_add_change_callback(_policy_changed_cb, user_data);
+ mm_sound_route_add_change_callback(_
_
policy_changed_cb, user_data);
return 0;
}
return 0;
}
@@
-238,7
+238,7
@@
int sound_manager_get_a2dp_status(bool *connected , char** bt_name){
ret = mm_sound_route_get_a2dp_status(&connect , bt_name );
if( ret == 0 )
*connected = connect;
ret = mm_sound_route_get_a2dp_status(&connect , bt_name );
if( ret == 0 )
*connected = connect;
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
}
@@
-246,30
+246,30
@@
int sound_manager_get_a2dp_status(bool *connected , char** bt_name){
int sound_manager_set_session_type(sound_session_type_e type){
int ret = 0;
if( type < 0 || type > SOUND_SESSION_TYPE_EXCLUSIVE )
int sound_manager_set_session_type(sound_session_type_e type){
int ret = 0;
if( type < 0 || type > SOUND_SESSION_TYPE_EXCLUSIVE )
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
if( g_session_notify_cb_table.is_registered ){
mm_session_finish();
g_session_notify_cb_table.is_registered = 0;
}
if( g_session_notify_cb_table.is_registered ){
mm_session_finish();
g_session_notify_cb_table.is_registered = 0;
}
- ret = mm_session_init_ex( type , _session_notify_cb, NULL);
+ ret = mm_session_init_ex( type , _
_
session_notify_cb, NULL);
if( ret == 0 ){
g_session_notify_cb_table.is_registered = 1;
}
if( ret == 0 ){
g_session_notify_cb_table.is_registered = 1;
}
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
}
int sound_manager_set_session_notify_cb(sound_session_notify_cb callback , void *user_data){
int ret =0 ;
if( callback == NULL)
}
int sound_manager_set_session_notify_cb(sound_session_notify_cb callback , void *user_data){
int ret =0 ;
if( callback == NULL)
- return _convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
+ return _
_
convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
if( g_session_notify_cb_table.is_registered ==0 ){
if( g_session_notify_cb_table.is_registered ==0 ){
- ret = mm_session_init_ex( SOUND_SESSION_TYPE_SHARE /*default*/ , _session_notify_cb, NULL);
+ ret = mm_session_init_ex( SOUND_SESSION_TYPE_SHARE /*default*/ , _
_
session_notify_cb, NULL);
if( ret != 0 )
if( ret != 0 )
- return _convert_sound_manager_error_code(__func__, ret);
+ return _
_
convert_sound_manager_error_code(__func__, ret);
g_session_notify_cb_table.is_registered = 1;
}
g_session_notify_cb_table.is_registered = 1;
}