diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-10-27 22:54:32 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-10-27 22:54:32 -0300 |
| commit | e82dc402052a47b44bb3bcf50ee4801257f92778 (patch) | |
| tree | 01c2cd8692b5569cae778f6504b76b3d1f9ccdad /drivers/vorbis | |
| parent | 9608d4255eb6c76b1c4496f4494c829133e096f4 (diff) | |
-Much improvement to baked light baker
-Fixed many bugs in stretch mode
-Fixes to camera project and unproject as consequence of the above
-added setget to script (documented in script doc)
-more fixes to collada exporter for blender
Diffstat (limited to 'drivers/vorbis')
| -rw-r--r-- | drivers/vorbis/SCsub | 6 | ||||
| -rw-r--r-- | drivers/vorbis/audio_stream_ogg_vorbis.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/vorbis/SCsub b/drivers/vorbis/SCsub index 1c7cccc427..2c137629ac 100644 --- a/drivers/vorbis/SCsub +++ b/drivers/vorbis/SCsub @@ -3,6 +3,9 @@ Import('env') sources = [ "vorbis/audio_stream_ogg_vorbis.cpp", +] + +sources_lib = [ "vorbis/analysis.c", #"vorbis/barkmel.c", "vorbis/bitrate.c", @@ -32,3 +35,6 @@ sources = [ env.drivers_sources += sources +if env['theora'] != "yes" or env['use_theoraplayer_binary'] != "yes": + env.drivers_sources += sources_lib + diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.cpp b/drivers/vorbis/audio_stream_ogg_vorbis.cpp index d9b7b1d161..996f75d165 100644 --- a/drivers/vorbis/audio_stream_ogg_vorbis.cpp +++ b/drivers/vorbis/audio_stream_ogg_vorbis.cpp @@ -215,7 +215,7 @@ AudioStreamOGGVorbis::UpdateMode AudioStreamOGGVorbis::get_update_mode() const { bool AudioStreamOGGVorbis::is_playing() const { - return playing; + return playing || (get_total() - get_todo() -1 > 0); } float AudioStreamOGGVorbis::get_pos() const { |