merge with master

diff --git a/include/mm_error.h b/include/mm_error.h
index 755bc28..c0e8527 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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