livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove new 'buffering' state for video media - seemed like it'd be useful but it broke things

master
Callum Linden 2016-07-21 15:20:00 -07:00
parent db76562aa7
commit befb0446c5
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/media_plugins/base/media_plugin_base.cpp
View File

@ -73,7 +73,6 @@ std::string MediaPluginBase::statusString()
case STATUS_PLAYING: result = "playing"; break;
case STATUS_PAUSED: result = "paused"; break;
case STATUS_DONE: result = "done"; break;
case STATUS_BUFFERING: result = "buffering"; break;
default:
// keep the empty string
break;

3
indra/media_plugins/base/media_plugin_base.h
View File

@ -56,8 +56,7 @@ protected:
STATUS_ERROR,
STATUS_PLAYING,
STATUS_PAUSED,
STATUS_DONE,
STATUS_BUFFERING
STATUS_DONE
} EStatus;
/** Plugin shared memory. */

6
indra/media_plugins/libvlc/media_plugin_libvlc.cpp
View File

@ -212,10 +212,6 @@ void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr)
parent->setStatus(STATUS_LOADING);
break;
case libvlc_MediaPlayerBuffering:
parent->setStatus(STATUS_BUFFERING);
break;
case libvlc_MediaPlayerPlaying:
parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f;
parent->setStatus(STATUS_PLAYING);
@ -276,7 +272,6 @@ void MediaPluginLibVLC::playMedia()
if (em)
{
libvlc_event_detach(em, libvlc_MediaPlayerOpening, eventCallbacks, NULL);
libvlc_event_detach(em, libvlc_MediaPlayerBuffering, eventCallbacks, NULL);
libvlc_event_detach(em, libvlc_MediaPlayerPlaying, eventCallbacks, NULL);
libvlc_event_detach(em, libvlc_MediaPlayerPaused, eventCallbacks, NULL);
libvlc_event_detach(em, libvlc_MediaPlayerStopped, eventCallbacks, NULL);
@ -321,7 +316,6 @@ void MediaPluginLibVLC::playMedia()
if (em)
{
libvlc_event_attach(em, libvlc_MediaPlayerOpening, eventCallbacks, this);
libvlc_event_attach(em, libvlc_MediaPlayerBuffering, eventCallbacks, this);
libvlc_event_attach(em, libvlc_MediaPlayerPlaying, eventCallbacks, this);
libvlc_event_attach(em, libvlc_MediaPlayerPaused, eventCallbacks, this);
libvlc_event_attach(em, libvlc_MediaPlayerStopped, eventCallbacks, this);