godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes following Visual Studio 2013 compile error on windows:

Browse Source 
audio_stream_opus.h(57) : error C2864: 'AudioStreamPlaybackOpus::osrate' : a static data member with an in-class initializer must have non-volatile const integral type

See: http://stackoverflow.com/questions/2454019/why-arent-static-const-floats-allowed
This commit is contained in:
ZuBsPaCe 2015-10-03 00:38:43 +02:00
parent 5ddbef1351
commit c69afe4948
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/opus/audio_stream_opus.cpp
View File

@ -30,6 +30,8 @@
/*************************************************************************/ /*************************************************************************/
#include "audio_stream_opus.h" #include "audio_stream_opus.h"
const float AudioStreamPlaybackOpus::osrate=48000.0f;
int AudioStreamPlaybackOpus::_op_read_func(void *_stream, unsigned char *_ptr, int _nbytes) { int AudioStreamPlaybackOpus::_op_read_func(void *_stream, unsigned char *_ptr, int _nbytes) {
FileAccess *fa=(FileAccess*)_stream; FileAccess *fa=(FileAccess*)_stream;

2
drivers/opus/audio_stream_opus.h
View File

@ -54,7 +54,7 @@ class AudioStreamPlaybackOpus : public AudioStreamPlayback {
static int _op_seek_func(void *_stream, opus_int64 _offset, int _whence); static int _op_seek_func(void *_stream, opus_int64 _offset, int _whence);
static int _op_close_func(void *_stream); static int _op_close_func(void *_stream);
static opus_int64 _op_tell_func(void *_stream); static opus_int64 _op_tell_func(void *_stream);
static const float osrate=48000.0f; static const float osrate;
String file; String file;
int64_t frames_mixed; int64_t frames_mixed;