From fd330eb5ba7877c8c76f221a3c7224be3de24e98 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 24 Aug 2017 09:16:31 +0100
Subject: Add default values to all simple type fields

---
 p2pvr/ice/dvbsi.ice | 102 ++++++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/p2pvr/ice/dvbsi.ice b/p2pvr/ice/dvbsi.ice
index 732aa00..63123f2 100644
--- a/p2pvr/ice/dvbsi.ice
+++ b/p2pvr/ice/dvbsi.ice
@@ -11,55 +11,55 @@ module DVBSI {
 	// Descriptors
 	class Delivery {
 		[ "slicer:db:pkey" ]
-		int TransportStreamId;
-		long Frequency;
+		int TransportStreamId = 0;
+		long Frequency = 0;
 	};
 
 	class SatelliteDelivery extends Delivery {
-		int OrbitalPosition;
-		bool WestEastFlag;
-		short Polarization;
-		short RollOff;
-		bool ModulationSystem;
-		short ModulationType;
-		int SymbolRate;
-		short FecInner;
+		int OrbitalPosition = 0;
+		bool WestEastFlag = false;
+		short Polarization = 0;
+		short RollOff = 0;
+		bool ModulationSystem = false;
+		short ModulationType = 0;
+		int SymbolRate = 0;
+		short FecInner = 0;
 	};
 
 	class CableDelivery extends Delivery {
-		short FecOuter;
-		short Modulation;
-		int SymbolRate;
-		short FecInner;
+		short FecOuter = 0;
+		short Modulation = 0;
+		int SymbolRate = 0;
+		short FecInner = 0;
 	};
 
 	class TerrestrialDelivery extends Delivery {
-		short Bandwidth;
-		bool Priority;
-		bool TimeSlicing;
-		bool MpeFec;
-		short Constellation;
-		short Hierarchy;
-		short CodeRateHP;
-		short CodeRateLP;
-		short GuardInterval;
-		short TransmissionMode;
-		bool OtherFrequencyFlag;
+		short Bandwidth = 0;
+		bool Priority = false;
+		bool TimeSlicing = false;
+		bool MpeFec = false;
+		short Constellation = 0;
+		short Hierarchy = 0;
+		short CodeRateHP = 0;
+		short CodeRateLP = 0;
+		short GuardInterval = 0;
+		short TransmissionMode = 0;
+		bool OtherFrequencyFlag = false;
 	};
 
 	struct NetworkService {
 		[ "slicer:db:pkey" ]
-		int ServiceId;
-		int TransportStreamId;
-		short Type;
+		int ServiceId = 0;
+		int TransportStreamId = 0;
+		short Type = 0;
 	};
 	sequence<NetworkService> NetworkServiceList;
 
 	class NetworkTransportStream {
-		int NetworkId;
+		int NetworkId = 0;
 		[ "slicer:db:pkey" ]
-		int TransportStreamId;
-		int OriginalNetworkId;
+		int TransportStreamId = 0;
+		int OriginalNetworkId = 0;
 		[ "slicer:db:ignore" ]
 		SatelliteDelivery Satellite;
 		[ "slicer:db:ignore" ]
@@ -73,7 +73,7 @@ module DVBSI {
 
 	class Network {
 		[ "slicer:db:pkey" ]
-		int NetworkId;
+		int NetworkId = 0;
 		optional(1) string Name;
 		[ "slicer:db:ignore" ]
 		NetworkTransportStreams TransportStreams;
@@ -82,15 +82,15 @@ module DVBSI {
 
 	class BouquetTransportStream {
 		[ "slicer:db:pkey" ]
-		int TransportStreamId;
+		int TransportStreamId = 0;
 		[ "slicer:db:pkey" ]
-		int OriginalNetworkId;
+		int OriginalNetworkId = 0;
 	};
 	sequence <BouquetTransportStream> BouquetTransportStreamList;
 
 	class Bouquet {
 		[ "slicer:db:pkey" ]
-		int BouquetId;
+		int BouquetId = 0;
 		optional(1) string Name;
 		optional(2) string DefaultAuthority;
 		[ "slicer:db:ignore" ]
@@ -101,11 +101,11 @@ module DVBSI {
 		[ "slicer:db:pkey" ]
 		int ServiceId;
 		[ "slicer:db:pkey" ]
-		int TransportStreamId;
-		bool EitSchedule;
-		bool EitPresentFollowing;
-		short RunningStatus;
-		bool FreeCaMode;
+		int TransportStreamId = 0;
+		bool EitSchedule = false;
+		bool EitPresentFollowing = false;
+		short RunningStatus = 0;
+		bool FreeCaMode = false;
 		optional(1) string ProviderName;
 		optional(2) string Name;
 		optional(3) short Type;
@@ -115,35 +115,35 @@ module DVBSI {
 
 	class TransportStream {
 		[ "slicer:db:pkey" ]
-		int TransportStreamId;
-		int OriginalNetworkId;
+		int TransportStreamId = 0;
+		int OriginalNetworkId = 0;
 		[ "slicer:db:ignore" ]
 		ServiceList Services;
 	};
 
 	class Stream {
-		short Type;
-		int Id;
-		int ServiceId;
+		short Type = 0;
+		int Id = 0;
+		int ServiceId = 0;
 	};
 	sequence<Stream> StreamList;
 
 	class ProgramMap {
-		int ServiceId;
+		int ServiceId = 0;
 		StreamList Streams;
 	};
 
 	class EitInformation {
-		int ServiceId;
-		int TransportStreamId;
-		int OriginalNetworkId;
+		int ServiceId = 0;
+		int TransportStreamId = 0;
+		int OriginalNetworkId = 0;
 	};
 
 	class Event {
 		[ "slicer:db:pkey" ]
-		int ServiceId;
+		int ServiceId = 0;
 		[ "slicer:db:pkey" ]
-		int EventId;
+		int EventId = 0;
 		string Title;
 		string TitleLang;
 		optional(1) string Subtitle;
-- 
cgit v1.2.3