8 files changed, 464 insertions, 405 deletions

diff --git a/TvPlay.cpp b/TvPlay.cpp
deleted file mode 100644
index 4f2f714..0000000
--- a/TvPlay.cpp
+++ b/dev/null
@@ -1,145 +0,0 @@
-#define LOG_TAG "TvPlay"
-
-#include <utils/Log.h>
-#include <string.h>
-#include "TvPlay.h"
-#include "tvcmd.h"
-#include <math.h>
-
-TvPlay::TvPlay()
-{
-    mpObserver = NULL;
-    tvSession = TvClient::connect();
-    tvSession->setListener(this);
-    mHdmiPorts = getHdmiPorts();
-
-    if ( mHdmiPorts >= pow(10, (max_port_num-1)))
-        hdmi_port[3] = mHdmiPorts/pow(10, (max_port_num-1));
-    else
-        hdmi_port[3] = 0;//in this case,there is only 3 hdmi_in ports
-    hdmi_port[2] = (mHdmiPorts -hdmi_port[3]*1000)/100;
-    hdmi_port[1] = (mHdmiPorts -hdmi_port[3]*1000-hdmi_port[2]*100)/10;
-    hdmi_port[0] = mHdmiPorts -hdmi_port[3]*1000-hdmi_port[2]*100-hdmi_port[1]*10;
-}
-
-TvPlay::~TvPlay()
-{
-    tvSession.clear();
-}
-
-int TvPlay::setTvObserver ( TvPlayObserver *ob )
-{
-    mpObserver = ob;
-    return 0;
-}
-
-void TvPlay::notify(int32_t msgType, const Parcel &p)
-{
-    ALOGD("TvPlay-------notify-------");
-    if (mpObserver != NULL)
-        mpObserver->onTvEvent(msgType, p);
-}
-
-int TvPlay::StartTv()
-{
-    Parcel p, r;
-    p.writeInt32(START_TV);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::StopTv()
-{
-    Parcel p, r;
-    p.writeInt32(STOP_TV);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::SwitchSourceInput(tv_source_input_t source_input)
-{
-    Parcel p, r;
-    p.writeInt32(SET_SOURCE_INPUT);
-    p.writeInt32(source_input);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::DoSuspend(int type)
-{
-    Parcel p, r;
-    p.writeInt32(DO_SUSPEND);
-    p.writeInt32(type);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::DoResume(int type)
-{
-    Parcel p, r;
-    p.writeInt32(DO_RESUME);
-    p.writeInt32(type);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::GetSourceConnectStatus(tv_source_input_t source_input)
-{
-    Parcel p, r;
-    p.writeInt32(GET_SOURCE_CONNECT_STATUS);
-    p.writeInt32(source_input);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::GetCurrentSourceInput()
-{
-    Parcel p, r;
-    p.writeInt32(GET_CURRENT_SOURCE_INPUT_VIRTUAL);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::GetHdmiAvHotplugDetectOnoff()
-{
-    Parcel p, r;
-    p.writeInt32(HDMIAV_HOTPLUGDETECT_ONOFF);
-    tvSession->processCmd(p, &r);
-    return r.readInt32();
-}
-
-int TvPlay::getAllTvDevices(int *devices, int *count)
-{
-    Parcel p, r;
-    p.writeInt32(GET_ALL_TV_DEVICES);
-    tvSession->processCmd(p, &r);
-    const char *input_list = r.readCString();
-    ALOGD("input_list = %s", input_list);
-
-    int len = 0;
-    const char *seg = ",";
-    char *pT = strtok((char*)input_list, seg);
-    while (pT) {
-        len ++;
-        *devices = atoi(pT);
-        ALOGD("devices: %d: %d", len , *devices);
-        devices ++;
-        pT = strtok(NULL, seg);
-    }
-    *count = len;
-    return 0;
-}
-
-int TvPlay::getHdmiPorts()
-{
-    Parcel p, r;
-    p.writeInt32(GET_HDMI_PORTS);
-    tvSession->processCmd(p, &r);
-
-    return r.readInt32();
-}
-
-int TvPlay::getHdmiPort(tv_source_input_t source_input) {
-     return mHdmiPorts == 0 ? 0 : hdmi_port[source_input - SOURCE_HDMI1];
-}
-