diff options
Diffstat (limited to 'drivers/register_driver_types.cpp')
| -rw-r--r-- | drivers/register_driver_types.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index e2af1e533..e4bb1a343 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -43,9 +43,11 @@ #endif #ifdef THEORA_ENABLED -#include "theora/video_stream_theora.h" +//#include "theora/video_stream_theora.h" +#include "theoraplayer/video_stream_theoraplayer.h" #endif + #include "drivers/trex/regex.h" #ifdef MUSEPACK_ENABLED @@ -88,7 +90,8 @@ static ResourceFormatLoaderAudioStreamSpeex *speex_stream_loader=NULL; #endif #ifdef THEORA_ENABLED -static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL; +//static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL; +static ResourceFormatLoaderVideoStreamTheoraplayer* theoraplayer_stream_loader = NULL; #endif #ifdef MUSEPACK_ENABLED @@ -202,11 +205,15 @@ 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>(); + theoraplayer_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheoraplayer ); + ResourceLoader::add_resource_format_loader(theoraplayer_stream_loader); + ObjectTypeDB::register_type<VideoStreamTheoraplayer>(); #endif + #ifdef TOOLS_ENABLED #ifdef SQUISH_ENABLED @@ -234,8 +241,8 @@ void unregister_driver_types() { #endif #ifdef THEORA_ENABLED - - memdelete (theora_stream_loader); + //memdelete (theora_stream_loader); + memdelete (theoraplayer_stream_loader); #endif #ifdef MUSEPACK_ENABLED |