Remove ASMReady / FMRadioRecording / Vconf initialization

[Version] Release 0.9.244
[Profile] Common
[Issue Type] Code Clean

Change-Id: I0364af15d69bab779b8714d413e51ac1f8d14b5e

diff --git a/include/mm_sound_common.h b/include/mm_sound_common.h
index 616f90c..6e40cf3 100644 (file)
--- a/include/mm_sound_common.h
+++ b/include/mm_sound_common.h
@@ -44,8 +44,6 @@
 #define VCONF_KEY_VR_LEFTHAND_ENABLED          VCONFKEY_SETAPPL_PERFERED_ARM_LEFT_BOOL
 #endif
 #endif
-#define ASM_READY_KEY          "memory/private/Sound/ASMReady"
-#define VCONF_KEY_FMRADIO_RECORDING    "memory/private/Sound/FMRadioRecording"
 
 #define PA_READY "/tmp/.pa_ready"
 

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 136cc32..f7329af 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.9.243
+Version:    0.9.244
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -119,21 +119,6 @@ ln -sf ../focus-server.path %{buildroot}%{_unitdir}/multi-user.target.wants/focu
 %post
 /sbin/ldconfig
 
-/usr/bin/vconftool set -t int memory/private/Sound/ASMReady 0 -g 29 -f -i -s system::vconf_multimedia
-/usr/bin/vconftool set -t int memory/private/Sound/VoiceControlOn 0 -g 29 -f -i -s system::vconf_multimedia
-/usr/bin/vconftool set -t string memory/private/sound/booting "/usr/share/keysound/poweron.wav" -g 29 -f -i -s system::vconf_multimedia
-/usr/bin/vconftool set -t int memory/private/sound/PrimaryVolumeType -1 -g 29 -f -i -s system::vconf_multimedia
-
-/usr/bin/vconftool set -t int file/private/sound/volume/system 9 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/notification 11 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/alarm 7 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/ringtone 11 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/media 7 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/call 4 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/voip 4 -g 29 -f -s system::vconf_multimedia
-/usr/bin/vconftool set -t int file/private/sound/volume/voice 7 -g 29 -f -s system::vconf_multimedia
-
-
 %postun -p /sbin/ldconfig
 
 

diff --git a/server/mm_sound_mgr_asm.c b/server/mm_sound_mgr_asm.c
index 4d958ed..6f2f30c 100644 (file)
--- a/server/mm_sound_mgr_asm.c
+++ b/server/mm_sound_mgr_asm.c
@@ -3912,15 +3912,13 @@ int __asm_process_message (void *rcv_msg, void *ret_msg)
        return ret;
 }
 
-void __asm_main_run (void* param)
+int MMSoundMgrASMInit(void)
 {
-       //ASM_msg_lib_to_asm_t asm_rcv_msg;
+       int ret = 0;
+       debug_fenter();
 
        signal(SIGPIPE, SIG_IGN);
 
-       /*
-        * Init Vconf
-        */
        if (vconf_set_int(SOUND_STATUS_KEY, 0)) {
                debug_error(" vconf_set_int fail\n");
                if (vconf_set_int(SOUND_STATUS_KEY, 0)) {
@@ -3928,24 +3926,6 @@ void __asm_main_run (void* param)
                }
        }
 
-       /* Set READY flag */
-       if (vconf_set_int(ASM_READY_KEY, 1)) {
-               debug_error(" vconf_set_int fail\n");
-       }
-}
-
-
-int MMSoundMgrASMInit(void)
-{
-       int ret = 0;
-       debug_fenter();
-
-       ret = MMSoundThreadPoolRun(NULL, __asm_main_run);
-       if (ret != MM_ERROR_NONE) {
-               /* TODO : Error Handling */
-               debug_error ("MMSoundThreadPoolRun failed....ret = [%x]\n", ret);
-       }
-
        debug_fleave();
        return ret;
 }

diff --git a/server/mm_sound_mgr_pulse.c b/server/mm_sound_mgr_pulse.c
index c79828a..6a2136c 100644 (file)
--- a/server/mm_sound_mgr_pulse.c
+++ b/server/mm_sound_mgr_pulse.c
@@ -1686,37 +1686,6 @@ unlock_and_fail:
        debug_leave("\n");
 }
 
-static void _recorder_changed_cb(keynode_t* node, void* data)
-{
-       int key_value;
-       pulse_info_t* pinfo = (pulse_info_t*)data;
-       session_t session = 0;
-
-       if (pinfo == NULL) {
-               debug_error ("pinfo is null\n");
-               return;
-       }
-
-       vconf_get_int(VCONFKEY_RECORDER_STATE, &key_value);
-       debug_msg ("%s changed callback called, recorder state value = %d\n", vconf_keynode_get_name(node), key_value);
-
-       MMSoundMgrSessionGetSession(&session);
-
-       if ((key_value == VCONFKEY_RECORDER_STATE_RECORDING || key_value == VCONFKEY_RECORDER_STATE_RECORDING_PAUSE) && session == SESSION_FMRADIO) {
-               vconf_set_int(VCONF_KEY_FMRADIO_RECORDING, 1);
-       } else {
-               vconf_set_int(VCONF_KEY_FMRADIO_RECORDING, 0);
-       }
-}
-
-int MMSoundMgrPulseHandleRegisterFMRadioRecording(void* pinfo)
-{
-       int ret = vconf_notify_key_changed(VCONFKEY_RECORDER_STATE, _recorder_changed_cb, pinfo);
-       debug_msg ("vconf [%s] set ret = %d\n", VCONFKEY_RECORDER_STATE, ret);
-
-       return ret;
-}
-
 void MMSoundMgrPulseUnLoadHDMI()
 {
        pa_operation *o = NULL;

diff --git a/server/mm_sound_server.c b/server/mm_sound_server.c
index 00a0161..e9ee571 100644 (file)
--- a/server/mm_sound_server.c
+++ b/server/mm_sound_server.c
@@ -116,21 +116,6 @@ void mainloop_run()
        g_main_loop_run(g_mainloop);
 }
 
-static void __wait_for_vconfkey_ready (const char *keyname)
-{
-       int retry_count = 0;
-       int vconf_ready = 0;
-       while (!vconf_ready) {
-               debug_msg("Checking the vconf key[%s] ready....[%d]\n", keyname, retry_count++);
-               if (vconf_get_int(keyname, &vconf_ready)) {
-                       debug_warning("vconf_get_int for vconf key[%s] failed\n", keyname);
-               }
-               usleep (VCONFKEY_CHECK_INTERVAL);
-       }
-       debug_msg("vconf key[%s] is now ready...clear the key!!!\n", keyname);
-       vconf_set_int(keyname, 0);
-}
-
 static int _handle_power_off ()
 {
        debug_warning ("not supported\n");
@@ -257,11 +242,6 @@ int main(int argc, char **argv)
 
 //             pulse_handle = MMSoundMgrPulseInit(_pa_disconnect_cb, g_mainloop);
                MMSoundMgrASMInit();
-               /* Wait for ASM Ready */
-#if 0 /* comment wait vconf key logic, it'll be removed after figuring it out */
-               __wait_for_vconfkey_ready(ASM_READY_KEY);
-               debug_warning("sound_server [%d] asm ready...now, initialize devices!!!\n", getpid());
-#endif
 //             _mm_sound_mgr_device_init();
 //             MMSoundMgrHeadsetInit();
 //             MMSoundMgrDockInit();