CZapitChannel: use unsigned char instead size_t

This removes some annoying warnings with specific compiler flags.
This commit is contained in:
2013-07-11 11:10:16 +02:00
parent a6c43a62bd
commit 71423089b0
2 changed files with 4 additions and 4 deletions

View File

@@ -202,7 +202,7 @@ void CProgressBar::paintAdvanced()
if (pb_active_width > pb_last_width) { if (pb_active_width > pb_last_width) {
int step, off; int step, off;
int b = 0; int b = 0;
uint8_t diff = 0; uint32_t diff = 0;
for (i = 0; (i < rd) && (i < maxi); i++) { for (i = 0; (i < rd) && (i < maxi); i++) {
diff = i * 255 / rd; diff = i * 255 / rd;
if (pb_invert) if (pb_invert)

View File

@@ -208,7 +208,7 @@ class CZapitChannel
/* get methods - read and write variables */ /* get methods - read and write variables */
const std::string& getName(void) const { return name; } const std::string& getName(void) const { return name; }
t_satellite_position getSatellitePosition(void) const { return satellitePosition; } t_satellite_position getSatellitePosition(void) const { return satellitePosition; }
unsigned char getAudioChannelCount(void) { return audioChannels.size(); } unsigned char getAudioChannelCount(void) { return (unsigned char) audioChannels.size(); }
unsigned short getPcrPid(void) { return pcrPid; } unsigned short getPcrPid(void) { return pcrPid; }
unsigned short getPmtPid(void) { return pmtPid; } unsigned short getPmtPid(void) { return pmtPid; }
unsigned short getTeletextPid(void) { return teletextPid; } unsigned short getTeletextPid(void) { return teletextPid; }
@@ -256,8 +256,8 @@ class CZapitChannel
void dumpServiceXml(FILE * fd, const char * action = NULL); void dumpServiceXml(FILE * fd, const char * action = NULL);
void dumpBouquetXml(FILE * fd); void dumpBouquetXml(FILE * fd);
void setRecordDemux(int num) { record_demux = num; }; void setRecordDemux(uint8_t num) { record_demux = num; };
void setPipDemux(int num) { pip_demux = num; }; void setPipDemux(uint8_t num) { pip_demux = num; };
int getRecordDemux() { return record_demux; }; int getRecordDemux() { return record_demux; };
int getPipDemux() { return pip_demux; }; int getPipDemux() { return pip_demux; };
static t_channel_id makeChannelId(t_satellite_position sat, freq_id_t freq, static t_channel_id makeChannelId(t_satellite_position sat, freq_id_t freq,