Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Some const fixes to make icc happy.

  • Loading branch information...
commit 05edfd94df3ff2b094ecdf16386bbefc4993bb5f 1 parent 3009980
@daniel-kristjansson daniel-kristjansson authored
View
8 mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
@@ -773,12 +773,12 @@ const MasterGuideTable *ATSCStreamData::GetCachedMGT(bool current) const
return mgt;
}
-tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
+const tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
{
if (!current)
LOG(VB_GENERAL, LOG_WARNING, "Currently we ignore \'current\' param");
- TerrestrialVirtualChannelTable *tvct = NULL;
+ tvct_ptr_t tvct = NULL;
_cache_lock.lock();
tvct_cache_t::const_iterator it = _cached_tvcts.find(pid);
@@ -789,12 +789,12 @@ tvct_ptr_t ATSCStreamData::GetCachedTVCT(uint pid, bool current) const
return tvct;
}
-cvct_ptr_t ATSCStreamData::GetCachedCVCT(uint pid, bool current) const
+const cvct_ptr_t ATSCStreamData::GetCachedCVCT(uint pid, bool current) const
{
if (!current)
LOG(VB_GENERAL, LOG_WARNING, "Currently we ignore \'current\' param");
- CableVirtualChannelTable *cvct = NULL;
+ cvct_ptr_t cvct = NULL;
_cache_lock.lock();
cvct_cache_t::const_iterator it = _cached_cvcts.find(pid);
View
4 mythtv/libs/libmythtv/mpeg/atscstreamdata.h
@@ -92,8 +92,8 @@ class MTV_PUBLIC ATSCStreamData : virtual public MPEGStreamData
{ return HasCachedAnyTVCTs(current) || HasCachedAnyCVCTs(current); }
const MasterGuideTable *GetCachedMGT(bool current = true) const;
- tvct_ptr_t GetCachedTVCT(uint pid, bool current = true) const;
- cvct_ptr_t GetCachedCVCT(uint pid, bool current = true) const;
+ const tvct_ptr_t GetCachedTVCT(uint pid, bool current = true) const;
+ const cvct_ptr_t GetCachedCVCT(uint pid, bool current = true) const;
tvct_vec_t GetCachedTVCTs(bool current = true) const;
cvct_vec_t GetCachedCVCTs(bool current = true) const;
View
4 mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
@@ -832,7 +832,7 @@ const nit_ptr_t DVBStreamData::GetCachedNIT(
return nit;
}
-const nit_vec_t DVBStreamData::GetCachedNIT(bool current) const
+nit_vec_t DVBStreamData::GetCachedNIT(bool current) const
{
QMutexLocker locker(&_cache_lock);
@@ -866,7 +866,7 @@ const sdt_ptr_t DVBStreamData::GetCachedSDT(
return sdt;
}
-const sdt_vec_t DVBStreamData::GetCachedSDTs(bool current) const
+sdt_vec_t DVBStreamData::GetCachedSDTs(bool current) const
{
QMutexLocker locker(&_cache_lock);
View
6 mythtv/libs/libmythtv/mpeg/dvbstreamdata.h
@@ -186,10 +186,10 @@ class MTV_PUBLIC DVBStreamData : virtual public MPEGStreamData
bool HasCachedAllSDTs(bool current = true) const;
const nit_ptr_t GetCachedNIT(uint section_num, bool current = true) const;
- const nit_vec_t GetCachedNIT(bool current = true) const;
+ nit_vec_t GetCachedNIT(bool current = true) const;
const sdt_ptr_t GetCachedSDT(uint tsid, uint section_num,
- bool current = true) const;
- const sdt_vec_t GetCachedSDTs(bool current = true) const;
+ bool current = true) const;
+ sdt_vec_t GetCachedSDTs(bool current = true) const;
void ReturnCachedSDTTables(sdt_vec_t&) const;
View
8 mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
@@ -1280,7 +1280,7 @@ bool MPEGStreamData::HasAllPMTSections(uint prog_num) const
bool MPEGStreamData::HasProgram(uint progNum) const
{
- pmt_ptr_t pmt = GetCachedPMT(progNum, 0);
+ const pmt_ptr_t pmt = GetCachedPMT(progNum, 0);
bool hasit = pmt;
ReturnCachedTable(pmt);
@@ -1417,7 +1417,7 @@ bool MPEGStreamData::HasCachedAnyPMTs(void) const
return _cached_pmts.size();
}
-pat_ptr_t MPEGStreamData::GetCachedPAT(uint tsid, uint section_num) const
+const pat_ptr_t MPEGStreamData::GetCachedPAT(uint tsid, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
ProgramAssociationTable *pat = NULL;
@@ -1461,7 +1461,7 @@ pat_vec_t MPEGStreamData::GetCachedPATs(void) const
return pats;
}
-cat_ptr_t MPEGStreamData::GetCachedCAT(uint tsid, uint section_num) const
+const cat_ptr_t MPEGStreamData::GetCachedCAT(uint tsid, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
ConditionalAccessTable *cat = NULL;
@@ -1505,7 +1505,7 @@ cat_vec_t MPEGStreamData::GetCachedCATs(void) const
return cats;
}
-pmt_ptr_t MPEGStreamData::GetCachedPMT(
+const pmt_ptr_t MPEGStreamData::GetCachedPMT(
uint program_num, uint section_num) const
{
QMutexLocker locker(&_cache_lock);
View
6 mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
@@ -235,17 +235,17 @@ class MTV_PUBLIC MPEGStreamData : public EITSource
bool HasCachedAllPMTs(void) const;
bool HasCachedAnyPMTs(void) const;
- pat_ptr_t GetCachedPAT(uint tsid, uint section_num) const;
+ const pat_ptr_t GetCachedPAT(uint tsid, uint section_num) const;
pat_vec_t GetCachedPATs(uint tsid) const;
pat_vec_t GetCachedPATs(void) const;
pat_map_t GetCachedPATMap(void) const;
- cat_ptr_t GetCachedCAT(uint tsid, uint section_num) const;
+ const cat_ptr_t GetCachedCAT(uint tsid, uint section_num) const;
cat_vec_t GetCachedCATs(uint tsid) const;
cat_vec_t GetCachedCATs(void) const;
cat_map_t GetCachedCATMap(void) const;
- pmt_ptr_t GetCachedPMT(uint program_num, uint section_num) const;
+ const pmt_ptr_t GetCachedPMT(uint program_num, uint section_num) const;
pmt_vec_t GetCachedPMTs(void) const;
pmt_map_t GetCachedPMTMap(void) const;
Please sign in to comment.
Something went wrong with that request. Please try again.