npapi-vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Mar 25 15:21:03 2015 +0100| [e017218dac7449f4a22faa4368ff538c2767d22e] | committer: Hugo Beauzée-Luyssen
npapi: Remove write only static instances set > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=e017218dac7449f4a22faa4368ff538c2767d22e --- npapi/vlcplugin_base.cpp | 5 ----- npapi/vlcplugin_base.h | 4 ---- 2 files changed, 9 deletions(-) diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp index 0b88535..a03e488 100644 --- a/npapi/vlcplugin_base.cpp +++ b/npapi/vlcplugin_base.cpp @@ -58,7 +58,6 @@ VlcPluginBase::VlcPluginBase( NPP instance, NPuint16_t mode ) : psz_baseURL(NULL) { memset(&npwindow, 0, sizeof(NPWindow)); - _instances.insert(this); } static bool boolValue(const char *value) { @@ -68,8 +67,6 @@ static bool boolValue(const char *value) { !strcasecmp(value, "yes") ); } -std::set<VlcPluginBase*> VlcPluginBase::_instances; - NPError VlcPluginBase::init(int argc, char* const argn[], char* const argv[]) { /* prepare VLC command line */ @@ -243,8 +240,6 @@ VlcPluginBase::~VlcPluginBase() { free(psz_baseURL); free(psz_target); - - _instances.erase(this); } void VlcPluginBase::setWindow(const NPWindow &window) diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h index b43347c..05361cf 100644 --- a/npapi/vlcplugin_base.h +++ b/npapi/vlcplugin_base.h @@ -35,7 +35,6 @@ #include "utils.hpp" #include <vector> -#include <set> #include <utility> #include <unordered_map> @@ -141,9 +140,6 @@ protected: vlc_player m_player; private: - static std::set<VlcPluginBase*> _instances; - -private: std::vector<std::tuple<std::string, NPObject*, VLC::EventManager::RegisteredEvent>> m_events; }; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
