Removes trailing spaces. Removes tabs.

[vlc] / mozilla / control / npolibvlc.h

diff --git a/mozilla/control/npolibvlc.h b/mozilla/control/npolibvlc.h
index 80c767353a975de795de1f40132b43a5a6c9641a..034c0847ce3781ffea3210c0236e824d153140f1 100755 (executable)
--- a/mozilla/control/npolibvlc.h
+++ b/mozilla/control/npolibvlc.h
@@ -32,7 +32,14 @@ class LibvlcRootNPObject: public RuntimeNPObject
 protected:\r
     friend class RuntimeNPClass<LibvlcRootNPObject>;\r
 \r
-    LibvlcRootNPObject(NPP instance, const NPClass *aClass);\r
+    LibvlcRootNPObject(NPP instance, const NPClass *aClass) :\r
+        RuntimeNPObject(instance, aClass),\r
+    audioObj(NULL),\r
+    inputObj(NULL),\r
+    logObj(NULL),\r
+    playlistObj(NULL),\r
+    videoObj(NULL) {};\r
+\r
     virtual ~LibvlcRootNPObject();\r
 \r
     static const int propertyCount;\r
@@ -45,6 +52,7 @@ protected:
 \r
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
 \r
+private:\r
     NPObject *audioObj;\r
     NPObject *inputObj;\r
     NPObject *logObj;\r
@@ -80,7 +88,7 @@ protected:
 \r
     LibvlcInputNPObject(NPP instance, const NPClass *aClass) :\r
         RuntimeNPObject(instance, aClass) {};\r
-        \r
+\r
     virtual ~LibvlcInputNPObject() {};\r
 \r
     static const int propertyCount;\r
@@ -106,7 +114,7 @@ protected:
 \r
     LibvlcMessageNPObject(NPP instance, const NPClass *aClass) :\r
         RuntimeNPObject(instance, aClass) {};\r
-        \r
+\r
     virtual ~LibvlcMessageNPObject() {};\r
 \r
     static const int propertyCount;\r
@@ -125,16 +133,11 @@ class LibvlcLogNPObject;
 \r
 class LibvlcMessageIteratorNPObject: public RuntimeNPObject\r
 {\r
-public:\r
-    void setLog(LibvlcLogNPObject* p_vlclog);\r
-\r
 protected:\r
     friend class RuntimeNPClass<LibvlcMessageIteratorNPObject>;\r
 \r
-    LibvlcMessageIteratorNPObject(NPP instance, const NPClass *aClass) :\r
-        RuntimeNPObject(instance, aClass) {};\r
-        \r
-    virtual ~LibvlcMessageIteratorNPObject() {};\r
+    LibvlcMessageIteratorNPObject(NPP instance, const NPClass *aClass);\r
+    virtual ~LibvlcMessageIteratorNPObject();\r
 \r
     static const int propertyCount;\r
     static const NPUTF8 * const propertyNames[];\r
@@ -147,25 +150,17 @@ protected:
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
 \r
 private:\r
-    LibvlcLogNPObject*      _p_vlclog;\r
     libvlc_log_iterator_t*  _p_iter;\r
 };\r
 \r
 class LibvlcMessagesNPObject: public RuntimeNPObject\r
 {\r
-public:\r
-    void setLog(LibvlcLogNPObject *p_log)\r
-    {\r
-        _p_vlclog = p_log;\r
-    }\r
-    \r
 protected:\r
     friend class RuntimeNPClass<LibvlcMessagesNPObject>;\r
 \r
     LibvlcMessagesNPObject(NPP instance, const NPClass *aClass) :\r
-        _p_vlclog(NULL),\r
         RuntimeNPObject(instance, aClass) {};\r
-        \r
+\r
     virtual ~LibvlcMessagesNPObject() {};\r
 \r
     static const int propertyCount;\r
@@ -177,32 +172,18 @@ protected:
     static const NPUTF8 * const methodNames[];\r
 \r
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
-\r
-private:\r
-    LibvlcLogNPObject* _p_vlclog;\r
 };\r
 \r
 class LibvlcLogNPObject: public RuntimeNPObject\r
 {\r
 protected:\r
     friend class RuntimeNPClass<LibvlcLogNPObject>;\r
-    friend class LibvlcMessagesNPObject;\r
-    friend class LibvlcMessageIteratorNPObject;\r
-\r
-    libvlc_log_t    *_p_log;\r
 \r
     LibvlcLogNPObject(NPP instance, const NPClass *aClass) :\r
-        RuntimeNPObject(instance, aClass),\r
-        _p_log(NULL)\r
-    {\r
-        _p_vlcmessages = static_cast<LibvlcMessagesNPObject*>(NPN_CreateObject(instance, RuntimeNPClass<LibvlcMessagesNPObject>::getClass()));\r
-        _p_vlcmessages->setLog(this);\r
-    };\r
-        \r
-    virtual ~LibvlcLogNPObject()\r
-    {\r
-        NPN_ReleaseObject(_p_vlcmessages);\r
-    };\r
+    RuntimeNPObject(instance, aClass),\r
+    messagesObj(NULL) {};\r
+\r
+    virtual ~LibvlcLogNPObject();\r
 \r
     static const int propertyCount;\r
     static const NPUTF8 * const propertyNames[];\r
@@ -214,7 +195,27 @@ protected:
     static const NPUTF8 * const methodNames[];\r
 \r
 private:\r
-    LibvlcMessagesNPObject* _p_vlcmessages;\r
+    NPObject* messagesObj;\r
+};\r
+\r
+class LibvlcPlaylistItemsNPObject: public RuntimeNPObject\r
+{\r
+protected:\r
+    friend class RuntimeNPClass<LibvlcPlaylistItemsNPObject>;\r
+\r
+    LibvlcPlaylistItemsNPObject(NPP instance, const NPClass *aClass) :\r
+        RuntimeNPObject(instance, aClass) {};\r
+    virtual ~LibvlcPlaylistItemsNPObject() {};\r
+\r
+    static const int propertyCount;\r
+    static const NPUTF8 * const propertyNames[];\r
+\r
+    InvokeResult getProperty(int index, NPVariant &result);\r
+\r
+    static const int methodCount;\r
+    static const NPUTF8 * const methodNames[];\r
+\r
+    InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
 };\r
 \r
 class LibvlcPlaylistNPObject: public RuntimeNPObject\r
@@ -223,8 +224,10 @@ protected:
     friend class RuntimeNPClass<LibvlcPlaylistNPObject>;\r
 \r
     LibvlcPlaylistNPObject(NPP instance, const NPClass *aClass) :\r
-        RuntimeNPObject(instance, aClass) {};\r
-    virtual ~LibvlcPlaylistNPObject() {};\r
+    RuntimeNPObject(instance, aClass),\r
+    playlistItemsObj(NULL) {};\r
+    \r
+    virtual ~LibvlcPlaylistNPObject();\r
 \r
     static const int propertyCount;\r
     static const NPUTF8 * const propertyNames[];\r
@@ -238,6 +241,9 @@ protected:
 \r
     void parseOptions(const NPString &s, int *i_options, char*** ppsz_options);\r
     void parseOptions(NPObject *obj, int *i_options, char*** ppsz_options);\r
+\r
+private:\r
+    NPObject*  playlistItemsObj;\r
 };\r
 \r
 class LibvlcVideoNPObject: public RuntimeNPObject\r
@@ -260,4 +266,3 @@ protected:
 \r
     InvokeResult invoke(int index, const NPVariant *args, uint32_t argCount, NPVariant &result);\r
 };\r
-\r