Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish hooking up VLC and removing quicktime

Browse Source
This commit is contained in:
Lirusaito
2019-04-19 15:00:05 -04:00
parent 01b4339b6f
commit 1a88370566
3 changed files with 12 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/plugins/libvlc/media_plugin_libvlc.cpp
View File

@@ -50,7 +50,7 @@ class MediaPluginLibVLC :
public MediaPluginBase
{
public:
MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data);
MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, LLPluginInstance* host_user_data);
~MediaPluginLibVLC();
/*virtual*/ void receiveMessage(const char* message_string) override;
@@ -104,7 +104,7 @@ private:
////////////////////////////////////////////////////////////////////////////////
//
MediaPluginLibVLC::MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data) :
MediaPluginLibVLC::MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, LLPluginInstance*host_user_data) :
MediaPluginBase(host_send_func, host_user_data)
{
mTextureWidth = 0;
@@ -700,14 +700,21 @@ bool MediaPluginLibVLC::init()
////////////////////////////////////////////////////////////////////////////////
//
int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func,
void* host_user_data,
LLPluginInstance::sendMessageFunction *plugin_send_func,
/*int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func,
LLPluginInstance* host_user_data,
LLPluginInstance::receiveMessageFunction *plugin_send_func,
void **plugin_user_data)
{
MediaPluginLibVLC* self = new MediaPluginLibVLC(host_send_func, host_user_data);
*plugin_send_func = MediaPluginLibVLC::staticReceiveMessage;
*plugin_user_data = (void*)self;
return 0;
}*/
int create_plugin(LLPluginInstance::sendMessageFunction send_message_function,
LLPluginInstance* plugin_instance,
BasicPluginBase** plugin_object)
{
*plugin_object = new MediaPluginLibVLC(send_message_function, plugin_instance);
return 0;
}