diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:15:48 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:15:48 +0900 |
| commit | aa6f4b5fb74de609d3c9f3c6693647f47fcdb00d (patch) | |
| tree | c9e7804e00441a3cc708ca8eb2711d4cfe860564 | |
| parent | fc3cf31f1278fc6d88ed1e2b2a3cef0254dcfc5b (diff) | |
| download | libmm-common-aa6f4b5fb74de609d3c9f3c6693647f47fcdb00d.tar.gz libmm-common-aa6f4b5fb74de609d3c9f3c6693647f47fcdb00d.tar.bz2 libmm-common-aa6f4b5fb74de609d3c9f3c6693647f47fcdb00d.zip | |
merge with master
| -rw-r--r-- | include/mm_error.h | 4 | ||||
| -rw-r--r-- | include/mm_message.h | 3 | ||||
| -rw-r--r-- | packaging/libmm-common.spec | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/mm_error.h b/include/mm_error.h index 755bc28..c0e8527 100644 --- a/include/mm_error.h +++ b/include/mm_error.h @@ -157,6 +157,10 @@ #define MM_ERROR_PLAYER_DSP_CRASHED (MM_ERROR_PLAYER_CLASS | 0x16) /**< Dsp is crashed */ #define MM_ERROR_PLAYER_INVALID_STREAM (MM_ERROR_PLAYER_CLASS | 0x17) /**< Invalid stream */ #define MM_ERROR_PLAYER_DOING_SEEK (MM_ERROR_PLAYER_CLASS | 0x18) /**< Still seeking */ +#define MM_ERROR_PLAYER_DRM_NO_LICENSE (MM_ERROR_PLAYER_CLASS | 0x19) /**< No license */ +#define MM_ERROR_PLAYER_DRM_EXPIRED (MM_ERROR_PLAYER_CLASS | 0x1a) /**< Expired license */ +#define MM_ERROR_PLAYER_DRM_FUTURE_USE (MM_ERROR_PLAYER_CLASS | 0x1b) /**< License for future use */ +#define MM_ERROR_PLAYER_DRM_NOT_AUTHORIZED (MM_ERROR_PLAYER_CLASS | 0x1c) /**< Not authorized */ #define MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_AUDIO (MM_ERROR_PLAYER_CLASS | 0x22) /**< Unsupported audio */ #define MM_ERROR_PLAYER_STREAMING_UNSUPPORTED_VIDEO (MM_ERROR_PLAYER_CLASS | 0x23) /**< Unsupported video */ diff --git a/include/mm_message.h b/include/mm_message.h index 57c74bc..82aa73b 100644 --- a/include/mm_message.h +++ b/include/mm_message.h @@ -74,6 +74,9 @@ enum MMMessageType { MM_MESSAGE_SEEK_COMPLETED, /**< Seek completed */ MM_MESSAGE_PD_DOWNLOADER_START, /**< PD downloader start message */ MM_MESSAGE_PD_DOWNLOADER_END, /**< PD downloader end message */ + MM_MESSAGE_DRM_NO_LICENSE, /**< No license */ + MM_MESSAGE_DRM_EXPIRED, /**< Expired license */ + MM_MESSAGE_DRM_FUTURE_USE, /**< License for future use */ /* CAMCORDER */ MM_MESSAGE_CAMCORDER_STATE_CHANGED = 0x200, /**< State changed.*/ diff --git a/packaging/libmm-common.spec b/packaging/libmm-common.spec index e475b8e..52664ce 100644 --- a/packaging/libmm-common.spec +++ b/packaging/libmm-common.spec @@ -1,7 +1,7 @@ Name: libmm-common Summary: Multimedia Framework Common Lib Version: 0.2.53 -Release: 0 +Release: 1 Group: TO_BE/FILLED_IN License: Apache-2.0 Source0: %{name}-%{version}.tar.gz |