From a266ff185a3f03b6fde88df6eca0c4941c8564f2 Mon Sep 17 00:00:00 2001 From: Wincent Balin Date: Tue, 1 Jun 2010 00:23:59 +0000 Subject: pdbox: Solved issue with WAV file import on big-endian targets (signed 16-bit files only); small I/O-related workaround in g_array.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26439 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pdbox/PDa/src/d_soundfile.c | 7 +++++++ apps/plugins/pdbox/PDa/src/g_array.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'apps/plugins/pdbox/PDa/src') diff --git a/apps/plugins/pdbox/PDa/src/d_soundfile.c b/apps/plugins/pdbox/PDa/src/d_soundfile.c index a23192319d..c8016ff302 100644 --- a/apps/plugins/pdbox/PDa/src/d_soundfile.c +++ b/apps/plugins/pdbox/PDa/src/d_soundfile.c @@ -423,7 +423,14 @@ static void soundfile_xferin(int sfchannels, int nvecs, t_sample **vecs, { for (j = 0, sp2 = sp, fp=vecs[i] + itemsread; j < nitems; j++, sp2 += bytesperframe, fp++) +#ifdef ROCKBOX_BIG_ENDIAN + { + short xx = (sp2[1] << 8) | sp2[0]; + *fp = xx << (fix1-16); + } +#else *fp = ((short*)sp2)[0]<<(fix1-16); +#endif } } else if (bytespersamp == 3) diff --git a/apps/plugins/pdbox/PDa/src/g_array.c b/apps/plugins/pdbox/PDa/src/g_array.c index 8b8c6bcd5a..484e6fa33d 100644 --- a/apps/plugins/pdbox/PDa/src/g_array.c +++ b/apps/plugins/pdbox/PDa/src/g_array.c @@ -1154,7 +1154,7 @@ static void garray_read(t_garray *x, t_symbol *filename) canvas_getdir(glist_getcanvas(x->x_glist))->s_name, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 0)) < 0 #ifdef ROCKBOX - ) + || !(fd = filedesc)) #else || !(fd = fdopen(filedesc, "r"))) #endif @@ -1234,7 +1234,7 @@ static void garray_read16(t_garray *x, t_symbol *filename, canvas_getdir(glist_getcanvas(x->x_glist))->s_name, filename->s_name, "", buf, &bufptr, MAXPDSTRING, 1)) < 0 #ifdef ROCKBOX - ) + || !(fd = filedesc)) #else || !(fd = fdopen(filedesc, BINREADMODE))) #endif -- cgit v1.2.3