21 files changed, 378 insertions, 386 deletions

diff --git a/tvapi/libtv/tvin/CTvin.h b/tvapi/libtv/tvin/CTvin.h
index 61ba064..c48ecc1 100644
--- a/tvapi/libtv/tvin/CTvin.h
+++ b/tvapi/libtv/tvin/CTvin.h
@@ -1150,13 +1150,15 @@ public:
     static int isSDFmtInHdmi ( tvin_sig_fmt_t fmt );
     static bool Tvin_is50HzFrameRateFmt ( tvin_sig_fmt_t fmt );
     static bool Tvin_IsDeinterlaceFmt ( tvin_sig_fmt_t fmt );
-    static  v4l2_std_id CvbsFtmToV4l2ColorStd(tvin_sig_fmt_t fmt);
+    static v4l2_std_id CvbsFtmToV4l2ColorStd(tvin_sig_fmt_t fmt);
+
+    static CTvin *getInstance();
 
 public:
     class CTvinSigDetect: public CThread {
     public:
         static const int VDIN_NOSIG_DEFAULT_CHECK_TIMES = 1;
-        CTvinSigDetect (CTvin *pTvin);
+        CTvinSigDetect ();
         ~CTvinSigDetect();
         int startDetect(bool bPause = true);
         int stopDetect();
@@ -1206,7 +1208,6 @@ public:
         int Tv_TvinSigDetect ( int &args );
 
         //member
-        CTvin *mpTvin;
         tvin_info_t m_cur_sig_info;
         tvin_info_t m_pre_sig_info;
         int mKeepNosigTime;
@@ -1226,83 +1227,8 @@ public:
         ISigDetectObserver *mpObserver;
     };//
 
-
-
-    class CHDMIRxCEC: public CThread {
-    public:
-        CHDMIRxCEC(CTvin *pTvin);
-        ~CHDMIRxCEC();
-
-        class IHDMIRxCECObserver {
-        public:
-            IHDMIRxCECObserver() {};
-            virtual ~IHDMIRxCECObserver() {};
-            virtual void onHDMIRxCECMessage(int msg_len, unsigned char msg_buf[]) {};
-        };
-        void setObserver ( IHDMIRxCECObserver *pOb )
-        {
-            mpObserver = pOb;
-        };
-
-        int start();
-        int stop();
-        int pause();
-        int resume();
-        int ClearRxMessageBuffer();
-        int processRefreshSrcDevice(int source_input);
-        int SendCustomMessage(int source_input, unsigned char data_buf[]);
-        int SendCustomMessageAndWaitReply(int source_input, unsigned char data_buf[], unsigned char reply_buf[], int WaitCmd, int timeout);
-        int SendBoradcastStandbyMessage(int source_input);
-        int SendGiveCECVersionMessage(int source_input, unsigned char data_buf[]);
-        int SendGiveDeviceVendorIDMessage(int source_input, unsigned char data_buf[]);
-        int SendGiveOSDNameMessage(int source_input, unsigned char data_buf[]);
-        int SendGivePhysicalAddressMessage(int source_input, int logic_addr, int *physical_addr);
-        int SendSetMenuLanguageMessage(int source_input, unsigned char data_buf[]);
-        int SendVendorRemoteKeyDownMessage(int source_input, unsigned char key_val);
-        int SendVendorRemoteKeyUpMessage(int source_input);
-
-
-    private:
-        int mModuleEnableFlag;
-        int mRequestPause;
-        int mState;
-        IHDMIRxCECObserver *mpObserver;
-        CTvin *mpTvin;
-
-        bool threadLoop();
-        int processData(int msg_cnt);
-
-        int isAllowOperate(int source_input);
-        int GetModuleEnableFlag();
-        int GetDeviceLogicAddr(int source_input);
-        int SendMessage(struct _cec_msg *msg);
-        int sendMessageAndWaitReply(struct _cec_msg *msg, struct _cec_msg *reply_msg, int WaitCmd, int timeout);
-        int GetMessage(struct _cec_msg *msg_list);
-        int rmFromRequestList(int index);
-        int addToRequestList(HDMIRxRequestReplyItem *reply_item);
-        int PrintMessage(const char *func_name, int data_type, struct _cec_msg *msg);
-        int ClrReplyListItem(HDMIRxRequestReplyItem *reply_item);
-        int CopyMessageData(unsigned char data_buf[], unsigned char msg_data[], int msg_len);
-
-        int mSourceDevLogicAddrBuf[CC_SOURCE_DEV_REFRESH_CNT];
-        int mSourceDevRefreshBuf[CC_SOURCE_DEV_REFRESH_CNT];
-
-        CCondition mPauseCondition;
-        mutable CMutex mLock;
-        mutable CMutex mListLock;
-        mutable CMutex mReplyLock[CC_REQUEST_LIST_SIZE];
-        HDMIRxRequestReplyItem mReplyList[CC_REQUEST_LIST_SIZE];
-        struct _cec_msg mMsgBuf[CC_REQUEST_LIST_SIZE];
-
-        enum RefreshState {
-            STATE_STOPED = 0,
-            STATE_RUNNING,
-            STATE_PAUSE,
-            STATE_FINISHED,
-        };
-    };
-
 private:
+    static CTvin *mInstance;
     int m_vdin_dev_fd;
     int afe_dev_fd;
     tvin_parm_t m_tvin_param;