summaryrefslogtreecommitdiff
authorLei Qian <lei.qian@amlogic.com>2017-10-19 05:41:32 (GMT)
committer Lei Qian <lei.qian@amlogic.com>2017-10-19 07:25:34 (GMT)
commit7e6afd2f43fd83722116c9648742bccc9eceb047 (patch)
tree8f64e633fb05bdef7462cdd62a502ba925ae7fe7
parent950db2649fd14fb69b6e832c60dec844e943f1a3 (diff)
downloadtv-ref-o-20171115.zip
tv-ref-o-20171115.tar.gz
tv-ref-o-20171115.tar.bz2
tv-frameworks: fix compile error [1/1]
PD# 152597 Change-Id: Ic28431e2050e6d1d3b99c89a9d3cec40c14c7b6c
Diffstat
-rw-r--r--core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java3
-rw-r--r--core/java/com/droidlogic/app/tv/TvControlManager.java45
-rw-r--r--core/java/com/droidlogic/app/tv/TvHdmiArc.java33
3 files changed, 2 insertions, 79 deletions
diff --git a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
index b16b57e..0a80335 100644
--- a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
+++ b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
@@ -137,7 +137,8 @@ public class DroidLogicTvUtils
public static final int DEVICE_ID_SPDIF = 15;
/*virtual device*/
- public static final int DEVICE_ID_ADTV = 16;
+ public static final int DEVICE_ID_ADTV = 16;
+ public static final int DEVICE_ID_HDMIEXTEND = 18;
public static final int RESULT_OK = 1;
public static final int RESULT_UPDATE = 2;
diff --git a/core/java/com/droidlogic/app/tv/TvControlManager.java b/core/java/com/droidlogic/app/tv/TvControlManager.java
index d6d591f..f741813 100644
--- a/core/java/com/droidlogic/app/tv/TvControlManager.java
+++ b/core/java/com/droidlogic/app/tv/TvControlManager.java
@@ -48,8 +48,6 @@ public class TvControlManager {
private static final String TAG = "TvControlManager";
private static final String OPEN_TV_LOG_FLG = "open.libtv.log.flg";
private boolean tvLogFlg =false;
- private int speakerState = AUDIO_MUTE_ON;
- private int numThreadUnmuteSpeaker = 0;
public static final int AUDIO_MUTE_ON = 0;
public static final int AUDIO_MUTE_OFF = 1;
@@ -2707,49 +2705,6 @@ public class TvControlManager {
int ret = r.readInt();
return ret;
}
-
- public enum AudioOutputEnum {
- SPEAKER, ARC;
- };
-
- /**
- * @description set audio output mode
- * @param mode output mode of auddio, e.g "SPEAKER"
- */
- //public void setAudioOutputMode(AudioOutputEnum mode) {
- public void setAudioOutputMode(int mode) {
- // TvHdmiArc ArcInfo = new TvHdmiArc(mInstance);
- if (mode == 0) {// speaker
- // ArcInfo.setArcEnable(false);
- SystemProperties.set("persist.sys.arc.enable", "false");
- SystemProperties.set("persist.sys.spdif.enable", "false");
- speakerState = AUDIO_MUTE_ON;
- SetAudioSPDIFMute(AUDIO_MUTE_OFF);
- new Thread() {
- public void run() {
- numThreadUnmuteSpeaker++;
- try {
- int millSec = SystemProperties.getInt("millsec.sleep.switch.tospeaker", 3000);
- Thread.sleep(millSec);
- } catch (Exception e) {
- e.printStackTrace();
- }
- if (numThreadUnmuteSpeaker == 1) {
- SetAudioMuteKeyStatus(speakerState);
- }
- numThreadUnmuteSpeaker--;
- }
- }.start();
- } else if (mode == 1) { // arc
- // ArcInfo.setArcEnable(true);
- SetAudioMuteKeyStatus(AUDIO_MUTE_OFF);
- speakerState = AUDIO_MUTE_OFF;
- SystemProperties.set("persist.sys.arc.enable", "true");
- SystemProperties.set("persist.sys.spdif.enable", "true");
- SystemProperties.set("persist.sys.arc.savevolume", "true");
- SetAudioSPDIFMute(AUDIO_MUTE_ON);
- }
- }
// AUDIO END
// SSM
diff --git a/core/java/com/droidlogic/app/tv/TvHdmiArc.java b/core/java/com/droidlogic/app/tv/TvHdmiArc.java
deleted file mode 100644
index ecc73f2..0000000
--- a/core/java/com/droidlogic/app/tv/TvHdmiArc.java
+++ b/dev/null
@@ -1,33 +0,0 @@
-package com.droidlogic.app.tv;
-
-import android.hardware.hdmi.HdmiControlManager;
-import android.hardware.hdmi.HdmiTvClient;
-import android.content.Context;
-import android.os.SystemProperties;
-import android.util.Slog;
-
-public class TvHdmiArc {
- private static final String TAG = "TvHdmiArc";
- private Context mContext = null;
-
- public TvHdmiArc(Context context) {
- mContext = context;
- }
-
- public void setArcEnable(boolean enable) {
- HdmiControlManager hcm = (HdmiControlManager) mContext.getSystemService(Context.HDMI_CONTROL_SERVICE);
- HdmiTvClient tv = hcm.getTvClient();
- if (tv == null)
- return;
- // String s = String.valueOf(enable);
- // SystemProperties.set("persist.sys.arc.enable", s);
- Slog.d(TAG, "setArcEnable:" + enable);
- tv.setArcMode(enable);
- }
-
- public boolean getArcEnabled() {
- boolean arcEnable = SystemProperties.getBoolean("persist.sys.arc.enable", true);
- Slog.d(TAG, "getArcEnabled:" + arcEnable);
- return arcEnable;
- }
-}