diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp index a34c5d862..9a0f8c9c4 100644 --- a/src/driver/audiodec/wavdec.cpp +++ b/src/driver/audiodec/wavdec.cpp @@ -90,12 +90,12 @@ CBaseDec::RetCode CWavDec::Decoder(FILE *in, int /*OutputFd*/, State* state, CAu return Status; } fseek(in, header_size, SEEK_SET); - int fmt; +// int fmt; switch(mBitsPerSample) { - case 8 : fmt = AFMT_U8; + case 8 : //fmt = AFMT_U8; break; - case 16 : fmt = header_size == 0 ? AFMT_S16_BE : AFMT_S16_LE; + case 16 : //fmt = header_size == 0 ? AFMT_S16_BE : AFMT_S16_LE; break; default: printf("%s: wrong bits per sample (%d)\n", ProgName, mBitsPerSample); diff --git a/src/driver/genpsi.c b/src/driver/genpsi.c index eeca06d22..966a27eac 100644 --- a/src/driver/genpsi.c +++ b/src/driver/genpsi.c @@ -194,7 +194,7 @@ static int copy_template(uint8_t *dst, uint8_t *src, int len) } int genpsi(int fd2) { - int bytes = 0; +// int bytes = 0; uint8_t pkt[SIZE_TS_PKT]; int i, data_len, patch_len, ofs; @@ -234,13 +234,13 @@ int genpsi(int fd2) //-- calculate CRC -- calc_crc32psi(&pkt[data_len], &pkt[OFS_HDR_2], data_len-OFS_HDR_2 ); //-- write TS packet -- - bytes += write(fd2, pkt, SIZE_TS_PKT); +// bytes += write(fd2, pkt, SIZE_TS_PKT); //-- (II) build PAT -- data_len = COPY_TEMPLATE(pkt, pkt_pat); //-- calculate CRC -- calc_crc32psi(&pkt[data_len], &pkt[OFS_HDR_2], data_len-OFS_HDR_2 ); //-- write TS packet -- - bytes += write(fd2, pkt, SIZE_TS_PKT); +// bytes += write(fd2, pkt, SIZE_TS_PKT); //-- (III) build PMT -- data_len = COPY_TEMPLATE(pkt, pkt_pmt); @@ -274,7 +274,7 @@ int genpsi(int fd2) //-- calculate CRC -- calc_crc32psi(&pkt[data_len], &pkt[OFS_HDR_2], data_len-OFS_HDR_2 ); //-- write TS packet -- - bytes += write(fd2, pkt, SIZE_TS_PKT); +// bytes += write(fd2, pkt, SIZE_TS_PKT); //-- finish -- avPids.vpid=0; avPids.nba=0; diff --git a/src/driver/netfile.cpp b/src/driver/netfile.cpp index 210fc4ce5..71d61d2f2 100644 --- a/src/driver/netfile.cpp +++ b/src/driver/netfile.cpp @@ -1021,7 +1021,7 @@ FILE *f_open(const char *filename, const char *acctype) case MODE_PLS: { char *ptr2, /*buf[4096], use local buf from function */ servers[25][1024]; - int rval, retries = retry_num; + int /*rval,*/ retries = retry_num; ptr = NULL; /* fetch the playlist from the shoutcast directory with our own */ @@ -1037,7 +1037,7 @@ FILE *f_open(const char *filename, const char *acctype) /* operating system because we don't need/want stream caching for */ /* this operation */ - rval = fread(buf, sizeof(char), 4096, fd); + /*rval =*/ fread(buf, sizeof(char), 4096, fd); f_close(fd); ptr = strstr(buf, "http://"); diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp index 632e1ca73..16bba96fb 100644 --- a/src/driver/pictureviewer/crw.cpp +++ b/src/driver/pictureviewer/crw.cpp @@ -169,7 +169,7 @@ int fh_crw_load(const char *filename,unsigned char **buffer,int* xp,int* /*yp*/) struct jpeg_decompress_struct *ciptr; struct r_crw_jpeg_error_mgr emgr; unsigned char *bp; - int px,py,c,x=*xp; + int px/*,py*/,c,x=*xp; FILE *fh; JSAMPLE *lb; @@ -204,7 +204,7 @@ int fh_crw_load(const char *filename,unsigned char **buffer,int* xp,int* /*yp*/) jpeg_start_decompress(ciptr); - px=ciptr->output_width; py=ciptr->output_height; + px=ciptr->output_width; //py=ciptr->output_height; c=ciptr->output_components; @@ -234,7 +234,7 @@ int fh_crw_getsize(const char *filename,int *x,int *y, int wanted_width, int wan struct jpeg_decompress_struct *ciptr; struct r_crw_jpeg_error_mgr emgr; - int px,py,c; + int px,py/*,c*/; FILE *fh; ciptr=&cinfo; @@ -271,7 +271,7 @@ int fh_crw_getsize(const char *filename,int *x,int *y, int wanted_width, int wan jpeg_start_decompress(ciptr); px=ciptr->output_width; py=ciptr->output_height; - c=ciptr->output_components; +// c=ciptr->output_components; *x=px; *y=py; // jpeg_finish_decompress(ciptr); jpeg_destroy_decompress(ciptr); diff --git a/src/driver/pictureviewer/gif.cpp b/src/driver/pictureviewer/gif.cpp index 1246f6ab8..3e2c837d4 100644 --- a/src/driver/pictureviewer/gif.cpp +++ b/src/driver/pictureviewer/gif.cpp @@ -47,7 +47,7 @@ inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,Col } int fh_gif_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/) { - int px,py,i,ibxs; + int px,py,i/*,ibxs*/; int j; unsigned char *fbptr; unsigned char *lb; @@ -79,7 +79,7 @@ int fh_gif_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/) cmap=(gft->Image.ColorMap ? gft->Image.ColorMap : gft->SColorMap); cmaps=cmap->ColorCount; - ibxs=ibxs*3; +// ibxs=ibxs*3; fbptr=*buffer; if(!(gft->Image.Interlace)) { diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index 33aae72cf..34a604bdf 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -234,7 +234,7 @@ int fh_jpeg_getsize(const char *filename,int *x,int *y, int wanted_width, int wa struct jpeg_decompress_struct *ciptr; struct r_jpeg_error_mgr emgr; - int px,py,c; + int px,py/*,c*/; FILE *fh; ciptr=&cinfo; if(!(fh=fopen(filename,"rb"))) return(FH_ERROR_FILE); @@ -269,7 +269,7 @@ int fh_jpeg_getsize(const char *filename,int *x,int *y, int wanted_width, int wa jpeg_start_decompress(ciptr); px=ciptr->output_width; py=ciptr->output_height; - c=ciptr->output_components; +// c=ciptr->output_components; #if 1 if(!g_settings.picviewer_decode_server_ip.empty()) { diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 2dab2184c..d0aa23b0c 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -111,10 +111,10 @@ bool CPictureViewer::DecodeImage (const std::string & name, bool showBusySign, b return true; } #endif - int x, y, xs, ys, imx, imy; + int x, y, imx, imy; - xs = CFrameBuffer::getInstance()->getScreenWidth(true); - ys = CFrameBuffer::getInstance()->getScreenHeight(true); +// int xs = CFrameBuffer::getInstance()->getScreenWidth(true); +// int ys = CFrameBuffer::getInstance()->getScreenHeight(true); // Show red block for "next ready" in view state if (showBusySign) diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 6967371c4..503562a90 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -502,9 +502,6 @@ void CUpnpBrowserGui::playnext(void) std::list::iterator i; std::stringstream sindex; std::vector *entries = NULL; - bool rfound = false; - bool nfound = false; - bool tfound = false; sindex << m_playid; attribs.push_back(UPnPAttribute("ObjectID", m_playfolder)); @@ -536,16 +533,13 @@ void CUpnpBrowserGui::playnext(void) m_folderplay = false; return; } - nfound=true; } if (i->first=="TotalMatches") { - tfound=true; } if (i->first=="Result") { entries=decodeResult(i->second); - rfound=true; } } m_playid++;