projects
/
profile
/
ivi
/
avsystem.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bf7ade0
)
Fixes for 2.0 interoperability.
author
Ismo Puustinen
<ismo.puustinen@intel.com>
Thu, 18 Oct 2012 13:16:18 +0000
(16:16 +0300)
committer
Ismo Puustinen
<ismo.puustinen@intel.com>
Mon, 11 Mar 2013 11:48:01 +0000
(13:48 +0200)
avsys-audio-path.c
patch
|
blob
|
history
diff --git
a/avsys-audio-path.c
b/avsys-audio-path.c
index
f46f75e
..
35ef48d
100644
(file)
--- a/
avsys-audio-path.c
+++ b/
avsys-audio-path.c
@@
-334,7
+334,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;
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, };
avsys_audio_conf conf = { 0, };
+#endif
/* Check root user */
err = avsys_check_root_privilege();
/* Check root user */
err = avsys_check_root_privilege();
@@
-1055,9
+1057,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 */
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__);
}
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__);
}
@@
-1112,6
+1112,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();
#ifndef MURPHY_SUPPORT
if (close_aif_later == true) {
__avsys_close_aif();
+ }
#endif
return err;
#endif
return err;
@@
-1333,7
+1334,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;
case AVSYS_AUDIO_PLAYBACK_GAIN_FMRADIO:
control->path_fixed_pid[PATH_FIXED_TYPE_FMRADIO] = current_pid;
+#ifndef MURPHY_SUPPORT
SET_AIF(AIF_RADIO_PLAYBACK);
SET_AIF(AIF_RADIO_PLAYBACK);
+#endif
break;
}
}
break;
}
}