diff --git a/src/gui/components/cc_item_progressbar.cpp b/src/gui/components/cc_item_progressbar.cpp index d2b77720e..2ffdf1abe 100644 --- a/src/gui/components/cc_item_progressbar.cpp +++ b/src/gui/components/cc_item_progressbar.cpp @@ -202,7 +202,7 @@ void CProgressBar::paintAdvanced() if (pb_active_width > pb_last_width) { int step, off; int b = 0; - uint8_t diff = 0; + uint32_t diff = 0; for (i = 0; (i < rd) && (i < maxi); i++) { diff = i * 255 / rd; if (pb_invert) diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h index d8f1225bf..4aa756340 100644 --- a/src/zapit/include/zapit/channel.h +++ b/src/zapit/include/zapit/channel.h @@ -208,7 +208,7 @@ class CZapitChannel /* get methods - read and write variables */ const std::string& getName(void) const { return name; } 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 getPmtPid(void) { return pmtPid; } unsigned short getTeletextPid(void) { return teletextPid; } @@ -256,8 +256,8 @@ class CZapitChannel void dumpServiceXml(FILE * fd, const char * action = NULL); void dumpBouquetXml(FILE * fd); - void setRecordDemux(int num) { record_demux = num; }; - void setPipDemux(int num) { pip_demux = num; }; + void setRecordDemux(uint8_t num) { record_demux = num; }; + void setPipDemux(uint8_t num) { pip_demux = num; }; int getRecordDemux() { return record_demux; }; int getPipDemux() { return pip_demux; }; static t_channel_id makeChannelId(t_satellite_position sat, freq_id_t freq,