PD#118336: dtv: disable epg in tvapi

  epg has been moved into dtvinputservice with jni mode.

Change-Id: I8e40cdc6c686578e096c902346fe697334341eb2

3 files changed, 14 insertions, 11 deletions

diff --git a/tvapi/libtv/Android.mk b/tvapi/libtv/Android.mk
index ae56c3d..7c438cc 100644
--- a/tvapi/libtv/Android.mk
+++ b/tvapi/libtv/Android.mk
@@ -172,14 +172,14 @@ endif
 
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/dtv_play \
-    $(LIB_ZVBI_PATH)/ntsc_decode/include \
-    $(LIB_ZVBI_PATH)/ntsc_decode/include/ntsc_dmx \
-    $(LIB_ZVBI_PATH)/src \
     $(DVB_PATH)/include/am_adp \
     $(DVB_PATH)/include/am_mw \
     $(DVB_PATH)/include/am_ver \
     $(DVB_PATH)/android/ndk/include \
+    $(LOCAL_PATH)/dtv_play \
+    $(LIB_ZVBI_PATH)/ntsc_decode/include \
+    $(LIB_ZVBI_PATH)/ntsc_decode/include/ntsc_dmx \
+    $(LIB_ZVBI_PATH)/src \
     $(AM_LIBPLAYER_PATH)/amadec/include \
     $(AM_LIBPLAYER_PATH)/amcodec/include \
     $(AM_LIBPLAYER_PATH)/amffmpeg \
diff --git a/tvapi/libtv/tv/CTv.cpp b/tvapi/libtv/tv/CTv.cpp
index 8a6aa0f..597aeec 100644
--- a/tvapi/libtv/tv/CTv.cpp
+++ b/tvapi/libtv/tv/CTv.cpp
@@ -115,7 +115,7 @@ CTv::CTv() :
     }
 
     AM_EVT_Init();
-    mTvEpg.setObserver ( &mTvMsgQueue );
+    //mTvEpg.setObserver ( &mTvMsgQueue );
     mpObserver = NULL;
     fbcIns = NULL;
     dtv_auto_3d_flag = 0;
@@ -534,7 +534,7 @@ int CTv::ClearAnalogFrontEnd() {
 int CTv::dtvAutoScan() {
     AutoMutex lock ( mLock );
     mTvAction |= TV_ACTION_SCANNING;
-    mTvEpg.leaveChannel();
+    //mTvEpg.leaveChannel();
     mAv.StopTS ();
     mAv.DisableVideoWithBlueColor();
     CTvProgram::CleanAllProgramBySrvType ( CTvProgram::TYPE_DTV );
@@ -562,7 +562,7 @@ int CTv::dtvCleanProgramByFreq ( int freq ) {
 int CTv::dtvManualScan (int beginFreq, int endFreq, int modulation) {
     AutoMutex lock ( mLock );
     mTvAction |= TV_ACTION_SCANNING;
-    mTvEpg.leaveChannel();
+    //mTvEpg.leaveChannel();
     mAv.StopTS ();
     mAv.DisableVideoWithBlueColor();
     CTvChannel::DeleteBetweenFreq(beginFreq, endFreq);
@@ -740,7 +740,7 @@ int CTv::stopScan() {
     }
     mSigDetectThread.requestAndWaitPauseDetect();
     mSigDetectThread.setObserver(this);
-    mTvEpg.leaveChannel();
+    //mTvEpg.leaveChannel();
     mTvScanner.stopScan();
     mFrontDev.Close();
     mTvAction &= ~TV_ACTION_SCANNING;
@@ -1165,8 +1165,8 @@ int CTv::stopPlaying() {
     } else if (m_source_input ==  SOURCE_DTV) {
         //mFrontDev.setPara(FE_DTMB, 51000000, 0, 0);
         mAv.StopTS ();
-        mTvEpg.leaveChannel();
-        mTvEpg.leaveProgram();
+        //mTvEpg.leaveChannel();
+        //mTvEpg.leaveProgram();
     }
     config_value = config_get_str ( CFG_SECTION_TV, CFG_BLUE_SCREEN_COLOR, "null" );
     if ( strcmp ( config_value, "black" ) == 0 ) {
@@ -1574,7 +1574,7 @@ int CTv::OpenTv ( void ) {
     mTvDmx.Open(para_dmx );
     mTvDmx.SetSource (AM_DMX_SRC_TS2);
     mAv.Open();
-    mTvEpg.Init ( 0, 0, 1, "eng zho chi", "GB2312" );
+    //mTvEpg.Init ( 0, 0, 1, "eng zho chi", "GB2312" );
     resetDmxAndAvSource();
     //	mSourceConnectDetectThread.startDetect();
     mSourceConnectDetectThread.startDetect();
diff --git a/tvapi/libtv/tv/CTvScanner.cpp b/tvapi/libtv/tv/CTvScanner.cpp
index 1800808..d451a27 100644
--- a/tvapi/libtv/tv/CTvScanner.cpp
+++ b/tvapi/libtv/tv/CTvScanner.cpp
@@ -186,6 +186,7 @@ void CTvScanner::am_scan_atv_store(AM_SCAN_Result_t *result)
 		m_s_Scanner->mCurEv.mFrequency = ts->analog.freq;
 		//
 		m_s_Scanner->sendEvent(m_s_Scanner->mCurEv);
+		LOGD("ATV: > freq:%d", m_s_Scanner->mCurEv.mFrequency);
 	}
 }
 
@@ -545,6 +546,7 @@ void CTvScanner::scan_extract_srv_info_from_sdt(AM_SCAN_Result_t *result, dvbpsi
 				AM_SI_ConvertDVBTextCode((char *)psd->i_service_name, psd->i_service_name_length, \
 										 name, AM_DB_MAX_SRV_NAME_LEN);
 				name[AM_DB_MAX_SRV_NAME_LEN] = 0;
+				LOGD("found name [%s]", name);
 
 				/*3bytes language code, using xxx to simulate*/
 				COPY_NAME("xxx", 3);
@@ -575,6 +577,7 @@ void CTvScanner::scan_extract_srv_info_from_sdt(AM_SCAN_Result_t *result, dvbpsi
 										 pmsnd->p_service_name[i].i_service_name_length,
 										 name, AM_DB_MAX_SRV_NAME_LEN);
 				name[AM_DB_MAX_SRV_NAME_LEN] = 0;
+				LOGD("found name [%s]", name);
 
 				if (curr_name_len > 0) {
 					/*extra split mark*/