From: Ismo Puustinen <ismo.puustinen@intel.com>
Date: Thu, 18 Oct 2012 13:16:18 +0000 (+0300)
Subject: Fixes for 2.0 interoperability.
X-Git-Tag: submit/2.0alpha/20121127.195601~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a0dd9111e151e19456c6915b9eaa2c8bd8d0a3a;p=profile%2Fivi%2Favsystem.git

Fixes for 2.0 interoperability.
---

diff --git a/avsys-audio-path.c b/avsys-audio-path.c
index b1d4c06..29e600c 100644
--- a/avsys-audio-path.c
+++ b/avsys-audio-path.c
@@ -309,7 +309,9 @@ int avsys_audio_path_ex_init(void)
 	option_info_t default_option = { AVSYS_AUDIO_PATH_OPTION_NONE, AVSYS_AUDIO_PATH_OPTION_NONE };
 	int index = 0;
 	int err = AVSYS_STATE_SUCCESS;
+#ifndef MURPHY_SUPPORT
 	avsys_audio_conf conf = { 0, };
+#endif
 
 	/* Check root user */
 	err = avsys_check_root_privilege();
@@ -966,9 +968,7 @@ static int __avsys_audio_release_path (gain_info_t local_gain, avsys_audio_path_
 
 	case AVSYS_AUDIO_PLAYBACK_GAIN_FMRADIO:
 		/* TODO: Reset & Codec disable on suspend script */
-#ifdef MURPHY_SUPPORT
-        control->p_path_status.playback = PS_PATH_NONE;
-#else
+#ifndef MURPHY_SUPPORT
 		if (AVSYS_FAIL(avsys_audio_ascn_single_set(ASCN_CODEC_DISABLE_ON_SUSPEND))) {
 			avsys_error_r(AVAUDIO, "[%s] failed to set codec_disable_on_suspend\n", __func__);
 		}
@@ -1023,6 +1023,7 @@ static int __avsys_audio_release_path (gain_info_t local_gain, avsys_audio_path_
 #ifndef MURPHY_SUPPORT
 	if (close_aif_later == true) {
 		__avsys_close_aif();
+    }
 #endif
 
 	return err;
@@ -1239,7 +1240,9 @@ int avsys_audio_path_ex_set_path(int gain, int out, int in, int option)
 
 			case AVSYS_AUDIO_PLAYBACK_GAIN_FMRADIO:
 				control->path_fixed_pid[PATH_FIXED_TYPE_FMRADIO] = current_pid;
+#ifndef MURPHY_SUPPORT
 				SET_AIF(AIF4_PLAYBACK);
+#endif
 				break;
 			}
 		}