[fix] Control::setAnimations took the wrong type. It should now be ba…

…ckwards compatible.
avdleeuw · Nov 1, 2012 · 4aad468 · 4aad468
1 parent 30ef98c
commit 4aad468
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/xbmc/interfaces/legacy/Control.cpp b/xbmc/interfaces/legacy/Control.cpp
@@ -762,7 +762,7 @@ namespace XBMCAddon
         pGUIControl->SetEnableCondition(enable);
     }
 
-    void Control::setAnimations(const std::vector< std::vector<String> >& eventAttr) throw (WindowException)
+    void Control::setAnimations(const std::vector< Tuple<String,String> >& eventAttr) throw (WindowException)
     {
       CXBMCTinyXML xmlDoc;
       TiXmlElement xmlRootElement("control");
@@ -774,13 +774,13 @@ namespace XBMCAddon
 
       for (unsigned int anim = 0; anim < eventAttr.size(); anim++)
       {
-        const std::vector<String>& pTuple = eventAttr[anim];
+        const Tuple<String,String>& pTuple = eventAttr[anim];
 
-        if (pTuple.size() != 2)
+        if (pTuple.GetNumValuesSet() != 2)
           throw WindowException("Error unpacking tuple found in list");
 
-        const String& cAttr = pTuple[0];
-        const String& cEvent = pTuple[1];
+        const String& cAttr = pTuple.first();
+        const String& cEvent = pTuple.second();
 
         TiXmlElement pNode("animation");
         CStdStringArray attrs;

diff --git a/xbmc/interfaces/legacy/Control.h b/xbmc/interfaces/legacy/Control.h
@@ -25,6 +25,7 @@
 #include "guilib/GUIFont.h"
 #include "guilib/Key.h"
 
+#include "Tuple.h"
 #include "ListItem.h"
 #include "swighelper.h"
 #include "WindowException.h"
@@ -241,7 +242,7 @@ namespace XBMCAddon
        * example:
        *   - self.button.setAnimations([('focus', 'effect=zoom end=90,247,220,56 time=0',)])\n
        */
-      virtual void setAnimations(const std::vector< std::vector<String> >& eventAttr) throw (WindowException);
+      virtual void setAnimations(const std::vector< Tuple<String,String> >& eventAttr) throw (WindowException);
 
       // setPosition() Method
       /**