Remove version from plugin so, remove symbolic link

few build warnings are removed also

[Version] 0.10.115
[Profile] Common
[Issue Type] Enhancement

Change-Id: Ia6657a1f82b090b9f62ee0b05c33426b7116ee3c

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 52cc064..fdea431 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.10.115
+Version:    0.10.116
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -71,7 +71,7 @@ CFLAGS="%{optflags} -fvisibility=hidden -D_TIZEN_PUBLIC_ -DMM_DEBUG_FLAG -DEXPOR
 
 ./autogen.sh
 %configure \
-       --with-plugindir=%{_libdir}/soundplugins/ \
+       --with-plugindir=%{_libdir}/soundplugins \
 %if "%{?TIZEN_PRODUCT_TV}" == "1"
        --enable-prelink \
        --enable-lwipc \
@@ -119,8 +119,6 @@ ln -sf ../focus-server.path %{buildroot}%{_unitdir}/multi-user.target.wants/focu
 %{_libdir}/libmmfsoundcommon.so.*
 %{_libdir}/libmmfkeysound.so.*
 %{_libdir}/libmmfbootsound.so.*
-%{_libdir}/libsoundplugintone.so*
-%{_libdir}/libsoundpluginwave.so*
 %{_libdir}/soundplugins/libsoundplugintone.so
 %{_libdir}/soundplugins/libsoundpluginwave.so
 %if 0%{?tizen_audio_feature_ogg_enable}

diff --git a/server/mm_sound_mgr_codec.c b/server/mm_sound_mgr_codec.c
index f0437fd..0db1eaa 100644 (file)
--- a/server/mm_sound_mgr_codec.c
+++ b/server/mm_sound_mgr_codec.c
@@ -582,7 +582,6 @@ cleanup:
 int MMSoundMgrCodecPlayDtmf(int *slotid, const mmsound_mgr_codec_param_t *param)
 {
        int plugin_id = 0;
-       int *codec_type;
        mmsound_codec_info_t info;
        mmsound_codec_param_t codec_param;
        int err = MM_ERROR_NONE;
@@ -768,7 +767,6 @@ cleanup:
 int MMSoundMgrCodecPlayDtmfWithStreamInfo(int *slotid, const mmsound_mgr_codec_param_t *param)
 {
        int plugin_id = 0;
-       int *codec_type;
        mmsound_codec_info_t info;
        mmsound_codec_param_t codec_param;
        int err = MM_ERROR_NONE;

diff --git a/server/mm_sound_plugin.c b/server/mm_sound_plugin.c
index ce85740..526b836 100644 (file)
--- a/server/mm_sound_plugin.c
+++ b/server/mm_sound_plugin.c
@@ -31,7 +31,7 @@
 #include <mm_error.h>
 #include <mm_debug.h>
 
-static char* __strcatdup(const char *str1, const char *str2);
+static char* __strcatdup(const char *str1, const char *str2, const char *str3);
 static int _MMSoundPluginGetList(const char *plugdir ,char ***list);
 static int _MMSoundPluginDestroyList(char **list);
 
@@ -229,7 +229,7 @@ static int _MMSoundPluginGetList(const char *plugdir ,char ***list)
                debug_log("item %d is %s\n", item_idx, entry[item_idx]->d_name);
 
                if (S_ISREG(finfo.st_mode)) {
-                       temp[tn++] = __strcatdup(plugdir, entry[item_idx]->d_name);
+                       temp[tn++] = __strcatdup(plugdir, "/", entry[item_idx]->d_name);
                }
        }
        *list =  temp;
@@ -251,15 +251,16 @@ static int _MMSoundPluginDestroyList(char **list)
        return MM_ERROR_NONE;
 }
 
-static char* __strcatdup(const char *str1, const char *str2)
+static char* __strcatdup(const char *str1, const char *str2, const char *str3)
 {
     char *dest = NULL;
     int len = 0;
-    len = strlen(str1) + strlen(str2) + 1;
+    len = strlen(str1) + strlen(str2) + strlen(str3) + 1;
     dest = (char*) malloc(len*sizeof(char));
     if (!dest)
         return NULL;
     strncpy(dest, str1, len-1);
     strncat(dest, str2, len-1);
+    strncat(dest, str3, len-1);
     return dest;
 }

diff --git a/server/mm_sound_server.c b/server/mm_sound_server.c
index 5df0f15..c646024 100644 (file)
--- a/server/mm_sound_server.c
+++ b/server/mm_sound_server.c
@@ -133,8 +133,6 @@ static int _get_option(int argc, char **argv, server_arg *arg)
 //__attribute__ ((destructor))
 static void _exit_handler(int sig)
 {
-       int ret = MM_ERROR_NONE;
-
        switch(sig) {
        case SIGINT:
                sigaction(SIGINT, &sigint_action, NULL);

diff --git a/server/plugin/tone/Makefile.am b/server/plugin/tone/Makefile.am
index b3ce3b0..2970b9e 100644 (file)
--- a/server/plugin/tone/Makefile.am
+++ b/server/plugin/tone/Makefile.am
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libsoundplugintone.la
 
 libsoundplugintone_la_SOURCES = mm_sound_plugin_codec_tone.c
+libdir = $(PLUGIN_DIR)
 
 libsoundplugintone_la_CFLAGS  = \
                                $(MMCOMMON_CFLAGS) \
@@ -16,7 +17,4 @@ libsoundplugintone_la_LIBADD  = \
                                $(srcdir)/../../../common/libmmfsoundcommon.la \
                                $(MMLOGSVR_LIBS)
 
-install-exec-hook:
-       mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf ../libsoundplugintone.so $(DESTDIR)$(libdir)/soundplugins/libsoundplugintone.so
-
+libsoundplugintone_la_LDFLAGS  = -avoid-version

diff --git a/server/plugin/wav/Makefile.am b/server/plugin/wav/Makefile.am
index 859d085..a91c60c 100644 (file)
--- a/server/plugin/wav/Makefile.am
+++ b/server/plugin/wav/Makefile.am
@@ -2,6 +2,8 @@ lib_LTLIBRARIES = libsoundpluginwave.la
 
 libsoundpluginwave_la_SOURCES = mm_sound_plugin_codec_wave.c
 
+libdir = $(PLUGIN_DIR)
+
 libsoundpluginwave_la_CFLAGS  = \
                                $(MMCOMMON_CFLAGS) \
                                -I$(srcdir)/../../../include \
@@ -17,7 +19,4 @@ libsoundpluginwave_la_LIBADD  = $(MMCOMMON_LIBS) \
                                $(srcdir)/../../../libmmfsound.la \
                                $(srcdir)/../../../common/libmmfsoundcommon.la
 
-install-exec-hook:
-       mkdir -p $(DESTDIR)$(libdir)/soundplugins
-       ln -sf ../libsoundpluginwave.so $(DESTDIR)$(libdir)/soundplugins/libsoundpluginwave.so
-
+libsoundpluginwave_la_LDFLAGS  = -avoid-version