[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[635] mplayerxp

[<nic...@us...>]

Revision: 635
          http://sourceforge.net/p/mplayerxp/code/635
Author:   nickols_k
Date:     2013-05-08 05:23:43 +0000 (Wed, 08 May 2013)
Log Message:
-----------
sync with beye

Modified Paths:
--------------
    mplayerxp/main.cpp
    mplayerxp/osdep/mplib.h

Modified: mplayerxp/main.cpp
===================================================================
--- mplayerxp/main.cpp	2013-04-30 17:28:09 UTC (rev 634)
+++ mplayerxp/main.cpp	2013-05-08 05:23:43 UTC (rev 635)
@@ -219,9 +219,13 @@
 }
 
 static volatile char antiviral_hole2[__VM_PAGE_SIZE__] __PAGE_ALIGNED__;
+static Opaque	opaque1;
 static LocalPtr<MPXPContext> MPXPCtx(new(zeromem) MPXPContext);
+static Opaque	opaque2;
 static volatile char antiviral_hole3[__VM_PAGE_SIZE__] __PAGE_ALIGNED__;
+static Opaque	opaque3;
 volatile MPXPSecureKeys* secure_keys;
+static Opaque	opaque4;
 /**************************************************************************
 	     Decoding ahead
 **************************************************************************/

Modified: mplayerxp/osdep/mplib.h
===================================================================
--- mplayerxp/osdep/mplib.h	2013-04-30 17:28:09 UTC (rev 634)
+++ mplayerxp/osdep/mplib.h	2013-05-08 05:23:43 UTC (rev 635)
@@ -18,8 +18,16 @@
 #include "mp_malloc.h"
 
 namespace mpxp {
+    class Opaque {
+	public:
+	    Opaque();
+	    virtual ~Opaque();
+	
+	any_t*		false_pointers[RND_CHAR0];
+	any_t*		unusable;
+    };
 
-    template <typename T> class LocalPtr {
+    template <typename T> class LocalPtr : public Opaque {
 	public:
 	    LocalPtr(T* value):ptr(value) {}
 	    virtual ~LocalPtr() { delete ptr; }
@@ -30,16 +38,10 @@
 	    LocalPtr<T>& operator=(LocalPtr<T> a) { return this; }
 	    LocalPtr<T>& operator=(LocalPtr<T>& a) { return this; }
 	    LocalPtr<T>& operator=(LocalPtr<T>* a) { return this; }
+
+	    Opaque	opaque1;
 	    T* ptr;
+	    Opaque	opaque2;
     };
-
-    class Opaque {
-	public:
-	    Opaque();
-	    virtual ~Opaque();
-	
-	any_t*		false_pointers[RND_CHAR0];
-	any_t*		unusable;
-    };
 } // namespace mpxp
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.