* skins2: Removed the Theme.fadetime attribute (unused)

diff --git a/modules/gui/skins2/parser/builder_data.def b/modules/gui/skins2/parser/builder_data.def
index 8a835ab0ce808adcf6b6005b3231846cfbc53573..4d37660b7a0da33be031f2ba97ec00cac24c75e5 100644 (file)
--- a/modules/gui/skins2/parser/builder_data.def
+++ b/modules/gui/skins2/parser/builder_data.def
@@ -1,4 +1,4 @@
-Theme tooltipfont:string magnet:int alpha:uint32_t moveAlpha:uint32_t fadeTime:uint32_t
+Theme tooltipfont:string magnet:int alpha:uint32_t moveAlpha:uint32_t
 Bitmap id:string fileName:string alphaColor:uint32_t
 BitmapFont id:string file:string type:string
 Font id:string fontFile:string size:int

diff --git a/modules/gui/skins2/parser/builder_data.hpp b/modules/gui/skins2/parser/builder_data.hpp
index 28595049fb97ee8764496cebc30f66c42bdd1408..5a204eccc7fb8c3c763f46fae0d0c547f3d39b09 100644 (file)
--- a/modules/gui/skins2/parser/builder_data.hpp
+++ b/modules/gui/skins2/parser/builder_data.hpp
@@ -42,14 +42,13 @@ struct BuilderData
     /// Type definition
     struct Theme
     {
-        Theme( const string & tooltipfont, int magnet, uint32_t alpha, uint32_t moveAlpha, uint32_t fadeTime ):
-m_tooltipfont( tooltipfont ), m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ), m_fadeTime( fadeTime ) {}
+        Theme( const string & tooltipfont, int magnet, uint32_t alpha, uint32_t moveAlpha ):
+m_tooltipfont( tooltipfont ), m_magnet( magnet ), m_alpha( alpha ), m_moveAlpha( moveAlpha ) {}
 
         const string m_tooltipfont;
         int m_magnet;
         uint32_t m_alpha;
         uint32_t m_moveAlpha;
-        uint32_t m_fadeTime;
     };
     /// List
     list<Theme> m_listTheme;

diff --git a/modules/gui/skins2/parser/skin_parser.cpp b/modules/gui/skins2/parser/skin_parser.cpp
index 85314c701e1a6ced80274636eb7bba0cd7061946..dbf2e76282b7aea30026c89d6aa72ceefcd7ad4f 100644 (file)
--- a/modules/gui/skins2/parser/skin_parser.cpp
+++ b/modules/gui/skins2/parser/skin_parser.cpp
@@ -255,8 +255,7 @@ void SkinParser::handleBeginElement( const string &rName, AttrList_t &attr )
         const BuilderData::Theme theme( attr["tooltipfont"],
                 atoi( attr["magnet"] ),
                 convertInRange( attr["alpha"], 1, 255, "alpha" ),
-                convertInRange( attr["movealpha"], 1, 255, "movealpha" ),
-                atoi( attr["fadetime"] ) );
+                convertInRange( attr["movealpha"], 1, 255, "movealpha" ) );
         m_data.m_listTheme.push_back( theme );
     }
 

diff --git a/share/skins2/default/theme.xml b/share/skins2/default/theme.xml
index fc8f3c58dc95d88eb3870beb25134f952aeee59b..ccc1d00408344888e176ed93272fef2d82b9aadb 100644 (file)
--- a/share/skins2/default/theme.xml
+++ b/share/skins2/default/theme.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE Theme PUBLIC "-//VideoLAN//DTD VLC Skins V2.0//EN" "skin.dtd">
 
-<Theme version="2.0" magnet="20" alpha="255" movealpha="192" fadetime="500">
+<Theme version="2.0" magnet="20" alpha="255" movealpha="192">
   <ThemeInfo name="VLC OSX Interface" author="BigBen"
              email="bigben@videolan.org" webpage="http://www.videolan.org"/>
 

diff --git a/share/skins2/skin.dtd b/share/skins2/skin.dtd
index 0405f681b5717055613c74318d51fbd275bfef34..85ec1baeaaa7f0006005e8609846d14ffd3384d5 100644 (file)
--- a/share/skins2/skin.dtd
+++ b/share/skins2/skin.dtd
@@ -9,7 +9,6 @@
         magnet      CDATA   "15"
         alpha       CDATA   "255"
         movealpha   CDATA   "255"
-        fadetime    CDATA   "400"
     >
 
 <!-- main elements -->