Mercurial > audlegacy
changeset 701:d539e5c5f730 trunk
[svn] Fixes of the remaining GCC 4.1 warnings from external contributor Diego "Flameeyes" Petteno (Gentoo).
line wrap: on
line diff
--- a/Plugins/Effect/ladspa/ladspa.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Effect/ladspa/ladspa.c Sun Feb 26 13:08:35 2006 -0800 @@ -74,7 +74,7 @@ static plugin_instance * add_plugin (ladspa_plugin *plugin); static void find_all_plugins(void); static void find_plugins(char *path_entry); -static ladspa_plugin *get_plugin_by_id(unsigned long id); +static ladspa_plugin *get_plugin_by_id(long id); static plugin_instance * load (char *filename, long int num); static void reboot_plugins (void); static void boot_plugin (plugin_instance *instance); @@ -111,7 +111,7 @@ gboolean ignore; gboolean running; gboolean initialised; -} state = { 0, 0, 0, FALSE, FALSE}; +} state = { 0, 0, 0, FALSE, FALSE, FALSE}; static GtkWidget *config_window = NULL, *run_clist = NULL; @@ -122,7 +122,8 @@ stop, NULL, configure, - apply_effect + apply_effect, + NULL }; EffectPlugin *get_eplugin_info (void) @@ -170,7 +171,7 @@ bmp_cfg_db_close(db); } -static ladspa_plugin *get_plugin_by_id(unsigned long id) +static ladspa_plugin *get_plugin_by_id(long id) { GSList *list; ladspa_plugin *plugin; @@ -489,7 +490,7 @@ DIR *dir; struct dirent *dirent; long int k; - long int port, input, output; + unsigned long int port, input, output; dir= opendir(path_entry); if (dir == NULL) return;
--- a/Plugins/General/inetctl/inetctl_actions.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/General/inetctl/inetctl_actions.c Sun Feb 26 13:08:35 2006 -0800 @@ -438,7 +438,7 @@ REGISTER(REQUEST, FALSE), REGISTER(EXIT, TRUE), REGISTER(QUIT, FALSE), - { "", NULL } /* This must be the LAST line of the table */ + { "", NULL, FALSE } /* This must be the LAST line of the table */ };
--- a/Plugins/General/inetctl/inetctl_status.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/General/inetctl/inetctl_status.c Sun Feb 26 13:08:35 2006 -0800 @@ -3,7 +3,21 @@ #include "inetctl.h" /* Static "previous state" of player */ -playerStatus lastPlayerStatus = { FALSE, 0 }; +playerStatus lastPlayerStatus = { + .infoValid = FALSE, + .curTrackInPlaylist = 0, + .totalTracksInPlaylist = 0, + .curTrackLength = 0, + .curTrackTime = 0, + .trackTitle = {0, }, + .trackFile = {0, }, + .volume = 0, + .balance = 0, + .playing = FALSE, + .paused = FALSE, + .repeat = FALSE, + .shuffle = FALSE +}; /* Option/controls */ Bool formattedTime = TRUE;
--- a/Plugins/Input/console/Audacious_Driver.cpp Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/console/Audacious_Driver.cpp Sun Feb 26 13:08:35 2006 -0800 @@ -500,8 +500,6 @@ // Playback -static int silence_pending; - static void* play_loop_track( gpointer ) { g_static_mutex_lock( &playback_mutex );
--- a/Plugins/Input/flac/plugin_common/charset.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/flac/plugin_common/charset.c Sun Feb 26 13:08:35 2006 -0800 @@ -88,7 +88,7 @@ outptr = out; retry: - if (iconv(cd, (char**)&input, &length, &outptr, &outleft) == -1) + if (iconv(cd, (char**)&input, &length, &outptr, &outleft) == (size_t)-1) { int used; switch (errno)
--- a/Plugins/Input/flac/replaygain.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/flac/replaygain.c Sun Feb 26 13:08:35 2006 -0800 @@ -41,10 +41,10 @@ #endif #define local_max(a,b) ((a)>(b)?(a):(b)) -static const FLAC__byte *tag_title_gain_ = "REPLAYGAIN_TRACK_GAIN"; -static const FLAC__byte *tag_title_peak_ = "REPLAYGAIN_TRACK_PEAK"; -static const FLAC__byte *tag_album_gain_ = "REPLAYGAIN_ALBUM_GAIN"; -static const FLAC__byte *tag_album_peak_ = "REPLAYGAIN_ALBUM_PEAK"; +static const FLAC__byte *tag_title_gain_ = (FLAC__byte*)"REPLAYGAIN_TRACK_GAIN"; +static const FLAC__byte *tag_title_peak_ = (FLAC__byte*)"REPLAYGAIN_TRACK_PEAK"; +static const FLAC__byte *tag_album_gain_ = (FLAC__byte*)"REPLAYGAIN_ALBUM_GAIN"; +static const FLAC__byte *tag_album_peak_ = (FLAC__byte*)"REPLAYGAIN_ALBUM_PEAK"; static const char *peak_format_ = "%s=%1.8f"; static const char *gain_format_ = "%s=%+2.2f dB"; @@ -570,7 +570,7 @@ return false; q++; memset(s, 0, sizeof(s)-1); - strncpy(s, q, local_min(sizeof(s)-1, entry->length - (q-p))); + strncpy(s, q, local_min(sizeof(s)-1, (size_t)(entry->length - (q-p)))); v = strtod(s, &end); if(end == s)
--- a/Plugins/Input/modplug/archive/open.cpp Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/modplug/archive/open.cpp Sun Feb 26 13:08:35 2006 -0800 @@ -17,7 +17,7 @@ uint32 lPos; lPos = aFileName.find_last_of('.'); - if(lPos < 0) + if(lPos > aFileName.length()) return NULL; lExt = aFileName.substr(lPos); for(uint32 i = 0; i < lExt.length(); i++) @@ -67,7 +67,7 @@ uint32 lPos; lPos = aFileName.find_last_of('.'); - if(lPos < 0) + if(lPos > aFileName.length()) return false; lExt = aFileName.substr(lPos); for(uint32 i = 0; i < lExt.length(); i++)
--- a/Plugins/Input/modplug/modplugbmp.cpp Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/modplug/modplugbmp.cpp Sun Feb 26 13:08:35 2006 -0800 @@ -220,7 +220,7 @@ uint n = mBufSize >> 1; for(uint i = 0; i < n; i++) { short old = ((short*)mBuffer)[i]; - ((short*)mBuffer)[i] *= mPreampFactor; + ((short*)mBuffer)[i] *= (short int)mPreampFactor; // detect overflow and clip! if ((old & 0x8000) != (((short*)mBuffer)[i] & 0x8000)) @@ -232,7 +232,7 @@ { for(uint i = 0; i < mBufSize; i++) { uchar old = ((uchar*)mBuffer)[i]; - ((uchar*)mBuffer)[i] *= mPreampFactor; + ((uchar*)mBuffer)[i] *= (short int)mPreampFactor; // detect overflow and clip! if ((old & 0x80) != (((uchar*)mBuffer)[i] & 0x80))
--- a/Plugins/Input/mpg123/common.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/common.c Sun Feb 26 13:08:35 2006 -0800 @@ -224,7 +224,7 @@ read_id3v2_tag(unsigned long head) { guchar *id3buf; - int hdrsize; + gsize hdrsize; struct id3_tag *id3d; struct id3tag_t tag; guchar buf[7]; @@ -250,7 +250,7 @@ if (mpg123_cfg.disable_id3v2) { guint8 *tmp = g_malloc(hdrsize); gboolean ret; - ret = (fullread(filept, tmp, hdrsize) == hdrsize); + ret = ((gsize)fullread(filept, tmp, hdrsize) == hdrsize); g_free(tmp); return ret; } @@ -262,7 +262,7 @@ /* * Read ID3tag body. */ - if (fullread(filept, id3buf + ID3_TAGHDR_SIZE + 3, hdrsize) != hdrsize) { + if ((gsize)fullread(filept, id3buf + ID3_TAGHDR_SIZE + 3, hdrsize) != hdrsize) { g_free(id3buf); return FALSE; }
--- a/Plugins/Input/mpg123/http.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/http.c Sun Feb 26 13:08:35 2006 -0800 @@ -58,7 +58,8 @@ extern gboolean mpg123_stereo; static gboolean prebuffering, going, eof = FALSE; -static gint sock, rd_index, wr_index, buffer_length, prebuffer_length; +static gint sock; +static gsize rd_index, wr_index, buffer_length, prebuffer_length; static guint64 buffer_read = 0; static gchar *buffer; static GThread *thread; @@ -188,7 +189,7 @@ } -static gint +static gsize http_used(void) { if (wr_index >= rd_index) @@ -196,7 +197,7 @@ return buffer_length - (rd_index - wr_index); } -static gint +static gsize http_free(void) { if (rd_index > wr_index) @@ -205,7 +206,7 @@ } static void -http_wait_for_data(gint bytes) +http_wait_for_data(gsize bytes) { while ((prebuffering || http_used() < bytes) && !eof && going && mpg123_info->going) @@ -227,9 +228,9 @@ } int -mpg123_http_read(gpointer data, gint length) +mpg123_http_read(gpointer data, gsize length) { - gint len, cnt, off = 0, meta_len, meta_off = 0, i; + gsize len, cnt, off = 0, meta_len, meta_off = 0, i; gchar *meta_data, **tags; http_wait_for_data(length); @@ -635,7 +636,7 @@ } else { status = - g_strdup_printf(_("PRE-BUFFERING: %dKB/%dKB"), + g_strdup_printf(_("PRE-BUFFERING: %luKB/%luKB"), http_used() / 1024, prebuffer_length / 1024); mpg123_ip.set_info_text(status);
--- a/Plugins/Input/mpg123/id3_frame.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/id3_frame.c Sun Feb 26 13:08:35 2006 -0800 @@ -253,7 +253,7 @@ static struct id3_framedesc * find_frame_description(guint32 id) { - int i; + size_t i; for (i = 0; i < sizeof(framedesc) / sizeof(struct id3_framedesc); i++) if (framedesc[i].fd_id == id) return &framedesc[i]; @@ -567,7 +567,7 @@ id3_add_frame(struct id3_tag *id3, guint32 type) { struct id3_frame *frame; - int i; + size_t i; /* * Allocate frame. @@ -683,7 +683,7 @@ static guint32 find_v24_id(guint32 v22) { - int i; + size_t i; for (i = 0; i < sizeof(framedesc22) / sizeof(framedesc22[0]); i++) if (framedesc22[i].fd_v22 == v22) return framedesc22[i].fd_v24;
--- a/Plugins/Input/mpg123/id3_frame_content.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/id3_frame_content.c Sun Feb 26 13:08:35 2006 -0800 @@ -74,7 +74,7 @@ ptr = buffer; while (text[0] == '(' && text[1] != '(' && spc > 0) { const char *genre; - int num = 0; + size_t num = 0; if (text[1] == 'R' && text[2] == 'X') { text += 4;
--- a/Plugins/Input/mpg123/id3_frame_text.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/id3_frame_text.c Sun Feb 26 13:08:35 2006 -0800 @@ -40,7 +40,7 @@ { char ascii[256]; char *uc = (char *) utf16 + 2; - int i; + size_t i; for (i = 0; *uc != 0 && i < sizeof(ascii); i++, uc += 2) ascii[i] = *uc;
--- a/Plugins/Input/mpg123/layer3.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/layer3.c Sun Feb 26 13:08:35 2006 -0800 @@ -618,7 +618,7 @@ int part2remain = gr_info->part2_3_length - part2bits; int *me; - int num = mpg123_getbitoffset(&bsi); + size_t num = mpg123_getbitoffset(&bsi); long mask; /* we must split this, because for num==0 the shift is undefined if you do it in one step */ mask = ((unsigned long) mpg123_getbits(&bsi,num))<<BITSHIFT; @@ -1661,7 +1661,8 @@ real *tspnt = (real *) tsOut; real *rawout1, *rawout2; - int bt, sb = 0; + int bt; + size_t sb = 0; { int b = blc[ch]; @@ -1774,8 +1775,7 @@ return 0; if (ms_stereo) { - int i; - int maxb = sideinfo.ch[0].gr[gr].maxb; + unsigned int i, maxb = sideinfo.ch[0].gr[gr].maxb; if (sideinfo.ch[1].gr[gr].maxb > maxb) maxb = sideinfo.ch[1].gr[gr].maxb; @@ -1801,7 +1801,7 @@ switch (single) { case 3: { - register int i; + register unsigned int i; register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1]; for (i = 0; i < SSLIMIT * gr_info->maxb; i++, in0++) @@ -1810,7 +1810,7 @@ break; case 1: { - register int i; + register unsigned int i; register real *in0 = (real *) hybridIn[0], *in1 = (real *) hybridIn[1]; for (i = 0; i < SSLIMIT * gr_info->maxb; i++)
--- a/Plugins/Input/mpg123/mpg123.h Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/mpg123/mpg123.h Sun Feb 26 13:08:35 2006 -0800 @@ -191,7 +191,7 @@ /* ------ Declarations from "http.c" ------ */ extern int mpg123_http_open(char *url); -int mpg123_http_read(gpointer data, gint length); +int mpg123_http_read(gpointer data, gsize length); void mpg123_http_close(void); char *mpg123_http_get_title(char *url); int mpg123_http_get_length(void);
--- a/Plugins/Input/sexypsf/Misc.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/sexypsf/Misc.c Sun Feb 26 13:08:35 2006 -0800 @@ -289,7 +289,7 @@ { char linebuf[1024]; - while(fgets(linebuf,1024,fp)>0) + while(fgets(linebuf,1024,fp)) { int x; char *key=0,*value=0; @@ -435,7 +435,7 @@ { PSFINFO *ret; if(!(ret=LoadPSF(path,0,1))) return(0); - if(ret->stop==~0) ret->fade=0; + if(ret->stop==(u32)~0) ret->fade=0; ret->length=ret->stop+ret->fade; return(ret); } @@ -456,7 +456,7 @@ return(0); } - if(ret->stop==~0) ret->fade=0; // Infinity+anything is still infinity...or is it? + if(ret->stop==(u32)~0) ret->fade=0; // Infinity+anything is still infinity...or is it? SPUsetlength(ret->stop,ret->fade); ret->length=ret->stop+ret->fade;
--- a/Plugins/Input/sexypsf/PsxBios.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/sexypsf/PsxBios.c Sun Feb 26 13:08:35 2006 -0800 @@ -239,12 +239,12 @@ } static INLINE void DeliverEvent(u32 ev, u32 spec) { - if (Event[ev][spec].status != BFLIP32(EvStACTIVE)) return; + if (Event[ev][spec].status != BFLIP32S(EvStACTIVE)) return; -// Event[ev][spec].status = BFLIP32(EvStALREADY); - if (Event[ev][spec].mode == BFLIP32(EvMdINTR)) { - softCall2(BFLIP32(Event[ev][spec].fhandler)); - } else Event[ev][spec].status = BFLIP32(EvStALREADY); +// Event[ev][spec].status = BFLIP32S(EvStALREADY); + if (Event[ev][spec].mode == BFLIP32S(EvMdINTR)) { + softCall2(BFLIP32S(Event[ev][spec].fhandler)); + } else Event[ev][spec].status = BFLIP32S(EvStALREADY); } /* * @@ -773,7 +773,7 @@ GetEv(); GetSpec(); - Event[ev][spec].status = BFLIP32(EvStWAIT); + Event[ev][spec].status = BFLIP32S(EvStWAIT); Event[ev][spec].mode = BFLIP32(a2); Event[ev][spec].fhandler = BFLIP32(a3); @@ -787,7 +787,7 @@ ev = a0 & 0xff; spec = (a0 >> 8) & 0xff; - Event[ev][spec].status = BFLIP32(EvStUNUSED); + Event[ev][spec].status = BFLIP32S(EvStUNUSED); v0 = 1; pc0 = ra; } @@ -798,7 +798,7 @@ ev = a0 & 0xff; spec = (a0 >> 8) & 0xff; - Event[ev][spec].status = BFLIP32(EvStACTIVE); + Event[ev][spec].status = BFLIP32S(EvStACTIVE); v0 = 1; pc0 = ra; } @@ -809,8 +809,8 @@ ev = a0 & 0xff; spec = (a0 >> 8) & 0xff; - if (Event[ev][spec].status == BFLIP32(EvStALREADY)) { - Event[ev][spec].status = BFLIP32(EvStACTIVE); v0 = 1; + if (Event[ev][spec].status == BFLIP32S(EvStALREADY)) { + Event[ev][spec].status = BFLIP32S(EvStACTIVE); v0 = 1; } else v0 = 0; pc0 = ra; @@ -822,7 +822,7 @@ ev = a0 & 0xff; spec = (a0 >> 8) & 0xff; - Event[ev][spec].status = BFLIP32(EvStACTIVE); + Event[ev][spec].status = BFLIP32S(EvStACTIVE); v0 = 1; pc0 = ra; } @@ -833,7 +833,7 @@ ev = a0 & 0xff; spec = (a0 >> 8) & 0xff; - Event[ev][spec].status = BFLIP32(EvStWAIT); + Event[ev][spec].status = BFLIP32S(EvStWAIT); v0 = 1; pc0 = ra; } @@ -887,8 +887,8 @@ } else { v0 = 1; - if (Thread[CurThread].status == BFLIP32(2)) { - Thread[CurThread].status = BFLIP32(1); + if (Thread[CurThread].status == BFLIP32S(2)) { + Thread[CurThread].status = BFLIP32S(1); Thread[CurThread].func = BFLIP32(ra); memcpy(Thread[CurThread].reg, psxRegs.GPR.r, 32*4); } @@ -931,9 +931,9 @@ GetEv(); GetSpec(); - if (Event[ev][spec].status == BFLIP32(EvStALREADY) && - Event[ev][spec].mode == BFLIP32(EvMdNOINTR)) - Event[ev][spec].status = BFLIP32(EvStACTIVE); + if (Event[ev][spec].status == BFLIP32S(EvStALREADY) && + Event[ev][spec].mode == BFLIP32S(EvMdNOINTR)) + Event[ev][spec].status = BFLIP32S(EvStACTIVE); pc0 = ra; } @@ -1271,7 +1271,7 @@ void biosInterrupt() { if (BFLIP32(psxHu32(0x1070)) & 0x1) { // Vsync - if (RcEV[3][1].status == BFLIP32(EvStACTIVE)) { + if (RcEV[3][1].status == BFLIP32S(EvStACTIVE)) { softCall(BFLIP32(RcEV[3][1].fhandler)); // hwWrite32(0x1f801070, ~(1)); } @@ -1282,7 +1282,7 @@ for (i=0; i<3; i++) { if (BFLIP32(psxHu32(0x1070)) & (1 << (i+4))) { - if (RcEV[i][1].status == BFLIP32(EvStACTIVE)) { + if (RcEV[i][1].status == BFLIP32S(EvStACTIVE)) { softCall(BFLIP32(RcEV[i][1].fhandler)); psxHwWrite32(0x1f801070, ~(1 << (i+4))); }
--- a/Plugins/Input/sexypsf/PsxMem.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/sexypsf/PsxMem.c Sun Feb 26 13:08:35 2006 -0800 @@ -31,7 +31,7 @@ u32 tmplen; //puts("Squishy"); - tmplen=((65536-(address&65535))>length)?length:65536-(address&65535); + tmplen=((65536-(address&65535))>(u32)length)?(u32)length:65536-(address&65535); if(psxMemLUT[address>>16]) memcpy((char *)(psxMemLUT[address>>16]+(address&65535)),data,tmplen); address+=tmplen;
--- a/Plugins/Input/sexypsf/PsxMem.h Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/sexypsf/PsxMem.h Sun Feb 26 13:08:35 2006 -0800 @@ -41,6 +41,12 @@ } #endif +static INLINE s32 BFLIP32S(s32 x) +{ return (s32)BFLIP32((u32)x); } + +static INLINE s16 BFLIP16S(s16 x) +{ return (s16)BFLIP16((u16)x); } + char *psxM; #define psxMu32(mem) (*(u32*)&psxM[(mem) & 0x1fffff])
--- a/Plugins/Input/sexypsf/spu/spu.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/sexypsf/spu/spu.c Sun Feb 26 13:08:35 2006 -0800 @@ -198,7 +198,7 @@ } } -static s32 seektime; +static u32 seektime; static s32 poo; int sexypsf_seek(u32 t) { @@ -448,7 +448,7 @@ if(sampcount>=decaybegin) { s32 dmul; - if(decaybegin!=~0) // Is anyone REALLY going to be playing a song + if(decaybegin!=(u32)~0) // Is anyone REALLY going to be playing a song // for 13 hours? { if(sampcount>=decayend) return(0); @@ -491,7 +491,7 @@ void SPUendflush(void) { - if((seektime!=~0) && seektime>sampcount) + if((seektime!=(u32)~0) && seektime>sampcount) { pS=(s16 *)pSpuBuffer; sexypsf_update(0,0); @@ -534,7 +534,7 @@ memset(spuMem,0,sizeof(spuMem)); InitADSR(); sampcount=poo=0; - seektime=~0; + seektime=(u32)~0; #ifdef TIMEO begintime=SexyTime64(); #endif
--- a/Plugins/Input/timidity/libtimidity/common.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/timidity/libtimidity/common.c Sun Feb 26 13:08:35 2006 -0800 @@ -95,8 +95,11 @@ void *p; p = malloc(count); + +#ifdef DEBUG if (p == NULL) DEBUG_MSG("Sorry. Couldn't malloc %d bytes.\n", count); +#endif return p; }
--- a/Plugins/Input/timidity/libtimidity/instrum.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/timidity/libtimidity/instrum.c Sun Feb 26 13:08:35 2006 -0800 @@ -351,8 +351,10 @@ if (strip_envelope==1) { +#ifdef DEBUG if (sp->modes & MODES_ENVELOPE) DEBUG_MSG(" - Removing envelope\n"); +#endif sp->modes &= ~MODES_ENVELOPE; } else if (strip_envelope != 0)
--- a/Plugins/Input/timidity/libtimidity/instrum_dls.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/timidity/libtimidity/instrum_dls.c Sun Feb 26 13:08:35 2006 -0800 @@ -79,7 +79,7 @@ static uint32 chunk_list[] = { RIFF, LIST }; - int i; + size_t i; for ( i = 0; i < (sizeof(chunk_list) / sizeof(uint32)); ++i ) { if ( magic == chunk_list[i] ) { return 1; @@ -93,7 +93,7 @@ static uint32 chunk_list[] = { RIFF, LIST }; - int i; + size_t i; for ( i = 0; i < (sizeof(chunk_list) / sizeof(uint32)); ++i ) { if ( magic == chunk_list[i] ) { return 1; @@ -547,7 +547,7 @@ uint32 magic = (chunk->magic == FOURCC_LIST) ? chunk->subtype : chunk->magic; switch(magic) { case FOURCC_INAM: /* Name */ - instrument->name = chunk->data; + instrument->name = (char*)chunk->data; break; } } @@ -663,15 +663,15 @@ case FOURCC_IARL: /* Archival Location */ break; case FOURCC_IART: /* Artist */ - data->artist = chunk->data; + data->artist = (char*)chunk->data; break; case FOURCC_ICMS: /* Commisioned */ break; case FOURCC_ICMT: /* Comments */ - data->comments = chunk->data; + data->comments = (char*)chunk->data; break; case FOURCC_ICOP: /* Copyright */ - data->copyright = chunk->data; + data->copyright = (char*)chunk->data; break; case FOURCC_ICRD: /* Creation Date */ break; @@ -684,7 +684,7 @@ case FOURCC_IMED: /* Medium */ break; case FOURCC_INAM: /* Name */ - data->name = chunk->data; + data->name = (char*)chunk->data; break; case FOURCC_IPRD: /* Product */ break; @@ -1017,7 +1017,7 @@ /*-------------------------------------------------------------------------*/ /* convert timecents to sec */ -static double to_msec(int timecent) +static double to_msec(unsigned int timecent) { if (timecent == 0x80000000 || timecent == 0) return 0.0; @@ -1152,7 +1152,7 @@ sample->loop_end <<= FRACTION_BITS; } -MidInstrument *load_instrument_dls(MidSong *song, int drum, int bank, int instrument) +MidInstrument *load_instrument_dls(MidSong *song, unsigned int drum, unsigned int bank, unsigned int instrument) { MidInstrument *inst; uint32 i;
--- a/Plugins/Input/timidity/libtimidity/timidity.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/timidity/libtimidity/timidity.c Sun Feb 26 13:08:35 2006 -0800 @@ -541,7 +541,7 @@ void mid_song_free(MidSong *song) { - int i; + size_t i; free_instruments(song);
--- a/Plugins/Input/tonegen/tonegen.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/tonegen/tonegen.c Sun Feb 26 13:08:35 2006 -0800 @@ -71,7 +71,7 @@ { GArray* frequencies = arg; gint16 data[BUF_SAMPLES]; - int i; + gsize i; struct { double wd; unsigned int period, t; @@ -92,7 +92,7 @@ { for (i = 0; i < BUF_SAMPLES; i++) { - int j; + gsize j; double sum_sines; for (sum_sines = 0, j = 0; j < frequencies->len; j++) @@ -153,7 +153,7 @@ { GArray *freqs; char* title; - int i; + gsize i; freqs = tone_filename_parse(filename); if (freqs == NULL)
--- a/Plugins/Input/vorbis/fileinfo.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/vorbis/fileinfo.c Sun Feb 26 13:08:35 2006 -0800 @@ -491,7 +491,8 @@ const gchar *rg_track_gain, *rg_track_peak; const gchar *rg_album_gain, *rg_album_peak; - gint time, minutes, seconds, bitrate, rate, channels, filesize, i; + gint time, minutes, seconds, bitrate, rate, channels, filesize; + gsize i; OggVorbis_File vf; vorbis_info *vi;
--- a/Plugins/Input/vorbis/vorbis.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/vorbis/vorbis.c Sun Feb 26 13:08:35 2006 -0800 @@ -475,7 +475,7 @@ last_section = current_section; } - if (!(vi->bitrate_upper == vi->bitrate_lower == vi->bitrate_nominal) + if (!(vi->bitrate_upper == vi->bitrate_lower && vi->bitrate_upper == vi->bitrate_nominal) && (vorbis_ip.output->output_time() > timercount + 1000 || vorbis_ip.output->output_time() < timercount)) { /*
--- a/Plugins/Input/wav/wav.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wav/wav.c Sun Feb 26 13:08:35 2006 -0800 @@ -76,7 +76,7 @@ /* needed for is_our_file() */ static gint -read_n_bytes(VFSFile * file, guint8 * buf, gint n) +read_n_bytes(VFSFile * file, guint8 * buf, gsize n) { if (vfs_fread(buf, 1, n, file) != n) { return FALSE; @@ -245,7 +245,7 @@ play_loop(gpointer arg) { gchar data[2048 * 2]; - gint bytes, blk_size, rate; + gsize bytes, blk_size, rate; gint actual_read; blk_size = 512 * (wav_file->bits_per_sample / 8) * wav_file->channels;
--- a/Plugins/Input/wma/libffwma/asf.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/asf.c Sun Feb 26 13:08:35 2006 -0800 @@ -196,9 +196,9 @@ { CODEC_ID_ADPCM_IMA_WAV, 0x11 }, { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, { CODEC_ID_ADPCM_IMA_DK3, 0x62 },*/ - { CODEC_ID_WMAV1, 0x160 }, - { CODEC_ID_WMAV2, 0x161 }, - { 0, 0 }, + { CODEC_ID_WMAV1, 0x160, 0 }, + { CODEC_ID_WMAV2, 0x161, 0 }, + { 0, 0, 0 }, }; enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag) @@ -927,12 +927,12 @@ } } - if(pts_min == AV_NOPTS_VALUE){ + if(pts_min == (int64_t)AV_NOPTS_VALUE){ pos_min = 0; pts_min = asf_read_pts(s, &pos_min, stream_index); - if (pts_min == AV_NOPTS_VALUE) return -1; + if (pts_min == (int64_t)AV_NOPTS_VALUE) return -1; } - if(pts_max == AV_NOPTS_VALUE){ + if(pts_max == (int64_t)AV_NOPTS_VALUE){ pos_max = (url_filesize(url_fileno(&s->pb)) - 1 - s->data_offset) / asf->packet_size; //FIXME wrong pts_max = s->duration; //FIXME wrong pos_limit= pos_max; @@ -997,6 +997,7 @@ asf_read_packet, asf_read_close, asf_read_seek, + 0, NULL, 0, NULL, NULL, NULL }; int asf_init(void)
--- a/Plugins/Input/wma/libffwma/avio.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/avio.c Sun Feb 26 13:08:35 2006 -0800 @@ -48,7 +48,7 @@ /* protocols can only contain alphabetic chars */ if (!isalpha(*p)) goto file_proto; - if ((q - proto_str) < sizeof(proto_str) - 1) + if ((size_t)(q - proto_str) < sizeof(proto_str) - 1) *q++ = *p; p++; }
--- a/Plugins/Input/wma/libffwma/file.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/file.c Sun Feb 26 13:08:35 2006 -0800 @@ -77,6 +77,7 @@ file_write, file_seek, file_close, + NULL }; /* pipe protocol */ @@ -118,4 +119,5 @@ pipe_write, NULL, pipe_close, + NULL };
--- a/Plugins/Input/wma/libffwma/futils.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/futils.c Sun Feb 26 13:08:35 2006 -0800 @@ -146,7 +146,7 @@ */ int av_new_packet(AVPacket *pkt, int size) { - void *data = malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); + unsigned char *data = malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); if (!data) return AVERROR_NOMEM; memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); @@ -469,9 +469,9 @@ int64_t delta_pts; int shift, pts_frac; - if (pts != AV_NOPTS_VALUE) { + if (pts != (int64_t)AV_NOPTS_VALUE) { stream_pts = pts; - if (*plast_pkt_stream_pts != AV_NOPTS_VALUE) { + if (*plast_pkt_stream_pts != (int64_t)AV_NOPTS_VALUE) { shift = 64 - s->pts_wrap_bits; delta_pts = ((stream_pts - *plast_pkt_stream_pts) << shift) >> shift; /* XXX: overflow possible but very unlikely as it is a delta */ @@ -575,7 +575,7 @@ if (presentation_delayed) { /* DTS = decompression time stamp */ /* PTS = presentation time stamp */ - if (pkt->dts == AV_NOPTS_VALUE) { + if (pkt->dts == (int64_t)AV_NOPTS_VALUE) { pkt->dts = st->cur_dts; } else { st->cur_dts = pkt->dts; @@ -591,7 +591,7 @@ by knowing the futur */ } else { /* presentation is not delayed : PTS and DTS are the same */ - if (pkt->pts == AV_NOPTS_VALUE) { + if (pkt->pts == (int64_t)AV_NOPTS_VALUE) { pkt->pts = st->cur_dts; pkt->dts = st->cur_dts; } else { @@ -994,8 +994,8 @@ for(i = 0;i < ic->nb_streams; i++) { st = ic->streams[i]; - if (st->start_time != AV_NOPTS_VALUE && - st->duration != AV_NOPTS_VALUE) + if (st->start_time != (int64_t)AV_NOPTS_VALUE && + st->duration != (int64_t)AV_NOPTS_VALUE) return 1; } return 0; @@ -1013,10 +1013,10 @@ end_time = MININT64; for(i = 0;i < ic->nb_streams; i++) { st = ic->streams[i]; - if (st->start_time != AV_NOPTS_VALUE) { + if (st->start_time != (int64_t)AV_NOPTS_VALUE) { if (st->start_time < start_time) start_time = st->start_time; - if (st->duration != AV_NOPTS_VALUE) { + if (st->duration != (int64_t)AV_NOPTS_VALUE) { end_time1 = st->start_time + st->duration; if (end_time1 > end_time) end_time = end_time1; @@ -1045,7 +1045,7 @@ av_update_stream_timings(ic); for(i = 0;i < ic->nb_streams; i++) { st = ic->streams[i]; - if (st->start_time == AV_NOPTS_VALUE) { + if (st->start_time == (int64_t)AV_NOPTS_VALUE) { st->start_time = ic->start_time; st->duration = ic->duration; } @@ -1069,7 +1069,7 @@ } /* if duration is already set, we believe it */ - if (ic->duration == AV_NOPTS_VALUE && + if (ic->duration == (int64_t)AV_NOPTS_VALUE && ic->bit_rate != 0 && ic->file_size != 0) { filesize = ic->file_size; @@ -1077,8 +1077,8 @@ duration = (int64_t)((8 * AV_TIME_BASE * (double)filesize) / (double)ic->bit_rate); for(i = 0; i < ic->nb_streams; i++) { st = ic->streams[i]; - if (st->start_time == AV_NOPTS_VALUE || - st->duration == AV_NOPTS_VALUE) { + if (st->start_time == (int64_t)AV_NOPTS_VALUE || + st->duration == (int64_t)AV_NOPTS_VALUE) { st->start_time = 0; st->duration = duration; } @@ -1643,7 +1643,7 @@ is_output ? "to" : "from", url); if (!is_output) { fprintf(stderr, " Duration: "); - if (ic->duration != AV_NOPTS_VALUE) { + if (ic->duration != (int64_t)AV_NOPTS_VALUE) { int hours, mins, secs, us; secs = ic->duration / AV_TIME_BASE; us = ic->duration % AV_TIME_BASE; @@ -1732,7 +1732,7 @@ int parse_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg) { - int i; + size_t i; char* cp; /* First, we check our abbreviation table */ @@ -1778,7 +1778,7 @@ const char *p; int64_t t; struct tm dt; - int i; + size_t i; static const char *date_fmt[] = { "%Y-%m-%d", "%Y%m%d", @@ -1887,7 +1887,7 @@ for(;;) { q = tag; while (*p != '\0' && *p != '=' && *p != '&') { - if ((q - tag) < sizeof(tag) - 1) + if ((size_t)(q - tag) < sizeof(tag) - 1) *q++ = *p; p++; } @@ -2018,13 +2018,13 @@ fprintf(f, " duration=%0.3f\n", (double)pkt->duration / AV_TIME_BASE); /* DTS is _always_ valid after av_read_frame() */ fprintf(f, " dts="); - if (pkt->dts == AV_NOPTS_VALUE) + if (pkt->dts == (int64_t)AV_NOPTS_VALUE) fprintf(f, "N/A"); else fprintf(f, "%0.3f", (double)pkt->dts / AV_TIME_BASE); /* PTS may be not known if B frames are present */ fprintf(f, " pts="); - if (pkt->pts == AV_NOPTS_VALUE) + if (pkt->pts == (int64_t)AV_NOPTS_VALUE) fprintf(f, "N/A"); else fprintf(f, "%0.3f", (double)pkt->pts / AV_TIME_BASE);
--- a/Plugins/Input/wma/libffwma/utils.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/utils.c Sun Feb 26 13:08:35 2006 -0800 @@ -42,7 +42,7 @@ */ void *av_fast_realloc(void *ptr, int *size, unsigned int min_size) { - if(min_size < *size) + if(min_size < (unsigned int)*size) return ptr; *size= min_size + 10*1024; @@ -304,7 +304,7 @@ AVCodec *p; p = first_avcodec; while (p) { - if (p->encode != NULL && p->id == id) + if (p->encode != NULL && (enum CodecID)p->id == id) return p; p = p->next; } @@ -328,7 +328,7 @@ AVCodec *p; p = first_avcodec; while (p) { - if (p->decode != NULL && p->id == id) + if (p->decode != NULL && (enum CodecID)p->id == id) return p; p = p->next; } @@ -352,7 +352,7 @@ AVCodec *p; p = first_avcodec; while (p) { - if (p->id == id) + if ((enum CodecID)p->id == id) return p; p = p->next; }
--- a/Plugins/Input/wma/libffwma/wmadec.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Input/wma/libffwma/wmadec.c Sun Feb 26 13:08:35 2006 -0800 @@ -1317,6 +1317,7 @@ NULL, wma_decode_end, wma_decode_superframe, + 0, NULL, NULL, NULL }; AVCodec wmav2_decoder = @@ -1329,4 +1330,5 @@ NULL, wma_decode_end, wma_decode_superframe, + 0, NULL, NULL, NULL };
--- a/Plugins/Output/OSS/audio.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Output/OSS/audio.c Sun Feb 26 13:08:35 2006 -0800 @@ -37,10 +37,10 @@ static gint fd = 0; static char *buffer; static gboolean going, prebuffer, paused, unpause, do_pause, remove_prebuffer; -static gint device_buffer_used, buffer_size, prebuffer_size, blk_size; +static gint buffer_size, prebuffer_size, blk_size; static gint rd_index = 0, wr_index = 0; static gint output_time_offset = 0; -static guint64 written = 0, output_bytes = 0; +static guint64 written = 0, output_bytes = 0, device_buffer_used; static gint flush; static gint fragsize, device_buffer_size; static gchar *device_name; @@ -252,7 +252,7 @@ static inline ssize_t write_all(int fd, const void *buf, size_t count) { - ssize_t done = 0; + size_t done = 0; do { ssize_t n = write(fd, (gchar *) buf + done, count - done); if (n == -1) { @@ -423,7 +423,7 @@ { guint w = 0; static gpointer nbuffer = NULL; - static gint nbuffer_size = 0; + static guint nbuffer_size = 0; switch (output.format.oss) { case AFMT_S16_BE:
--- a/Plugins/Output/OSS/configure.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Output/OSS/configure.c Sun Feb 26 13:08:35 2006 -0800 @@ -153,7 +153,7 @@ else item = gtk_menu_item_new_with_label(buffer); g_signal_connect(G_OBJECT(item), "activate", - G_CALLBACK(sigfunc), (gpointer) index++); + G_CALLBACK(sigfunc), (gpointer)(long)(index++)); gtk_widget_show(item); gtk_menu_append(GTK_MENU(menu), item); }
--- a/Plugins/Output/OSS/convert.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Output/OSS/convert.c Sun Feb 26 13:08:35 2006 -0800 @@ -27,7 +27,7 @@ static void * oss_get_convert_buffer(struct buffer *buffer, size_t size) { - if (size > 0 && size <= buffer->size) + if (size > 0 && size <= (size_t)buffer->size) return buffer->buffer; buffer->size = size;
--- a/Plugins/Output/alsa/audio.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Output/alsa/audio.c Sun Feb 26 13:08:35 2006 -0800 @@ -688,8 +688,8 @@ ep->query_format) ep->query_format(&f, &new_freq, &new_chn); - if (f != effectf->xmms_format || new_freq != effectf->rate || - new_chn != effectf->channels) + if (f != effectf->xmms_format || (unsigned int)new_freq != effectf->rate || + (unsigned int)new_chn != effectf->channels) { debug("Changing audio format for effect plugin"); g_free(effectf); @@ -904,7 +904,7 @@ static struct snd_format * snd_format_from_xmms(AFormat fmt, int rate, int channels) { struct snd_format *f = g_malloc(sizeof(struct snd_format)); - int i; + size_t i; f->xmms_format = fmt; f->format = SND_PCM_FORMAT_UNKNOWN; @@ -935,7 +935,7 @@ static int format_from_alsa(snd_pcm_format_t fmt) { - int i; + size_t i; for (i = 0; i < sizeof(format_table) / sizeof(format_table[0]); i++) if (format_table[i].alsa == fmt) return format_table[i].xmms; @@ -1018,7 +1018,7 @@ snd_pcm_format_t formats[] = {SND_PCM_FORMAT_S16_LE, SND_PCM_FORMAT_S16_BE, SND_PCM_FORMAT_U8}; - int i; + size_t i; for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) { @@ -1035,8 +1035,6 @@ format_from_alsa(outputf->format); debug("Converting format from %d to %d", f->xmms_format, outputf->xmms_format); - if (outputf->xmms_format < 0) - return -1; alsa_convert_func = xmms_convert_get_func(outputf->xmms_format, f->xmms_format);
--- a/Plugins/Visualization/blur_scope/blur_scope.c Sun Feb 26 10:21:49 2006 -0800 +++ b/Plugins/Visualization/blur_scope/blur_scope.c Sun Feb 26 13:08:35 2006 -0800 @@ -55,8 +55,8 @@ GtkItemFactoryEntry blurscope_menu_entries[] = { {N_("/Toggle Decorations"), NULL, blurscope_callback, SCOPE_TOGGLE, - "<Item>"}, - {N_("/-"), NULL, NULL, 0, "<Separator>"}, + "<Item>", 0}, + {N_("/-"), NULL, NULL, 0, "<Separator>", 0}, {N_("/Close"), NULL, blurscope_callback, SCOPE_CLOSE, "<StockItem>", GTK_STOCK_CLOSE}, }; @@ -98,7 +98,7 @@ static guchar rgb_buf[(WIDTH + 2) * (HEIGHT + 2)]; static GdkRgbCmap *cmap = NULL; -static void inline +inline static void draw_pixel_8(guchar * buffer, gint x, gint y, guchar c) { buffer[((y + 1) * BPL) + (x + 1)] = c;
--- a/audacious/playlist_list.c Sun Feb 26 10:21:49 2006 -0800 +++ b/audacious/playlist_list.c Sun Feb 26 13:08:35 2006 -0800 @@ -356,7 +356,8 @@ guint padding, padding_dwidth, padding_plength; guint max_time_len = 0; gint queue_tailpadding = 0; - gint tpadding, tpadding_dwidth = 0; + gint tpadding; + gsize tpadding_dwidth = 0; gchar tail[100]; gchar queuepos[255]; /* FIXME CRITICAL: Allows for a limited number of queue positions only */