X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mozilla%2Fcontrol%2Fnpolibvlc.h;h=034c0847ce3781ffea3210c0236e824d153140f1;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=b0639ff5803d4d3fa042e45aa037d08165f27355;hpb=2dfa55bd53357dc8bfcb6c94ec9a204dc9d3fe65;p=vlc

diff --git a/mozilla/control/npolibvlc.h b/mozilla/control/npolibvlc.h
index b0639ff580..034c0847ce 100755
--- a/mozilla/control/npolibvlc.h
+++ b/mozilla/control/npolibvlc.h
@@ -32,7 +32,14 @@ class LibvlcRootNPObject: public RuntimeNPObject
 protected:
     friend class RuntimeNPClass<LibvlcRootNPObject>;
 
-    LibvlcRootNPObject(NPP instance, const NPClass *aClass);
+    LibvlcRootNPObject(NPP instance, const NPClass *aClass) :
+        RuntimeNPObject(instance, aClass),
+    audioObj(NULL),
+    inputObj(NULL),
+    logObj(NULL),
+    playlistObj(NULL),
+    videoObj(NULL) {};
+
     virtual ~LibvlcRootNPObject();
 
     static const int propertyCount;
@@ -45,6 +52,7 @@ protected:
 
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
 
+private:
     NPObject *audioObj;
     NPObject *inputObj;
     NPObject *logObj;
@@ -171,7 +179,10 @@ class LibvlcLogNPObject: public RuntimeNPObject
 protected:
     friend class RuntimeNPClass<LibvlcLogNPObject>;
 
-    LibvlcLogNPObject(NPP instance, const NPClass *aClass);
+    LibvlcLogNPObject(NPP instance, const NPClass *aClass) :
+    RuntimeNPObject(instance, aClass),
+    messagesObj(NULL) {};
+
     virtual ~LibvlcLogNPObject();
 
     static const int propertyCount;
@@ -184,7 +195,7 @@ protected:
     static const NPUTF8 * const methodNames[];
 
 private:
-    LibvlcMessagesNPObject* _p_vlcmessages;
+    NPObject* messagesObj;
 };
 
 class LibvlcPlaylistItemsNPObject: public RuntimeNPObject
@@ -212,7 +223,10 @@ class LibvlcPlaylistNPObject: public RuntimeNPObject
 protected:
     friend class RuntimeNPClass<LibvlcPlaylistNPObject>;
 
-    LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass);
+    LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass) :
+    RuntimeNPObject(instance, aClass),
+    playlistItemsObj(NULL) {};
+    
     virtual ~LibvlcPlaylistNPObject();
 
     static const int propertyCount;
@@ -229,7 +243,7 @@ protected:
     void parseOptions(NPObject *obj, int *i_options, char*** ppsz_options);
 
 private:
-    LibvlcPlaylistItemsNPObject* _p_vlcplaylistitems;
+    NPObject*  playlistItemsObj;
 };
 
 class LibvlcVideoNPObject: public RuntimeNPObject
@@ -252,4 +266,3 @@ protected:
 
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);
 };
-