diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-09-25 15:31:49 -0400 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-09-25 15:31:49 -0400 |
| commit | d7abefd924b8cbe245425b70a0c0911ec5e73115 (patch) | |
| tree | 55750f9327e6d8c8538fb1df65037dc66c743454 | |
| parent | b5b8f6c643e4c33a591ae15e2aa158825994dda4 (diff) | |
| parent | e082523d76130101f347762b57be9d9142955aa3 (diff) | |
| download | libmm-common-d7abefd924b8cbe245425b70a0c0911ec5e73115.tar.gz libmm-common-d7abefd924b8cbe245425b70a0c0911ec5e73115.tar.bz2 libmm-common-d7abefd924b8cbe245425b70a0c0911ec5e73115.zip | |
Merge branch 'tizen_2.2' into tizentizen_3.0.m14.2_ivi_releasesubmit/tizen_ivi_stable/20131116.100639submit/tizen_ivi_panda/20140403.011856submit/tizen/20130925.193241accepted/tizen_ivi_stable/20131116.111838accepted/tizen/ivi/panda/20140403.015038accepted/tizen/20130926.191155accepted/tizen/20130926.050854accepted/tizen/20130926.033135tizen_ivi_pandatizen_3.0.m14.2_iviaccepted/tizen_ivi_pandaaccepted/tizen_genericaccepted/tizen/ivi/stable
| -rw-r--r-- | include/mm_error.h | 2 | ||||
| -rw-r--r-- | include/mm_types.h | 1 | ||||
| -rw-r--r-- | packaging/libmm-common.spec | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/mm_error.h b/include/mm_error.h index 25a6777..775b260 100644 --- a/include/mm_error.h +++ b/include/mm_error.h @@ -340,6 +340,8 @@ #define MM_ERROR_POLICY_INTERNAL (MM_ERROR_POLICY_CLASS | 0x03) /**< Internal errors */ #define MM_ERROR_POLICY_DUPLICATED (MM_ERROR_POLICY_CLASS | 0x04) /**< Duplicated Policy Instance */ #define MM_ERROR_POLICY_RESTRICTED (MM_ERROR_POLICY_CLASS | 0x05) /**< Restricted by security system policy */ +#define MM_ERROR_POLICY_BLOCKED_BY_CALL (MM_ERROR_POLICY_CLASS | 0x06) /**< Blocked by Audio system policy - CALL */ +#define MM_ERROR_POLICY_BLOCKED_BY_ALARM (MM_ERROR_POLICY_CLASS | 0x07) /**< Blocked by Audio system policy - ALARM */ /** @} */ diff --git a/include/mm_types.h b/include/mm_types.h index c08f84a..3bc1057 100644 --- a/include/mm_types.h +++ b/include/mm_types.h @@ -165,6 +165,7 @@ enum MMSoftwareVolumeTableType { MM_SOUND_VOLUME_TYPE_RINGTONE, /**< Volume table for Ringtone */ MM_SOUND_VOLUME_TYPE_MEDIA, /**< Volume table for Multimedia */ MM_SOUND_VOLUME_TYPE_CALL, /**< Volume table for Call */ + MM_SOUND_VOLUME_TYPE_VOIP, /**< Volume table for VOIP */ MM_SOUND_VOLUME_TYPE_EMERGENCY, /**< Volume table for Emergency (FIXED) */ MM_SOUND_VOLUME_TYPE_NUM, MM_SOUND_VOLUME_TABLE_NUM = MM_SOUND_VOLUME_TYPE_NUM, diff --git a/packaging/libmm-common.spec b/packaging/libmm-common.spec index f63c2ed..f467234 100644 --- a/packaging/libmm-common.spec +++ b/packaging/libmm-common.spec @@ -1,6 +1,6 @@ Name: libmm-common -Version: 0.2.53 -Release: 2 +Version: 0.2.54 +Release: 0 Summary: Multimedia Framework Common Library Group: Multimedia Framework/Libraries License: Apache-2.0 |