mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-08 06:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/scan.cpp: try to fix channels save issue, when channels only present

Browse Source 
in ubouquets but with different frequency value
This commit is contained in:
[CST] Focus
2015-01-05 10:55:57 +03:00
parent 18bc87592b
commit 0d384d610a
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/channel.h
View File

@@ -152,7 +152,6 @@ class CZapitChannel
t_transport_stream_id transport_stream_id; t_transport_stream_id transport_stream_id;
t_original_network_id original_network_id; t_original_network_id original_network_id;
t_satellite_position satellitePosition; t_satellite_position satellitePosition;
freq_id_t freq;
/* read/write properties (write possibility needed by scan) */ /* read/write properties (write possibility needed by scan) */
unsigned char serviceType; unsigned char serviceType;
@@ -201,6 +200,7 @@ class CZapitChannel
uint8_t polarization; uint8_t polarization;
int flags; int flags;
delivery_system_t delsys; delivery_system_t delsys;
freq_id_t freq;
/* constructor, desctructor */ /* constructor, desctructor */
CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t freq); CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t freq);

1
src/zapit/src/scan.cpp
View File

@@ -514,6 +514,7 @@ void CServiceScan::SaveServices()
if(flags & SCAN_RESET_NUMBERS) if(flags & SCAN_RESET_NUMBERS)
CServiceManager::getInstance()->ResetChannelNumbers(true, true); CServiceManager::getInstance()->ResetChannelNumbers(true, true);
/* first save bouquets, next load to re-number */ /* first save bouquets, next load to re-number */
g_bouquetManager->saveUBouquets();
g_bouquetManager->saveBouquets(); g_bouquetManager->saveBouquets();
printf("[scan] save bouquets done\n"); printf("[scan] save bouquets done\n");
/* load and renumber */ /* load and renumber */

6
src/zapit/src/scansdt.cpp
View File

@@ -323,7 +323,11 @@ bool CSdt::ParseServiceDescriptor(ServiceDescription * service, ServiceDescripto
if (channel) { if (channel) {
channel->setName(serviceName); channel->setName(serviceName);
channel->setServiceType(real_type); channel->setServiceType(real_type);
channel->flags = CZapitChannel::UPDATED; channel->freq = freq_id;
if (CServiceScan::getInstance()->SatHaveChannels() && (channel->flags & CZapitChannel::NOT_FOUND))
channel->flags = CZapitChannel::NEW;
else
channel->flags = CZapitChannel::UPDATED;
} else { } else {
channel = new CZapitChannel(serviceName, channel_id, channel = new CZapitChannel(serviceName, channel_id,
real_type, satellitePosition, freq_id); real_type, satellitePosition, freq_id);