diff options
| author | reduz <juan@okamstudio.com> | 2015-10-10 09:09:59 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-10-10 09:09:59 -0300 |
| commit | 6b20ee4324224d926a3eb43a59068c2cf12dc75e (patch) | |
| tree | 6c021363ddff3f0323190459a22536e5d6757d94 /drivers/speex/audio_stream_speex.cpp | |
| parent | 422929e87fbe91be1efedf1fe3a9a71d61e58b40 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/speex/audio_stream_speex.cpp')
| -rw-r--r-- | drivers/speex/audio_stream_speex.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/speex/audio_stream_speex.cpp b/drivers/speex/audio_stream_speex.cpp index 2440969345..1bb4952cc8 100644 --- a/drivers/speex/audio_stream_speex.cpp +++ b/drivers/speex/audio_stream_speex.cpp @@ -22,7 +22,7 @@ int AudioStreamPlaybackSpeex::mix(int16_t* p_buffer,int p_frames) { //printf("update, loops %i, read ofs %i\n", (int)loops, read_ofs); //printf("playing %i, paused %i\n", (int)playing, (int)paused); - if (!active || !playing || paused || !data.size()) + if (!active || !playing || !data.size()) return 0; /* @@ -490,6 +490,8 @@ AudioStreamPlaybackSpeex::AudioStreamPlaybackSpeex() { stream_channels=1; stream_srate=1; stream_minbuff_size=1; + playing=false; + } |