From 1a6d0b9abdafc58c85d10684bfa0e104c7614d7a Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 10 Apr 2012 13:42:52 +0400
Subject: [PATCH] unify transponder constructor

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/73906e3591b3ab6d1b475d3b45817b39bfeeca42
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
---
 src/zapit/include/zapit/getservices.h | 18 ------------------
 src/zapit/src/fastscan.cpp            |  4 ++--
 src/zapit/src/getservices.cpp         |  7 +++----
 src/zapit/src/scan.cpp                |  4 ++--
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h
index 41ac17472..7ee4bfd2b 100644
--- a/src/zapit/include/zapit/getservices.h
+++ b/src/zapit/include/zapit/getservices.h
@@ -45,15 +45,6 @@ struct transponder
 	unsigned char polarization;
 	bool updated;
 
-	transponder (t_transport_stream_id p_transport_stream_id, struct dvb_frontend_parameters p_feparams)
-	{
-		transport_stream_id = p_transport_stream_id;
-		feparams = p_feparams;
-		polarization = 0;
-		original_network_id = 0;
-		updated = 0;
-	}
-
 	transponder(const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id, const struct dvb_frontend_parameters p_feparams, const uint8_t p_polarization = 0)
         {
                 transport_stream_id = p_transport_stream_id;
@@ -62,15 +53,6 @@ struct transponder
                 polarization        = p_polarization;
 		updated = 0;
         }
-
-	transponder (t_transport_stream_id p_transport_stream_id, struct dvb_frontend_parameters p_feparams, unsigned short p_polarization, t_original_network_id p_original_network_id)
-	{
-		transport_stream_id = p_transport_stream_id;
-		feparams = p_feparams;
-		polarization = p_polarization;
-		original_network_id = p_original_network_id;
-		updated = 0;
-	}
 };
 
 typedef std::map <transponder_id_t, transponder> transponder_list_t;
diff --git a/src/zapit/src/fastscan.cpp b/src/zapit/src/fastscan.cpp
index a6d12cb38..e9d410ebd 100644
--- a/src/zapit/src/fastscan.cpp
+++ b/src/zapit/src/fastscan.cpp
@@ -484,9 +484,9 @@ bool CServiceScan::ParseFnt(unsigned short pid, unsigned short operator_id)
 											TsidOnid,
 											transponder (
 												transport_stream_id,
+												original_network_id,
 												feparams,
-												polarization,
-												original_network_id
+												polarization
 												)
 											)
 										);
diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
index 2a84a1e9c..ab770501d 100644
--- a/src/zapit/src/getservices.cpp
+++ b/src/zapit/src/getservices.cpp
@@ -331,8 +331,8 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
 
 		ret = transponders.insert (
 				std::pair <transponder_id_t, transponder> ( tid,
-					transponder (transport_stream_id, feparams,
-						polarization, original_network_id)
+					transponder (transport_stream_id, original_network_id,
+						feparams, polarization)
 					)
 				);
 		if (ret.second == false)
@@ -502,8 +502,7 @@ void CServiceManager::ParseSatTransponders(fe_type_t fType, xmlNodePtr search, t
 		polarization &= 1;
 		select_transponders.insert (
 				std::pair <transponder_id_t, transponder> (tid,
-					transponder (fake_tid, feparams,
-						polarization, fake_nid))
+					transponder (fake_tid, fake_nid, feparams, polarization))
 				);
 		fake_nid ++; fake_tid ++;
 
diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp
index 68ae49f9e..79a99bbbb 100644
--- a/src/zapit/src/scan.cpp
+++ b/src/zapit/src/scan.cpp
@@ -321,9 +321,9 @@ _repeat:
 						TsidOnid,
 						transponder (
 							tI->second.transport_stream_id,
+							tI->second.original_network_id,
 							tI->second.feparams,
-							tI->second.polarization,
-							tI->second.original_network_id
+							tI->second.polarization
 							)
 						)
 					);