Change not to export muse module enumeration

Change-Id: I5531512146c695625fb088ab10b24e92e2381c8f

diff --git a/client/include/muse_client.h b/client/include/muse_client.h
index a0a0d5a..eac1fdb 100644 (file)
--- a/client/include/muse_client.h
+++ b/client/include/muse_client.h
@@ -34,7 +34,7 @@ int muse_client_close(int sock_fd);
 int muse_client_ipc_push_data(int sock_fd, const char *data, int size, uint64_t data_id);
 int muse_client_get_fd_id_value(int sock_fd);
 bool muse_client_check_fd_id_value(int sock_fd, int sock_id);
-int muse_client_get_module_index(char *module_name, int *module_index);
+int muse_client_get_module_index(const char *module_name, int *module_index);
 
 #ifdef __cplusplus
 }

diff --git a/client/src/muse_client.c b/client/src/muse_client.c
index bb3a2fd..d60cf72 100644 (file)
--- a/client/src/muse_client.c
+++ b/client/src/muse_client.c
@@ -290,7 +290,7 @@ bool muse_client_check_fd_id_value(int sock_fd, int sock_id)
                return false;
 }
 
-int muse_client_get_module_index(char *module_name, int *module_index)
+int muse_client_get_module_index(const char *module_name, int *module_index)
 {
        int idx = 0;
        char *str;

diff --git a/core/include/muse_core.h b/core/include/muse_core.h
index f58727b..76e0075 100644 (file)
--- a/core/include/muse_core.h
+++ b/core/include/muse_core.h
@@ -43,14 +43,6 @@ extern "C" {
 typedef struct muse_module *muse_module_h;
 
 typedef enum {
-       MUSE_PLAYER,
-       MUSE_CAMERA,
-       MUSE_RECORDER,
-       MUSE_DRM,
-       MUSE_MODULE_TYPE_MAX
-} muse_core_api_module_e;
-
-typedef enum {
        MUSE_TYPE_INT = 1,
        MUSE_TYPE_INT64,
        MUSE_TYPE_POINTER,

diff --git a/core/include/muse_core_internal.h b/core/include/muse_core_internal.h
index e900b7b..8e06ee2 100644 (file)
--- a/core/include/muse_core_internal.h
+++ b/core/include/muse_core_internal.h
@@ -74,9 +74,6 @@ extern "C" {
 #define MUSE_MSG_LEN                           32
 #define MUSE_MSG_LEN_MAX                       128
 
-/* module */
-#define MUSE_MODULE_TYPE_MAX           10
-
 /* dispatcher */
 #define MUSE_DISPATCHER_MAX                    512
 
@@ -119,6 +116,15 @@ extern "C" {
        } while (0)
 
 typedef enum {
+       MUSE_PLAYER,
+       MUSE_CAMERA,
+       MUSE_RECORDER,
+       MUSE_DRM_SVC,
+       MUSE_EPPLAYER,
+       MUSE_MODULE_MAX
+} muse_core_module_e;
+
+typedef enum {
        API_CREATE,
        API_DESTROY,
        API_MAX = MUSE_DISPATCHER_MAX
@@ -180,4 +186,4 @@ void muse_core_get_cur_time(char *time_buf);
 #ifdef __cplusplus
 }
 #endif
-#endif /*__MUSE_CORE_INTERNAL_H__*/
\ No newline at end of file
+#endif /*__MUSE_CORE_INTERNAL_H__*/

diff --git a/packaging/mused.spec b/packaging/mused.spec
index c3e4893..0815831 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.64
+Version:    0.3.65
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause

diff --git a/server/include/muse_server_config.h b/server/include/muse_server_config.h
index 783d9c2..5a3f274 100644 (file)
--- a/server/include/muse_server_config.h
+++ b/server/include/muse_server_config.h
@@ -70,7 +70,7 @@ typedef struct host_info {
 
 typedef struct ms_config {
        char *hosts;
-       char *host[MUSE_MODULE_TYPE_MAX];
+       char *host[MUSE_MODULE_MAX];
        int host_cnt;
        gboolean log_enabled;
        char *lockfile;
@@ -80,7 +80,7 @@ typedef struct ms_config {
        gboolean is_watch_external_storage_enabled;
        char *gst_param_str[MUSE_PARAM_MAX];
        int gst_param_cnt;
-       host_info_t *host_infos[MUSE_MODULE_TYPE_MAX];
+       host_info_t *host_infos[MUSE_MODULE_MAX];
        dictionary *muse_dict;
        gboolean is_on_demand;
        int max_idle_time;

diff --git a/server/include/muse_server_connection.h b/server/include/muse_server_connection.h
index 73ba675..134d24a 100644 (file)
--- a/server/include/muse_server_connection.h
+++ b/server/include/muse_server_connection.h
@@ -40,7 +40,7 @@ typedef enum {
 typedef struct ms_connection {
        int epfd;
        struct epoll_event events[MS_EVENT_MAX];
-       int instance_count[MUSE_MODULE_TYPE_MAX];
+       int instance_count[MUSE_MODULE_MAX];
        GQueue *instance_queue;
        GMutex lock;
 } ms_connection_t;

diff --git a/server/include/muse_server_private.h b/server/include/muse_server_private.h
index e36603d..29e40b1 100644 (file)
--- a/server/include/muse_server_private.h
+++ b/server/include/muse_server_private.h
@@ -76,7 +76,7 @@ typedef struct _muse_server {
        GThread *diag_thread;
        ms_config_t *conf;
        ms_connection_t *connection;
-       ms_module_t *module[MUSE_MODULE_TYPE_MAX];
+       ms_module_t *module[MUSE_MODULE_MAX];
        ms_log_t *log;
        ms_security_t *security;
        ms_system_t *system;