Browse Source

Restored opus build since WebM needs it, but disabled it from code.

Juan Linietsky 7 years ago
parent
commit
e1da261844
2 changed files with 11 additions and 11 deletions
  1. 1 6
      modules/opus/config.py
  2. 10 5
      modules/opus/register_types.cpp

+ 1 - 6
modules/opus/config.py

@@ -1,10 +1,5 @@
 def can_build(platform):
 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):
 def configure(env):
     pass
     pass

+ 10 - 5
modules/opus/register_types.cpp

@@ -34,13 +34,18 @@
 static ResourceFormatLoaderAudioStreamOpus *opus_stream_loader = NULL;
 static ResourceFormatLoaderAudioStreamOpus *opus_stream_loader = NULL;
 
 
 void register_opus_types() {
 void register_opus_types() {
-
-	opus_stream_loader = memnew(ResourceFormatLoaderAudioStreamOpus);
-	ResourceLoader::add_resource_format_loader(opus_stream_loader);
-	ClassDB::register_class<AudioStreamOpus>();
+    // 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<AudioStreamOpus>();
 }
 }
 
 
 void unregister_opus_types() {
 void unregister_opus_types() {
 
 
-	memdelete(opus_stream_loader);
+	//memdelete(opus_stream_loader);
 }
 }