diff options
| author | Ovnuniarchos <pujalte.jorge@gmail.com> | 2015-11-19 01:19:19 +0100 |
|---|---|---|
| committer | Ovnuniarchos <pujalte.jorge@gmail.com> | 2015-11-19 01:19:19 +0100 |
| commit | a9a330645b29152ccc29b6e075c0ebda24b03e37 (patch) | |
| tree | 2cf319ce8453dd295c40b809b4bf54527e4fe020 /drivers/vorbis | |
| parent | 0f0dc1a5d328502343c5a902aec552fb01033504 (diff) | |
| parent | 94fdd01241749cb7a575ed5f9fa4c7bbb286901a (diff) | |
Merge branch 'master' into BBCodeDocs
Diffstat (limited to 'drivers/vorbis')
| -rw-r--r-- | drivers/vorbis/SCsub | 2 | ||||
| -rw-r--r-- | drivers/vorbis/audio_stream_ogg_vorbis.cpp | 3 | ||||
| -rw-r--r-- | drivers/vorbis/audio_stream_ogg_vorbis.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/vorbis/SCsub b/drivers/vorbis/SCsub index 2c137629ac..4a16e80dfc 100644 --- a/drivers/vorbis/SCsub +++ b/drivers/vorbis/SCsub @@ -1,4 +1,3 @@ - Import('env') sources = [ @@ -37,4 +36,3 @@ 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 8c1c05006f..9a60098526 100644 --- a/drivers/vorbis/audio_stream_ogg_vorbis.cpp +++ b/drivers/vorbis/audio_stream_ogg_vorbis.cpp @@ -289,8 +289,7 @@ Error AudioStreamPlaybackOGGVorbis::set_file(const String& p_file) { const vorbis_info *vinfo=ov_info(&vf,-1); stream_channels=vinfo->channels; stream_srate=vinfo->rate; - ogg_int64_t len = ov_time_total(&vf,-1); - length=len/1000.0; + length = ov_time_total(&vf,-1); ov_clear(&vf); memdelete(f); f=NULL; diff --git a/drivers/vorbis/audio_stream_ogg_vorbis.h b/drivers/vorbis/audio_stream_ogg_vorbis.h index 827d8b0be3..5dbada962a 100644 --- a/drivers/vorbis/audio_stream_ogg_vorbis.h +++ b/drivers/vorbis/audio_stream_ogg_vorbis.h @@ -85,7 +85,7 @@ public: virtual void stop(); virtual bool is_playing() const; - virtual void set_loop_restart_time(float p_time) { loop_restart_time=0; } + virtual void set_loop_restart_time(float p_time) { loop_restart_time=p_time; } virtual void set_paused(bool p_paused); virtual bool is_paused(bool p_paused) const; |