Skip to content
Snippets Groups Projects
Commit 2a7ae50c authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Tweak vlc media

parent 7bb0d1d7
No related branches found
No related tags found
No related merge requests found
...@@ -300,7 +300,7 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr) ...@@ -300,7 +300,7 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr)
// //
void MediaPluginLibVLC::playMedia() void MediaPluginLibVLC::playMedia()
{ {
if (mURL.length() == 0 || mWidth == 0 || mHeight == 0) if (mURL.length() == 0)
{ {
return; return;
} }
......
...@@ -70,6 +70,8 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url) ...@@ -70,6 +70,8 @@ void LLStreamingAudio_MediaPlugins::start(const std::string& url)
LL_INFOS() << "setting stream to NULL"<< LL_ENDL; LL_INFOS() << "setting stream to NULL"<< LL_ENDL;
mURL.clear(); mURL.clear();
mMediaPlugin->stop(); mMediaPlugin->stop();
delete mMediaPlugin;
mMediaPlugin = nullptr;
} }
} }
...@@ -79,6 +81,8 @@ void LLStreamingAudio_MediaPlugins::stop() ...@@ -79,6 +81,8 @@ void LLStreamingAudio_MediaPlugins::stop()
if(mMediaPlugin) if(mMediaPlugin)
{ {
mMediaPlugin->stop(); mMediaPlugin->stop();
delete mMediaPlugin;
mMediaPlugin = nullptr;
} }
mURL.clear(); mURL.clear();
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
audio audio
</widgettype> </widgettype>
<impl> <impl>
media_plugin_cef media_plugin_libvlc
</impl> </impl>
</mimetype> </mimetype>
<mimetype name="application/pdf"> <mimetype name="application/pdf">
...@@ -309,6 +309,17 @@ ...@@ -309,6 +309,17 @@
media_plugin_cef media_plugin_cef
</impl> </impl>
</mimetype> </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"> <mimetype name="audio/mid">
<label name="audio/mid_label"> <label name="audio/mid_label">
Audio (MIDI) Audio (MIDI)
...@@ -317,7 +328,7 @@ ...@@ -317,7 +328,7 @@
audio audio
</widgettype> </widgettype>
<impl> <impl>
media_plugin_cef media_plugin_libvlc
</impl> </impl>
</mimetype> </mimetype>
<mimetype name="audio/mpeg"> <mimetype name="audio/mpeg">
...@@ -474,6 +485,17 @@ ...@@ -474,6 +485,17 @@
media_plugin_libvlc media_plugin_libvlc
</impl> </impl>
</mimetype> </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"> <mimetype name="application/octet-stream">
<label name="video/octet-stream"> <label name="video/octet-stream">
Movie Movie
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment