Move parent object Ids into domain objects, remove all the parent object mess from binders

7 files changed, 21 insertions, 18 deletions

diff --git a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
index a550de7..94aa275 100644
--- a/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/cableDelivery.cpp
@@ -15,10 +15,10 @@ CreateColumns<DVBSI::CableDeliveryPtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::CableDeliveryPtr & s, const DVBSI::NetworkTransportStreamPtr & ts)
+BindColumns(RowState & rs, const DVBSI::CableDeliveryPtr & s)
 {
 	rs.fields[0] << s->Frequency;
-	rs.fields[1] << ts->TransportStreamId;
+	rs.fields[1] << s->TransportStreamId;
 	rs.fields[2] << s->FecOuter;
 	rs.fields[3] << s->Modulation;
 	rs.fields[4] << s->SymbolRate;
@@ -29,6 +29,7 @@ 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;
diff --git a/p2pvr/lib/dvbsiHelpers/networkService.cpp b/p2pvr/lib/dvbsiHelpers/networkService.cpp
index 60b357a..80700b4 100644
--- a/p2pvr/lib/dvbsiHelpers/networkService.cpp
+++ b/p2pvr/lib/dvbsiHelpers/networkService.cpp
@@ -12,10 +12,10 @@ CreateColumns<DVBSI::NetworkService>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::NetworkService & s, const DVBSI::NetworkTransportStreamPtr & ts)
+BindColumns(RowState & rs, const DVBSI::NetworkService & s)
 {
 	rs.fields[0] << s.ServiceId;
 	rs.fields[1] << s.ServiceType;
-	rs.fields[2] << ts->TransportStreamId;
+	rs.fields[2] << s.TransportStreamId;
 }
 
diff --git a/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp b/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
index 884a7db..04f9bb0 100644
--- a/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
+++ b/p2pvr/lib/dvbsiHelpers/networkTransportStream.cpp
@@ -12,10 +12,10 @@ CreateColumns<DVBSI::NetworkTransportStreamPtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::NetworkTransportStreamPtr & ts, const DVBSI::NetworkPtr & network)
+BindColumns(RowState & rs, const DVBSI::NetworkTransportStreamPtr & ts)
 {
 	rs.fields[0] << ts->TransportStreamId;
-	rs.fields[1] << network->NetworkId;
+	rs.fields[1] << ts->NetworkId;
 	rs.fields[2] << ts->OriginalNetworkId;
 }
 
diff --git a/p2pvr/lib/dvbsiHelpers/programMap.cpp b/p2pvr/lib/dvbsiHelpers/programMap.cpp
index 5b543a9..60cf0d4 100644
--- a/p2pvr/lib/dvbsiHelpers/programMap.cpp
+++ b/p2pvr/lib/dvbsiHelpers/programMap.cpp
@@ -12,9 +12,9 @@ CreateColumns<DVBSI::StreamPtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::StreamPtr & stream, const DVBSI::ProgramMapPtr & pmp)
+BindColumns(RowState & rs, const DVBSI::StreamPtr & stream)
 {
-	rs.fields[0] << pmp->ServiceId;
+	rs.fields[0] << stream->ServiceId;
 	rs.fields[1] << stream->Id;
 	rs.fields[2] << stream->Type;
 }
diff --git a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
index a8d6f1a..a337df6 100644
--- a/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/satelliteDelivery.cpp
@@ -19,10 +19,10 @@ CreateColumns<DVBSI::SatelliteDeliveryPtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::SatelliteDeliveryPtr & s, const DVBSI::NetworkTransportStreamPtr & ts)
+BindColumns(RowState & rs, const DVBSI::SatelliteDeliveryPtr & s)
 {
 	rs.fields[0] << s->Frequency;
-	rs.fields[1] << ts->TransportStreamId;
+	rs.fields[1] << s->TransportStreamId;
 	rs.fields[2] << s->OrbitalPosition;
 	rs.fields[3] << s->WestEastFlag;
 	rs.fields[4] << s->Polarization;
@@ -37,6 +37,7 @@ 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;
diff --git a/p2pvr/lib/dvbsiHelpers/service.cpp b/p2pvr/lib/dvbsiHelpers/service.cpp
index dfc03be..88b09cc 100644
--- a/p2pvr/lib/dvbsiHelpers/service.cpp
+++ b/p2pvr/lib/dvbsiHelpers/service.cpp
@@ -14,12 +14,12 @@ CreateColumns<DVBSI::ServicePtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::ServicePtr & s, const DVBSI::TransportStreamPtr & ts)
+BindColumns(RowState & rs, const DVBSI::ServicePtr & s)
 {
 	rs.fields[0] << s->ServiceId;
-	rs.fields[1] << ts->TransportStreamId;
+	rs.fields[1] << s->TransportStreamId;
 	rs.fields[2] << s->Name;
-	rs.fields[4] << s->ProviderName;
+	rs.fields[3] << s->ProviderName;
 	rs.fields[4] << s->DefaultAuthority;
 }
 
@@ -28,8 +28,9 @@ void
 UnbindColumns(RowState & rs, DVBSI::ServicePtr const & s)
 {
 	rs.fields[0] >> s->ServiceId;
-	rs.fields[0] >> s->Name;
-	rs.fields[0] >> s->ProviderName;
-	rs.fields[0] >> s->DefaultAuthority;
+	rs.fields[1] >> s->TransportStreamId;
+	rs.fields[2] >> s->Name;
+	rs.fields[3] >> s->ProviderName;
+	rs.fields[4] >> s->DefaultAuthority;
 }
 
diff --git a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
index dfacd01..d178845 100644
--- a/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
+++ b/p2pvr/lib/dvbsiHelpers/terrestrialDelivery.cpp
@@ -22,10 +22,10 @@ CreateColumns<DVBSI::TerrestrialDeliveryPtr>(const ColumnCreator & cc)
 
 template<>
 void
-BindColumns(RowState & rs, const DVBSI::TerrestrialDeliveryPtr & s, const DVBSI::NetworkTransportStreamPtr & ts)
+BindColumns(RowState & rs, const DVBSI::TerrestrialDeliveryPtr & s)
 {
 	rs.fields[0] << s->Frequency;
-	rs.fields[1] << ts->TransportStreamId;
+	rs.fields[1] << s->TransportStreamId;
 	rs.fields[2] << s->Bandwidth;
 	rs.fields[3] << s->Priority;
 	rs.fields[4] << s->TimeSlicing;