aboutsummaryrefslogtreecommitdiff
path: root/drivers/register_driver_types.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/register_driver_types.cpp')
-rw-r--r--drivers/register_driver_types.cpp24
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp
index 01f6a8b5b..20c8e0e4b 100644
--- a/drivers/register_driver_types.cpp
+++ b/drivers/register_driver_types.cpp
@@ -43,7 +43,10 @@
#endif
#ifdef THEORA_ENABLED
-//#include "theora/video_stream_theora.h"
+#include "theora/video_stream_theora.h"
+#endif
+
+#ifdef THEORAPLAYER_ENABLED
#include "theoraplayer/video_stream_theoraplayer.h"
#endif
@@ -90,7 +93,10 @@ static ResourceFormatLoaderAudioStreamSpeex *speex_stream_loader=NULL;
#endif
#ifdef THEORA_ENABLED
-//static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
+static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
+#endif
+
+#ifdef THEORAPLAYER_ENABLED
static ResourceFormatLoaderVideoStreamTheoraplayer* theoraplayer_stream_loader = NULL;
#endif
@@ -205,9 +211,12 @@ void register_driver_types() {
#endif
#ifdef THEORA_ENABLED
- //theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
- //ResourceLoader::add_resource_format_loader(theora_stream_loader);
- //ObjectTypeDB::register_type<VideoStreamTheora>();
+ theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
+ ResourceLoader::add_resource_format_loader(theora_stream_loader);
+ ObjectTypeDB::register_type<VideoStreamTheora>();
+#endif
+
+#ifdef THEORAPLAYER_ENABLED
theoraplayer_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheoraplayer );
ResourceLoader::add_resource_format_loader(theoraplayer_stream_loader);
ObjectTypeDB::register_type<VideoStreamTheoraplayer>();
@@ -244,7 +253,10 @@ void unregister_driver_types() {
#endif
#ifdef THEORA_ENABLED
- //memdelete (theora_stream_loader);
+ memdelete (theora_stream_loader);
+#endif
+
+#ifdef THEORAPLAYER_ENABLED
memdelete (theoraplayer_stream_loader);
#endif