ALT Linux repos
S: | 0.23.13-alt1 |
D: | 0.13.0-alt1.1 |
5.0: | 0.13.2-alt3 |
4.1: | 0.13.1-alt1 |
4.0: | 0.13.0-alt3 |
3.0: | 0.11.5-alt1.1 |
Group :: Sound
RPM: mpd
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: mpd-0.13.2-alt.patch
Download
Download
diff -urN mpd-0.13.2.orig/src/audioOutputs/audioOutput_alsa.c mpd-0.13.2/src/audioOutputs/audioOutput_alsa.c
--- mpd-0.13.2.orig/src/audioOutputs/audioOutput_alsa.c 2008-01-28 01:12:13 +0200
+++ mpd-0.13.2/src/audioOutputs/audioOutput_alsa.c 2008-08-10 22:06:04 +0300
@@ -288,10 +288,12 @@
if (err < 0)
goto error;
+#if 0
cmd = "snd_pcm_sw_params_set_xfer_align";
err = snd_pcm_sw_params_set_xfer_align(ad->pcmHandle, swparams, 1);
if (err < 0)
goto error;
+#endif
cmd = "snd_pcm_sw_params";
err = snd_pcm_sw_params(ad->pcmHandle, swparams);
diff -urN mpd-0.13.2.orig/src/mp4ff/mp4atom.c mpd-0.13.2/src/mp4ff/mp4atom.c
--- mpd-0.13.2.orig/src/mp4ff/mp4atom.c 2006-07-26 06:19:14 +0300
+++ mpd-0.13.2/src/mp4ff/mp4atom.c 2008-08-10 21:36:02 +0300
@@ -280,7 +280,7 @@
f->track[f->total_tracks - 1]->decoderConfig = malloc(f->track[f->total_tracks - 1]->decoderConfigLen);
if (f->track[f->total_tracks - 1]->decoderConfig)
{
- mp4ff_read_data(f, f->track[f->total_tracks - 1]->decoderConfig, f->track[f->total_tracks - 1]->decoderConfigLen);
+ mp4ff_read_data(f, (int8_t*)f->track[f->total_tracks - 1]->decoderConfig, f->track[f->total_tracks - 1]->decoderConfigLen);
} else {
f->track[f->total_tracks - 1]->decoderConfigLen = 0;
}
diff -urN mpd-0.13.2.orig/src/mp4ff/mp4ff.c mpd-0.13.2/src/mp4ff/mp4ff.c
--- mpd-0.13.2.orig/src/mp4ff/mp4ff.c 2006-08-20 03:50:44 +0300
+++ mpd-0.13.2/src/mp4ff/mp4ff.c 2008-08-10 21:31:59 +0300
@@ -384,7 +384,7 @@
mp4ff_set_sample_position(f, track, sample);
- result = mp4ff_read_data(f, *audio_buffer, *bytes);
+ result = mp4ff_read_data(f, (int8_t*)*audio_buffer, *bytes);
if (!result)
{
@@ -410,7 +410,7 @@
int32_t size = mp4ff_audio_frame_size(f,track,sample);
if (size<=0) return 0;
mp4ff_set_sample_position(f, track, sample);
- result = mp4ff_read_data(f,buffer,size);
+ result = mp4ff_read_data(f, (int8_t*)buffer, size);
#ifdef ITUNES_DRM
if (f->track[track]->p_drms != NULL)
diff -urN mpd-0.13.2.orig/src/mp4ff/mp4tagupdate.c mpd-0.13.2/src/mp4ff/mp4tagupdate.c
--- mpd-0.13.2.orig/src/mp4ff/mp4tagupdate.c 2006-08-20 03:50:44 +0300
+++ mpd-0.13.2/src/mp4ff/mp4tagupdate.c 2008-08-10 22:00:07 +0300
@@ -143,7 +143,7 @@
bufptr = membuffer_get_ptr(buf);
if (bufptr==0) return 0;
- if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes)
+ if ((unsigned) mp4ff_read_data(src, (int8_t*)(bufptr + oldsize), bytes) != bytes)
{
membuffer_set_error(buf);
return 0;
@@ -406,7 +406,7 @@
if (remaining < 8) break;
atom_size = mp4ff_read_int32(f);
if (atom_size > remaining || atom_size < 8) break;
- mp4ff_read_data(f,atom_name,4);
+ mp4ff_read_data(f, (int8_t*)atom_name, 4);
if (!memcmp(atom_name,name,4))
{
@@ -573,21 +573,21 @@
p_out = (uint8_t*)*out_buffer;
mp4ff_set_position(f,total_base);
- mp4ff_read_data(f,p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
+ mp4ff_read_data(f, (int8_t*)p_out, (uint32_t)(udta_offset - total_base)); p_out += (uint32_t)(udta_offset - total_base );
*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
- mp4ff_read_data(f,p_out,4); p_out += 4;
- mp4ff_read_data(f,p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
+ mp4ff_read_data(f, (int8_t*)p_out, 4); p_out += 4;
+ mp4ff_read_data(f, (int8_t*)p_out, (uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
- mp4ff_read_data(f,p_out,4); p_out += 4;
- mp4ff_read_data(f,p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
+ mp4ff_read_data(f, (int8_t*)p_out, 4); p_out += 4;
+ mp4ff_read_data(f, (int8_t*)p_out, (uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
- mp4ff_read_data(f,p_out,4); p_out += 4;
+ mp4ff_read_data(f, (int8_t*)p_out, 4); p_out += 4;
memcpy(p_out,new_ilst_buffer,new_ilst_size);
p_out += new_ilst_size;
mp4ff_set_position(f,ilst_offset + ilst_size);
- mp4ff_read_data(f,p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
+ mp4ff_read_data(f, (int8_t*)p_out, (uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
free(new_ilst_buffer);
}
@@ -622,18 +622,18 @@
/* rename old moov to free */
mp4ff_set_position(ff, ff->moov_offset + 4);
- mp4ff_write_data(ff, free_data, 4);
+ mp4ff_write_data(ff, (int8_t*)free_data, 4);
mp4ff_set_position(ff, ff->file_size);
mp4ff_write_int32(ff,new_moov_size + 8);
- mp4ff_write_data(ff,"moov",4);
+ mp4ff_write_data(ff, (int8_t*)"moov", 4);
mp4ff_write_data(ff, new_moov_data, new_moov_size);
}
else
{
mp4ff_set_position(ff, ff->moov_offset);
mp4ff_write_int32(ff,new_moov_size + 8);
- mp4ff_write_data(ff,"moov",4);
+ mp4ff_write_data(ff, (int8_t*)"moov", 4);
mp4ff_write_data(ff, new_moov_data, new_moov_size);
}
diff -urN mpd-0.13.2.orig/src/mp4ff/mp4util.c mpd-0.13.2/src/mp4ff/mp4util.c
--- mpd-0.13.2.orig/src/mp4ff/mp4util.c 2006-07-26 06:19:14 +0300
+++ mpd-0.13.2/src/mp4ff/mp4util.c 2008-08-10 21:44:38 +0300
@@ -69,7 +69,7 @@
result = (a<<24) | (b<<16) | (c<<8) | d;
- return mp4ff_write_data(f,(uint8_t*)&result,sizeof(result));
+ return mp4ff_write_data(f, (int8_t*)&result, sizeof(result));
}
int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position)
@@ -91,7 +91,7 @@
uint64_t result = 0;
int8_t i;
- mp4ff_read_data(f, data, 8);
+ mp4ff_read_data(f, (int8_t*)data, 8);
for (i = 0; i < 8; i++)
{
@@ -151,7 +151,7 @@
char * str = (char*)malloc(length + 1);
if (str!=0)
{
- if ((uint32_t)mp4ff_read_data(f,str,length)!=length)
+ if ((uint32_t) mp4ff_read_data(f, (int8_t*)str, length) != length)
{
free(str);
str = 0;
@@ -167,7 +167,7 @@
uint8_t mp4ff_read_char(mp4ff_t *f)
{
uint8_t output;
- mp4ff_read_data(f, &output, 1);
+ mp4ff_read_data(f, (int8_t*)&output, 1);
return output;
}