From e6b578b2e1de84f3079232a8f980f30aeacb7d9d Mon Sep 17 00:00:00 2001 From: "[CST]Nicu" Date: Thu, 29 Mar 2012 21:52:27 +0300 Subject: [PATCH 1/6] changes for eywa zapit wrapper: -CZapit constructor and instance are done protected to allow inheritance -SendEvent is done virtual to be overriden into eywa wrapper class --- src/zapit/include/zapit/zapit.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 4ee25b8f1..8a22305ee 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -118,10 +118,11 @@ class CZapit : public OpenThreads::Thread unsigned int ZapTo(const unsigned int pchannel); void PrepareScan(); - CZapitSdtMonitor SdtMonitor; + CZapitSdtMonitor SdtMonitor; - static CZapit * zapit; void run(); + protected: + static CZapit * zapit; CZapit(); public: ~CZapit(); @@ -148,7 +149,7 @@ class CZapit : public OpenThreads::Thread void SetConfig(Zapit_config * Cfg); void GetConfig(Zapit_config &Cfg); - void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); + virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); audio_map_set_t * GetSavedPids(const t_channel_id channel_id); From ab414009b576f188b5a00851bef7dd6e34af5492 Mon Sep 17 00:00:00 2001 From: satbaby Date: Sun, 1 Apr 2012 13:23:14 +0000 Subject: [PATCH 2/6] satellites.xml: update Hotbird13 & Astra19.2 git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2170 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/satellites.xml | 126 ++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/data/satellites.xml b/data/satellites.xml index bcd66a36a..155a69d52 100755 --- a/data/satellites.xml +++ b/data/satellites.xml @@ -1372,7 +1372,7 @@ - + @@ -1390,21 +1390,19 @@ - + - - - - - + + + + - - - + + @@ -1418,55 +1416,55 @@ - + - - + + - + - - + + - - - - + + + + - - + + - + - - + + - + - + - - + + - + - - + + @@ -1557,45 +1555,45 @@ - + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - + @@ -1603,49 +1601,49 @@ - + - + - + - - + + - + - + - + - - - - - + + + + + - - + + - + From 67c68b72c4158337d2145394d9628a1788b504f8 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 2 Apr 2012 12:28:28 +0400 Subject: [PATCH 3/6] zapit/include/zapit/zapit.h: fix indent --- src/zapit/include/zapit/zapit.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 8a22305ee..44a23a37a 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -118,11 +118,11 @@ class CZapit : public OpenThreads::Thread unsigned int ZapTo(const unsigned int pchannel); void PrepareScan(); - CZapitSdtMonitor SdtMonitor; + CZapitSdtMonitor SdtMonitor; void run(); - protected: - static CZapit * zapit; + protected: + static CZapit * zapit; CZapit(); public: ~CZapit(); @@ -149,7 +149,7 @@ class CZapit : public OpenThreads::Thread void SetConfig(Zapit_config * Cfg); void GetConfig(Zapit_config &Cfg); - virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); + virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); audio_map_set_t * GetSavedPids(const t_channel_id channel_id); From 62d08179407dd4da4beb1d0fabad7fb0db631c98 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 26 Mar 2012 17:22:31 +0400 Subject: [PATCH 4/6] src/zapit.cpp: move TP_params TP inside class, add method to start manual TP scan --- src/zapit/include/zapit/zapit.h | 2 ++ src/zapit/src/zapit.cpp | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 67c1032b2..4ee25b8f1 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -79,6 +79,7 @@ class CZapit : public OpenThreads::Thread CZapitChannel * current_channel; t_channel_id live_channel_id; + TP_params TP; audio_map_t audio_map; bool current_is_nvod; @@ -140,6 +141,7 @@ class CZapit : public OpenThreads::Thread bool PrepareChannels(); bool StartScan(int scan_mode); + bool StartScanTP(TP_params * TPparams); bool StartFastScan(int scan_mode, int opid); void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 78e9bae00..8eade5cef 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -97,7 +97,7 @@ transponder_list_t transponders; CZapitClient::bouquetMode bouquetMode = CZapitClient::BM_UPDATEBOUQUETS; CZapitClient::scanType scanType = CZapitClient::ST_TVRADIO; -static TP_params TP; +//static TP_params TP; static bool update_pmt = true; /******************************************************************************/ @@ -701,6 +701,14 @@ bool CZapit::StartScan(int scan_mode) return true; } +bool CZapit::StartScanTP(TP_params * TPparams) +{ + PrepareScan(); + + CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) TPparams); + return true; +} + bool CZapit::StartFastScan(int scan_mode, int opid) { fast_scan_type_t scant; @@ -1059,8 +1067,11 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams //if(satellitePositions.find(current_channel->getSatellitePosition()) != satellitePositions.end()) current_channel = 0; } +#if 0 PrepareScan(); CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) &TP); +#endif + StartScanTP(&TP); break; } From dcf31333500609a02e98bcada3d6de83c3754db8 Mon Sep 17 00:00:00 2001 From: "[CST]Nicu" Date: Thu, 29 Mar 2012 21:52:27 +0300 Subject: [PATCH 5/6] changes for eywa zapit wrapper: -CZapit constructor and instance are done protected to allow inheritance -SendEvent is done virtual to be overriden into eywa wrapper class --- src/zapit/include/zapit/zapit.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 4ee25b8f1..8a22305ee 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -118,10 +118,11 @@ class CZapit : public OpenThreads::Thread unsigned int ZapTo(const unsigned int pchannel); void PrepareScan(); - CZapitSdtMonitor SdtMonitor; + CZapitSdtMonitor SdtMonitor; - static CZapit * zapit; void run(); + protected: + static CZapit * zapit; CZapit(); public: ~CZapit(); @@ -148,7 +149,7 @@ class CZapit : public OpenThreads::Thread void SetConfig(Zapit_config * Cfg); void GetConfig(Zapit_config &Cfg); - void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); + virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); audio_map_set_t * GetSavedPids(const t_channel_id channel_id); From 654dc3cfc0a605f10a58711fbd6feda34b13a670 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 2 Apr 2012 12:28:28 +0400 Subject: [PATCH 6/6] zapit/include/zapit/zapit.h: fix indent --- src/zapit/include/zapit/zapit.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 8a22305ee..44a23a37a 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -118,11 +118,11 @@ class CZapit : public OpenThreads::Thread unsigned int ZapTo(const unsigned int pchannel); void PrepareScan(); - CZapitSdtMonitor SdtMonitor; + CZapitSdtMonitor SdtMonitor; void run(); - protected: - static CZapit * zapit; + protected: + static CZapit * zapit; CZapit(); public: ~CZapit(); @@ -149,7 +149,7 @@ class CZapit : public OpenThreads::Thread void SetConfig(Zapit_config * Cfg); void GetConfig(Zapit_config &Cfg); - virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); + virtual void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0); audio_map_set_t * GetSavedPids(const t_channel_id channel_id);