diff options
Diffstat (limited to 'src/fig')
| -rw-r--r-- | src/fig/FIG0_1.h | 4 | ||||
| -rw-r--r-- | src/fig/FIG0_13.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_17.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_18.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_2.h | 6 | ||||
| -rw-r--r-- | src/fig/FIG0_24.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_3.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_5.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG0_8.h | 2 | ||||
| -rw-r--r-- | src/fig/FIG1.h | 6 |
10 files changed, 15 insertions, 15 deletions
diff --git a/src/fig/FIG0_1.h b/src/fig/FIG0_1.h index fd98037..4e8b5f5 100644 --- a/src/fig/FIG0_1.h +++ b/src/fig/FIG0_1.h @@ -45,8 +45,8 @@ class FIG0_1 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<DabSubchannel*> subchannels; - std::vector<DabSubchannel*>::iterator subchannelFIG0_1; + vec_sp_subchannel subchannels; + vec_sp_subchannel::iterator subchannelFIG0_1; uint8_t m_watermarkData[128]; size_t m_watermarkSize; diff --git a/src/fig/FIG0_13.h b/src/fig/FIG0_13.h index 4465aef..cd9ae9f 100644 --- a/src/fig/FIG0_13.h +++ b/src/fig/FIG0_13.h @@ -46,7 +46,7 @@ class FIG0_13 : public IFIG FIGRuntimeInformation *m_rti; bool m_initialised; bool m_transmit_programme; - std::vector<DabComponent*>::iterator componentFIG0_13; + vec_sp_component::iterator componentFIG0_13; }; } diff --git a/src/fig/FIG0_17.h b/src/fig/FIG0_17.h index 2d5088b..06d0743 100644 --- a/src/fig/FIG0_17.h +++ b/src/fig/FIG0_17.h @@ -45,7 +45,7 @@ class FIG0_17 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_17; + vec_sp_service::iterator serviceFIG0_17; }; } diff --git a/src/fig/FIG0_18.h b/src/fig/FIG0_18.h index f73687c..da0e748 100644 --- a/src/fig/FIG0_18.h +++ b/src/fig/FIG0_18.h @@ -44,7 +44,7 @@ class FIG0_18 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<std::shared_ptr<DabService> >::iterator service; + vec_sp_service::iterator service; }; } diff --git a/src/fig/FIG0_2.h b/src/fig/FIG0_2.h index 2f35b21..53865db 100644 --- a/src/fig/FIG0_2.h +++ b/src/fig/FIG0_2.h @@ -45,9 +45,9 @@ class FIG0_2 : public IFIG FIGRuntimeInformation *m_rti; bool m_initialised; bool m_inserting_audio_not_data; - std::vector<std::shared_ptr<DabService> > m_audio_services; - std::vector<std::shared_ptr<DabService> > m_data_services; - std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_2; + vec_sp_service m_audio_services; + vec_sp_service m_data_services; + vec_sp_service::iterator serviceFIG0_2; }; } diff --git a/src/fig/FIG0_24.h b/src/fig/FIG0_24.h index 4ccbd0c..1c17f6b 100644 --- a/src/fig/FIG0_24.h +++ b/src/fig/FIG0_24.h @@ -47,7 +47,7 @@ class FIG0_24 : public IFIG FIGRuntimeInformation *m_rti; bool m_initialised; bool m_inserting_audio_not_data; - std::vector<std::shared_ptr<DabService> >::iterator serviceFIG0_24; + vec_sp_service::iterator serviceFIG0_24; }; } diff --git a/src/fig/FIG0_3.h b/src/fig/FIG0_3.h index d2b1563..a3a936b 100644 --- a/src/fig/FIG0_3.h +++ b/src/fig/FIG0_3.h @@ -46,7 +46,7 @@ class FIG0_3 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<DabComponent*>::iterator componentFIG0_3; + vec_sp_component::iterator componentFIG0_3; }; } diff --git a/src/fig/FIG0_5.h b/src/fig/FIG0_5.h index 51ac177..1bfe8c3 100644 --- a/src/fig/FIG0_5.h +++ b/src/fig/FIG0_5.h @@ -49,7 +49,7 @@ class FIG0_5 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<DabComponent*>::iterator componentFIG0_5; + vec_sp_component::iterator componentFIG0_5; }; } diff --git a/src/fig/FIG0_8.h b/src/fig/FIG0_8.h index 81d00ea..dc150aa 100644 --- a/src/fig/FIG0_8.h +++ b/src/fig/FIG0_8.h @@ -48,7 +48,7 @@ class FIG0_8 : public IFIG FIGRuntimeInformation *m_rti; bool m_initialised; bool m_transmit_programme; - std::vector<DabComponent*>::iterator componentFIG0_8; + vec_sp_component::iterator componentFIG0_8; }; } diff --git a/src/fig/FIG1.h b/src/fig/FIG1.h index 9910320..2ae0bfb 100644 --- a/src/fig/FIG1.h +++ b/src/fig/FIG1.h @@ -64,7 +64,7 @@ class FIG1_1 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<std::shared_ptr<DabService> >::iterator service; + vec_sp_service::iterator service; }; // FIG type 1/4, service component label @@ -82,7 +82,7 @@ class FIG1_4 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<DabComponent*>::iterator component; + vec_sp_component::iterator component; }; // FIG type 1/5, data service label @@ -100,7 +100,7 @@ class FIG1_5 : public IFIG private: FIGRuntimeInformation *m_rti; bool m_initialised; - std::vector<std::shared_ptr<DabService> >::iterator service; + vec_sp_service::iterator service; }; #ifdef _WIN32 |