From 61ecb6a5e6bbf54c53cc6f87d1830ee803981cb1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 1 Nov 2015 12:32:11 -0300 Subject: properly compute total time for ogg vorbis --- drivers/vorbis/audio_stream_ogg_vorbis.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/vorbis') 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; -- cgit v1.2.3 From 399b1b047498d154440f5cda4a5ceb08ea3de68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 1 Nov 2015 20:53:26 +0100 Subject: Cosmetic fixes to SCons buildsystem - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check --- drivers/vorbis/SCsub | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/vorbis') 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 - -- cgit v1.2.3 From 6bcc2e1f835c5e4f1c788f026e870019a4defff6 Mon Sep 17 00:00:00 2001 From: Saracen Date: Wed, 28 Oct 2015 20:03:10 +0000 Subject: Fixed broken set_loop_restart_time method in AudioStreamPlaybackOGGVorbis class. --- drivers/vorbis/audio_stream_ogg_vorbis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/vorbis') 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; -- cgit v1.2.3