From e1da261844419ebb31a1d0a82f0853acc42f6427 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 24 Dec 2017 09:37:51 -0300 Subject: Restored opus build since WebM needs it, but disabled it from code. --- modules/opus/config.py | 7 +------ modules/opus/register_types.cpp | 15 ++++++++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/opus/config.py b/modules/opus/config.py index 0ee1b1b7b4..60f8d838d6 100644 --- a/modules/opus/config.py +++ b/modules/opus/config.py @@ -1,10 +1,5 @@ def can_build(platform): - # Sorry guys, do not enable this unless you can figure out a way - # to get Opus to not do any memory allocation or system calls - # in the audio thread. - # Currently the implementation even reads files from the audio thread, - # and this is not how audio programming works. - return False + return True def configure(env): pass diff --git a/modules/opus/register_types.cpp b/modules/opus/register_types.cpp index a69c8bf9f3..6d7a3575ed 100644 --- a/modules/opus/register_types.cpp +++ b/modules/opus/register_types.cpp @@ -34,13 +34,18 @@ static ResourceFormatLoaderAudioStreamOpus *opus_stream_loader = NULL; void register_opus_types() { - - opus_stream_loader = memnew(ResourceFormatLoaderAudioStreamOpus); - ResourceLoader::add_resource_format_loader(opus_stream_loader); - ClassDB::register_class(); + // Sorry guys, do not enable this unless you can figure out a way + // to get Opus to not do any memory allocation or system calls + // in the audio thread. + // Currently the implementation even reads files from the audio thread, + // and this is not how audio programming works. + + //opus_stream_loader = memnew(ResourceFormatLoaderAudioStreamOpus); + //ResourceLoader::add_resource_format_loader(opus_stream_loader); + //ClassDB::register_class(); } void unregister_opus_types() { - memdelete(opus_stream_loader); + //memdelete(opus_stream_loader); } -- cgit v1.2.3