From db01a16612fcbf9004ffda23b213a2d849390445 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 17 Jan 2015 01:48:29 +0000 Subject: Remove some no longer required UnbindColumns impls --- p2pvr/daemon/events.cpp | 32 -------------------------- p2pvr/lib/dvbsiHelpers/cableDelivery.cpp | 11 --------- p2pvr/lib/dvbsiHelpers/event.cpp | 30 ------------------------ p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp | 15 ------------ p2pvr/lib/dvbsiHelpers/service.cpp | 15 ------------ p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp | 17 -------------- 6 files changed, 120 deletions(-) diff --git a/p2pvr/daemon/events.cpp b/p2pvr/daemon/events.cpp index 676b2b3..40db4df 100644 --- a/p2pvr/daemon/events.cpp +++ b/p2pvr/daemon/events.cpp @@ -67,35 +67,3 @@ BindColumns(RowState & rs, const P2PVR::EventPtr & e) rs.fields[25] << e->Current; } -template<> -void -UnbindColumns(RowState & rs, const P2PVR::EventPtr & e) -{ - rs.fields[0] >> e->ServiceId; - rs.fields[1] >> e->EventId; - rs.fields[2] >> e->Title; - rs.fields[3] >> e->TitleLang; - rs.fields[4] >> e->Subtitle; - rs.fields[5] >> e->Description; - rs.fields[6] >> e->DescriptionLang; - rs.fields[7] >> e->VideoAspect; - rs.fields[8] >> e->VideoFrameRate; - rs.fields[9] >> e->VideoHD; - rs.fields[10] >> e->AudioChannels; - rs.fields[11] >> e->AudioLanguage; - rs.fields[12] >> e->SubtitleLanguage; - rs.fields[13] >> e->Category; - rs.fields[14] >> e->SubCategory; - rs.fields[15] >> e->UserCategory; - rs.fields[16] >> e->DvbRating; - rs.fields[17] >> e->StartTime; - rs.fields[18] >> e->StopTime; - rs.fields[19] >> e->Episode; - rs.fields[20] >> e->Episodes; - rs.fields[21] >> e->Year; - rs.fields[22] >> e->Flags; - rs.fields[23] >> e->Season; - rs.fields[24] >> e->EventUid; - rs.fields[25] >> e->Current; -} - diff --git a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp index 7bf9f6d..c4b82e7 100644 --- a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp +++ b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp @@ -25,15 +25,4 @@ BindColumns(RowState & rs, const DVBSI::CableDeliveryPtr & s) rs.fields[4] << s->SymbolRate; rs.fields[5] << s->FecInner; } -template<> -void -UnbindColumns(RowState & rs, DVBSI::CableDeliveryPtr const & s) -{ - rs.fields[0] >> s->Frequency; - rs.fields[1] >> s->TransportStreamId; - rs.fields[2] >> s->FecOuter; - rs.fields[3] >> s->Modulation; - rs.fields[4] >> s->SymbolRate; - rs.fields[5] >> s->FecInner; -} diff --git a/p2pvr/lib/dvbsiHelpers/event.cpp b/p2pvr/lib/dvbsiHelpers/event.cpp index 4bca135..f3daab3 100644 --- a/p2pvr/lib/dvbsiHelpers/event.cpp +++ b/p2pvr/lib/dvbsiHelpers/event.cpp @@ -62,33 +62,3 @@ BindColumns(RowState & rs, const DVBSI::EventPtr & e) rs.fields[23] << e->Season; } -template<> -void -UnbindColumns(RowState & rs, const DVBSI::EventPtr & e) -{ - rs.fields[0] >> e->ServiceId; - rs.fields[1] >> e->EventId; - rs.fields[2] >> e->Title; - rs.fields[3] >> e->TitleLang; - rs.fields[4] >> e->Subtitle; - rs.fields[5] >> e->Description; - rs.fields[6] >> e->DescriptionLang; - rs.fields[7] >> e->VideoAspect; - rs.fields[8] >> e->VideoFrameRate; - rs.fields[9] >> e->VideoHD; - rs.fields[10] >> e->AudioChannels; - rs.fields[11] >> e->AudioLanguage; - rs.fields[12] >> e->SubtitleLanguage; - rs.fields[13] >> e->Category; - rs.fields[14] >> e->SubCategory; - rs.fields[15] >> e->UserCategory; - rs.fields[16] >> e->DvbRating; - rs.fields[17] >> e->StartTime; - rs.fields[18] >> e->StopTime; - rs.fields[19] >> e->Episode; - rs.fields[20] >> e->Episodes; - rs.fields[21] >> e->Year; - rs.fields[22] >> e->Flags; - rs.fields[23] >> e->Season; -} - diff --git a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp index 8231fc3..02f4d42 100644 --- a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp +++ b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp @@ -33,19 +33,4 @@ BindColumns(RowState & rs, const DVBSI::SatelliteDeliveryPtr & s) rs.fields[8] << s->SymbolRate; rs.fields[9] << s->FecInner; } -template<> -void -UnbindColumns(RowState & rs, DVBSI::SatelliteDeliveryPtr const & s) -{ - rs.fields[0] >> s->Frequency; - rs.fields[1] << s->TransportStreamId; - rs.fields[2] >> s->OrbitalPosition; - rs.fields[3] >> s->WestEastFlag; - rs.fields[4] >> s->Polarization; - rs.fields[5] >> s->RollOff; - rs.fields[6] >> s->ModulationSystem; - rs.fields[7] >> s->ModulationType; - rs.fields[8] >> s->SymbolRate; - rs.fields[9] >> s->FecInner; -} diff --git a/p2pvr/lib/dvbsiHelpers/service.cpp b/p2pvr/lib/dvbsiHelpers/service.cpp index 9f82d91..45c1fa0 100644 --- a/p2pvr/lib/dvbsiHelpers/service.cpp +++ b/p2pvr/lib/dvbsiHelpers/service.cpp @@ -32,18 +32,3 @@ BindColumns(RowState & rs, const DVBSI::ServicePtr & s) rs.fields[8] << s->FreeCaMode; } -template<> -void -UnbindColumns(RowState & rs, DVBSI::ServicePtr const & s) -{ - rs.fields[0] >> s->ServiceId; - rs.fields[1] >> s->TransportStreamId; - rs.fields[2] >> s->Name; - rs.fields[3] >> s->ProviderName; - rs.fields[4] >> s->DefaultAuthority; - rs.fields[5] >> s->RunningStatus; - rs.fields[6] >> s->EitSchedule; - rs.fields[7] >> s->EitPresentFollowing; - rs.fields[8] >> s->FreeCaMode; -} - diff --git a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp index 46e60f9..28ca855 100644 --- a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp +++ b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp @@ -39,21 +39,4 @@ BindColumns(RowState & rs, const DVBSI::TerrestrialDeliveryPtr & s) rs.fields[11] << s->TransmissionMode; rs.fields[12] << s->OtherFrequencyFlag; } -template<> -void -UnbindColumns(RowState & rs, DVBSI::TerrestrialDeliveryPtr const & s) -{ - rs.fields[0] >> s->Frequency; - rs.fields[2] >> s->Bandwidth; - rs.fields[3] >> s->Priority; - rs.fields[4] >> s->TimeSlicing; - rs.fields[5] >> s->MpeFec; - rs.fields[6] >> s->Constellation; - rs.fields[7] >> s->Hierarchy; - rs.fields[8] >> s->CodeRateHP; - rs.fields[9] >> s->CodeRateLP; - rs.fields[10] >> s->GuardInterval; - rs.fields[11] >> s->TransmissionMode; - rs.fields[12] >> s->OtherFrequencyFlag; -} -- cgit v1.2.3