diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index f41efd580f2d90cb11c4a1cf6efc75765a37d07f..0c86e51e278ccd5290c33ef3eaccea5515c6e505 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -300,7 +300,7 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr) // void MediaPluginLibVLC::playMedia() { - if (mURL.length() == 0 || mWidth == 0 || mHeight == 0) + if (mURL.length() == 0) { return; } diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp index af3a21c1835e754e4713f78e69b5efc9ba6e0442..b68ffbe1a231b4828e193c21b525a14a71126e05 100644 --- a/indra/newview/llviewermedia_streamingaudio.cpp +++ b/indra/newview/llviewermedia_streamingaudio.cpp @@ -70,6 +70,8 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url) LL_INFOS() << "setting stream to NULL"<< LL_ENDL; mURL.clear(); mMediaPlugin->stop(); + delete mMediaPlugin; + mMediaPlugin = nullptr; } } @@ -79,6 +81,8 @@ void LLStreamingAudio_MediaPlugins::stop() if(mMediaPlugin) { mMediaPlugin->stop(); + delete mMediaPlugin; + mMediaPlugin = nullptr; } mURL.clear(); diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml index 4f0323fdbf0f42eee6827eda314c03de0933ad1b..75cff742f72e553e7300660514fa3ed2dad02fbb 100644 --- a/indra/newview/skins/default/xui/en/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml @@ -240,7 +240,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="application/pdf"> @@ -309,6 +309,17 @@ media_plugin_cef </impl> </mimetype> + <mimetype name="application/octet-stream"> + <label name="application/octet-stream_label"> + Stream + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_libvlc + </impl> + </mimetype> <mimetype name="audio/mid"> <label name="audio/mid_label"> Audio (MIDI) @@ -317,7 +328,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="audio/mpeg"> @@ -474,6 +485,17 @@ media_plugin_libvlc </impl> </mimetype> + <mimetype name="video/x-flv"> + <label name="video/x-flv_label"> + Movie (flv) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_libvlc + </impl> + </mimetype> <mimetype name="application/octet-stream"> <label name="video/octet-stream"> Movie