e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix C++ build. 

SVN revision: 84010
This commit is contained in:
Kim Woelders 2013-02-17 00:19:50 +00:00
parent 25069baced
commit e1da1479b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sound_load.c
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
* Copyright (C) 2004-2012 Kim Woelders
* Copyright (C) 2004-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -103,7 +103,7 @@ SoundSampleGetData(const char *file, SoundSampleData * ssd)
Eprintf("SoundSampleGetData frames=%u chan=%u width=%u rate=%u\n",
frame_count, ssd->channels, ssd->bit_per_sample, ssd->rate);
frames_read = sf_readf_short(sf, ssd->data, frame_count);
frames_read = sf_readf_short(sf, (short *)ssd->data, frame_count);
sf_close(sf);

6
src/sound_pa.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2009 Kim Woelders
* Copyright (C) 2008-2013 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@ -136,7 +136,7 @@ stream_write_callback(pa_stream * pas, size_t length, void *userdata)
{
D2printf("%s: state=%d length=%d\n", __func__, pa_stream_get_state(pas),
length);
Sample *s = userdata;
Sample *s = (Sample *) userdata;
unsigned int left;
left = s->ssd.size - s->written;
@ -330,7 +330,7 @@ _sound_pa_Init(void)
pa_context_set_state_callback(pa_ctx, context_state_callback, NULL);
/* Connect the context */
err = pa_context_connect(pa_ctx, NULL, 0, NULL);
err = pa_context_connect(pa_ctx, NULL, PA_CONTEXT_NOFLAGS, NULL);
if (err)
Eprintf("pa_context_connect(): %s\n", pa_strerror(err));