Silenced some warnings
parent
a93ec7b95f
commit
25bf55459e
|
@ -529,7 +529,7 @@ void analyze_stereo (WavpackContext *wpc, int32_t *samples)
|
||||||
else if (wpc->config.flags & CONFIG_FAST_FLAG)
|
else if (wpc->config.flags & CONFIG_FAST_FLAG)
|
||||||
decorr_terms = fast_terms;
|
decorr_terms = fast_terms;
|
||||||
|
|
||||||
info.nterms = strlen (decorr_terms);
|
info.nterms = strlen ((const char *)decorr_terms);
|
||||||
|
|
||||||
if (wpc->config.extra_flags & EXTRA_TERMS)
|
if (wpc->config.extra_flags & EXTRA_TERMS)
|
||||||
if ((info.nterms += (wpc->config.extra_flags & EXTRA_TERMS) >> 10) > MAX_NTERMS)
|
if ((info.nterms += (wpc->config.extra_flags & EXTRA_TERMS) >> 10) > MAX_NTERMS)
|
||||||
|
|
|
@ -157,7 +157,7 @@ void MD5Final(digest, ctx)
|
||||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||||
byteReverse((unsigned char *) ctx->buf, 4);
|
byteReverse((unsigned char *) ctx->buf, 4);
|
||||||
memcpy(digest, ctx->buf, 16);
|
memcpy(digest, ctx->buf, 16);
|
||||||
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
|
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,6 @@ const signed char fast_terms [] = { 17,17,0 };
|
||||||
void pack_init (WavpackContext *wpc)
|
void pack_init (WavpackContext *wpc)
|
||||||
{
|
{
|
||||||
WavpackStream *wps = wpc->streams [wpc->current_stream];
|
WavpackStream *wps = wpc->streams [wpc->current_stream];
|
||||||
uint32_t flags = wps->wphdr.flags;
|
|
||||||
|
|
||||||
wps->sample_index = 0;
|
wps->sample_index = 0;
|
||||||
wps->delta_decay = 2.0;
|
wps->delta_decay = 2.0;
|
||||||
|
@ -663,7 +662,6 @@ static int pack_samples (WavpackContext *wpc, int32_t *buffer)
|
||||||
WavpackStream *wps = wpc->streams [wpc->current_stream];
|
WavpackStream *wps = wpc->streams [wpc->current_stream];
|
||||||
uint32_t sample_count = wps->wphdr.block_samples;
|
uint32_t sample_count = wps->wphdr.block_samples;
|
||||||
uint32_t flags = wps->wphdr.flags, data_count;
|
uint32_t flags = wps->wphdr.flags, data_count;
|
||||||
int mag16 = ((flags & MAG_MASK) >> MAG_LSB) >= 16;
|
|
||||||
int tcount, lossy = FALSE, m = 0;
|
int tcount, lossy = FALSE, m = 0;
|
||||||
double noise_acc = 0.0, noise;
|
double noise_acc = 0.0, noise;
|
||||||
struct decorr_pass *dpp;
|
struct decorr_pass *dpp;
|
||||||
|
|
|
@ -103,7 +103,7 @@ int unpack_init (WavpackContext *wpc)
|
||||||
|
|
||||||
int init_wv_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
int init_wv_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
||||||
{
|
{
|
||||||
bs_open_read (&wps->wvbits, wpmd->data, (char *) wpmd->data + wpmd->byte_length);
|
bs_open_read (&wps->wvbits, wpmd->data, (uchar *) wpmd->data + wpmd->byte_length);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ int init_wv_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
||||||
|
|
||||||
int init_wvc_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
int init_wvc_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
||||||
{
|
{
|
||||||
bs_open_read (&wps->wvcbits, wpmd->data, (char *) wpmd->data + wpmd->byte_length);
|
bs_open_read (&wps->wvcbits, wpmd->data, (uchar *) wpmd->data + wpmd->byte_length);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,7 +132,7 @@ int init_wvx_bitstream (WavpackStream *wps, WavpackMetadata *wpmd)
|
||||||
wps->crc_wvx |= (int32_t) *cp++ << 16;
|
wps->crc_wvx |= (int32_t) *cp++ << 16;
|
||||||
wps->crc_wvx |= (int32_t) *cp++ << 24;
|
wps->crc_wvx |= (int32_t) *cp++ << 24;
|
||||||
|
|
||||||
bs_open_read (&wps->wvxbits, cp, (char *) wpmd->data + wpmd->byte_length);
|
bs_open_read (&wps->wvxbits, cp, (uchar *) wpmd->data + wpmd->byte_length);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -482,8 +482,8 @@ static int unpack_size (WavpackStream3 *wps)
|
||||||
byte_sum += sizeof (wps->dc.weight);
|
byte_sum += sizeof (wps->dc.weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG))
|
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) {
|
||||||
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
|
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
|
||||||
if (dpp->term > 0) {
|
if (dpp->term > 0) {
|
||||||
byte_sum += sizeof (dpp->samples_A [0]) * dpp->term;
|
byte_sum += sizeof (dpp->samples_A [0]) * dpp->term;
|
||||||
byte_sum += sizeof (dpp->weight_A);
|
byte_sum += sizeof (dpp->weight_A);
|
||||||
|
@ -497,6 +497,8 @@ static int unpack_size (WavpackStream3 *wps)
|
||||||
byte_sum += sizeof (dpp->samples_A [0]) + sizeof (dpp->samples_B [0]);
|
byte_sum += sizeof (dpp->samples_A [0]) + sizeof (dpp->samples_B [0]);
|
||||||
byte_sum += sizeof (dpp->weight_A) + sizeof (dpp->weight_B);
|
byte_sum += sizeof (dpp->weight_A) + sizeof (dpp->weight_B);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return byte_sum;
|
return byte_sum;
|
||||||
}
|
}
|
||||||
|
@ -550,8 +552,8 @@ static void *unpack_save (WavpackStream3 *wps, void *destin)
|
||||||
SAVE (destin, wps->dc.weight);
|
SAVE (destin, wps->dc.weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG))
|
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) {
|
||||||
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
|
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
|
||||||
if (dpp->term > 0) {
|
if (dpp->term > 0) {
|
||||||
int count = dpp->term;
|
int count = dpp->term;
|
||||||
int index = wps->dc.m;
|
int index = wps->dc.m;
|
||||||
|
@ -581,6 +583,8 @@ static void *unpack_save (WavpackStream3 *wps, void *destin)
|
||||||
SAVE (destin, dpp->samples_A [0]);
|
SAVE (destin, dpp->samples_A [0]);
|
||||||
SAVE (destin, dpp->samples_B [0]);
|
SAVE (destin, dpp->samples_B [0]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return destin;
|
return destin;
|
||||||
}
|
}
|
||||||
|
@ -662,8 +666,8 @@ static void *unpack_restore (WavpackStream3 *wps, void *source, int keep_resourc
|
||||||
RESTORE (wps->dc.weight, source);
|
RESTORE (wps->dc.weight, source);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG))
|
if (flags & (HIGH_FLAG | NEW_HIGH_FLAG)) {
|
||||||
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++)
|
for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) {
|
||||||
if (dpp->term > 0) {
|
if (dpp->term > 0) {
|
||||||
int count = dpp->term;
|
int count = dpp->term;
|
||||||
int index = wps->dc.m;
|
int index = wps->dc.m;
|
||||||
|
@ -693,6 +697,8 @@ static void *unpack_restore (WavpackStream3 *wps, void *source, int keep_resourc
|
||||||
RESTORE (dpp->samples_A [0], source);
|
RESTORE (dpp->samples_A [0], source);
|
||||||
RESTORE (dpp->samples_B [0], source);
|
RESTORE (dpp->samples_B [0], source);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return source;
|
return source;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ typedef enum {
|
||||||
PlaylistEntry *currentEntry;
|
PlaylistEntry *currentEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
@property(retain) PlaylistEntry *currentEntry;
|
@property(nonatomic, retain) PlaylistEntry *currentEntry;
|
||||||
@property(retain) NSString *totalTime;
|
@property(retain) NSString *totalTime;
|
||||||
|
|
||||||
//Private Methods
|
//Private Methods
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
|
|
||||||
@property(retain) NSString *artist;
|
@property(retain) NSString *artist;
|
||||||
@property(retain) NSString *album;
|
@property(retain) NSString *album;
|
||||||
@property(retain) NSString *title;
|
@property(nonatomic, retain) NSString *title;
|
||||||
@property(retain) NSString *genre;
|
@property(retain) NSString *genre;
|
||||||
@property(retain) NSNumber *year;
|
@property(retain) NSNumber *year;
|
||||||
@property(retain) NSNumber *track;
|
@property(retain) NSNumber *track;
|
||||||
|
|
|
@ -461,7 +461,7 @@ static AppleRemote* sharedInstance=nil;
|
||||||
// happen when the main thread is too busy to handle all incoming events in time.
|
// happen when the main thread is too busy to handle all incoming events in time.
|
||||||
NSString* subCookieString;
|
NSString* subCookieString;
|
||||||
NSString* lastSubCookieString=nil;
|
NSString* lastSubCookieString=nil;
|
||||||
while(subCookieString = [self validCookieSubstring: cookieString]) {
|
while((subCookieString = [self validCookieSubstring: cookieString])) {
|
||||||
cookieString = [cookieString substringFromIndex: [subCookieString length]];
|
cookieString = [cookieString substringFromIndex: [subCookieString length]];
|
||||||
lastSubCookieString = subCookieString;
|
lastSubCookieString = subCookieString;
|
||||||
if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
|
if (processesBacklog) [self handleEventWithCookieString: subCookieString sumOfValues:sumOfValues];
|
||||||
|
@ -501,7 +501,7 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon,
|
||||||
|
|
||||||
if (((int)event.elementCookie)!=5) {
|
if (((int)event.elementCookie)!=5) {
|
||||||
sumOfValues+=event.value;
|
sumOfValues+=event.value;
|
||||||
[cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]];
|
[cookieString appendString:[NSString stringWithFormat:@"%p_", event.elementCookie]];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue