| 1 | *** dvbdescriptors.h.orig 2009-10-29 14:33:01.000000000 +1300 |
|---|
| 2 | --- dvbdescriptors.h 2009-10-29 15:22:30.000000000 +1300 |
|---|
| 3 | *************** |
|---|
| 4 | *** 1301,1319 **** |
|---|
| 5 | kServiceTypeNVODTimeShifted = 0x05, |
|---|
| 6 | kServiceTypeMosaic = 0x06, |
|---|
| 7 | kServiceTypePALCodedSignal = 0x07, |
|---|
| 8 | kServiceTypeSECAMCodedSignal = 0x08, |
|---|
| 9 | kServiceTypeD_D2_MAC = 0x09, |
|---|
| 10 | ! kServiceTypeFMRadio = 0x0A, |
|---|
| 11 | kServiceTypeNTSCCodedSignal = 0x0B, |
|---|
| 12 | kServiceTypeDataBroadcast = 0x0C, |
|---|
| 13 | kServiceTypeCommonInterface = 0x0D, |
|---|
| 14 | kServiceTypeRCS_Map = 0x0E, |
|---|
| 15 | kServiceTypeRCS_FLS = 0x0F, |
|---|
| 16 | kServiceTypeDVB_MHP = 0x10, |
|---|
| 17 | kServiceTypeHDTV = 0x11, |
|---|
| 18 | ! kServiceTypeHDTV2 = 0x19, |
|---|
| 19 | kServiceTypeEchoStarTV1 = 0x91, |
|---|
| 20 | kServiceTypeEchoStarTV2 = 0x9a, |
|---|
| 21 | kServiceTypeEchoStarTV3 = 0xa4, |
|---|
| 22 | kServiceTypeEchoStarTV4 = 0xa6, |
|---|
| 23 | kServiceTypeNimiqTV1 = 0x81, |
|---|
| 24 | --- 1301,1320 ---- |
|---|
| 25 | kServiceTypeNVODTimeShifted = 0x05, |
|---|
| 26 | kServiceTypeMosaic = 0x06, |
|---|
| 27 | kServiceTypePALCodedSignal = 0x07, |
|---|
| 28 | kServiceTypeSECAMCodedSignal = 0x08, |
|---|
| 29 | kServiceTypeD_D2_MAC = 0x09, |
|---|
| 30 | ! kServiceTypeAdvancedCodecDigitalRadioSound = 0x0A, |
|---|
| 31 | kServiceTypeNTSCCodedSignal = 0x0B, |
|---|
| 32 | kServiceTypeDataBroadcast = 0x0C, |
|---|
| 33 | kServiceTypeCommonInterface = 0x0D, |
|---|
| 34 | kServiceTypeRCS_Map = 0x0E, |
|---|
| 35 | kServiceTypeRCS_FLS = 0x0F, |
|---|
| 36 | kServiceTypeDVB_MHP = 0x10, |
|---|
| 37 | kServiceTypeHDTV = 0x11, |
|---|
| 38 | ! kServiceTypeAdvancedCodecSDDigitalTelevision = 0x16, |
|---|
| 39 | ! kServiceTypeAdvancedCodecHDDigitalTelevision = 0x19, |
|---|
| 40 | kServiceTypeEchoStarTV1 = 0x91, |
|---|
| 41 | kServiceTypeEchoStarTV2 = 0x9a, |
|---|
| 42 | kServiceTypeEchoStarTV3 = 0xa4, |
|---|
| 43 | kServiceTypeEchoStarTV4 = 0xa6, |
|---|
| 44 | kServiceTypeNimiqTV1 = 0x81, |
|---|
| 45 | *************** |
|---|
| 46 | *** 1328,1337 **** |
|---|
| 47 | --- 1329,1339 ---- |
|---|
| 48 | |
|---|
| 49 | }; |
|---|
| 50 | uint ServiceType() const { return m_serviceid; } |
|---|
| 51 | bool IsDTV(void) const |
|---|
| 52 | { return ((ServiceType() == kServiceTypeDigitalTelevision) || |
|---|
| 53 | + (ServiceType() == kServiceTypeAdvancedCodecSDDigitalTelevision) || |
|---|
| 54 | IsHDTV() || |
|---|
| 55 | (ServiceType() == kServiceTypeEchoStarTV1) || |
|---|
| 56 | (ServiceType() == kServiceTypeEchoStarTV2) || |
|---|
| 57 | (ServiceType() == kServiceTypeEchoStarTV3) || |
|---|
| 58 | (ServiceType() == kServiceTypeEchoStarTV4) || |
|---|
| 59 | *************** |
|---|
| 60 | *** 1343,1357 **** |
|---|
| 61 | (ServiceType() == kServiceTypeNimiqTV6) || |
|---|
| 62 | (ServiceType() == kServiceTypeNimiqTV7) || |
|---|
| 63 | (ServiceType() == kServiceTypeNimiqTV8) || |
|---|
| 64 | (ServiceType() == kServiceTypeNimiqTV9)); } |
|---|
| 65 | bool IsDigitalAudio(void) const |
|---|
| 66 | ! { return ServiceType() == kServiceTypeDigitalRadioSound; } |
|---|
| 67 | bool IsHDTV(void) const |
|---|
| 68 | { return |
|---|
| 69 | (ServiceType() == kServiceTypeHDTV) || |
|---|
| 70 | ! (ServiceType() == kServiceTypeHDTV2); } |
|---|
| 71 | bool IsTeletext(void) const |
|---|
| 72 | { return ServiceType() == kServiceTypeDataBroadcast; } |
|---|
| 73 | QString toString(void) const; |
|---|
| 74 | |
|---|
| 75 | private: |
|---|
| 76 | --- 1345,1360 ---- |
|---|
| 77 | (ServiceType() == kServiceTypeNimiqTV6) || |
|---|
| 78 | (ServiceType() == kServiceTypeNimiqTV7) || |
|---|
| 79 | (ServiceType() == kServiceTypeNimiqTV8) || |
|---|
| 80 | (ServiceType() == kServiceTypeNimiqTV9)); } |
|---|
| 81 | bool IsDigitalAudio(void) const |
|---|
| 82 | ! { return ((ServiceType() == kServiceTypeDigitalRadioSound) || |
|---|
| 83 | ! (ServiceType() == kServiceTypeAdvancedCodecDigitalRadioSound)); } |
|---|
| 84 | bool IsHDTV(void) const |
|---|
| 85 | { return |
|---|
| 86 | (ServiceType() == kServiceTypeHDTV) || |
|---|
| 87 | ! (ServiceType() == kServiceTypeAdvancedCodecHDDigitalTelevision); } |
|---|
| 88 | bool IsTeletext(void) const |
|---|
| 89 | { return ServiceType() == kServiceTypeDataBroadcast; } |
|---|
| 90 | QString toString(void) const; |
|---|
| 91 | |
|---|
| 92 | private: |
|---|
