summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--[-rwxr-xr-x]include/asm-error.h0
-rw-r--r--[-rwxr-xr-x]include/asm-log.h0
-rw-r--r--[-rwxr-xr-x]include/audio-session-manager-types.h18
-rw-r--r--[-rwxr-xr-x]include/audio-session-manager.h6
4 files changed, 16 insertions, 8 deletions
diff --git a/include/asm-error.h b/include/asm-error.h
index 9084444..9084444 100755..100644
--- a/include/asm-error.h
+++ b/include/asm-error.h
diff --git a/include/asm-log.h b/include/asm-log.h
index e945238..e945238 100755..100644
--- a/include/asm-log.h
+++ b/include/asm-log.h
diff --git a/include/audio-session-manager-types.h b/include/audio-session-manager-types.h
index f2ab404..1c4a17a 100755..100644
--- a/include/audio-session-manager-types.h
+++ b/include/audio-session-manager-types.h
@@ -62,15 +62,16 @@
typedef enum
{
ASM_REQUEST_REGISTER = 0,
- ASM_REQUEST_UNREGISTER = 1,
- ASM_REQUEST_GETSTATE = 2,
- ASM_REQUEST_GETMYSTATE = 3,
- ASM_REQUEST_SETSTATE = 4,
- ASM_REQUEST_EMERGENT_EXIT = 5,
- ASM_REQUEST_DUMP = 6,
+ ASM_REQUEST_UNREGISTER,
+ ASM_REQUEST_GETSTATE,
+ ASM_REQUEST_GETMYSTATE,
+ ASM_REQUEST_SETSTATE,
+ ASM_REQUEST_EMERGENT_EXIT,
+ ASM_REQUEST_DUMP,
+ ASM_REQUEST_SET_SUBSESSION,
+ ASM_REQUEST_GET_SUBSESSION,
} ASM_requests_t;
-
/**
* This enumeration defines sound event for Sound Scenario in Multimedia Resources Conflict Manager.
*/
@@ -96,6 +97,7 @@ typedef enum
ASM_EVENT_ALARM,
ASM_EVENT_VIDEOCALL,
ASM_EVENT_MONITOR,
+ ASM_EVENT_RICH_CALL,
ASM_EVENT_MAX
} ASM_sound_events_t;
@@ -154,6 +156,7 @@ typedef enum
ASM_STATUS_ALARM = 0x00100000,
ASM_STATUS_VIDEOCALL = 0x20000000, //Watch out
ASM_STATUS_MONITOR = 0x80000000, //watch out
+ ASM_STATUS_RICH_CALL = 0x40000000, //Watch out
} ASM_sound_status_t;
@@ -314,6 +317,7 @@ static const ASM_sound_event_type_t ASM_sound_type[] = {
{ ASM_EVENT_ALARM, ASM_STATUS_ALARM },
{ ASM_EVENT_VIDEOCALL, ASM_STATUS_VIDEOCALL },
{ ASM_EVENT_MONITOR, ASM_STATUS_MONITOR },
+ { ASM_EVENT_RICH_CALL, ASM_STATUS_RICH_CALL },
};
diff --git a/include/audio-session-manager.h b/include/audio-session-manager.h
index 9a74181..b7434b2 100755..100644
--- a/include/audio-session-manager.h
+++ b/include/audio-session-manager.h
@@ -53,6 +53,9 @@ bool
ASM_register_sound(const int application_pid, int *asm_handle, ASM_sound_events_t sound_event,
ASM_sound_states_t sound_state, ASM_sound_cb_t callback, void* cb_data, ASM_resource_t mm_resource, int *error_code);
+bool
+ASM_register_sound_ex (const int application_pid, int *asm_handle, ASM_sound_events_t sound_event,
+ ASM_sound_states_t sound_state, ASM_sound_cb_t callback, void* cb_data, ASM_resource_t mm_resource, int *error_code, int (*func)(void*,void*));
/**
* This function unregister sound event to ASM server. If unregistered, sound event is not playing.
@@ -65,6 +68,7 @@ ASM_register_sound(const int application_pid, int *asm_handle, ASM_sound_events_
bool
ASM_unregister_sound(const int asm_handle, ASM_sound_events_t sound_event, int *error_code);
+bool ASM_unregister_sound_ex(const int asm_handle, ASM_sound_events_t sound_event, int *error_code, int (*func)(void*,void*));
/**
@@ -118,7 +122,7 @@ ASM_get_process_session_state(const int asm_handle, ASM_sound_states_t *sound_st
bool
ASM_set_sound_state(const int asm_handle, ASM_sound_events_t sound_event, ASM_sound_states_t sound_state, ASM_resource_t mm_resource, int *error_code);
-
+bool ASM_set_sound_state_ex (const int asm_handle, ASM_sound_events_t sound_event, ASM_sound_states_t sound_state, ASM_resource_t mm_resource, int *error_code, int (*func)(void*,void*));
/**
* This function ask sound policy to ASM server.