Uniformize source files encoding

[vlc] / modules / gui / skins2 / src / skin_common.hpp

diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp
index 800c9830d6b0995a2431b1714faaba3a06a7fb66..d87473a8cccd61e0fad2bbf0d49e303163f006f5 100644 (file)
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * skin_common.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: skin_common.hpp,v 1.2 2004/01/11 17:12:17 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef SKIN_COMMON_HPP
@@ -28,6 +28,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
+#include <string>
 using namespace std;
 
 class AsyncQueue;
@@ -39,7 +40,18 @@ class OSLoop;
 class VarManager;
 class VlcProc;
 class Theme;
+class ThemeRepository;
 
+#ifndef M_PI
+#   define M_PI 3.14159265358979323846
+#endif
+
+#ifdef _MSC_VER
+// turn off 'warning C4355: 'this' : used in base member initializer list'
+#pragma warning ( disable:4355 )
+// turn off 'identifier was truncated to '255' characters in the debug info'
+#pragma warning ( disable:4786 )
+#endif
 
 // Useful macros
 #define SKINS_DELETE( p ) \
@@ -85,6 +97,8 @@ struct intf_sys_t
     VarManager *p_varManager;
     /// VLC state handler
     VlcProc *p_vlcProc;
+    /// Theme repository
+    ThemeRepository *p_repository;
 
     /// Current theme
     Theme *p_theme;
@@ -102,28 +116,6 @@ class SkinObject
         /// interface)
         intf_thread_t *getIntf() const { return m_pIntf; }
 
-        /// Class for callbacks
-        class Callback {
-            public:
-                /// Type for callback methods
-                typedef void (*CallbackFunc_t)( SkinObject* );
-
-                /// Create a callback with the given object and function
-                Callback( SkinObject *pObj, CallbackFunc_t pFunc ):
-                    m_pObj( pObj ), m_pFunc( pFunc ) {}
-                ~Callback() {}
-
-                /// Getters
-                SkinObject *getObj() const { return m_pObj; }
-                CallbackFunc_t getFunc() const { return m_pFunc; }
-
-            private:
-                /// Pointer on the callback object
-                SkinObject *const m_pObj;
-                /// Pointer on the callback method
-                CallbackFunc_t m_pFunc;
-        };
-
     private:
         intf_thread_t *m_pIntf;
 };