summaryrefslogtreecommitdiff
authorLei Qian <lei.qian@amlogic.com>2017-12-28 08:42:18 (GMT)
committer Lei Qian <lei.qian@amlogic.com>2017-12-28 08:42:18 (GMT)
commitae1a0d0b5359503e5132cc70af63d9c5b174f0ae (patch)
treec3e7d8818567df4149e16ea7575562e8e485b073
parentb0f6ad57ae9678f498e7cf201657b012e6d07a17 (diff)
downloadTvInput-ae1a0d0b5359503e5132cc70af63d9c5b174f0ae.zip
TvInput-ae1a0d0b5359503e5132cc70af63d9c5b174f0ae.tar.gz
TvInput-ae1a0d0b5359503e5132cc70af63d9c5b174f0ae.tar.bz2
DroidLogicTvInput: change mute API [1/1]
PD# 154222 audio RD says that we can't control audio hardware switch. Change-Id: I4e06bf49d66662adad9cbe9f6aadc1d0c69dd0d0 Signed-off-by: Lei Qian <lei.qian@amlogic.com>
Diffstat
-rw-r--r--DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java8
-rw-r--r--DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java8
-rw-r--r--DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java8
3 files changed, 12 insertions, 12 deletions
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
index a3bdc71..934110f 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/services/DTVInputService.java
@@ -1131,7 +1131,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
break;
case TvControlManager.EVENT_AV_PLAYBACK_RESUME:
if (mCurrentChannel != null && ChannelInfo.isRadioChannel(mCurrentChannel)) {
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_UNMUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_UNMUTE_FOR_TV);
notifyVideoUnavailable(TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY);
}
break;
@@ -1232,7 +1232,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
public void notifyVideoAvailable() {
Log.d(TAG, "notifyVideoAvailable "+getSessionId());
super.notifyVideoAvailable();
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_UNMUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_UNMUTE_FOR_TV);
mSubtitleView.setVisible(is_subtitle_enabled);
}
@@ -1244,7 +1244,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
if (mOverlayView != null) {
switch (reason) {
case TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY:
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_UNMUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_UNMUTE_FOR_TV);
mOverlayView.setImage(R.drawable.bg_radio);
mSystemControlManager.writeSysFs("/sys/class/video/disable_video",
"2");
@@ -1254,7 +1254,7 @@ public class DTVInputService extends DroidLogicTvInputService implements TvContr
case TvInputManager.VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL:
case TvInputManager.VIDEO_UNAVAILABLE_REASON_UNKNOWN:
default:
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
mOverlayView.setImage(R.drawable.bg_no_signal);
mOverlayView.setImageVisibility(true);
mOverlayView.setTextVisibility(true);
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
index b40a3c6..8f21e4d 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManager.java
@@ -1377,7 +1377,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
}
private void startManualSearchAccordingMode() {
Log.d(TAG, "startManualSearchAccordingMode");
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
ViewGroup parent = (ViewGroup) ((TvSettingsActivity) mContext).mOptionLayout.getChildAt(0);
OptionEditText edit = (OptionEditText) parent.findViewById(R.id.manual_search_dtv_channel_manual);
String channel = edit.getText().toString();
@@ -1473,7 +1473,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
private void startManualSearch() {
Log.d(TAG, "startManualSearch");
ViewGroup parent = (ViewGroup) ((TvSettingsActivity) mContext).mOptionLayout.getChildAt(0);
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
if (mSettingsManager.getCurentVirtualTvSource() == TvControlManager.SourceInput_Type.SOURCE_TYPE_ADTV) {
Log.d(TAG, "ADTV");
OptionEditText edit = (OptionEditText) parent.findViewById(R.id.manual_search_dtv_channel);
@@ -1814,7 +1814,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
private void startAutosearch() {
Log.d(TAG, "startAutoSearch");
TvControlManager.TvMode mode = new TvControlManager.TvMode(mSettingsManager.getDtvType());
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
//mSettingsManager.sendBroadcastToTvapp("search_channel");
if (mSettingsManager.getCurentVirtualTvSource() == TvControlManager.SourceInput_Type.SOURCE_TYPE_ADTV) {
Log.d(TAG, "ADTV");
@@ -1893,7 +1893,7 @@ public class OptionUiManager implements OnClickListener, OnFocusChangeListener,
bundle.putInt(DroidLogicTvUtils.PARA_SCAN_PARA3, TvControlManager.ATV_VIDEO_STD_AUTO);
bundle.putInt(DroidLogicTvUtils.PARA_SCAN_PARA4, TvControlManager.ATV_AUDIO_STD_AUTO);
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
switch (((TvSettingsActivity)mContext).mScanEdit.checkAutoScanMode()) {
case ScanEdit.SCAN_ATV_DTV:
Log.d(TAG, "ADTV");
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
index e5ccf4b..bc86ea1 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/settings/OptionUiManagerT.java
@@ -229,7 +229,7 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage
private void startManualSearchAccordingMode() {
Log.d(TAG, "startManualSearchAccordingMode");
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
String channel;
if (!isLiveTvScaning) {
ViewGroup parent = (ViewGroup) ((TvSettingsActivity) mContext).mOptionLayout.getChildAt(0);
@@ -350,7 +350,7 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage
if (!isLiveTvScaning) {
parent = (ViewGroup) ((TvSettingsActivity) mContext).mOptionLayout.getChildAt(0);
}
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
if (mSettingsManager.getCurentVirtualTvSource() == TvControlManager.SourceInput_Type.SOURCE_TYPE_ADTV) {
Log.d(TAG, "ADTV");
String channel;
@@ -730,7 +730,7 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage
private void startAutosearch() {
Log.d(TAG, "startAutoSearch");
TvControlManager.TvMode mode = new TvControlManager.TvMode(mSettingsManager.getDtvType());
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
//mSettingsManager.sendBroadcastToTvapp("search_channel");
if (mSettingsManager.getCurentVirtualTvSource() == TvControlManager.SourceInput_Type.SOURCE_TYPE_ADTV) {
Log.d(TAG, "ADTV");
@@ -809,7 +809,7 @@ public class OptionUiManagerT implements OnFocusChangeListener, TvControlManage
bundle.putInt(DroidLogicTvUtils.PARA_SCAN_PARA3, TvControlManager.ATV_VIDEO_STD_AUTO);
bundle.putInt(DroidLogicTvUtils.PARA_SCAN_PARA4, TvControlManager.ATV_AUDIO_STD_AUTO);
- mTvControlManager.SetAudioMuteForTv(TvControlManager.AUDIO_MUTE_FOR_TV);
+ mTvControlManager.setAmAudioPreMute(TvControlManager.AUDIO_MUTE_FOR_TV);
int autoscanmode;
int checkcablemode;
if (!isLiveTvScaning) {