XBMC Media Center

Revision: 13969
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13969&view=rev
Author:   monkeyman_67156
Date:     2008-07-06 07:32:26 -0700 (Sun, 06 Jul 2008)

Log Message:
-----------
fixed: various warnings and build errors on GCC 4.3

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/GUIListGroup.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-builder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/compile.c

Modified: branches/linuxport/XBMC/guilib/GUIListGroup.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListGroup.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/guilib/GUIListGroup.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -72,7 +72,7 @@
           control->GetControlType() == CGUIControl::GUICONTROL_IMAGE ||
           control->GetControlType() == CGUIControl::GUICONTROL_BORDEREDIMAGE ||
           control->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT))
-      CLog::Log(LOGWARNING, "%s - trying to add unsupported control type %d", control->GetControlType());
+      CLog::Log(LOGWARNING, "Trying to add unsupported control type %d", control->GetControlType());
     control->SetPushUpdates(true);
   }
   CGUIControlGroup::AddControl(control);

Modified: branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -65,7 +65,7 @@
     {
       CGUIDialogBoxBase::OnMessage(message);
       FreeControls();
-      CreateControls();
+      CreateControls();
       return true;
     }
 
@@ -223,413 +223,422 @@
               else if (strcmpi(type, "music") == 0)
                 strMask = g_stSettings.m_musicExtensions;
               else if (strcmpi(type, "programs") == 0)
-#if defined(_WIN32_WINNT)
-                strMask = ".exe|.bat|.cmd|.py";
-#else
-                strMask = "";
+#if defined(_WIN32_WINNT)
+                strMask = ".exe|.bat|.cmd|.py";
+#else
+                strMask = "";
 #endif
-            }
-
-            // get any options
-            bool bUseThumbs = false;
-            bool bUseFileDirectories = false;
-            if (option)
-            {
-              bUseThumbs = (strcmpi(option, "usethumbs") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
-              bUseFileDirectories = (strcmpi(option, "treatasfolder") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
-            }
-
-            if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, ((CGUIButtonControl*) control)->GetLabel(), value))
-              ((CGUIButtonControl*) control)->SetLabel2(value);
-          }
-        }
-        else if (strcmpi(type, "action") == 0)
-        {
-          if (setting->Attribute("default"))
-          {
-            if (option)
-              bCloseDialog = (strcmpi(option, "close") == 0);
+            }
+
+            // get any options
+            bool bUseThumbs = false;
+            bool bUseFileDirectories = false;
+            if (option)
+            {
+              bUseThumbs = (strcmpi(option, "usethumbs") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
+              bUseFileDirectories = (strcmpi(option, "treatasfolder") == 0 || strcmpi(option, "usethumbs|treatasfolder") == 0);
+            }
+
+            if (CGUIDialogFileBrowser::ShowAndGetFile(*shares, strMask, ((CGUIButtonControl*) control)->GetLabel(), value))
+              ((CGUIButtonControl*) control)->SetLabel2(value);
+          }
+        }
+        else if (strcmpi(type, "action") == 0)
+        {
+          if (setting->Attribute("default"))
+          {
+            if (option)
+              bCloseDialog = (strcmpi(option, "close") == 0);
             g_application.getApplicationMessenger().ExecBuiltIn(setting->Attribute("default"));
-          }
-        }
-        break;
-      }
-    }
-    setting = setting->NextSiblingElement("setting");
-    controlId++;
-  }
-  EnableControls();
-  return bCloseDialog;
-}
-
-// Go over all the settings and set their values according to the values of the GUI components
-bool CGUIDialogPluginSettings::SaveSettings(void)
-{
-  // Retrieve all the values from the GUI components and put them in the model
-  int controlId = CONTROL_START_CONTROL;
-  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
-  while (setting)
-  {
-    CStdString id;
-    if (setting->Attribute("id"))
-      id = setting->Attribute("id");
-    const char *type = setting->Attribute("type");
-    const CGUIControl* control = GetControl(controlId);
-
-    CStdString value;
-    switch (control->GetControlType())
-    {
-      case CGUIControl::GUICONTROL_BUTTON:
-        value = ((CGUIButtonControl*) control)->GetLabel2();
-        break;
-      case CGUIControl::GUICONTROL_RADIO:
-        value = ((CGUIRadioButtonControl*) control)->IsSelected() ? "true" : "false";
-        break;
-      case CGUIControl::GUICONTROL_SPINEX:
-        if (strcmpi(type, "fileenum") == 0 || strcmpi(type, "labelenum") == 0)
-          value = ((CGUISpinControlEx*) control)->GetLabel();
-        else
-          value.Format("%i", ((CGUISpinControlEx*) control)->GetValue());
-        break;
-      default:
-        break;
-    }
-    m_settings.Set(id, value);
-
-    setting = setting->NextSiblingElement("setting");
-    controlId++;
-  }
-  return true;
-}
-
-void CGUIDialogPluginSettings::FreeControls()
-{
-  // clear the category group
-  CGUIControlGroupList *control = (CGUIControlGroupList *)GetControl(CONTROL_AREA);
-  if (control)
-  {
-    control->FreeResources();
-    control->ClearAll();
-  }
-}
-
-void CGUIDialogPluginSettings::CreateControls()
-{
-  CGUISpinControlEx *pOriginalSpin = (CGUISpinControlEx*)GetControl(CONTROL_DEFAULT_SPIN);
-  CGUIRadioButtonControl *pOriginalRadioButton = (CGUIRadioButtonControl *)GetControl(CONTROL_DEFAULT_RADIOBUTTON);
-  CGUIButtonControl *pOriginalButton = (CGUIButtonControl *)GetControl(CONTROL_DEFAULT_BUTTON);
-  CGUIImage *pOriginalImage = (CGUIImage *)GetControl(CONTROL_DEFAULT_SEPARATOR);
-
-  if (!pOriginalSpin || !pOriginalRadioButton || !pOriginalButton || !pOriginalImage)
-    return;
-
-  pOriginalSpin->SetVisible(false);
-  pOriginalRadioButton->SetVisible(false);
-  pOriginalButton->SetVisible(false);
-  pOriginalImage->SetVisible(false);
-
-  // clear the category group
-  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_AREA);
-  if (!group)
-    return;
-
-  // set our dialog heading
-  SET_CONTROL_LABEL(CONTROL_HEADING_LABEL, m_strHeading);
-
-  // Create our base path, used for type "fileenum" settings
-  CStdString basepath = "Q:\\plugins\\";
-  CUtil::AddFileToFolder(basepath, m_url.GetHostName(), basepath);
-  CUtil::AddFileToFolder(basepath, m_url.GetFileName(), basepath);
-  // Replace the / at end, GetFileName() leaves a / at the end
-  basepath.Replace("/", "\\");
-
-  CGUIControl* pControl = NULL;
-  int controlId = CONTROL_START_CONTROL;
-  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
-  while (setting)
-  {
-    const char *type = setting->Attribute("type");
-    const char *id = setting->Attribute("id");
-    CStdString values;
-    if (setting->Attribute("values"))
-      values = setting->Attribute("values");
-    CStdString lvalues;
-    if (setting->Attribute("lvalues"))
-      lvalues = setting->Attribute("lvalues");
-    CStdString entries;
-    if (setting->Attribute("entries"))
-      entries = setting->Attribute("entries");
-    CStdString label;
-    if (setting->Attribute("label") && atoi(setting->Attribute("label")) > 0)
-      label.Format("$LOCALIZE[%s]", setting->Attribute("label"));
-    else
-      label = setting->Attribute("label");
-
-    if (strcmpi(type, "text") == 0 || strcmpi(type, "ipaddress") == 0 ||
-      strcmpi(type, "integer") == 0 || strcmpi(type, "video") == 0 ||
-      strcmpi(type, "music") == 0 || strcmpi(type, "pictures") == 0 ||
-      strcmpi(type, "folder") == 0 || strcmpi(type, "programs") == 0 ||
-      strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0)
-    {
-      pControl = new CGUIButtonControl(*pOriginalButton);
-      if (!pControl) return;
-      ((CGUIButtonControl *)pControl)->SettingsCategorySetTextAlign(XBFONT_CENTER_Y);
-      ((CGUIButtonControl *)pControl)->SetLabel(label);
-      if (id)
-        ((CGUIButtonControl *)pControl)->SetLabel2(m_settings.Get(id));
-    }
-    else if (strcmpi(type, "bool") == 0)
-    {
-      pControl = new CGUIRadioButtonControl(*pOriginalRadioButton);
-      if (!pControl) return;
-      ((CGUIRadioButtonControl *)pControl)->SetLabel(label);
-      ((CGUIRadioButtonControl *)pControl)->SetSelected(m_settings.Get(id) == "true");
-    }
-    else if (strcmpi(type, "enum") == 0 || strcmpi(type, "labelenum") == 0)
-    {
-      vector<CStdString> valuesVec;
-      vector<CStdString> entryVec;
-
-      pControl = new CGUISpinControlEx(*pOriginalSpin);
-      if (!pControl) return;
-      ((CGUISpinControlEx *)pControl)->SetText(label);
-
-      if (!lvalues.IsEmpty())
-        CUtil::Tokenize(lvalues, valuesVec, "|");
-      else
-        CUtil::Tokenize(values, valuesVec, "|");
-      if (!entries.IsEmpty())
-        CUtil::Tokenize(entries, entryVec, "|");
-      for (unsigned int i = 0; i < valuesVec.size(); i++)
-      {
-        int iAdd = i;
-        if (entryVec.size() > i)
-          iAdd = atoi(entryVec[i]);
-        if (!lvalues.IsEmpty())
-        {
-          CStdString replace = g_localizeStringsTemp.Get(atoi(valuesVec[i]));
-          if (replace.IsEmpty())
-            replace = g_localizeStrings.Get(atoi(valuesVec[i]));
-          ((CGUISpinControlEx *)pControl)->AddLabel(replace, iAdd);
-        }
-        else
-          ((CGUISpinControlEx *)pControl)->AddLabel(valuesVec[i], iAdd);
-      }
-      if (strcmpi(type, "labelenum") == 0)
-      { // need to run through all our settings and find the one that matches
-        ((CGUISpinControlEx*) pControl)->SetValueFromLabel(m_settings.Get(id));
-      }
-      else
-        ((CGUISpinControlEx*) pControl)->SetValue(atoi(m_settings.Get(id)));
-
-    }
-    else if (strcmpi(type, "fileenum") == 0)
-    {
-      pControl = new CGUISpinControlEx(*pOriginalSpin);
-      if (!pControl) return;
-      ((CGUISpinControlEx *)pControl)->SetText(label);
-
-      //find Folders...
-      DIRECTORY::CHDDirectory directory;
-      CFileItemList items;
-      CStdString enumpath;
-      CUtil::AddFileToFolder(basepath, values, enumpath);
-      CStdString mask;
-      if (setting->Attribute("mask"))
-        mask = setting->Attribute("mask");
-      if (!mask.IsEmpty())
-        directory.SetMask(mask);
-      directory.GetDirectory(enumpath, items);
-
-      int iItem = 0;
-      for (int i = 0; i < items.Size(); ++i)
-      {
-        CFileItemPtr pItem = items[i];
-        if ((mask.Equals("/") && pItem->m_bIsFolder) || !pItem->m_bIsFolder)
-        {
-          ((CGUISpinControlEx *)pControl)->AddLabel(pItem->GetLabel(), iItem);
-          if (pItem->GetLabel().Equals(m_settings.Get(id)))
-            ((CGUISpinControlEx *)pControl)->SetValue(iItem);
-          iItem++;
-        }
-      }
-    }
-    else if (strcmpi(type, "sep") == 0 && pOriginalImage)
-      pControl = new CGUIImage(*pOriginalImage);
-
-    if (pControl)
-    {
-      pControl->SetWidth(group->GetWidth());
-      pControl->SetVisible(true);
-      pControl->SetID(controlId);
-      pControl->AllocResources();
-      group->AddControl(pControl);
-      pControl = NULL;
-    }
-
-    setting = setting->NextSiblingElement("setting");
-    controlId++;
-  }
-  EnableControls();
-}
-
-// Go over all the settings and set their enabled condition according to the values of the enabled attribute
-void CGUIDialogPluginSettings::EnableControls()
-{
-  int controlId = CONTROL_START_CONTROL;
-  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
-  while (setting)
-  {
-    const CGUIControl* control = GetControl(controlId);
-    if (control)
-    {
-      // set enable status
-      if (setting->Attribute("enable"))
-        ((CGUIControl*) control)->SetEnabled(GetCondition(setting->Attribute("enable"), controlId));
-      else
-        ((CGUIControl*) control)->SetEnabled(true);
-      // set visible status
-      if (setting->Attribute("visible"))
-        ((CGUIControl*) control)->SetVisible(GetCondition(setting->Attribute("visible"), controlId));
-      else
-        ((CGUIControl*) control)->SetVisible(true);
-    }
-    setting = setting->NextSiblingElement("setting");
-    controlId++;
-  }
-}
-
-bool CGUIDialogPluginSettings::GetCondition(const CStdString &condition, const int controlId)
-{
-  if (condition.IsEmpty()) return true;
-
-  bool bCondition = true;
-  bool bCompare = true;
-  vector<CStdString> conditionVec;
-  if (condition.Find("+") >= 0)
-    CUtil::Tokenize(condition, conditionVec, "+");
-  else
-  {
-    bCondition = false;
-    bCompare = false;
+          }
+        }
+        break;
+      }
+    }
+    setting = setting->NextSiblingElement("setting");
+    controlId++;
+  }
+  EnableControls();
+  return bCloseDialog;
+}
+
+// Go over all the settings and set their values according to the values of the GUI components
+bool CGUIDialogPluginSettings::SaveSettings(void)
+{
+  // Retrieve all the values from the GUI components and put them in the model
+  int controlId = CONTROL_START_CONTROL;
+  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
+  while (setting)
+  {
+    CStdString id;
+    if (setting->Attribute("id"))
+      id = setting->Attribute("id");
+    const char *type = setting->Attribute("type");
+    const CGUIControl* control = GetControl(controlId);
+
+    CStdString value;
+    switch (control->GetControlType())
+    {
+      case CGUIControl::GUICONTROL_BUTTON:
+        value = ((CGUIButtonControl*) control)->GetLabel2();
+        break;
+      case CGUIControl::GUICONTROL_RADIO:
+        value = ((CGUIRadioButtonControl*) control)->IsSelected() ? "true" : "false";
+        break;
+      case CGUIControl::GUICONTROL_SPINEX:
+        if (strcmpi(type, "fileenum") == 0 || strcmpi(type, "labelenum") == 0)
+          value = ((CGUISpinControlEx*) control)->GetLabel();
+        else
+          value.Format("%i", ((CGUISpinControlEx*) control)->GetValue());
+        break;
+      default:
+        break;
+    }
+    m_settings.Set(id, value);
+
+    setting = setting->NextSiblingElement("setting");
+    controlId++;
+  }
+  return true;
+}
+
+void CGUIDialogPluginSettings::FreeControls()
+{
+  // clear the category group
+  CGUIControlGroupList *control = (CGUIControlGroupList *)GetControl(CONTROL_AREA);
+  if (control)
+  {
+    control->FreeResources();
+    control->ClearAll();
+  }
+}
+
+void CGUIDialogPluginSettings::CreateControls()
+{
+  CGUISpinControlEx *pOriginalSpin = (CGUISpinControlEx*)GetControl(CONTROL_DEFAULT_SPIN);
+  CGUIRadioButtonControl *pOriginalRadioButton = (CGUIRadioButtonControl *)GetControl(CONTROL_DEFAULT_RADIOBUTTON);
+  CGUIButtonControl *pOriginalButton = (CGUIButtonControl *)GetControl(CONTROL_DEFAULT_BUTTON);
+  CGUIImage *pOriginalImage = (CGUIImage *)GetControl(CONTROL_DEFAULT_SEPARATOR);
+
+  if (!pOriginalSpin || !pOriginalRadioButton || !pOriginalButton || !pOriginalImage)
+    return;
+
+  pOriginalSpin->SetVisible(false);
+  pOriginalRadioButton->SetVisible(false);
+  pOriginalButton->SetVisible(false);
+  pOriginalImage->SetVisible(false);
+
+  // clear the category group
+  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_AREA);
+  if (!group)
+    return;
+
+  // set our dialog heading
+  SET_CONTROL_LABEL(CONTROL_HEADING_LABEL, m_strHeading);
+
+  // Create our base path, used for type "fileenum" settings
+  CStdString basepath = "Q:\\plugins\\";
+  CUtil::AddFileToFolder(basepath, m_url.GetHostName(), basepath);
+  CUtil::AddFileToFolder(basepath, m_url.GetFileName(), basepath);
+  // Replace the / at end, GetFileName() leaves a / at the end
+  basepath.Replace("/", "\\");
+
+  CGUIControl* pControl = NULL;
+  int controlId = CONTROL_START_CONTROL;
+  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
+  while (setting)
+  {
+    const char *type = setting->Attribute("type");
+    const char *id = setting->Attribute("id");
+    CStdString values;
+    if (setting->Attribute("values"))
+      values = setting->Attribute("values");
+    CStdString lvalues;
+    if (setting->Attribute("lvalues"))
+      lvalues = setting->Attribute("lvalues");
+    CStdString entries;
+    if (setting->Attribute("entries"))
+      entries = setting->Attribute("entries");
+    CStdString label;
+    if (setting->Attribute("label") && atoi(setting->Attribute("label")) > 0)
+      label.Format("$LOCALIZE[%s]", setting->Attribute("label"));
+    else
+      label = setting->Attribute("label");
+
+    if (strcmpi(type, "text") == 0 || strcmpi(type, "ipaddress") == 0 ||
+      strcmpi(type, "integer") == 0 || strcmpi(type, "video") == 0 ||
+      strcmpi(type, "music") == 0 || strcmpi(type, "pictures") == 0 ||
+      strcmpi(type, "folder") == 0 || strcmpi(type, "programs") == 0 ||
+      strcmpi(type, "files") == 0 || strcmpi(type, "action") == 0)
+    {
+      pControl = new CGUIButtonControl(*pOriginalButton);
+      if (!pControl) return;
+      ((CGUIButtonControl *)pControl)->SettingsCategorySetTextAlign(XBFONT_CENTER_Y);
+      ((CGUIButtonControl *)pControl)->SetLabel(label);
+      if (id)
+        ((CGUIButtonControl *)pControl)->SetLabel2(m_settings.Get(id));
+    }
+    else if (strcmpi(type, "bool") == 0)
+    {
+      pControl = new CGUIRadioButtonControl(*pOriginalRadioButton);
+      if (!pControl) return;
+      ((CGUIRadioButtonControl *)pControl)->SetLabel(label);
+      ((CGUIRadioButtonControl *)pControl)->SetSelected(m_settings.Get(id) == "true");
+    }
+    else if (strcmpi(type, "enum") == 0 || strcmpi(type, "labelenum") == 0)
+    {
+      vector<CStdString> valuesVec;
+      vector<CStdString> entryVec;
+
+      pControl = new CGUISpinControlEx(*pOriginalSpin);
+      if (!pControl) return;
+      ((CGUISpinControlEx *)pControl)->SetText(label);
+
+      if (!lvalues.IsEmpty())
+        CUtil::Tokenize(lvalues, valuesVec, "|");
+      else
+        CUtil::Tokenize(values, valuesVec, "|");
+      if (!entries.IsEmpty())
+        CUtil::Tokenize(entries, entryVec, "|");
+      for (unsigned int i = 0; i < valuesVec.size(); i++)
+      {
+        int iAdd = i;
+        if (entryVec.size() > i)
+          iAdd = atoi(entryVec[i]);
+        if (!lvalues.IsEmpty())
+        {
+          CStdString replace = g_localizeStringsTemp.Get(atoi(valuesVec[i]));
+          if (replace.IsEmpty())
+            replace = g_localizeStrings.Get(atoi(valuesVec[i]));
+          ((CGUISpinControlEx *)pControl)->AddLabel(replace, iAdd);
+        }
+        else
+          ((CGUISpinControlEx *)pControl)->AddLabel(valuesVec[i], iAdd);
+      }
+      if (strcmpi(type, "labelenum") == 0)
+      { // need to run through all our settings and find the one that matches
+        ((CGUISpinControlEx*) pControl)->SetValueFromLabel(m_settings.Get(id));
+      }
+      else
+        ((CGUISpinControlEx*) pControl)->SetValue(atoi(m_settings.Get(id)));
+
+    }
+    else if (strcmpi(type, "fileenum") == 0)
+    {
+      pControl = new CGUISpinControlEx(*pOriginalSpin);
+      if (!pControl) return;
+      ((CGUISpinControlEx *)pControl)->SetText(label);
+
+      //find Folders...
+      DIRECTORY::CHDDirectory directory;
+      CFileItemList items;
+      CStdString enumpath;
+      CUtil::AddFileToFolder(basepath, values, enumpath);
+      CStdString mask;
+      if (setting->Attribute("mask"))
+        mask = setting->Attribute("mask");
+      if (!mask.IsEmpty())
+        directory.SetMask(mask);
+      directory.GetDirectory(enumpath, items);
+
+      int iItem = 0;
+      for (int i = 0; i < items.Size(); ++i)
+      {
+        CFileItemPtr pItem = items[i];
+        if ((mask.Equals("/") && pItem->m_bIsFolder) || !pItem->m_bIsFolder)
+        {
+          ((CGUISpinControlEx *)pControl)->AddLabel(pItem->GetLabel(), iItem);
+          if (pItem->GetLabel().Equals(m_settings.Get(id)))
+            ((CGUISpinControlEx *)pControl)->SetValue(iItem);
+          iItem++;
+        }
+      }
+    }
+    else if (strcmpi(type, "sep") == 0 && pOriginalImage)
+      pControl = new CGUIImage(*pOriginalImage);
+
+    if (pControl)
+    {
+      pControl->SetWidth(group->GetWidth());
+      pControl->SetVisible(true);
+      pControl->SetID(controlId);
+      pControl->AllocResources();
+      group->AddControl(pControl);
+      pControl = NULL;
+    }
+
+    setting = setting->NextSiblingElement("setting");
+    controlId++;
+  }
+  EnableControls();
+}
+
+// Go over all the settings and set their enabled condition according to the values of the enabled attribute
+void CGUIDialogPluginSettings::EnableControls()
+{
+  int controlId = CONTROL_START_CONTROL;
+  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
+  while (setting)
+  {
+    const CGUIControl* control = GetControl(controlId);
+    if (control)
+    {
+      // set enable status
+      if (setting->Attribute("enable"))
+        ((CGUIControl*) control)->SetEnabled(GetCondition(setting->Attribute("enable"), controlId));
+      else
+        ((CGUIControl*) control)->SetEnabled(true);
+      // set visible status
+      if (setting->Attribute("visible"))
+        ((CGUIControl*) control)->SetVisible(GetCondition(setting->Attribute("visible"), controlId));
+      else
+        ((CGUIControl*) control)->SetVisible(true);
+    }
+    setting = setting->NextSiblingElement("setting");
+    controlId++;
+  }
+}
+
+bool CGUIDialogPluginSettings::GetCondition(const CStdString &condition, const int controlId)
+{
+  if (condition.IsEmpty()) return true;
+
+  bool bCondition = true;
+  bool bCompare = true;
+  vector<CStdString> conditionVec;
+  if (condition.Find("+") >= 0)
+    CUtil::Tokenize(condition, conditionVec, "+");
+  else
+  {
+    bCondition = false;
+    bCompare = false;
     CUtil::Tokenize(condition, conditionVec, "|");
   }
-
-  for (unsigned int i = 0; i < conditionVec.size(); i++)
-  {
-    vector<CStdString> condVec;
-    if (!TranslateSingleString(conditionVec[i], condVec)) continue;
-
-    const CGUIControl* control2 = GetControl(controlId + atoi(condVec[1]));
-
-    CStdString value;
-    switch (control2->GetControlType())
-    {
-      case CGUIControl::GUICONTROL_BUTTON:
-        value = ((CGUIButtonControl*) control2)->GetLabel2();
-        break;
-      case CGUIControl::GUICONTROL_RADIO:
-        value = ((CGUIRadioButtonControl*) control2)->IsSelected() ? "true" : "false";
-        break;
-      case CGUIControl::GUICONTROL_SPINEX:
-        value.Format("%i", ((CGUISpinControlEx*) control2)->GetValue());
-        break;
-      default:
-        break;
-    }
-    if (condVec[0].Equals("eq"))
-      if (bCompare)
-        bCondition &= value.Equals(condVec[2]);
-      else
-        bCondition |= value.Equals(condVec[2]);
-    else if (condVec[0].Equals("!eq"))
-      if (bCompare)
-        bCondition &= !value.Equals(condVec[2]);
-      else
-        bCondition |= !value.Equals(condVec[2]);
-    else if (condVec[0].Equals("gt"))
-      if (bCompare)
-        bCondition &= (atoi(value) > atoi(condVec[2]));
-      else
-        bCondition |= (atoi(value) > atoi(condVec[2]));
-    else if (condVec[0].Equals("lt"))
-      if (bCompare)
-        bCondition &= (atoi(value) < atoi(condVec[2]));
-      else
-        bCondition |= (atoi(value) < atoi(condVec[2]));
-  }
-  return bCondition;
-}
-
-bool CGUIDialogPluginSettings::TranslateSingleString(const CStdString &strCondition, vector<CStdString> &condVec)
-{
-  CStdString strTest = strCondition;
-  strTest.ToLower();
-  strTest.TrimLeft(" ");
-  strTest.TrimRight(" ");
-
-  int pos1 = strTest.Find("(");
-  int pos2 = strTest.Find(",");
-  int pos3 = strTest.Find(")");
-  if (pos1 >= 0 && pos2 > pos1 && pos3 > pos2)
-  {
-    condVec.push_back(strTest.Left(pos1));
-    condVec.push_back(strTest.Mid(pos1 + 1, pos2 - pos1 - 1));
-    condVec.push_back(strTest.Mid(pos2 + 1, pos3 - pos2 - 1));
-    return true;
-  }
-  return false;
-}
-
-// Go over all the settings and set their default values
-void CGUIDialogPluginSettings::SetDefaults()
-{
-  int controlId = CONTROL_START_CONTROL;
-  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
-  while (setting)
-  {
-    const CGUIControl* control = GetControl(controlId);
-    if (control)
-    {
-      CStdString value;
-      switch (control->GetControlType())
-      {
-        case CGUIControl::GUICONTROL_BUTTON:
-          if (setting->Attribute("default") && setting->Attribute("id"))
-            ((CGUIButtonControl*) control)->SetLabel2(setting->Attribute("default"));
-          else
-            ((CGUIButtonControl*) control)->SetLabel2("");
-          break;
-        case CGUIControl::GUICONTROL_RADIO:
-          if (setting->Attribute("default"))
-            ((CGUIRadioButtonControl*) control)->SetSelected(strcmpi(setting->Attribute("default"), "true") == 0);
-          else
-            ((CGUIRadioButtonControl*) control)->SetSelected(false);
-          break;
-        case CGUIControl::GUICONTROL_SPINEX:
-          {
-            if (setting->Attribute("default"))
-            {
-              if (strcmpi(setting->Attribute("type"), "fileenum") == 0 || strcmpi(setting->Attribute("type"), "labelenum") == 0)
-              { // need to run through all our settings and find the one that matches
-                  ((CGUISpinControlEx*) control)->SetValueFromLabel(setting->Attribute("default"));
-              }
-              else
-                ((CGUISpinControlEx*) control)->SetValue(atoi(setting->Attribute("default")));
-            }
-            else
-              ((CGUISpinControlEx*) control)->SetValue(0);
-          }
-          break;
-        default:
-          break;
-      }
-    }
-    setting = setting->NextSiblingElement("setting");
-    controlId++;
-  }
-  EnableControls();
-}
-
-CURL CGUIDialogPluginSettings::m_url;
 
+  for (unsigned int i = 0; i < conditionVec.size(); i++)
+  {
+    vector<CStdString> condVec;
+    if (!TranslateSingleString(conditionVec[i], condVec)) continue;
+
+    const CGUIControl* control2 = GetControl(controlId + atoi(condVec[1]));
+
+    CStdString value;
+    switch (control2->GetControlType())
+    {
+      case CGUIControl::GUICONTROL_BUTTON:
+        value = ((CGUIButtonControl*) control2)->GetLabel2();
+        break;
+      case CGUIControl::GUICONTROL_RADIO:
+        value = ((CGUIRadioButtonControl*) control2)->IsSelected() ? "true" : "false";
+        break;
+      case CGUIControl::GUICONTROL_SPINEX:
+        value.Format("%i", ((CGUISpinControlEx*) control2)->GetValue());
+        break;
+      default:
+        break;
+    }
+
+    if (condVec[0].Equals("eq"))
+    {
+      if (bCompare)
+        bCondition &= value.Equals(condVec[2]);
+      else
+        bCondition |= value.Equals(condVec[2]);
+    }
+    else if (condVec[0].Equals("!eq"))
+    {
+      if (bCompare)
+        bCondition &= !value.Equals(condVec[2]);
+      else
+        bCondition |= !value.Equals(condVec[2]);
+    }
+    else if (condVec[0].Equals("gt"))
+    {
+      if (bCompare)
+        bCondition &= (atoi(value) > atoi(condVec[2]));
+      else
+        bCondition |= (atoi(value) > atoi(condVec[2]));
+    }
+    else if (condVec[0].Equals("lt"))
+    {
+      if (bCompare)
+        bCondition &= (atoi(value) < atoi(condVec[2]));
+      else
+        bCondition |= (atoi(value) < atoi(condVec[2]));
+    }
+  }
+  return bCondition;
+}
+
+bool CGUIDialogPluginSettings::TranslateSingleString(const CStdString &strCondition, vector<CStdString> &condVec)
+{
+  CStdString strTest = strCondition;
+  strTest.ToLower();
+  strTest.TrimLeft(" ");
+  strTest.TrimRight(" ");
+
+  int pos1 = strTest.Find("(");
+  int pos2 = strTest.Find(",");
+  int pos3 = strTest.Find(")");
+  if (pos1 >= 0 && pos2 > pos1 && pos3 > pos2)
+  {
+    condVec.push_back(strTest.Left(pos1));
+    condVec.push_back(strTest.Mid(pos1 + 1, pos2 - pos1 - 1));
+    condVec.push_back(strTest.Mid(pos2 + 1, pos3 - pos2 - 1));
+    return true;
+  }
+  return false;
+}
+
+// Go over all the settings and set their default values
+void CGUIDialogPluginSettings::SetDefaults()
+{
+  int controlId = CONTROL_START_CONTROL;
+  TiXmlElement *setting = m_settings.GetPluginRoot()->FirstChildElement("setting");
+  while (setting)
+  {
+    const CGUIControl* control = GetControl(controlId);
+    if (control)
+    {
+      CStdString value;
+      switch (control->GetControlType())
+      {
+        case CGUIControl::GUICONTROL_BUTTON:
+          if (setting->Attribute("default") && setting->Attribute("id"))
+            ((CGUIButtonControl*) control)->SetLabel2(setting->Attribute("default"));
+          else
+            ((CGUIButtonControl*) control)->SetLabel2("");
+          break;
+        case CGUIControl::GUICONTROL_RADIO:
+          if (setting->Attribute("default"))
+            ((CGUIRadioButtonControl*) control)->SetSelected(strcmpi(setting->Attribute("default"), "true") == 0);
+          else
+            ((CGUIRadioButtonControl*) control)->SetSelected(false);
+          break;
+        case CGUIControl::GUICONTROL_SPINEX:
+          {
+            if (setting->Attribute("default"))
+            {
+              if (strcmpi(setting->Attribute("type"), "fileenum") == 0 || strcmpi(setting->Attribute("type"), "labelenum") == 0)
+              { // need to run through all our settings and find the one that matches
+                  ((CGUISpinControlEx*) control)->SetValueFromLabel(setting->Attribute("default"));
+              }
+              else
+                ((CGUISpinControlEx*) control)->SetValue(atoi(setting->Attribute("default")));
+            }
+            else
+              ((CGUISpinControlEx*) control)->SetValue(0);
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    setting = setting->NextSiblingElement("setting");
+    controlId++;
+  }
+  EnableControls();
+}
+
+CURL CGUIDialogPluginSettings::m_url;
+

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -62,7 +62,7 @@
     if (file.IsPicture() && !(file.IsZIP() || file.IsRAR() || file.IsCBR() || file.IsCBZ())) // ignore non-pictures
     { // check for filename only (i.e. lookup in skin/media/)
       CStdString loadPath;
-      if (path.FindOneOf("/\\") == CStdString::npos)
+      if ((size_t)path.FindOneOf("/\\") == CStdString::npos)
       {
         loadPath = CUtil::AddFileToFolder(g_graphicsContext.GetMediaDir(), "media");
         loadPath = CUtil::AddFileToFolder(loadPath, path);

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -4108,10 +4108,11 @@
       }
     }
     break;
+
+    // stack other types later
+    default:
+      break;
   }
-  // stack other types later
-
-  return;
 }
 
 bool CVideoDatabase::GetEpisodesNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idYear, long idActor, long idDirector, long idShow, long idSeason)

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c	2008-07-06 14:32:26 UTC (rev 13969)
@@ -38,6 +38,10 @@
 typedef off64_t   __off64_t;
 #endif
 
+#ifdef _LINUX
+#define _stat stat
+#endif
+
 void* dllmalloc(size_t );
 void* dllcalloc( size_t , size_t );
 void* dllrealloc(void*, size_t);

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c	2008-07-06 14:32:26 UTC (rev 13969)
@@ -38,7 +38,6 @@
     __int64 offset;
 };
 
-extern struct alac_file;
 extern struct alac_file *create_alac(int samplesize, int numchannels);
 extern void alac_set_info(struct alac_file *alac, char *inputbuffer);
 extern void decode_frame(struct alac_file *alac, unsigned char *inbuffer,void *outbuffer, int *outputsize);
@@ -505,7 +504,7 @@
   do {
     char *pName=NULL;
 
-    if (mp4ff_meta_get_by_index(st->mp4file, i, (char**)&pName, &pValue))
+    if (mp4ff_meta_get_by_index(st->mp4file, i, (char**)&pName, (char**)&pValue))
     {
       if (strcmp(name, pName)==0)
       {

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h	2008-07-06 14:32:26 UTC (rev 13969)
@@ -10,9 +10,19 @@
 #else
 #define AACAPI
 #include <inttypes.h>
+
+#if !defined(__int8)
 #define __int8 char
+#endif
+
+#if !defined(__int32)
 #define __int32 long
+#endif
+
+#if !defined(__int64)
 #define __int64 long long
+#endif
+
 typedef long LONG_PTR;
 typedef unsigned char BYTE;
 #include <string.h>

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-builder.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-builder.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-builder.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -37,6 +37,7 @@
  ***************************************************************************/
 
 #include <stdio.h>
+#include <cstring>
 
 #include "config.h"
 #ifdef HAVE_EXCEPTIONS

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid.cpp	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid.cpp	2008-07-06 14:32:26 UTC (rev 13969)
@@ -16,6 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstring>
 #include "config.h"
 
 #ifdef HAVE_EXCEPTIONS

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/compile.c
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/compile.c	2008-07-06 10:36:49 UTC (rev 13968)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/compile.c	2008-07-06 14:32:26 UTC (rev 13969)
@@ -1100,20 +1100,6 @@
 		fprintf(stderr, "  ");
 }
 
-static void
-dump(node *n, int pad, int depth)
-{
-	int i;
-	if (depth == 0)
-	    return;
-	do_pad(pad);
-	fprintf(stderr, "%d: %s\n", TYPE(n), STR(n));
-	if (depth > 0)
-	    depth--;
-	for (i = 0; i < NCH(n); ++i)
-		dump(CHILD(n, i), pad + 1, depth);
-}
-
 static int
 com_init(struct compiling *c, const char *filename)
 {


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

Revision: 13990
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13990&view=rev
Author:   malloc64
Date:     2008-07-09 02:57:13 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
OSX: Trying to get OSX to compile with ./configure, make

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.include.in
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile

Modified: branches/linuxport/XBMC/Makefile.include.in
===================================================================
--- branches/linuxport/XBMC/Makefile.include.in	2008-07-09 03:31:55 UTC (rev 13989)
+++ branches/linuxport/XBMC/Makefile.include.in	2008-07-09 09:57:13 UTC (rev 13990)
@@ -1,6 +1,7 @@
 AR=ar
 ARFLAGS=rus
 RM=rm -f
+abs_top_srcdir=@abs_top_srcdir@
 prefix=@prefix@
 CXX=@CXX@
 CC=@CC@

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-09 03:31:55 UTC (rev 13989)
+++ branches/linuxport/XBMC/configure	2008-07-09 09:57:13 UTC (rev 13990)
@@ -3340,7 +3340,7 @@
 
    LDFLAGS="-L/System/Library/Frameworks/OpenGL.framework/Libraries -L/opt/local/lib -L/opt/local/lib/mysql5/mysql"
 
-   INCLUDES="-I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include/mysql5 -I../xbmc -I../xbmc/lib -I../xbmc/osx -Ixbmc/lib -Ixbmc/osx -Ilib/libffmpeg-OSX/libavutil -I../xbmc/lib/libffmpeg-OSX -Ilib -Iosx -I."
+   INCLUDES="-I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include/mysql5 -I\$(abs_top_srcdir)/xbmc -I\$(abs_top_srcdir)/xbmc/lib -I\$(abs_top_srcdir)/xbmc/osx -I\$(abs_top_srcdir)/xbmc/lib/libffmpeg-OSX/libavutil -I\$(abs_top_srcdir)/xbmc/lib/libffmpeg-OSX -I."
 
 fi
 
@@ -9914,13 +9914,11 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }
@@ -9960,13 +9958,11 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-09 03:31:55 UTC (rev 13989)
+++ branches/linuxport/XBMC/configure.in	2008-07-09 09:57:13 UTC (rev 13990)
@@ -73,7 +73,7 @@
    AC_SUBST(CFLAGS, "-L/System/Library/Frameworks/OpenGL.framework/Libraries -L/opt/local/lib -L/opt/local/lib/mysql5/mysql -I/opt/local/include")
    AC_SUBST(CXXFLAGS, "-L/System/Library/Frameworks/OpenGL.framework/Libraries -L/opt/local/lib -L/opt/local/lib/mysql5/mysql -I/opt/local/include")
    AC_SUBST(LDFLAGS, "-L/System/Library/Frameworks/OpenGL.framework/Libraries -L/opt/local/lib -L/opt/local/lib/mysql5/mysql")
-   AC_SUBST(INCLUDES, "-I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include/mysql5 -I../xbmc -I../xbmc/lib -I../xbmc/osx -Ixbmc/lib -Ixbmc/osx -Ilib/libffmpeg-OSX/libavutil -I../xbmc/lib/libffmpeg-OSX -Ilib -Iosx -I.")
+   AC_SUBST(INCLUDES, "-I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include/mysql5 -I\$(abs_top_srcdir)/xbmc -I\$(abs_top_srcdir)/xbmc/lib -I\$(abs_top_srcdir)/xbmc/osx -I\$(abs_top_srcdir)/xbmc/lib/libffmpeg-OSX/libavutil -I\$(abs_top_srcdir)/xbmc/lib/libffmpeg-OSX -I.")
 fi
 
 # Checks for boost headers using g++ instead of gcc

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile	2008-07-09 03:31:55 UTC (rev 13989)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile	2008-07-09 09:57:13 UTC (rev 13990)
@@ -10,10 +10,10 @@
 -include Makefile.depend
 
 wrapper.o : wrapper.c
-	gcc -fPIC -c -g -D_LINUX -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
+	gcc -fPIC -c -g -D_LINUX -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 $(INCLUDES) $< -o $@
 
 exports_python_linux.o : exports_python_linux.cpp
-	g++ -c -g -D_LINUX -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -I. -I../../../ -I../../../linux -I../../../../guilib $< -o $@
+	g++ -c -g -D_LINUX -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 $(INCLUDES) $< -o $@
 
 wrapper.def : wrapper.c
 	(echo -n "-Wl"; grep __wrap wrapper.c | grep -v bash | sed "s/.*__wrap_//g" | sed "s/(.*//g" | awk '{printf(",-wrap,%s",$$0);}') > wrapper.def


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

Revision: 13991
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13991&view=rev
Author:   charlydoes
Date:     2008-07-09 10:43:54 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
[WIN32] added: very basic "IR Server Suite" support. *Should* work for mce-remotes with the added IRSSmap.xml

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/guilib_win32.vcproj
    branches/linuxport/XBMC/guilib/system.h
    branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp
    branches/linuxport/XBMC/xbmc/XBApplicationEx.h

Added Paths:
-----------
    branches/linuxport/XBMC/guilib/common/IRServerSuite/
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
    branches/linuxport/XBMC/userdata/IRSSmap.xml

Added: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp	2008-07-09 17:43:54 UTC (rev 13991)
@@ -0,0 +1,417 @@
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "include.h"
+#include "IRServerSuite.h"
+#include "IrssMessage.h"
+#include "ButtonTranslator.h"
+#include "log.h"
+#include "Settings.h"
+
+#define IRSS_PORT 24000
+
+CRemoteControl g_RemoteControl;
+
+CRemoteControl::CRemoteControl()
+{
+  m_bInitialized = false;
+  m_isConnecting = false;
+  Reset();
+}
+
+CRemoteControl::~CRemoteControl()
+{
+  Close();
+}
+
+void CRemoteControl::Close()
+{
+  if (m_socket)
+  {
+    if (m_bInitialized)
+    {
+      m_bInitialized = false;
+      CIrssMessage message(IRSSMT_UnregisterClient, IRSSMF_Request | IRSSMF_ForceNotRespond);
+      SendPacket(message);
+    }
+    shutdown(m_socket, SD_BOTH);
+    closesocket(m_socket);
+  }
+}
+
+void CRemoteControl::Reset()
+{
+  m_isHolding = false;
+  m_button = 0;
+}
+
+bool CRemoteControl::Initialize()
+{
+  //trying to connect when there is nothing to connect to is kinda slow so kick it off in a thread.
+  Create();
+  return true;
+}
+
+void CRemoteControl::Process()
+{
+  Connect();
+}
+
+bool CRemoteControl::Connect()
+{
+  m_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (m_socket == INVALID_SOCKET)
+  {
+    return false; //Couldn't create the socket
+  }  
+  // Get the local host information
+  hostent* localHost = gethostbyname("");
+  char* localIP = inet_ntoa (*(struct in_addr *)*localHost->h_addr_list);
+
+  SOCKADDR_IN target;
+  memset(&target, 0, sizeof(SOCKADDR_IN));
+
+  target.sin_family = AF_INET;
+  target.sin_addr.s_addr = inet_addr(localIP);
+  target.sin_port = htons (IRSS_PORT);
+
+  if (connect(m_socket, (SOCKADDR *)&target, sizeof(target)) == SOCKET_ERROR)
+  {
+    return false; //Couldn't connect, irss not available
+  }
+
+  u_long iMode = 1; //non-blocking
+  ioctlsocket(m_socket, FIONBIO, &iMode);
+
+  //register
+  CIrssMessage mess(IRSSMT_RegisterClient, IRSSMF_Request);
+  if (!SendPacket(mess))
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: failed to send RegisterClient packet.");
+    return false;
+  }
+  m_isConnecting = true;
+  return true;
+}
+
+bool CRemoteControl::SendPacket(CIrssMessage& message)
+{
+  int iSize = 0;
+  char* bytes = message.ToBytes(iSize);
+  char buffer[4];
+  uint32_t len = htonl(iSize);
+  memcpy(&buffer[0], &len, 4);
+  bool bResult = WriteN(&buffer[0], 4);
+  if (bResult)
+  {
+    bResult = WriteN(bytes, iSize);
+  }
+  delete[] bytes;
+  if (!bResult)
+  {
+    Close();
+    return false;
+  }
+  return true;
+}
+
+
+void CRemoteControl::Update()
+{
+  if (!m_bInitialized && !m_isConnecting)
+  {
+    return;
+  }
+
+  CIrssMessage mess;
+  if (!ReadPacket(mess))
+  {
+    return;
+  }
+  switch (mess.GetType())
+  {
+  case IRSSMT_RegisterClient:
+    m_isConnecting = false;
+    if ((mess.GetFlags() & IRSSMF_Success) != IRSSMF_Success)
+    {
+      //uh oh, it failed to register
+      Close();
+      CLog::Log(LOGERROR, "IRServerSuite: failed to register XBMC as a client.");
+    }
+    else
+    {
+      m_bInitialized = true;
+      //request info about receivers
+      CIrssMessage mess(IRSSMT_DetectedReceivers, IRSSMF_Request);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+      mess.SetType(IRSSMT_AvailableReceivers);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+      mess.SetType(IRSSMT_ActiveReceivers);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+    }
+    break;
+  case IRSSMT_RemoteEvent:
+    HandleRemoteEvent(mess);
+    break;
+  case IRSSMT_Error:
+    //I suppose the errormessage is in the packet somewhere...
+    CLog::Log(LOGERROR, "IRServerSuite: we got an error message.");
+    break;
+  case IRSSMT_ServerShutdown:
+    Close();
+    break;
+  case IRSSMT_ServerSuspend:
+    //should we do something?
+    break;
+  case IRSSMT_ServerResume:
+    //should we do something?
+    break;
+  case IRSSMT_AvailableReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* availablereceivers = new char[size + 1];
+        memcpy(availablereceivers, data, size);
+        availablereceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Available receivers: %s", availablereceivers);
+        delete[] availablereceivers;
+      }
+    }
+    break;
+  case IRSSMT_DetectedReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* detectedreceivers = new char[size + 1];
+        memcpy(detectedreceivers, data, size);
+        detectedreceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Detected receivers: %s", detectedreceivers);
+        delete[] detectedreceivers;
+      }
+    }
+    break;
+  case IRSSMT_ActiveReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* activereceivers = new char[size + 1];
+        memcpy(activereceivers, data, size);
+        activereceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Active receivers: %s", activereceivers);
+        delete[] activereceivers;
+      }
+    }
+    break;
+  }
+}
+
+bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
+{
+  try
+  {
+    //flag should be notify, maybe check it?
+    char* data = message.GetData();
+    uint32_t datalen = message.GetDataSize();
+    char* deviceName;
+    char* keycode;
+    uint32_t devicenamelength;
+    uint32_t keycodelength;
+    if (datalen == 0)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: no data in remote message.");
+      return false;
+    }
+    if (datalen <= 8)
+    {
+      //seems to be version 1.0.4.1, only keycode is sent, use Microsoft MCE mapping??
+      devicenamelength = 13;
+      deviceName = new char[devicenamelength + 1];
+      sprintf(deviceName, "Microsoft MCE"); 
+      keycodelength = datalen;
+      keycode = new char[keycodelength + 1];
+      memcpy(keycode, data, keycodelength);
+    }
+    else
+    {
+      //first 4 bytes is devicename length
+      memcpy(&devicenamelength, data, 4);
+      //devicename itself
+      if (datalen < 4 + devicenamelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        return false;
+      }
+      deviceName = new char[devicenamelength + 1];
+      memcpy(deviceName, data + 4, devicenamelength);
+      if (datalen < 8 + devicenamelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        return false;
+      }
+      //next 4 bytes is keycode length
+      memcpy(&keycodelength, data + 4 + devicenamelength, 4);
+      //keycode itself
+      if (datalen < 8 + devicenamelength + keycodelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        delete[] deviceName;
+        return false;
+      }
+      keycode = new char[keycodelength + 1];
+      memcpy(keycode, data + 8 + devicenamelength, keycodelength);
+    }
+    deviceName[devicenamelength] = '\0';
+    keycode[keycodelength] = '\0';
+    //translate to a buttoncode xbmc understands
+    m_button = g_buttonTranslator.TranslateLircRemoteString(deviceName, keycode);
+    if (g_advancedSettings.m_logLevel == LOG_LEVEL_DEBUG_FREEMEM)
+    {
+      CLog::Log(LOGINFO, "IRServerSuite, RemoteEvent: %s %s", deviceName, keycode);
+    }
+    delete[] deviceName;
+    delete[] keycode;
+    return true;
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: exception while processing RemoteEvent.");
+    return false;
+  }
+}
+
+int CRemoteControl::ReadN(char *buffer, int n)
+{
+  int nOriginalSize = n;
+  memset(buffer, 0, n);
+  char *ptr = buffer;
+  while (n > 0)
+  {
+    int nBytes = 0;
+    nBytes = recv(m_socket, ptr, n, 0);
+
+    if (WSAGetLastError() == WSAEWOULDBLOCK)
+    {
+      return nOriginalSize - n;
+    }
+    if (nBytes < 0)
+    {
+      CLog::Log(LOGERROR, "%s, IRServerSuite recv error %d", __FUNCTION__, GetLastError());
+      Close();
+      return -1;
+    }
+    
+    if (nBytes == 0)
+    {
+      CLog::Log(LOGDEBUG,"%s, IRServerSuite socket closed by server", __FUNCTION__);
+      Close();
+      break;
+    }
+    
+    n -= nBytes;
+    ptr += nBytes;
+  }
+
+  return nOriginalSize - n;
+}
+
+bool CRemoteControl::WriteN(const char *buffer, int n)
+{
+  const char *ptr = buffer;
+  while (n > 0)
+  {
+    int nBytes = send(m_socket, ptr, n, 0);
+    if (nBytes < 0)
+    {
+      CLog::Log(LOGERROR, "%s, IRServerSuite send error %d (%d bytes)", __FUNCTION__, GetLastError(), n);
+      Close();
+      return false;
+    }
+    
+    if (nBytes == 0)
+      break;
+    
+    n -= nBytes;
+    ptr += nBytes;
+  }
+
+  return n == 0;
+}
+
+bool CRemoteControl::ReadPacket(CIrssMessage &message)
+{
+  try
+  {
+    char sizebuf[4];
+    int iRead = ReadN(&sizebuf[0], 4);
+    if (iRead == 0) return false; //nothing to read
+    if (iRead != 4)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: failed to read packetsize.");
+      return false;
+    }
+    uint32_t size = 0;
+    memcpy(&size, &sizebuf[0], 4);
+    size = ntohl(size);
+    char* messagebytes = new char[size];
+    if (ReadN(messagebytes, size) != size)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: failed to read packet.");
+      return false;
+    }
+    if (!CIrssMessage::FromBytes(messagebytes, size, message))
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: invalid packet received (size: %u).", size);
+      return false;
+    }
+    delete[] messagebytes;
+    return true;
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: exception while processing packet.");
+    return false;
+  }
+}
+
+WORD CRemoteControl::GetButton()
+{
+  return m_button;
+}
+
+bool CRemoteControl::IsHolding()
+{
+  return m_isHolding;
+}

Added: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h	                        (rev 0)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h	2008-07-09 17:43:54 UTC (rev 13991)
@@ -0,0 +1,60 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <winsock2.h>
+#include "IrssMessage.h"
+#include "Thread.h"
+
+class CRemoteControl : CThread
+{
+public:
+  CRemoteControl();
+  ~CRemoteControl();
+  bool Initialize();
+  void Reset();
+  void Update();
+  WORD GetButton();
+  bool IsHolding();
+
+protected:
+  virtual void Process();
+
+private:
+  WORD  m_button;
+  bool  m_isHolding;
+  bool  m_bInitialized;
+  SOCKET m_socket;
+  bool m_isConnecting;
+  CStdString m_deviceName;
+  CStdString m_keyCode;
+
+  bool SendPacket(CIrssMessage& message);
+  bool ReadPacket(CIrssMessage& message);
+  int  ReadN(char *buffer, int n);
+  bool WriteN(const char *buffer, int n);
+  bool Connect();
+  void Close();
+
+  bool HandleRemoteEvent(CIrssMessage& message);
+};
+
+extern CRemoteControl g_RemoteControl;

Added: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp	2008-07-09 17:43:54 UTC (rev 13991)
@@ -0,0 +1,149 @@
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "include.h"
+#include "IrssMessage.h"
+
+CIrssMessage::CIrssMessage()
+{
+  m_type = IRSSMT_Unknown;
+  m_flags = 0;
+  m_data = NULL;
+  m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags)
+{
+  m_type     = type;
+  m_flags    = flags;
+  m_data     = NULL;
+  m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size)
+{
+  CIrssMessage::CIrssMessage(type, flags);
+  SetDataAsBytes(data, size);
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data)
+{
+  CIrssMessage::CIrssMessage(type, flags);
+  SetDataAsString(data);
+}
+
+CIrssMessage::~CIrssMessage()
+{
+  FreeData();
+}
+
+void CIrssMessage::SetDataAsBytes(char* data, int size)
+{
+  if (!data)
+  {
+    FreeData();
+  }
+  else
+  {
+    m_data = new char[size];
+    memcpy(m_data, data, size);
+    m_dataSize = size;
+  }
+}
+
+void CIrssMessage::SetDataAsString(const CStdString& data)
+{
+  if (!data || data.IsEmpty())
+  {
+    FreeData();
+  }
+  else
+  {
+    m_data = strdup(data.c_str());
+    m_dataSize = strlen(data.c_str());
+  }
+}
+
+void CIrssMessage::FreeData()
+{
+  if (m_data)
+  {
+    delete[] m_data;
+  }
+  m_data = NULL;
+  m_dataSize = 0;
+}
+
+
+char* CIrssMessage::ToBytes(int& size)
+{
+  int dataLength = 0;
+  if (m_data)
+  {
+    dataLength = m_dataSize;
+  }
+
+  size = 8 + dataLength;
+  char* byteArray = new char[size];
+
+  memcpy(&byteArray[0], &m_type, 4);
+  memcpy(&byteArray[4], &m_flags, 4);
+
+  if (m_data)
+  {
+    memcpy(&byteArray[8], &m_data, m_dataSize);
+  }
+
+  return byteArray;
+}
+
+bool CIrssMessage::FromBytes(char* from, int size, CIrssMessage& message)
+{
+  if (!from)
+    return false;
+
+  if (size < 8)
+    return false;
+
+  //IRSS_MessageType type    = (MessageType)BitConverter.ToInt32(from, 0);
+  //IRSS_MessageFlags flags  = (MessageFlags)BitConverter.ToInt32(from, 4);
+  uint32_t type;
+  memcpy(&type, from, 4);
+  uint32_t flags;
+  memcpy(&flags, from + 4, 4);
+
+  message.SetType((IRSS_MessageType)type);
+  message.SetFlags(flags);
+  if (size > 8)
+  {
+    message.SetDataAsBytes(from + 8, size - 8);
+  }
+  return true;
+}
+
+void CIrssMessage::SetType(IRSS_MessageType type)
+{
+  m_type = type;
+}
+void CIrssMessage::SetFlags(uint32_t flags)
+{
+  m_flags = flags;
+}

Added: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h	                        (rev 0)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h	2008-07-09 17:43:54 UTC (rev 13991)
@@ -0,0 +1,207 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+  /// <summary>
+  /// Type of message.
+  /// </summary>
+  enum IRSS_MessageType
+  {
+    /// <summary>
+    /// Unknown message type.
+    /// </summary>
+    IRSSMT_Unknown = 0,
+
+    /// <summary>
+    /// Register Client.
+    /// </summary>
+    IRSSMT_RegisterClient = 1,
+    /// <summary>
+    /// Unregister Client.
+    /// </summary>
+    IRSSMT_UnregisterClient = 2,
+
+    /// <summary>
+    /// Register Repeater.
+    /// </summary>
+    IRSSMT_RegisterRepeater = 3,
+    /// <summary>
+    /// Unregister Repeater.
+    /// </summary>
+    IRSSMT_UnregisterRepeater = 4,
+
+    /// <summary>
+    /// Learn IR Command.
+    /// </summary>
+    IRSSMT_LearnIR = 5,
+    /// <summary>
+    /// Blast IR Command.
+    /// </summary>
+    IRSSMT_BlastIR = 6,
+
+    /// <summary>
+    /// Error.
+    /// </summary>
+    IRSSMT_Error = 7,
+
+    /// <summary>
+    /// Server Shutdown.
+    /// </summary>
+    IRSSMT_ServerShutdown = 8,
+    /// <summary>
+    /// Server Suspend.
+    /// </summary>
+    IRSSMT_ServerSuspend = 9,
+    /// <summary>
+    /// Server Resume
+    /// </summary>
+    IRSSMT_ServerResume = 10,
+
+    /// <summary>
+    /// Remote Event.
+    /// </summary>
+    IRSSMT_RemoteEvent = 11,
+    /// <summary>
+    /// Keyboard Event.
+    /// </summary>
+    IRSSMT_KeyboardEvent = 12,
+    /// <summary>
+    /// Mouse Event.
+    /// </summary>
+    IRSSMT_MouseEvent = 13,
+
+    /// <summary>
+    /// Forward a Remote Event.
+    /// </summary>
+    IRSSMT_ForwardRemoteEvent = 14,
+    /// <summary>
+    /// Forward a Keyboard Event.
+    /// </summary>
+    IRSSMT_ForwardKeyboardEvent = 15,
+    /// <summary>
+    /// Forward a Mouse Event.
+    /// </summary>
+    IRSSMT_ForwardMouseEvent = 16,
+
+    /// <summary>
+    /// Available Receivers.
+    /// </summary>
+    IRSSMT_AvailableReceivers = 17,
+    /// <summary>
+    /// Available Blasters.
+    /// </summary>
+    IRSSMT_AvailableBlasters = 18,
+    /// <summary>
+    /// Active Receivers.
+    /// </summary>
+    IRSSMT_ActiveReceivers = 19,
+    /// <summary>
+    /// Active Blasters.
+    /// </summary>
+    IRSSMT_ActiveBlasters = 20,
+    /// <summary>
+    /// Detected Receivers.
+    /// </summary>
+    IRSSMT_DetectedReceivers = 21,
+    /// <summary>
+    /// Detected Blasters.
+    /// </summary>
+    IRSSMT_DetectedBlasters = 22,
+  };
+
+  /// <summary>
+  /// Flags to determine more information about the message.
+  /// </summary>
+  enum IRSS_MessageFlags
+  {
+    /// <summary>
+    /// No Flags.
+    /// </summary>
+    IRSSMF_None            = 0x0000,
+
+    /// <summary>
+    /// Message is a Request.
+    /// </summary>
+    IRSSMF_Request         = 0x0001,
+    /// <summary>
+    /// Message is a Response to a received Message.
+    /// </summary>
+    IRSSMF_Response        = 0x0002,
+    /// <summary>
+    /// Message is a Notification.
+    /// </summary>
+    IRSSMF_Notify          = 0x0004,
+
+    /// <summary>
+    /// Operation Success.
+    /// </summary>
+    IRSSMF_Success         = 0x0008,
+    /// <summary>
+    /// Operation Failure.
+    /// </summary>
+    IRSSMF_Failure         = 0x0010,
+    /// <summary>
+    /// Operation Time-Out.
+    /// </summary>
+    IRSSMF_Timeout         = 0x0020,
+    
+    //IRSSMF_Error           = 0x0040,
+
+    //IRSSMF_DataString      = 0x0080,
+    //IRSSMF_DataBytes       = 0x0100,
+
+    //IRSSMF_ForceRespond    = 0x0200,
+    
+    /// <summary>
+    /// Force the recipient not to respond.
+    /// </summary>
+    IRSSMF_ForceNotRespond = 0x0400,
+  };
+
+class CIrssMessage
+{
+public:
+  CIrssMessage();
+  CIrssMessage(IRSS_MessageType type, uint32_t flags);
+  CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size);
+  CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data);
+  ~CIrssMessage();
+
+  void SetDataAsBytes(char* data, int size);
+  void SetDataAsString(const CStdString& data);
+  char* ToBytes(int& size);
+  void SetType(IRSS_MessageType type);
+  void SetFlags(uint32_t flags);
+  IRSS_MessageType GetType() {return m_type;}
+  uint32_t GetFlags() {return m_flags;}
+  char* GetData() {return m_data;}
+  uint32_t GetDataSize() {return m_dataSize;}
+  static bool FromBytes(char* from, int size, CIrssMessage& message);
+
+private:
+  IRSS_MessageType m_type;
+  uint32_t m_flags;
+  
+  char* m_data;
+  int m_dataSize;
+
+  void FreeData();
+};

Modified: branches/linuxport/XBMC/guilib/guilib_win32.vcproj
===================================================================
--- branches/linuxport/XBMC/guilib/guilib_win32.vcproj	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/guilib/guilib_win32.vcproj	2008-07-09 17:43:54 UTC (rev 13991)
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa"
 				Optimization="0"
-				AdditionalIncludeDirectories="../guilib;../xbmc/Win32;../xbmc/;freetype2/include;../xbmc/lib/boost"
+				AdditionalIncludeDirectories="../guilib;../xbmc/Win32;../xbmc/;freetype2/include;../xbmc/lib/boost;../xbmc/utils"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX"
 				StringPooling="FALSE"
 				MinimalRebuild="TRUE"
@@ -155,7 +155,7 @@
 				Name="VCCLCompilerTool"
 				GlobalOptimizations="TRUE"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../guilib;../xbmc/win32;../xbmc;freetype2\include;../xbmc/lib/boost"
+				AdditionalIncludeDirectories="../guilib;../xbmc/win32;../xbmc;freetype2\include;../xbmc/lib/boost;../xbmc/utils"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX"
 				MinimalRebuild="FALSE"
 				RuntimeLibrary="0"
@@ -758,6 +758,22 @@
 			<File
 				RelativePath=".\common\SDLMouse.h">
 			</File>
+			<Filter
+				Name="IRServerSuite"
+				Filter="">
+				<File
+					RelativePath=".\common\IRServerSuite\IRServerSuite.cpp">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IRServerSuite.h">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IrssMessage.cpp">
+				</File>
+				<File
+					RelativePath=".\common\IRServerSuite\IrssMessage.h">
+				</File>
+			</Filter>
 		</Filter>
 		<File
 			RelativePath=".\ReadMe.txt">

Modified: branches/linuxport/XBMC/guilib/system.h
===================================================================
--- branches/linuxport/XBMC/guilib/system.h	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/guilib/system.h	2008-07-09 17:43:54 UTC (rev 13991)
@@ -1,26 +1,26 @@
 #pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
 
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #undef HAS_XBOX_D3D
 #undef HAS_RAM_CONTROL
 #undef HAS_XFONT
@@ -164,6 +164,8 @@
 #define HAS_EVENT_SERVER
 #define HAS_SHOUTCAST
 #define HAS_WIN32_NETWORK
+#define HAS_LIRC
+#define HAS_IRSERVERSUITE // depends on HAS_LIRC define
 
 #undef HAS_SDL_AUDIO   // use dsound for audio on win32
 #undef HAS_SCREENSAVER // no screensavers

Modified: branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj
===================================================================
--- branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj	2008-07-09 17:43:54 UTC (rev 13991)
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\xbmc\Win32;..\..\xbmc\;..\..\guilib\freetype2\include;..\..\xbmc\lib\boost"
+				AdditionalIncludeDirectories="..\..\xbmc\Win32;..\..\xbmc\;..\..\guilib\freetype2\include;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_USE_32BIT_TIME_T"
 				StringPooling="false"
 				MinimalRebuild="true"
@@ -114,7 +114,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\xbmc\win32;..\..\xbmc;..\..\guilib\freetype2\include;..\..\xbmc\lib\boost"
+				AdditionalIncludeDirectories="..\..\xbmc\Win32;..\..\xbmc\;..\..\guilib\freetype2\include;..\..\xbmc\lib\boost;..\..\guilib;..\..\xbmc\utils"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAS_SDL;_MSVC;NOMINMAX;_USE_32BIT_TIME_T"
 				MinimalRebuild="false"
 				RuntimeLibrary="0"
@@ -1068,6 +1068,26 @@
 				RelativePath="..\..\guilib\common\SDLMouse.h"
 				>
 			</File>
+			<Filter
+				Name="IRServerSuite"
+				>
+				<File
+					RelativePath="..\..\guilib\common\IRServerSuite\IRServerSuite.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\guilib\common\IRServerSuite\IRServerSuite.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\guilib\common\IRServerSuite\IrssMessage.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\guilib\common\IRServerSuite\IrssMessage.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<File
 			RelativePath="..\..\guilib\ReadMe.txt"

Added: branches/linuxport/XBMC/userdata/IRSSmap.xml
===================================================================
--- branches/linuxport/XBMC/userdata/IRSSmap.xml	                        (rev 0)
+++ branches/linuxport/XBMC/userdata/IRSSmap.xml	2008-07-09 17:43:54 UTC (rev 13991)
@@ -0,0 +1,46 @@
+<!-- This file contains the mapping of IR Server Suite keys to XBMC keys used in Keymap.xml  -->
+
+<irssmap>
+	<remote device="Microsoft MCE">
+		<pause>31719</pause> <!-- pause -->
+		<stop>31718</stop> <!-- stop -->
+		<play>31721</play> <!-- play -->
+		<forward>31723</forward> <!-- forward -->
+		<reverse>31722</reverse> <!-- reverse -->
+		<left>31711</left> <!-- left -->
+		<right>31710</right> <!-- right -->
+		<up>31713</up> <!-- up -->
+		<down>31712</down> <!-- down -->
+		<select>31709</select> <!-- ok -->
+		<pageplus>31725</pageplus> <!-- channel up -->
+		<pageminus>31724</pageminus> <!-- channel down -->
+		<back>31708</back> <!-- previous -->
+		<menu>31707</menu> <!-- dvd menu -->
+		<title>31671</title> <!-- recorded tv -->
+		<info>31728</info> <!-- info -->
+		<skipplus>31717</skipplus> <!-- skip -->
+		<skipminus>31716</skipminus> <!-- repeat -->
+		<display>31705</display> <!-- guide -->
+		<start>31730</start> <!-- start -->
+		<record>31720</record> <!-- record -->
+		<volumeplus>31727</volumeplus> <!-- volume up -->
+		<volumeminus>31726</volumeminus> <!-- volume down -->
+		<mute>31729</mute> <!-- mute -->
+		<power>31642</power> <!-- tv power -->
+		<mytv>31706</mytv> <!-- live tv -->
+		<one>31742</one>
+		<two>31741</two>
+		<three>31740</three>
+		<four>31739</four>
+		<five>31738</five>
+		<six>31737</six>
+		<seven>31736</seven>
+		<eight>31735</eight>
+		<nine>31734</nine>
+		<zero>31743</zero>
+		<mytv>31652</mytv> <!-- red -->
+		<mymusic>31651</mymusic> <!-- green -->
+		<mypictures>31650</mypictures> <!-- yellow -->
+		<myvideo>31649</myvideo> <!-- blue -->
+	</remote>
+</irssmap>

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-09 17:43:54 UTC (rev 13991)
@@ -1159,6 +1159,7 @@
     CopyUserDataIfNeeded(strPath, "Keymap.xml");
     CopyUserDataIfNeeded(strPath, "RssFeeds.xml");
     CopyUserDataIfNeeded(strPath, "favourites.xml");
+    CopyUserDataIfNeeded(strPath, "IRSSmap.xml");
   }
   else
   {

Modified: branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp	2008-07-09 17:43:54 UTC (rev 13991)
@@ -92,11 +92,18 @@
 #ifdef HAS_LIRC
 bool CButtonTranslator::LoadLircMap()
 {
+#ifdef _LINUX
+#define REMOTEMAP "Lircmap.xml"
+#define REMOTEMAPTAG "lircmap"
+#else
+#define REMOTEMAP "IRSSmap.xml"
+#define REMOTEMAPTAG "irssmap"
+#endif
   // load our xml file, and fill up our mapping tables
   TiXmlDocument xmlDoc;
 
   // Load the config file
-  CStdString lircmapPath = g_settings.GetUserDataItem("Lircmap.xml");
+  CStdString lircmapPath = g_settings.GetUserDataItem(REMOTEMAP);
   CLog::Log(LOGINFO, "Loading %s", lircmapPath.c_str());
   if (!xmlDoc.LoadFile(lircmapPath))
   {
@@ -107,9 +114,9 @@
   lircRemotesMap.clear();
   TiXmlElement* pRoot = xmlDoc.RootElement();
   CStdString strValue = pRoot->Value();
-  if (strValue != "lircmap")
+  if (strValue != REMOTEMAPTAG)
   {
-    g_LoadErrorStr.Format("%sl Doesn't contain <lircmap>", lircmapPath.c_str());
+    g_LoadErrorStr.Format("%sl Doesn't contain <%s>", lircmapPath.c_str(), REMOTEMAPTAG);
     return false;
   }
 

Modified: branches/linuxport/XBMC/xbmc/XBApplicationEx.h
===================================================================
--- branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-07-09 09:57:13 UTC (rev 13990)
+++ branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-07-09 17:43:54 UTC (rev 13991)
@@ -21,7 +21,9 @@
 #endif
 #endif
 #include "common/Keyboard.h"
-#ifdef HAS_LIRC
+#ifdef HAS_IRSERVERSUITE
+#include "common/IRServerSuite/IRServerSuite.h"
+#elif defined(HAS_LIRC)
 #include "common/LIRC.h"
 #endif
 


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

Revision: 13993
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13993&view=rev
Author:   elupus
Date:     2008-07-09 10:52:15 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
cosmetic: minor warnings with windows build

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/FrameBufferObject.cpp
    branches/linuxport/XBMC/xbmc/utils/Socket.cpp

Modified: branches/linuxport/XBMC/guilib/FrameBufferObject.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/FrameBufferObject.cpp	2008-07-09 17:51:51 UTC (rev 13992)
+++ branches/linuxport/XBMC/guilib/FrameBufferObject.cpp	2008-07-09 17:52:15 UTC (rev 13993)
@@ -94,8 +94,8 @@
   glGenTextures(1, &m_texid);
   glBindTexture(target, m_texid);
   glTexImage2D(target, 0, format,  width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
-  glTexParameterf(target, GL_TEXTURE_WRAP_S, clampmode);
-  glTexParameterf(target, GL_TEXTURE_WRAP_T, clampmode);
+  glTexParameteri(target, GL_TEXTURE_WRAP_S, clampmode);
+  glTexParameteri(target, GL_TEXTURE_WRAP_T, clampmode);
   glTexParameteri(target, GL_TEXTURE_MAG_FILTER, filter);
   glTexParameteri(target, GL_TEXTURE_MIN_FILTER, filter);
   VerifyGLState();

Modified: branches/linuxport/XBMC/xbmc/utils/Socket.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Socket.cpp	2008-07-09 17:51:51 UTC (rev 13992)
+++ branches/linuxport/XBMC/xbmc/utils/Socket.cpp	2008-07-09 17:52:15 UTC (rev 13993)
@@ -28,7 +28,7 @@
 using namespace SOCKETS;
 using namespace std;
 
-#if defined (_XBOX) || defined (_WIN32)
+#ifdef WINSOCK_VERSION
 #define close closesocket
 #endif
 
@@ -52,7 +52,7 @@
   }
 
   // make sure we can reuse the address
-#if defined (_XBOX) || defined (_WIN32)
+#ifdef WINSOCK_VERSION
   const char yes=1;
 #else
   int yes = 1;
@@ -149,7 +149,7 @@
   {
     m_sockets.push_back(sock);
     FD_SET(sock->Socket(), &m_fdset);
-#ifndef _XBOX
+#ifndef WINSOCK_VERSION
     if (sock->Socket() > m_iMaxSockets)
       m_iMaxSockets = sock->Socket();
 #endif


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

Revision: 13995
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13995&view=rev
Author:   wattazoum
Date:     2008-07-09 11:30:47 -0700 (Wed, 09 Jul 2008)

Log Message:
-----------
Install the web UI using the Makefile

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/README.linux

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-09 18:06:11 UTC (rev 13994)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-09 18:30:47 UTC (rev 13995)
@@ -110,7 +110,7 @@
 install-bin: all # developement convenience target
 	sudo cp xbmc.bin $(prefix)/share/xbmc
 
-install: all install-datas
+install: all install-datas install-web
 	@echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin"
 	@cp xbmc.bin $(prefix)/share/xbmc/xbmc.bin
 	@mkdir -p $(prefix)/bin
@@ -132,6 +132,10 @@
 	@# PM3
 	@find skin -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.png|.*\.gif" -exec cp '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %f                            \r"
 
+install-web:
+	@mkdir -p $(prefix)/share/xbmc/web
+	@unrar x -o+ web/Project_Mayem_III_webserver_v1.0.rar $(prefix)/share/xbmc/web
+
 uninstall:
 	@echo "Removing XBMC..."
 	@rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc

Modified: branches/linuxport/XBMC/README.linux
===================================================================
--- branches/linuxport/XBMC/README.linux	2008-07-09 18:06:11 UTC (rev 13994)
+++ branches/linuxport/XBMC/README.linux	2008-07-09 18:30:47 UTC (rev 13995)
@@ -42,15 +42,15 @@
 
 For Ubuntu 7.04 (Feisty Fawn):
 
-   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1 libglew-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1 libglew-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip unrar
 
 For Ubuntu 7.10 (Gutsy Gibbon):
 
-   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.4 libglew1.4-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.4 libglew1.4-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper1 libfontconfig1-dev libbz2-dev libboost-dev libtool zip unrar
 
 For Ubuntu 8.04 (Hardy Heron):
 
-   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.5 libglew1.5-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libhal1 libhal-dev libhal-storage1 libhal-storage-dev libpcre3-dev subversion libjasper1 libfontconfig-dev libbz2-dev libboost-dev libtool zip
+   # sudo apt-get install make g++-4.1 gcc-4.1 libsdl1.2-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libsdl-sound1.2-dev libsdl-stretch-dev libfribidi0 libfribidi-dev liblzo1 liblzo-dev libfreetype6 libfreetype6-dev libsqlite3-0 libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew1.5 libglew1.5-dev libcurl3-dev g++ gawk x11proto-xinerama-dev libxinerama-dev libxrandr-dev libxrender-dev libmms-dev pmount libmad0-dev libtre-dev libogg-dev libvorbis-dev libmysqlclient15-dev libhal1 libhal-dev libhal-storage1 libhal-storage-dev libpcre3-dev subversion libjasper1 libfontconfig-dev libbz2-dev libboost-dev libtool zip unrar
 
 *** For developers and anyone else who compiles frequently it is recommended to use ccache
 sudo apt-get install ccache


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

Revision: 14002
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14002&view=rev
Author:   malloc64
Date:     2008-07-10 01:33:14 -0700 (Thu, 10 Jul 2008)

Log Message:
-----------
OSX: Python compiles with Makefiles

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/lib/libPython/linux/Makefile.in

Added Paths:
-----------
    branches/linuxport/XBMC/tools/Mach5/Makefile

Added: branches/linuxport/XBMC/tools/Mach5/Makefile
===================================================================
--- branches/linuxport/XBMC/tools/Mach5/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/tools/Mach5/Makefile	2008-07-10 08:33:14 UTC (rev 14002)
@@ -0,0 +1,5 @@
+default:
+
+python: ../../xbmc/lib/libPython/Python/python24-osx.so
+	./mach5.rb $<
+	./mach5.rb output.so libpython

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/linux/Makefile.in
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/linux/Makefile.in	2008-07-10 05:55:21 UTC (rev 14001)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/linux/Makefile.in	2008-07-10 08:33:14 UTC (rev 14002)
@@ -1,16 +1,32 @@
+ARCH=@ARCH@
 
-default: python24-@...
-	cp python24.zip python24-@...  ../../../../system/python
+ifeq ($(ARCH), x86-osx)
+LIB=python24-osx.so
+else
+LIB=python24-@...
+endif
 
+default: $(LIB)
+	cp $^  ../../../../system/python
+
 python24.zip: python-lib
 	(cd python-lib/lib/python2.4; mv lib-dynload/* .; zip -0 -r ../../../python24.zip *)
 
-python24-@... : wrapper_python.o wrapper_python.def ../../../cores/DllLoader/exports/wrapper.def ../../../cores/DllLoader/exports/wrapper.o python24.zip
-	if [ \! -d tmp ]; then mkdir tmp; fi
+tmp:
+	mkdir tmp;
 	(cd ./tmp; ar x ../../Python/libpython2.4.a)
+
+python24-@... : wrapper_python.o wrapper_python.def ../../../cores/DllLoader/exports/wrapper.def ../../../cores/DllLoader/exports/wrapper.o python24.zip tmp
 	gcc -shared -o $@ tmp/*.o `cat wrapper_python.def` wrapper_python.o `cat ../../../cores/DllLoader/exports/wrapper.def` ../../../cores/DllLoader/exports/wrapper.o
 	rm -rf tmp
 
+python24-osx.so: python24.zip tmp ../../../../tools/Mach5/Makefile
+	gcc -bundle -flat_namespace -undefined suppress -shared \
+		-o python24-osx.so tmp/*.o
+	$(MAKE) -C ../../../../tools/Mach5/ python
+	cp ../../../../tools/Mach5/output.so $@
+	rm -rf tmp
+
 wrapper_python.o : wrapper_python.c
 	gcc -fPIC -o $@ -D_FILE_DEFINED -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -c $<
 


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

Revision: 14005
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14005&view=rev
Author:   d4rkm4ster
Date:     2008-07-11 00:21:53 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
added: [OSX] new target to create XBMC.app

Modified Paths:
--------------
    branches/linuxport/XBMC/XBMC.xcodeproj/project.pbxproj

Added Paths:
-----------
    branches/linuxport/XBMC/media/xbmc.icns
    branches/linuxport/XBMC/xbmc/osx/Info.plist

Modified: branches/linuxport/XBMC/XBMC.xcodeproj/project.pbxproj
===================================================================
--- branches/linuxport/XBMC/XBMC.xcodeproj/project.pbxproj	2008-07-10 16:49:29 UTC (rev 14004)
+++ branches/linuxport/XBMC/XBMC.xcodeproj/project.pbxproj	2008-07-11 07:21:53 UTC (rev 14005)
@@ -7,6 +7,18 @@
 	objects = {
 
 /* Begin PBXAggregateTarget section */
+		6E2FACBA0E26DF7A00DF79EA /* XBMC.app */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 6E2FACC10E26DFA300DF79EA /* Build configuration list for PBXAggregateTarget "XBMC.app" */;
+			buildPhases = (
+				6E2FACC70E26E22400DF79EA /* ShellScript */,
+			);
+			dependencies = (
+				6E2FACC40E26E08100DF79EA /* PBXTargetDependency */,
+			);
+			name = XBMC.app;
+			productName = XBMC.app;
+		};
 		882630940E1B6FAD00DC9524 /* build python */ = {
 			isa = PBXAggregateTarget;
 			buildConfigurationList = 8826309C0E1B6FE100DC9524 /* Build configuration list for PBXAggregateTarget "build python" */;
@@ -1665,6 +1677,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		6E2FACC30E26E08100DF79EA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DD76F740486A8DE00D96B5E;
+			remoteInfo = XBMC;
+		};
 		88E384580E1EF65E0028AFC0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -1697,6 +1716,7 @@
 
 /* Begin PBXFileReference section */
 		09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		6E2FACD20E26E92800DF79EA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = xbmc/osx/Info.plist; sourceTree = "<group>"; };
 		6E65F6660E1BF31200B73755 /* XBMC */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = XBMC; sourceTree = BUILT_PRODUCTS_DIR; };
 		6E65F66A0E1BF51500B73755 /* libxdaap-i486-osx-tiger.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libxdaap-i486-osx-tiger.a"; path = "xbmc/lib/libXDAAP/libxdaap-i486-osx-tiger.a"; sourceTree = "<group>"; };
 		6E65F66C0E1BF57400B73755 /* avcodec-51-i486-osx-tiger.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "avcodec-51-i486-osx-tiger.a"; path = "xbmc/lib/libffmpeg-OSX/avcodec-51-i486-osx-tiger.a"; sourceTree = "<group>"; };
@@ -3710,6 +3730,7 @@
 		08FB7794FE84155DC02AAC07 /* XBMC */ = {
 			isa = PBXGroup;
 			children = (
+				6E2FACD20E26E92800DF79EA /* Info.plist */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				C6859E96029091FE04C91782 /* Documentation */,
 				08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
@@ -6733,11 +6754,26 @@
 				8DD76F740486A8DE00D96B5E /* XBMC */,
 				882630940E1B6FAD00DC9524 /* build python */,
 				6E65F32C0E1BF31200B73755 /* XBMC (Tiger) */,
+				6E2FACBA0E26DF7A00DF79EA /* XBMC.app */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		6E2FACC70E26E22400DF79EA /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(SRCROOT)/build/Debug/XBMC",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "mkdir -p \"$TARGET_BUILD_DIR/XBMC.app\"\nmkdir -p \"$TARGET_BUILD_DIR/XBMC.app/Contents/Resources/English.lproj\"\nmkdir -p \"$TARGET_BUILD_DIR/XBMC.app/Contents/Frameworks\"\nmkdir -p \"$TARGET_BUILD_DIR/XBMC.app/Contents/MacOS\"\n\ncp \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BUILD_DIR/XBMC.app/Contents/MacOS/\"\ncp \"$SRCROOT/media/xbmc.icns\" \"$TARGET_BUILD_DIR/XBMC.app/Contents/Resources/\"\ncp \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_BUILD_DIR/XBMC.app/Contents/\"\n\n\nfor a in $(otool -L \"$TARGET_BUILD_DIR/XBMC.app/Contents/MacOS/XBMC\"  | grep opt | awk ' { print $1 } ') ; do cp \"$a\" \"$TARGET_BUILD_DIR/XBMC.app/Contents/Frameworks\"; install_name_tool -change \"$a\" @executable_path/../Frameworks/$(basename $a) \"$TARGET_BUILD_DIR/XBMC.app/Contents/MacOS/XBMC\" ; done";
+		};
 		882630930E1B6FAD00DC9524 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -8321,6 +8357,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		6E2FACC40E26E08100DF79EA /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DD76F740486A8DE00D96B5E /* XBMC */;
+			targetProxy = 6E2FACC30E26E08100DF79EA /* PBXContainerItemProxy */;
+		};
 		88E384590E1EF65E0028AFC0 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 882630940E1B6FAD00DC9524 /* build python */;
@@ -8555,6 +8596,41 @@
 			};
 			name = Release;
 		};
+		6E2FACBB0E26DF7A00DF79EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = XBMC.app;
+			};
+			name = Debug;
+		};
+		6E2FACBC0E26DF7A00DF79EA /* Debug (Tiger) */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = XBMC.app;
+			};
+			name = "Debug (Tiger)";
+		};
+		6E2FACBD0E26DF7A00DF79EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = XBMC.app;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		6E2FACBE0E26DF7A00DF79EA /* Release (Tiger) */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = XBMC.app;
+			};
+			name = "Release (Tiger)";
+		};
 		6E65F6640E1BF31200B73755 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -9182,6 +9258,17 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		6E2FACC10E26DFA300DF79EA /* Build configuration list for PBXAggregateTarget "XBMC.app" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6E2FACBB0E26DF7A00DF79EA /* Debug */,
+				6E2FACBC0E26DF7A00DF79EA /* Debug (Tiger) */,
+				6E2FACBD0E26DF7A00DF79EA /* Release */,
+				6E2FACBE0E26DF7A00DF79EA /* Release (Tiger) */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		6E65F6630E1BF31200B73755 /* Build configuration list for PBXNativeTarget "XBMC (Tiger)" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Added: branches/linuxport/XBMC/media/xbmc.icns
===================================================================
(Binary files differ)


Property changes on: branches/linuxport/XBMC/media/xbmc.icns
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/linuxport/XBMC/xbmc/osx/Info.plist
===================================================================
--- branches/linuxport/XBMC/xbmc/osx/Info.plist	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/osx/Info.plist	2008-07-11 07:21:53 UTC (rev 14005)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>XBMC</string>
+	<key>CFBundleIconFile</key>
+	<string>xbmc</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.teamxbmc.XBMC</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>XBMC</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2.1</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>LSEnvironment</key>
+	<dict>
+	  <key>XBMC_HOME</key>
+	  <string>/Library/Application Support/XBMC</string>
+	</dict>
+</dict>
+</plist>


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

Revision: 14008
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14008&view=rev
Author:   elupus
Date:     2008-07-11 07:13:23 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
changed: avoid some unneccesary duplicate logging of opengl version

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/Surface.cpp
    branches/linuxport/XBMC/guilib/Surface.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp

Modified: branches/linuxport/XBMC/guilib/Surface.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/Surface.cpp	2008-07-11 12:42:12 UTC (rev 14007)
+++ branches/linuxport/XBMC/guilib/Surface.cpp	2008-07-11 14:13:23 UTC (rev 14008)
@@ -52,6 +52,8 @@
 bool CSurface::b_glewInit = 0;
 std::string CSurface::s_glVendor = "";
 std::string CSurface::s_glRenderer = "";
+int         CSurface::s_glMajVer = 0;
+int         CSurface::s_glMinVer = 0;
 
 #include "GraphicContext.h"
 
@@ -81,8 +83,6 @@
   m_pShared = shared;
   m_bVSync = false;
   m_iVSyncMode = 0;
-  m_iGLMajVer = 0;
-  m_iGLMinVer = 0;
 
 #ifdef __APPLE__
   m_glContext = 0;
@@ -287,12 +287,6 @@
       else
       {
         b_glewInit = true;
-        if (s_glVendor.length()==0)
-        {
-          s_glVendor = (const char*)glGetString(GL_VENDOR);
-          s_glRenderer = (const char*)glGetString(GL_RENDERER);
-          CLog::Log(LOGINFO, "GL: OpenGL Vendor String: %s", s_glVendor.c_str());
-        }
       }
     }
     m_bOK = true;
@@ -353,12 +347,6 @@
       else
       {
         b_glewInit = true;
-        if (s_glVendor.length()==0)
-        {
-          s_glVendor = (const char*)glGetString(GL_VENDOR);
-          s_glRenderer = (const char*)glGetString(GL_RENDERER);
-          CLog::Log(LOGINFO, "GL: OpenGL Vendor String: %s", s_glVendor.c_str());
-        }
       }
     }
 
@@ -819,16 +807,24 @@
   return false;
 }
 
-#ifdef HAS_SDL_OPENGL
+
 void CSurface::GetGLVersion(int& maj, int& min)
 {
-  if (m_iGLMajVer==0)
+#ifdef HAS_SDL_OPENGL
+  if (s_glMajVer==0)
   {
     const char* ver = (const char*)glGetString(GL_VERSION);
     if (ver != 0)
-      sscanf(ver, "%d.%d", &m_iGLMajVer, &m_iGLMinVer);
+      sscanf(ver, "%d.%d", &s_glMajVer, &s_glMinVer);
   }
-  maj = m_iGLMajVer;
-  min = m_iGLMinVer;
-}
+
+  if (s_glVendor.length()==0)
+  {
+    s_glVendor   = (const char*)glGetString(GL_VENDOR);
+    s_glRenderer = (const char*)glGetString(GL_RENDERER);
+  }
 #endif
+  maj = s_glMajVer;
+  min = s_glMinVer;
+}
+

Modified: branches/linuxport/XBMC/guilib/Surface.h
===================================================================
--- branches/linuxport/XBMC/guilib/Surface.h	2008-07-11 12:42:12 UTC (rev 14007)
+++ branches/linuxport/XBMC/guilib/Surface.h	2008-07-11 14:13:23 UTC (rev 14008)
@@ -83,12 +83,11 @@
   bool MakePBuffer();
   bool MakePixmap();
 #endif
-  std::string& GetGLVendor() { return s_glVendor; }
-  std::string& GetGLRenderer() { return s_glRenderer; }
-#ifdef HAS_SDL_OPENGL
-  void GetGLVersion(int& maj, int&min);
-#endif
 
+  static std::string& GetGLVendor() { return s_glVendor; }
+  static std::string& GetGLRenderer() { return s_glRenderer; }
+  static void         GetGLVersion(int& maj, int&min);
+
   // SDL_Surface always there - just sometimes not in use (HAS_GLX)
   SDL_Surface* SDL() {return m_SDLSurface;}
 
@@ -101,8 +100,6 @@
   bool m_bOK;
   bool m_bVSync;
   int m_iVSyncMode;
-  int m_iGLMajVer;
-  int m_iGLMinVer;
   short int m_iRedSize;
   short int m_iGreenSize;
   short int m_iBlueSize;
@@ -121,6 +118,8 @@
   static bool b_glewInit;
   static std::string s_glVendor;
   static std::string s_glRenderer;
+  static int         s_glMajVer;
+  static int         s_glMinVer;
 
   SDL_Surface* m_SDLSurface;
 };

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2008-07-11 12:42:12 UTC (rev 14007)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2008-07-11 14:13:23 UTC (rev 14008)
@@ -1456,12 +1456,8 @@
   }
   
   // determine whether GPU supports NPOT textures
-  CSurface *screen = g_graphicsContext.getScreenSurface();
-  int maj, min;
-  screen->GetGLVersion(maj, min);
   if (!glewIsSupported("GL_ARB_texture_non_power_of_two"))
   {
-    CLog::Log(LOGNOTICE, "GL: OpenGL version %d.%d detected", maj, min);
     if (!glewIsSupported("GL_ARB_texture_rectangle"))
     {
       CLog::Log(LOGNOTICE, "GL: GL_ARB_texture_rectangle not supported and OpenGL version is not 2.x");
@@ -1469,15 +1465,10 @@
       m_renderMethod |= RENDER_POT;
     }
     else
-    {
       CLog::Log(LOGNOTICE, "GL: NPOT textures are supported through GL_ARB_texture_rectangle extension");
-    }
   }
   else
-  {
-    CLog::Log(LOGNOTICE, "GL: OpenGL version %d.%d detected", maj, min);
     CLog::Log(LOGNOTICE, "GL: NPOT texture support detected");
-  }
 }
 
 void CLinuxRendererGL::UnInit()


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

Revision: 14009
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14009&view=rev
Author:   nuka1195
Date:     2008-07-11 07:43:29 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
added: language support for windowxml based scripts. (reserved id's 32000-32999)
changed: xbmc.getLocalizedString() now can return plugins, skins and scripts strings

* you need to place the language folder in the same folder as skins(your fallback path). to use them in the xml file you must use <label>$LOCALIZE[id]</label>

Modified Paths:
--------------
    branches/linuxport/XBMC/language/English/strings.xml
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp

Modified: branches/linuxport/XBMC/language/English/strings.xml
===================================================================
--- branches/linuxport/XBMC/language/English/strings.xml	2008-07-11 14:13:23 UTC (rev 14008)
+++ branches/linuxport/XBMC/language/English/strings.xml	2008-07-11 14:43:29 UTC (rev 14009)
@@ -1968,4 +1968,5 @@
 
   <!-- strings 30000 thru 30999 reserved for plugins and plugin settings -->
   <!-- strings 31000 thru 31999 reserved for skins -->
+  <!-- strings 32000 thru 32999 reserved for scripts -->
 </strings>

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2008-07-11 14:13:23 UTC (rev 14008)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2008-07-11 14:43:29 UTC (rev 14009)
@@ -298,6 +298,9 @@
 
 void CGUIPythonWindowXML::AllocResources(bool forceLoad /*= FALSE */)
 {
+  // Load language strings temporarily
+  LoadScriptStrings(m_fallbackPath);
+
   m_backupMediaDir = g_graphicsContext.GetMediaDir();
   CStdString tmpDir;
   CUtil::GetDirectory(m_xmlFile, tmpDir);
@@ -314,6 +317,14 @@
   g_graphicsContext.SetMediaDir(m_backupMediaDir);
 }
 
+void CGUIPythonWindowXML::FreeResources(bool forceUnLoad /*= FALSE */)
+{
+  // Unload temporary language strings
+  ClearScriptStrings();
+
+  CGUIWindow::FreeResources(forceUnLoad);
+}
+
 void CGUIPythonWindowXML::Render()
 {
   g_graphicsContext.SetMediaDir(m_fallbackPath);
@@ -485,3 +496,25 @@
 { 
   return *m_vecItems;
 }
+
+void CGUIPythonWindowXML::LoadScriptStrings(const CStdString &strPath)
+{
+  // Path where the language strings reside
+  CStdString pathToLanguageFile = strPath;
+  CStdString pathToFallbackLanguageFile = strPath;
+  CUtil::AddFileToFolder(pathToLanguageFile, "language", pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "language", pathToFallbackLanguageFile);
+  CUtil::AddFileToFolder(pathToLanguageFile, g_guiSettings.GetString("locale.language"), pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "english", pathToFallbackLanguageFile);
+  CUtil::AddFileToFolder(pathToLanguageFile, "strings.xml", pathToLanguageFile);
+  CUtil::AddFileToFolder(pathToFallbackLanguageFile, "strings.xml", pathToFallbackLanguageFile);
+
+  // Load language strings temporarily
+  g_localizeStringsTemp.Load(pathToLanguageFile, pathToFallbackLanguageFile);
+}
+
+void CGUIPythonWindowXML::ClearScriptStrings()
+{
+  // Unload temporary language strings
+  g_localizeStringsTemp.Clear();
+}

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h	2008-07-11 14:13:23 UTC (rev 14008)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h	2008-07-11 14:43:29 UTC (rev 14009)
@@ -38,6 +38,7 @@
   virtual bool      OnMessage(CGUIMessage& message);
   virtual bool      OnAction(const CAction &action);
   virtual void      AllocResources(bool forceLoad = false);
+  virtual void      FreeResources(bool forceUnLoad = false);
   virtual void      Render();
   void              WaitForActionEvent(DWORD timeout);
   void              PulseActionEvent();
@@ -54,6 +55,8 @@
   virtual CFileItemPtr GetCurrentListItem(int offset = 0);
   const CFileItemList& CurrentDirectory() const;
   int               GetViewContainerID() const { return m_viewControl.GetCurrentControl(); };
+  static void       LoadScriptStrings(const CStdString &strPath);
+  static void       ClearScriptStrings();
 
 protected:
   CGUIControl      *GetFirstFocusableControl(int id);

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2008-07-11 14:13:23 UTC (rev 14008)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2008-07-11 14:43:29 UTC (rev 14009)
@@ -291,7 +291,7 @@
     if (!PyArg_ParseTuple(args, (char*)"i", &iString)) return NULL;
 
     CStdStringW unicodeLabel;
-    if (iString >= 30000 && iString <= 30999)
+    if (iString >= 30000 && iString <= 32999)
       g_charsetConverter.utf8ToW(g_localizeStringsTemp.Get(iString), unicodeLabel);
     else
       g_charsetConverter.utf8ToW(g_localizeStrings.Get(iString), unicodeLabel);


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

Revision: 14011
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14011&view=rev
Author:   elupus
Date:     2008-07-11 11:21:08 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
fixed: cmyth client would fail on recorded files with spaces in the filename

Modified Paths:
--------------
    branches/linuxport/XBMC/system/libcmyth.dll
    branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c

Modified: branches/linuxport/XBMC/system/libcmyth.dll
===================================================================
(Binary files differ)

Modified: branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c	2008-07-11 16:51:35 UTC (rev 14010)
+++ branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c	2008-07-11 18:21:08 UTC (rev 14011)
@@ -1659,7 +1659,12 @@
 		return NULL;
 	}
 
-	if(control->conn_version >= 32) {
+	/*
+	 * mythbackend doesn't support spaces in basenames
+	 * when doing QUERY_RECORDING.  If there are spaces, fallback
+	 * to enumerating all recordings
+	 */
+	if(control->conn_version >= 32 && strchr(basename, ' ') == NULL) {
 		pthread_mutex_lock(&mutex);
 
 		snprintf(msg, sizeof(msg), "QUERY_RECORDING BASENAME %s",


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

Revision: 14023
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14023&view=rev
Author:   jmarshallnz
Date:     2008-07-11 21:52:50 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
fixed: Use a smart pointer when passing CFileItem or CGUIListItem's around via messages, as otherwise threaded messages could free the pointer before it gets to it's destination, thanks to vulkanr.

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
    branches/linuxport/XBMC/guilib/GUIMessage.cpp
    branches/linuxport/XBMC/guilib/GUIMessage.h
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp

Modified: branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp	2008-07-12 04:52:50 UTC (rev 14023)
@@ -143,9 +143,9 @@
         SelectItem(message.GetParam1());
         return true;
       }
-      if (message.GetMessage() == GUI_MSG_LABEL_ADD && message.GetLPVOID())
+      if (message.GetMessage() == GUI_MSG_LABEL_ADD && message.GetItem())
       {
-        CGUIListItemPtr item = *(CGUIListItemPtr*)message.GetLPVOID();
+        CGUIListItemPtr item = message.GetItem();
         m_items.push_back(item);
         if (m_pageControl)
         {

Modified: branches/linuxport/XBMC/guilib/GUIMessage.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIMessage.cpp	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/guilib/GUIMessage.cpp	2008-07-12 04:52:50 UTC (rev 14023)
@@ -52,7 +52,7 @@
   m_dwControlID = dwControlID;
   m_dwParam1 = dwParam1;
   m_dwParam2 = dwParam2;
-  m_lpVoid = (void *)&item;
+  m_item = item;
 }
 
 CGUIMessage::CGUIMessage(DWORD dwMsg, DWORD dwSenderID, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, CVisualisation* vis)
@@ -101,6 +101,11 @@
   return m_lpVoid;
 }
 
+CGUIListItemPtr CGUIMessage::GetItem() const
+{
+  return m_item;
+}
+
 DWORD CGUIMessage::GetParam1() const
 {
   return m_dwParam1;
@@ -129,6 +134,7 @@
   m_strLabel = msg.m_strLabel;
   m_dwSenderID = msg.m_dwSenderID;
   m_strParam = msg.m_strParam;
+  m_item = msg.m_item;
   return *this;
 }
 

Modified: branches/linuxport/XBMC/guilib/GUIMessage.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIMessage.h	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/guilib/GUIMessage.h	2008-07-12 04:52:50 UTC (rev 14023)
@@ -241,6 +241,7 @@
   DWORD GetControlId() const ;
   DWORD GetMessage() const;
   void* GetLPVOID() const;
+  CGUIListItemPtr GetItem() const;
   DWORD GetParam1() const;
   DWORD GetParam2() const;
   DWORD GetSenderId() const;
@@ -262,5 +263,6 @@
   void* m_lpVoid;
   DWORD m_dwParam1;
   DWORD m_dwParam2;
+  CGUIListItemPtr m_item;
 };
 #endif

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-12 04:52:50 UTC (rev 14023)
@@ -267,12 +267,12 @@
         Update(m_vecItems->m_strPath);
         m_viewControl.SetSelectedItem(iItem);
       }
-      else if (message.GetParam1()==GUI_MSG_UPDATE_ITEM && message.GetLPVOID())
+      else if (message.GetParam1()==GUI_MSG_UPDATE_ITEM && message.GetItem())
       {
-        CFileItemPtr newItem = *(CFileItemPtr*)message.GetLPVOID();
+        CFileItemPtr newItem = boost::static_pointer_cast<CFileItem>(message.GetItem());
         if (IsActive())
           m_vecItems->UpdateItem(newItem.get());
-        else
+        else if (newItem)
         { // need to remove the disc cache
           CFileItemList items;
           CUtil::GetDirectory(newItem->m_strPath, items.m_strPath);

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-07-12 04:52:50 UTC (rev 14023)
@@ -64,7 +64,7 @@
     {
       // update our item if necessary
       CPlayList &playlist = GetPlaylist(m_iCurrentPlayList);
-      CFileItemPtr item = *(CFileItemPtr *)message.GetLPVOID();
+      CFileItemPtr item = boost::static_pointer_cast<CFileItem>(message.GetItem());
       playlist.UpdateItem(item.get());
     }
     break;

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-07-12 01:18:09 UTC (rev 14022)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-07-12 04:52:50 UTC (rev 14023)
@@ -103,10 +103,10 @@
 {
   if (message.GetMessage() == GUI_MSG_NOTIFY_ALL)
   {
-    if (message.GetParam1() == GUI_MSG_UPDATE_ITEM && message.GetLPVOID())
+    if (message.GetParam1() == GUI_MSG_UPDATE_ITEM && message.GetItem())
     {
-      CFileItemPtr item = *(CFileItemPtr*)message.GetLPVOID();
-      if (m_currentFile->m_strPath.Equals(item->m_strPath))
+      CFileItemPtr item = boost::static_pointer_cast<CFileItem>(message.GetItem());
+      if (item && m_currentFile->m_strPath.Equals(item->m_strPath))
         *m_currentFile = *item;
       return true;
     }


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

Revision: 14036
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14036&view=rev
Author:   jmarshallnz
Date:     2008-07-12 19:30:28 -0700 (Sat, 12 Jul 2008)

Log Message:
-----------
added: Preliminary support for an in-place edit control (based on the old one).

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/GUIEditControl.cpp
    branches/linuxport/XBMC/guilib/GUIEditControl.h
    branches/linuxport/XBMC/guilib/GUITextLayout.cpp
    branches/linuxport/XBMC/guilib/GUITextLayout.h
    branches/linuxport/XBMC/xbmc/Application.cpp

Modified: branches/linuxport/XBMC/guilib/GUIEditControl.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIEditControl.cpp	2008-07-13 02:24:43 UTC (rev 14035)
+++ branches/linuxport/XBMC/guilib/GUIEditControl.cpp	2008-07-13 02:30:28 UTC (rev 14036)
@@ -31,23 +31,23 @@
     : CGUILabelControl(dwParentID, dwControlId, posX, posY, width, height, labelInfo, false, false)
 {
   ControlType = GUICONTROL_EDIT;
-  m_pObserver = NULL;
   m_originalPosX = posX;
+  m_originalWidth = width;
   SetLabel(strLabel);
-  ShowCursor(true);
+  ShowCursor(false);
 }
 
 CGUIEditControl::~CGUIEditControl(void)
-{}
-
-void CGUIEditControl::SetObserver(IEditControlObserver* aObserver)
 {
-  m_pObserver = aObserver;
 }
 
-void CGUIEditControl::OnKeyPress(const CAction &action) // FIXME TESTME: NEW/CHANGED parameter and NOT tested CAN'T do it/DON'T know where (window 2700)/how exactly
+bool CGUIEditControl::OnAction(const CAction &action)
 {
-  CStdString label(m_infoLabel.GetLabel(m_dwParentID));
+  CStdStringW label;
+  g_charsetConverter.utf8ToW(m_infoLabel.GetLabel(m_dwParentID), label);
+
+  ValidateCursor((int)label.length());
+
   if (action.wID >= KEY_VKEY && action.wID < KEY_ASCII)
   {
     // input from the keyboard (vkey, not ascii)
@@ -56,20 +56,21 @@
     {
       // left
       m_iCursorPos--;
+      SetInvalid();
+      return true;
     }
     if (b == 0x27 && m_iCursorPos < (int)label.length())
     {
       // right
       m_iCursorPos++;
+      SetInvalid();
+      return true;
     }
   }
   else if (action.wID >= KEY_ASCII)
   {
     // input from the keyboard
-    // NOTE: The below code is from the unicode keyboard patch which isn't in trunk fully yet.
-    //       I have included it as this class will eventually need it anyway.  Ideally it should
-    //       be using action.unicode if/when the unicode keyboard patch is merged to trunk.
-    switch (action.wID) 
+    switch (action.unicode) 
     {
     case 27:
       { // escape
@@ -80,13 +81,6 @@
     case 10:
       {
         // enter
-        if (m_pObserver)
-        {
-          CStdString strLineOfText = label;
-          label.clear();
-          m_iCursorPos = 0;
-          m_pObserver->OnEditTextComplete(strLineOfText);
-        }
         break;
       }
     case 8:
@@ -101,67 +95,69 @@
       }
     default:
       {
-        // use character input // FIXME TESTME: NEW/CHANGED and NOT tested CAN'T do it/DON'T know where/how exactly (conversion from utf8 to WCHAR and back) 
-        CStdStringW wStrLabel;
-        g_charsetConverter.utf8ToW(label, wStrLabel);
-        wStrLabel.insert( wStrLabel.begin() + m_iCursorPos, (WCHAR)action.wID);
-        g_charsetConverter.wToUTF8(wStrLabel, label);
+        label.insert( label.begin() + m_iCursorPos, (WCHAR)action.unicode);
         m_iCursorPos++;
         break;
       }
     }
+    CStdString utf8Label;
+    g_charsetConverter.wToUTF8(label, utf8Label);
+    SetLabel(utf8Label);
+    SetInvalid();
+    return true;
   }
-  SetLabel(label);
-  RecalcLabelPosition();
+  return CGUILabelControl::OnAction(action);  // TODO:EDIT - based off labelcontrol
 }
 
 void CGUIEditControl::RecalcLabelPosition()
 {
-  float maxWidth = m_width - 8;
+  if (!m_label.font) return;
 
-  float fTextWidth, fTextHeight;
+  // ensure that our cursor is within our width
+  CStdStringW label;
+  g_charsetConverter.utf8ToW(m_infoLabel.GetLabel(m_dwParentID), label);
+  ValidateCursor((int)label.length());
 
-  // this is possibly not quite correct (utf8 issues)
-  CStdString strTempLabel = m_infoLabel.GetLabel(m_dwParentID);
-  CStdString strTempPart = strTempLabel.Mid(0, m_iCursorPos);
-
-  m_textLayout.Update(strTempPart);
-  m_textLayout.GetTextExtent(fTextWidth, fTextHeight);
-
+  float beforeCursorWidth = m_textLayout.GetTextWidth(label.Left(m_iCursorPos));
+  float afterCursorWidth = m_textLayout.GetTextWidth(label.Left(m_iCursorPos) + L'|');
+  
   // if skinner forgot to set height :p
   if (m_height == 0)
   {
-    // store font height
-    m_height = fTextHeight;
+    m_height = 2*m_label.font->GetTextHeight(1);
   }
 
   // if text accumulated is greater than width allowed
-  if (fTextWidth > maxWidth)
+  if (m_posX + afterCursorWidth > m_originalPosX + m_originalWidth)  // off screen to the right
   {
     // move the position of the label to the left (outside of the viewport)
-    m_posX = (m_originalPosX + maxWidth) - fTextWidth;
+    m_posX = (m_originalPosX + m_originalWidth) - afterCursorWidth;
   }
-  else
+  else if (m_posX + beforeCursorWidth < m_originalPosX) // offscreen to the left
   {
     // otherwise use original position
-    m_posX = m_originalPosX;
+    m_posX = m_originalPosX - beforeCursorWidth;
   }
+  m_width = m_textLayout.GetTextWidth(label) + m_height*2;   // ensure it's plenty long enough :)
 }
 
 void CGUIEditControl::Render()
 {
-  // we can only perform view port operations if we have an area to display
-  if (m_height > 0 && m_width > 0)
+  ShowCursor(HasFocus());
+  if (m_bInvalidated)
+    RecalcLabelPosition();
+
+  if (g_graphicsContext.SetClipRegion(m_originalPosX, m_posY, m_originalWidth, m_height))
   {
-    if (g_graphicsContext.SetClipRegion(m_originalPosX, m_posY, m_width, m_height))
-    {
-      CGUILabelControl::Render();
-      g_graphicsContext.RestoreClipRegion();
-    }
-  }
-  else
-  {
-    // use default rendering until we have recalculated label position
     CGUILabelControl::Render();
+    g_graphicsContext.RestoreClipRegion();
   }
 }
+
+void CGUIEditControl::ValidateCursor(int maxLength)
+{
+  if (m_iCursorPos > maxLength)
+    m_iCursorPos = maxLength;
+  if (m_iCursorPos < 0)
+    m_iCursorPos = 0;
+}

Modified: branches/linuxport/XBMC/guilib/GUIEditControl.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIEditControl.h	2008-07-13 02:24:43 UTC (rev 14035)
+++ branches/linuxport/XBMC/guilib/GUIEditControl.h	2008-07-13 02:30:28 UTC (rev 14036)
@@ -36,13 +36,6 @@
  \brief 
  */
 
-class IEditControlObserver
-{
-public:
-  virtual void OnEditTextComplete(CStdString& strLineOfText) = 0;
-  virtual ~IEditControlObserver() {}
-};
-
 class CGUIEditControl : public CGUILabelControl
 {
 public:
@@ -51,15 +44,16 @@
 
   virtual ~CGUIEditControl(void);
 
-  virtual void SetObserver(IEditControlObserver* aObserver);
-  virtual void OnKeyPress(const CAction &action); // FIXME TESTME: NEW/CHANGED parameter and NOT tested CAN'T do it/DON'T know where (window 2700)/how exactly 
+  virtual bool OnAction(const CAction &action);
   virtual void Render();
 
+  virtual bool CanFocus() const { return true; }; // TODO:EDIT only needed because we're based on labelcontrol
+
 protected:
   void RecalcLabelPosition();
+  void ValidateCursor(int maxLength);
 
-protected:
-  IEditControlObserver* m_pObserver;
   float m_originalPosX;
+  float m_originalWidth;
 };
 #endif

Modified: branches/linuxport/XBMC/guilib/GUITextLayout.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUITextLayout.cpp	2008-07-13 02:24:43 UTC (rev 14035)
+++ branches/linuxport/XBMC/guilib/GUITextLayout.cpp	2008-07-13 02:30:28 UTC (rev 14036)
@@ -437,6 +437,15 @@
     text = m_lines[0].m_text;
 }
 
+float CGUITextLayout::GetTextWidth(const CStdStringW &text) const
+{
+  // NOTE: Assumes a single line of text
+  if (!m_font) return 0;
+  vector<DWORD> utf32;
+  AppendToUTF32(text, m_font->GetStyle(), utf32);
+  return m_font->GetTextWidth(utf32);
+}
+
 void CGUITextLayout::DrawText(CGUIFont *font, float x, float y, DWORD color, DWORD shadowColor, const CStdString &text, DWORD align)
 {
   if (!font) return;
@@ -471,15 +480,23 @@
   font->DrawText(x, y, colors, 0, text, align, maxWidth);
 }
 
-void CGUITextLayout::AppendToUTF32(const CStdString &text, DWORD colStyle, vector<DWORD> &utf32)
+void CGUITextLayout::AppendToUTF32(const CStdStringW &utf16, DWORD colStyle, vector<DWORD> &utf32)
 {
+  // NOTE: Assumes a single link of text
+  utf32.reserve(utf32.size() + utf16.size());
+  for (unsigned int i = 0; i < utf16.size(); i++)
+    utf32.push_back(utf16[i] | colStyle);
+}
+
+void CGUITextLayout::AppendToUTF32(const CStdString &utf8, DWORD colStyle, vector<DWORD> &utf32)
+{
   // convert text to utf32
 #ifdef WORK_AROUND_NEEDED_FOR_LINE_BREAKS
   // NOTE: This appears to strip \n characters from text.  This may be a consequence of incorrect
   //       expression of the \n in utf8 (we just use character code 10) or it might be something
   //       more sinister.  For now, we use the workaround below.
   CStdStringW utf16;
-  g_charsetConverter.utf8ToUTF16(text, utf16);
+  g_charsetConverter.utf8ToUTF16(utf8, utf16);
   utf16.Replace(L"\r", L"");
   utf32.reserve(utf32.size() + utf16.size());
   for (unsigned int i = 0; i < utf16.size(); i++)
@@ -487,15 +504,13 @@
 #else
   // workaround - break into \n separated, and re-assemble
   CStdStringArray multiLines;
-  StringUtils::SplitString(text, "\n", multiLines);
+  StringUtils::SplitString(utf8, "\n", multiLines);
   for (unsigned int i = 0; i < multiLines.size(); i++)
   {
     CStdStringW utf16;
     g_charsetConverter.utf8ToW(multiLines[i], utf16);
     utf16.Replace(L"\r", L"");  // filter out '\r'
-    utf32.reserve(utf32.size() + utf16.size() + 1);
-    for (unsigned int j = 0; j < utf16.size(); j++)
-      utf32.push_back(utf16[j] | colStyle);
+    AppendToUTF32(utf16, colStyle, utf32);
     if (i < multiLines.size() - 1)
       utf32.push_back(L'\n');
   }

Modified: branches/linuxport/XBMC/guilib/GUITextLayout.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUITextLayout.h	2008-07-13 02:24:43 UTC (rev 14035)
+++ branches/linuxport/XBMC/guilib/GUITextLayout.h	2008-07-13 02:30:28 UTC (rev 14036)
@@ -58,6 +58,7 @@
   void RenderScrolling(float x, float y, float angle, DWORD color, DWORD shadowColor, DWORD alignment, float maxWidth, CScrollInfo &scrollInfo);
   void RenderOutline(float x, float y, DWORD color, DWORD outlineColor, DWORD outlineWidth, DWORD alignment, float maxWidth);
   void GetTextExtent(float &width, float &height);
+  float GetTextWidth(const CStdStringW &text) const;
   bool Update(const CStdString &text, float maxWidth = 0);
 
   unsigned int GetTextLength() const;
@@ -67,6 +68,7 @@
   void SetWrap(bool bWrap=true);
   void SetMaxHeight(float fHeight);
 
+
   static void DrawText(CGUIFont *font, float x, float y, DWORD color, DWORD shadowColor, const CStdString &text, DWORD align);
   static void DrawOutlineText(CGUIFont *font, float x, float y, DWORD color, DWORD outlineColor, DWORD outlineWidth, const CStdString &text);
 protected:
@@ -88,7 +90,8 @@
 
   CStdString m_lastText;
 private:
-  static void AppendToUTF32(const CStdString &text, DWORD colStyle, std::vector<DWORD> &utf32);
+  static void AppendToUTF32(const CStdString &utf8, DWORD colStyle, std::vector<DWORD> &utf32);
+  static void AppendToUTF32(const CStdStringW &utf16, DWORD colStyle, std::vector<DWORD> &utf32);
   static void DrawOutlineText(CGUIFont *font, float x, float y, const std::vector<DWORD> &colors, DWORD outlineColor, DWORD outlineWidth, const std::vector<DWORD> &text, DWORD align, float maxWidth);
 };
 

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-13 02:24:43 UTC (rev 14035)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-13 02:30:28 UTC (rev 14036)
@@ -2432,8 +2432,18 @@
     // current active window isnt the fullscreen window
     // just use corresponding section from keymap.xml
     // to map key->action
-    if (key.FromKeyboard() && (iWin == WINDOW_DIALOG_KEYBOARD || iWin == WINDOW_DIALOG_NUMERIC) )
+
+    // first determine if we should use keyboard input directly
+    bool useKeyboard = key.FromKeyboard() && (iWin == WINDOW_DIALOG_KEYBOARD || iWin == WINDOW_DIALOG_NUMERIC);
+    CGUIWindow *window = m_gWindowManager.GetWindow(iWin);
+    if (window)
     {
+      CGUIControl *control = window->GetFocusedControl();
+      if (control && control->GetControlType() == CGUIControl::GUICONTROL_EDIT)
+        useKeyboard = true;
+    }
+    if (useKeyboard)
+    {
       if (key.GetFromHttpApi())
       {
         if (key.GetButtonCode() != KEY_INVALID)
@@ -2461,20 +2471,23 @@
           action.unicode = 0;
         }
       }
+#ifdef HAS_SDL
+      g_Keyboard.Reset();
+#endif
+      if (OnAction(action))
+        return true;
+      // failed to handle the keyboard action, drop down through to standard action
     }
-    else
+    if (key.GetFromHttpApi())
     {
-      if (key.GetFromHttpApi())
+      if (key.GetButtonCode() != KEY_INVALID)
       {
-        if (key.GetButtonCode() != KEY_INVALID)
-        {
-          action.wID = (WORD) key.GetButtonCode();
-          g_buttonTranslator.GetAction(iWin, key, action);
-        }
+        action.wID = (WORD) key.GetButtonCode();
+        g_buttonTranslator.GetAction(iWin, key, action);
       }
-      else
-        g_buttonTranslator.GetAction(iWin, key, action);
     }
+    else
+      g_buttonTranslator.GetAction(iWin, key, action);
   }
   if (!key.IsAnalogButton())
     CLog::Log(LOGDEBUG, "%s: %i pressed, action is %i", __FUNCTION__, (int) key.GetButtonCode(), action.wID);


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

Revision: 14038
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14038&view=rev
Author:   yuvalt
Date:     2008-07-13 05:05:43 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
add dependency generation (.P). No need to clean everything after updating a header file

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.include.in
    branches/linuxport/XBMC/guilib/Makefile
    branches/linuxport/XBMC/guilib/common/Makefile
    branches/linuxport/XBMC/guilib/tinyXML/Makefile
    branches/linuxport/XBMC/xbmc/FileSystem/Makefile
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/Makefile
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/Makefile
    branches/linuxport/XBMC/xbmc/Makefile
    branches/linuxport/XBMC/xbmc/cdrip/Makefile
    branches/linuxport/XBMC/xbmc/cores/DllLoader/Makefile
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/util/Makefile
    branches/linuxport/XBMC/xbmc/cores/Makefile
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/Makefile
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/Makefile
    branches/linuxport/XBMC/xbmc/lib/UnrarXLib/Makefile
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/Makefile
    branches/linuxport/XBMC/xbmc/lib/libPython/Makefile
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/Makefile
    branches/linuxport/XBMC/xbmc/lib/libRTMP/Makefile
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Makefile
    branches/linuxport/XBMC/xbmc/lib/libscrobbler/Makefile
    branches/linuxport/XBMC/xbmc/lib/sqLite/Makefile
    branches/linuxport/XBMC/xbmc/linux/Makefile
    branches/linuxport/XBMC/xbmc/screensavers/Makefile
    branches/linuxport/XBMC/xbmc/utils/Makefile
    branches/linuxport/XBMC/xbmc/visualizations/Makefile
    branches/linuxport/XBMC/xbmc/xbox/Makefile

Modified: branches/linuxport/XBMC/Makefile.include.in
===================================================================
--- branches/linuxport/XBMC/Makefile.include.in	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/Makefile.include.in	2008-07-13 12:05:43 UTC (rev 14038)
@@ -12,12 +12,20 @@
 ARCH=@ARCH@
 
 .cpp.o:
-	rm -f ${<:.cpp=.o}
-	$(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
+	@rm -f ${<:.cpp=.o}
+	$(CXX) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.cpp=.o}
+	@cp $*.d $*.P; \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+	  rm -f $*.d
 
 .c.o:
-	rm -f ${<:.c=.o}
-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
+	@rm -f ${<:.c=.o}
+	$(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o ${<:.c=.o}
+	@cp $*.d $*.P; \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
+	  rm -f $*.d
 
 .S.o:
 	rm -f ${<:.S=.o}
@@ -28,7 +36,7 @@
 
 OBJS+=$(patsubst %.cpp,%.o,$(patsubst %.S,%.o,$(SRCS)))
 
-.PHONY : lib pch clean depend
+.PHONY : lib pch clean 
 
 lib: $(OBJS)
 
@@ -36,16 +44,12 @@
 	for d in $(DIRS); do (cd $$d; $(MAKE) pch ); done
 
 clean: 
-	$(RM) $(OBJS) $(LIB) $(PCH:.h=.h.gch)
+	$(RM) $(OBJS) $(LIB) $(PCH:.h=.h.gch) $(OBJS:.o=.P)
 	for d in $(DIRS); do (cd $$d; $(MAKE) clean ); done
 
 distclean: clean
-	@echo "Removing all object file (.o)"
+	@echo "Removing all object files (.o)"
 	@find . -name "*.o" -exec echo 'Removing "{}"' \; -exec rm -f "{}" \;
-	@echo "Removing all object file (.depend)"
-	@find . -name "*.depend" -exec echo 'Removing "{}"' \; -exec rm -f "{}" \;
+	@echo "Removing all dependency files (.P)"
+	@find . -name "*.P" -exec echo 'Removing "{}"' \; -exec rm -f "{}" \;
 	@echo "Done."
-
-depend: $(PCH) $(SRCS)
-	-$(CXX) -MM $(DEFINES) $(INCLUDES) $(SRCS) > Makefile.depend
-	-for d in $(DIRS); do (cd $$d; $(MAKE) depend ); done

Modified: branches/linuxport/XBMC/guilib/Makefile
===================================================================
--- branches/linuxport/XBMC/guilib/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/guilib/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -1,11 +1,11 @@
 INCLUDES=-I. -Icommon -I../xbmc -I../xbmc/cores -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL
 
-SRCS=ActionManager.cpp AnimatedGif.cpp AudioContext.cpp DirectXGraphics.cpp GraphicContext.cpp GUIAudioManager.cpp GUIBaseContainer.cpp GUIButtonControl.cpp GUIButtonScroller.cpp GUICheckMarkControl.cpp GUIConsoleControl.cpp GUIControl.cpp GuiControlFactory.cpp GUIControlGroup.cpp GUIControlGroupList.cpp GUIDialog.cpp GUIEditControl.cpp GUIFadeLabelControl.cpp GUIFixedListContainer.cpp GUIFont.cpp GUIFontManager.cpp GUIFontTTF.cpp guiImage.cpp GUIIncludes.cpp GUIItem.cpp GUILabelControl.cpp GUIListContainer.cpp GUIListControlEx.cpp GUIList.cpp GUIListExItem.cpp GUIListGroup.cpp GUIListItem.cpp GUIListItemLayout.cpp GUIMessage.cpp GUIMoverControl.cpp GUIMultiImage.cpp GUIPanelContainer.cpp GUIProgressControl.cpp GUIRadioButtonControl.cpp GUIResizeControl.cpp GUIRSSControl.cpp GUIScrollBarControl.cpp GUISelectButtonControl.cpp GUISettingsSliderControl.cpp GUISliderControl.cpp GUISpinControl.cpp GUISpinControlEx.cpp GUIStandardWindow.cpp GUITextBox.cpp GUIToggleButtonControl.cpp GUIVideoControl.cpp GUIVisualisationControl.cpp GUIWindow.cpp GUIWindowManager.cpp GUIWrappingListContainer.cpp include.cpp IWindowManagerCallback.cpp Key.cpp LocalizeStrings.cpp SkinInfo.cpp TextureBundle.cpp TextureManager.cpp VisibleEffect.cpp XMLUtils.cpp GUISound.o GUIColorManager.o Surface.cpp FrameBufferObject.cpp Shader.cpp GUILargeImage.cpp GUIListLabel.cpp GUIBorderedImage.cpp GUITextLayout.cpp GUIMultiSelectText.cpp GUIInfoColor.cpp
+SRCS=ActionManager.cpp AnimatedGif.cpp AudioContext.cpp DirectXGraphics.cpp GraphicContext.cpp GUIAudioManager.cpp GUIBaseContainer.cpp GUIButtonControl.cpp GUIButtonScroller.cpp GUICheckMarkControl.cpp GUIConsoleControl.cpp GUIControl.cpp GuiControlFactory.cpp GUIControlGroup.cpp GUIControlGroupList.cpp GUIDialog.cpp GUIEditControl.cpp GUIFadeLabelControl.cpp GUIFixedListContainer.cpp GUIFont.cpp GUIFontManager.cpp GUIFontTTF.cpp guiImage.cpp GUIIncludes.cpp GUIItem.cpp GUILabelControl.cpp GUIListContainer.cpp GUIListControlEx.cpp GUIList.cpp GUIListExItem.cpp GUIListGroup.cpp GUIListItem.cpp GUIListItemLayout.cpp GUIMessage.cpp GUIMoverControl.cpp GUIMultiImage.cpp GUIPanelContainer.cpp GUIProgressControl.cpp GUIRadioButtonControl.cpp GUIResizeControl.cpp GUIRSSControl.cpp GUIScrollBarControl.cpp GUISelectButtonControl.cpp GUISettingsSliderControl.cpp GUISliderControl.cpp GUISpinControl.cpp GUISpinControlEx.cpp GUIStandardWindow.cpp GUITextBox.cpp GUIToggleButtonControl.cpp GUIVideoControl.cpp GUIVisualisationControl.cpp GUIWindow.cpp GUIWindowManager.cpp GUIWrappingListContainer.cpp include.cpp IWindowManagerCallback.cpp Key.cpp LocalizeStrings.cpp SkinInfo.cpp TextureBundle.cpp TextureManager.cpp VisibleEffect.cpp XMLUtils.cpp GUISound.cpp GUIColorManager.cpp Surface.cpp FrameBufferObject.cpp Shader.cpp GUILargeImage.cpp GUIListLabel.cpp GUIBorderedImage.cpp GUITextLayout.cpp GUIMultiSelectText.cpp GUIInfoColor.cpp
 
 LIB=guilib.a
 
 include ../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
 
 try : try.o TextureBundle.o DirectXGraphics.o GUIFontTTF.o
 	g++ -o try try.o TextureBundle.o DirectXGraphics.o GraphicContext.o GUIIncludes.o ../xbmc/utils/CriticalSection.o ../xbmc/XBVideoConfig.o SkinInfo.o tinyXML/tinyxml.a ../xbmc/linux/CriticalSection.o GUIFontTTF.o GUIFontBase.o GUIFontManager.o GUIFont.o XMLUtils.o guiImage.o GUIControl.o TextureManager.o GUIMessage.o ../xbmc/utils/SingleLock.o VisibleEffect.o GUIWindowManager.o AnimatedGif.o -lSDL_image -lSDL_gfx -lSDL -llzo -lfreetype

Modified: branches/linuxport/XBMC/guilib/common/Makefile
===================================================================
--- branches/linuxport/XBMC/guilib/common/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/guilib/common/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=gui_common.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/guilib/tinyXML/Makefile
===================================================================
--- branches/linuxport/XBMC/guilib/tinyXML/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/guilib/tinyXML/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -3,4 +3,4 @@
 LIB=tinyxml.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/FileSystem/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/FileSystem/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -8,4 +8,4 @@
 LIB=filesystem.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=musicdatabasedirectory.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=videodatabasedirectory.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -9,6 +9,6 @@
 
 LIB=xbmc.a
 
+include ../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
 
-include ../Makefile.include
--include Makefile.depend

Modified: branches/linuxport/XBMC/xbmc/cdrip/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cdrip/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cdrip/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=cdrip.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -9,4 +9,4 @@
 LIB=dllloader.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,7 +7,7 @@
 LIB=exports.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
 
 wrapper.o : wrapper.c
 	gcc -fPIC -c -g -D_LINUX -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 $(INCLUDES) $< -o $@

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/util/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/util/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/util/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=exports_utils.a
 
 include ../../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=cores.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=VideoRenderer.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -4,4 +4,4 @@
 LIB=VideoShaders.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,6 +5,6 @@
 LIB=dvdcodecs_audio.a
 
 include ../../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
 
 CFLAGS+=-DHAVE_MMX

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=dvdcodecs.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,4 +7,4 @@
 dvdcodecs_overlay.a : libspucc/cc_decoder.o DVDOverlayCodecCC.o DVDOverlayCodecFFmpeg.o DVDOverlayCodecText.o DVDOverlayCodecSSA.o
 
 include ../../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=dvdcodecs_video.a
 
 include ../../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -6,4 +6,4 @@
 LIB=dvddemuxers.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -6,4 +6,4 @@
 LIB=dvdinputstream.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=dvdinputstream.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,4 +7,4 @@
 LIB=dvdplayer.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,4 +7,4 @@
 LIB=paplayer.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/UnrarXLib/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/UnrarXLib/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/UnrarXLib/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,4 +7,4 @@
 LIB=UnrarXLib.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -4,4 +4,4 @@
 LIB=goahead.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -4,5 +4,4 @@
 LIB=python.a
 
 include ../../../Makefile.include
--include Makefile.depend
-
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(pathsubst %.S,,$(SRCS))))

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=xbmcmodule.a
 
 include ../../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/libRTMP/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTMP/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libRTMP/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -4,5 +4,4 @@
 LIB=librtmp.a
 
 include ../../../Makefile.include
--include Makefile.depend
-
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/libcmyth/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libcmyth/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libcmyth/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,7 +5,7 @@
 LIB=libcmyth.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
 
 OBJSC+=$(SRCSC:.c=.o)
 OBJS=$(OBJSC)

Modified: branches/linuxport/XBMC/xbmc/lib/libscrobbler/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libscrobbler/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/libscrobbler/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=scrobbler.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/lib/sqLite/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/sqLite/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/lib/sqLite/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -3,4 +3,4 @@
 LIB=sqllite.a
 
 include ../../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/linux/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/linux/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -7,7 +7,4 @@
 
 include ../../Makefile.include
 
--include Makefile.depend
-
-x: NetworkLinux.o
-	g++ -o x NetworkLinux.o
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/screensavers/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/screensavers/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/screensavers/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -3,4 +3,4 @@
 SRCS=ScreenSaver.cpp ScreenSaverFactory.cpp
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/utils/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -8,4 +8,4 @@
 LIB=utils.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/visualizations/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/visualizations/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/visualizations/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=visualizations.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

Modified: branches/linuxport/XBMC/xbmc/xbox/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/xbox/Makefile	2008-07-13 10:41:47 UTC (rev 14037)
+++ branches/linuxport/XBMC/xbmc/xbox/Makefile	2008-07-13 12:05:43 UTC (rev 14038)
@@ -5,4 +5,4 @@
 LIB=xbox.a
 
 include ../../Makefile.include
--include Makefile.depend
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))


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

Revision: 14071
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14071&view=rev
Author:   wiso
Date:     2008-07-14 12:07:01 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
[win32]: added hibernate and suspend possibility to system menu (from Linux). Restart doesn't work yet (maybe a permission issue).

Modified Paths:
--------------
    branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h

Modified: branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj
===================================================================
--- branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj	2008-07-14 19:07:01 UTC (rev 14071)
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 /ignore:4254"
-				AdditionalDependencies="SDL.lib SDL_image.lib opengl32.lib DSound.lib glew32.lib glu32.lib winmm.lib ws2_32.lib Mpr.lib Iphlpapi.lib"
+				AdditionalDependencies="SDL.lib SDL_image.lib opengl32.lib DSound.lib glew32.lib glu32.lib winmm.lib ws2_32.lib Mpr.lib Iphlpapi.lib PowrProf.lib"
 				OutputFile="$(OutDir)\XBMC.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc;msvcrt;libcmt"
@@ -160,7 +160,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="false"
 				AdditionalOptions="/MACHINE:I386 /IGNORE:4089 /ignore:4254"
-				AdditionalDependencies="SDL.lib SDL_image.lib opengl32.lib DSound.lib glew32.lib glu32.lib winmm.lib ws2_32.lib Mpr.lib Iphlpapi.lib"
+				AdditionalDependencies="SDL.lib SDL_image.lib opengl32.lib DSound.lib glew32.lib glu32.lib winmm.lib ws2_32.lib Mpr.lib Iphlpapi.lib PowrProf.lib"
 				OutputFile="$(OutDir)\XBMC.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="libc;msvcrt;libci"

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-07-14 19:07:01 UTC (rev 14071)
@@ -41,6 +41,10 @@
 #ifdef HAS_HAL
 #include "linux/HalManager.h"
 #endif
+#ifdef _WIN32PC
+#include "WIN32Util.h"
+#define CHalManager CWIN32Util
+#endif
 
 using namespace std;
 
@@ -141,7 +145,7 @@
   {
     case TMSG_SHUTDOWN:
       {
-#ifdef HAS_HAL
+#if defined(HAS_HAL) || defined(_WIN32PC)
         int ShutdownState = g_guiSettings.GetInt("system.shutdownstate");
 #else
         g_application.Stop();
@@ -151,6 +155,10 @@
         // send the WM_CLOSE window message
         ::SendMessage( g_hWnd, WM_CLOSE, 0, 0 );
 #endif
+#ifdef _WIN32PC
+        if (ShutdownState) // If we have a setting for powerstate mode
+          CWIN32Util::PowerManagement((PowerState)ShutdownState);
+#endif
 #else
         // exit the application
 #ifdef HAS_HAL
@@ -184,6 +192,9 @@
         // send the WM_CLOSE window message
         ::SendMessage( g_hWnd, WM_CLOSE, 0, 0 );
 #endif
+#ifdef _WIN32PC
+        CWIN32Util::PowerManagement(POWERSTATE_REBOOT);
+#endif
 #else
         // exit the application
 #ifdef HAS_HAL
@@ -203,6 +214,9 @@
         // send the WM_CLOSE window message
         ::SendMessage( g_hWnd, WM_CLOSE, 0, 0 );
 #endif
+#ifdef _WIN32PC
+        CWIN32Util::PowerManagement(POWERSTATE_REBOOT);
+#endif
 #else
         // exit the application
 #ifdef HAS_HAL

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-14 19:07:01 UTC (rev 14071)
@@ -314,7 +314,7 @@
 #ifdef __APPLE__
   AddInt(3, "system.displaysleeptime", 17500, 0, 0, 5, 120, SPIN_CONTROL_INT_PLUS, MASK_MINS, TEXT_OFF);
 #endif
-#ifdef HAS_HAL
+#if defined(HAS_HAL) || defined(_WIN32PC)
   AddInt(3, "system.shutdownstate", 13008, 0, 0, 1, 4, SPIN_CONTROL_TEXT);
 #endif
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-14 19:07:01 UTC (rev 14071)
@@ -71,7 +71,7 @@
 #include "CPortAudio.h"
 #include "XBMCHelper.h"
 #endif
-#ifdef HAS_LINUX_NETWORK
+#if defined(HAS_LINUX_NETWORK) || defined(HAS_WIN32_NETWORK)
 #include "GUIDialogAccessPoints.h"
 #endif
 #include "FileSystem/Directory.h"
@@ -80,6 +80,10 @@
 #include "FileItem.h"
 #include "GUIToggleButtonControl.h"
 
+#ifdef _WIN32PC
+#include "WIN32Util.h"
+#endif
+
 using namespace std;
 using namespace DIRECTORY;
 
@@ -732,7 +736,7 @@
       pControl->SetValue(pSettingInt->GetData());
     }
 #endif
-#ifdef HAS_HAL
+#if defined(HAS_HAL) || defined(_WIN32PC)
     else if (strSetting.Equals("system.shutdownstate"))
     {
       CSettingInt *pSettingInt = (CSettingInt*)pSetting;

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-07-14 19:07:01 UTC (rev 14071)
@@ -24,6 +24,7 @@
 #include "GUISettings.h"
 #include "../Util.h"
 #include "FileSystem/cdioSupport.h"
+#include "PowrProf.h"
 
 using namespace std;
 using namespace MEDIA_DETECT;
@@ -228,3 +229,30 @@
 }
 
 // End Workaround
+
+bool CWIN32Util::PowerManagement(PowerState State)
+{
+  switch (State)
+  {
+  case POWERSTATE_HIBERNATE:
+    CLog::Log(LOGINFO, "Asking Windows to hibernate...");
+    return SetSuspendState(true,true,false);
+    break;
+  case POWERSTATE_SUSPEND:
+    CLog::Log(LOGINFO, "Asking Windows to suspend...");
+    return SetSuspendState(false,true,false);
+    break;
+  case POWERSTATE_SHUTDOWN:
+    CLog::Log(LOGINFO, "Shutdown Windows...");
+    return InitiateSystemShutdown(NULL, NULL,0,true,false);
+    break;
+  case POWERSTATE_REBOOT:
+    CLog::Log(LOGINFO, "Rebooting Windows...");
+    return InitiateSystemShutdown(NULL, NULL,0,true,true);
+    break;
+  default:
+    CLog::Log(LOGERROR, "Unknown PowerState called.");
+    return false;
+    break;
+  }
+}
\ No newline at end of file

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-07-14 19:00:00 UTC (rev 14070)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-07-14 19:07:01 UTC (rev 14071)
@@ -23,6 +23,14 @@
 
 #include "URL.h"
 
+enum PowerState
+{
+  POWERSTATE_SHUTDOWN  = 1,
+  POWERSTATE_HIBERNATE = 2,
+  POWERSTATE_SUSPEND   = 3,
+  POWERSTATE_REBOOT    = 4
+};
+
 class CWIN32Util
 {
 public:
@@ -39,6 +47,7 @@
   static int CWIN32Util::GetDriveStatus(const CStdString &strPath);
   static void UpdateDriveMask();
   static CStdString GetChangedDrive();
+  static bool PowerManagement(PowerState State);
 
 private:
   static DWORD dwDriveMask;


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

Revision: 14093
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14093&view=rev
Author:   spiff_
Date:     2008-07-14 15:07:13 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
fixed: missing configure flags for mp3 codec

Modified Paths:
--------------
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-14 21:19:36 UTC (rev 14092)
+++ branches/linuxport/XBMC/configure	2008-07-14 22:07:13 UTC (rev 14093)
@@ -14261,7 +14261,7 @@
 
 pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd
 pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd
-pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure; popd
+pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-14 21:19:36 UTC (rev 14092)
+++ branches/linuxport/XBMC/configure.in	2008-07-14 22:07:13 UTC (rev 14093)
@@ -333,7 +333,7 @@
 AC_CONFIG_FILES([Makefile Makefile.include xbmc/lib/libPython/linux/Makefile xbmc/lib/libUPnP/Makefile tools/Linux/xbmc.sh tools/XBMCTex/Makefile])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/lib/libPython/Python; ./configure --enable-ipv6 --enable-unicode=ucs4 --without-cxx --enable-shared --prefix=`pwd`/../linux/python-lib MACOSX_DEPLOYMENT_TARGET=10.5; sed -i -e "s/define HAVE_GETC_UNLOCKED 1/undef HAVE_GETC_UNLOCKED/" pyconfig.h; cp pyconfig.h Include; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd])
-AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd])
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"


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

Revision: 14098
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14098&view=rev
Author:   jmarshallnz
Date:     2008-07-14 22:08:58 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
changed: Moved Keymap.xml, IRSSmap.xml, and Lircmap.xml to system.  If the user has files in userdata/ then they will extend the files found in system.  This allows you to add to these files without having to bother merging changes on updates.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp
    branches/linuxport/XBMC/xbmc/ButtonTranslator.h

Added Paths:
-----------
    branches/linuxport/XBMC/system/IRSSmap.xml
    branches/linuxport/XBMC/system/Keymap.xml
    branches/linuxport/XBMC/system/Lircmap.xml

Removed Paths:
-------------
    branches/linuxport/XBMC/userdata/IRSSmap.xml
    branches/linuxport/XBMC/userdata/Keymap.xml
    branches/linuxport/XBMC/userdata/Lircmap.xml

Added: branches/linuxport/XBMC/system/IRSSmap.xml
===================================================================
--- branches/linuxport/XBMC/system/IRSSmap.xml	                        (rev 0)
+++ branches/linuxport/XBMC/system/IRSSmap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -0,0 +1,46 @@
+<!-- This file contains the mapping of IR Server Suite keys to XBMC keys used in Keymap.xml  -->
+
+<irssmap>
+	<remote device="Microsoft MCE">
+		<pause>31719</pause> <!-- pause -->
+		<stop>31718</stop> <!-- stop -->
+		<play>31721</play> <!-- play -->
+		<forward>31723</forward> <!-- forward -->
+		<reverse>31722</reverse> <!-- reverse -->
+		<left>31711</left> <!-- left -->
+		<right>31710</right> <!-- right -->
+		<up>31713</up> <!-- up -->
+		<down>31712</down> <!-- down -->
+		<select>31709</select> <!-- ok -->
+		<pageplus>31725</pageplus> <!-- channel up -->
+		<pageminus>31724</pageminus> <!-- channel down -->
+		<back>31708</back> <!-- previous -->
+		<menu>31707</menu> <!-- dvd menu -->
+		<title>31671</title> <!-- recorded tv -->
+		<info>31728</info> <!-- info -->
+		<skipplus>31717</skipplus> <!-- skip -->
+		<skipminus>31716</skipminus> <!-- repeat -->
+		<display>31705</display> <!-- guide -->
+		<start>31730</start> <!-- start -->
+		<record>31720</record> <!-- record -->
+		<volumeplus>31727</volumeplus> <!-- volume up -->
+		<volumeminus>31726</volumeminus> <!-- volume down -->
+		<mute>31729</mute> <!-- mute -->
+		<power>31642</power> <!-- tv power -->
+		<mytv>31706</mytv> <!-- live tv -->
+		<one>31742</one>
+		<two>31741</two>
+		<three>31740</three>
+		<four>31739</four>
+		<five>31738</five>
+		<six>31737</six>
+		<seven>31736</seven>
+		<eight>31735</eight>
+		<nine>31734</nine>
+		<zero>31743</zero>
+		<mytv>31652</mytv> <!-- red -->
+		<mymusic>31651</mymusic> <!-- green -->
+		<mypictures>31650</mypictures> <!-- yellow -->
+		<myvideo>31649</myvideo> <!-- blue -->
+	</remote>
+</irssmap>

Added: branches/linuxport/XBMC/system/Keymap.xml
===================================================================
--- branches/linuxport/XBMC/system/Keymap.xml	                        (rev 0)
+++ branches/linuxport/XBMC/system/Keymap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -0,0 +1,1590 @@
+<!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
+<!-- The <global> section is a fall through - they will only be used if the button is not          -->
+<!-- used in the current window's section.  Note that there is only handling                       -->
+<!-- for a single action per button at this stage.                                                 -->
+<!-- For joystick/gamepad configuration under linux/win32, see below as it differs from xbox       -->
+<!-- gamepads.                                                                                     -->
+
+<!-- The format is:                      -->
+<!--    <device>                         -->
+<!--      <button>action</button>        -->
+<!--    </device>                        -->
+
+<!-- To map keys from other remotes using the RCA 5 protocol, you may add <universalremote> blocks -->
+<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
+<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
+<!--    <universalremote>             -->
+<!--       <obc45>Stop</obc45>         -->
+<!--    </universalremote>            -->
+<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
+
+<!-- Note that the action can be a built-in function.                 -->
+<!--  eg <B>XBMC.ActivateWindow(MyMusic)"</B>                         -->
+<!-- would automatically go to My Music on the press of the B button. -->
+
+<!-- Joysticks / Gamepads:                                                                    -->
+<!--   See the sample PS3 controller configuration below for the format.                      -->
+<!--                                                                                          -->
+<!--  Joystick Name:                                                                          -->
+<!--   Do 'cat /proc/bus/input/devices' or see your xbmc log file  to find the names of       -->
+<!--   detected joysticks. The name used in the configuration should match the detected name. -->
+<!--                                                                                          -->
+<!--  Button Ids:                                                                             -->
+<!--   'id' is the button ID used by SDL. Joystick button ids of connected joysticks appear   -->
+<!--   in xbmc.log when they are pressed. Use your log to map custom buttons to actions.      -->
+<!--                                                                                          -->
+<!--  Axis Ids / Analog Controls                                                              -->
+<!--   Coming soon.                                                                           -->
+
+<keymap>
+  <global>
+    <remote>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+      <play>Play</play>
+      <pause>Pause</pause>
+      <stop>Stop</stop>
+      <forward>FastForward</forward>
+      <reverse>Rewind</reverse>
+      <left>Left</left>
+      <right>Right</right>
+      <up>Up</up>
+      <down>Down</down>
+      <select>Select</select>
+      <pageplus>PageUp</pageplus>
+      <pageminus>PageDown</pageminus>
+      <back>ParentDir</back>
+      <menu>PreviousMenu</menu>
+      <title>ContextMenu</title>
+      <info>Info</info>
+      <skipplus>SkipNext</skipplus>
+      <skipminus>SkipPrevious</skipminus>
+      <display>FullScreen</display>
+      <start>PreviousMenu</start>
+      <record>Screenshot</record>
+      <volumeplus>VolumeUp</volumeplus>
+      <volumeminus>VolumeDown</volumeminus>
+      <mute>Mute</mute>
+      <power>XBMC.ShutDown()</power>
+      <myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
+      <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
+      <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>
+      <mytv>XBMC.ActivateWindow(Home)</mytv>
+    </remote>
+
+    <gamepad>
+      <A>Select</A>
+      <B>ParentDir</B>
+      <X>FullScreen</X>
+      <Y>Queue</Y>
+      <white>ContextMenu</white>
+      <black></black>
+      <start>XBMC.ActivateWindow(PlayerControls)</start>
+      <back>PreviousMenu</back>
+      <dpadleft>Left</dpadleft>
+      <dpadright>Right</dpadright>
+      <dpadup>Up</dpadup>
+      <dpaddown>Down</dpaddown>
+      <leftthumbbutton>Screenshot</leftthumbbutton>
+      <rightthumbbutton>XBMC.ActivateWindow(ShutdownMenu)</rightthumbbutton>
+      <leftanalogtrigger>ScrollUp</leftanalogtrigger>
+      <rightanalogtrigger>ScrollDown</rightanalogtrigger>
+      <rightthumbstickleft>AnalogSeekBack</rightthumbstickleft>
+      <rightthumbstickright>AnalogSeekForward</rightthumbstickright>
+      <rightthumbstickup>VolumeUp</rightthumbstickup>
+      <rightthumbstickdown>VolumeDown</rightthumbstickdown>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">Select</button>
+      <button id="2">ParentDir</button>
+      <button id="3"></button>
+      <button id="4">FullScreen</button>
+      <button id="5">Queue</button>
+      <button id="6">ContextMenu</button>
+      <button id="7"></button>
+      <button id="8"></button>
+      <button id="9">XBMC.ActivateWindow(PlayerControls)</button>
+      <button id="10"></button>
+      <button id="11">Screenshot</button>
+      <button id="12">XBMC.ActivateWindow(ShutdownMenu)</button>
+      <button id="13">Up</button>
+      <button id="14">Right</button>
+      <button id="15">Down</button>
+      <button id="16">Left</button>
+      <button id="17">PreviousMenu</button>
+      <axis id="5" limit="-1">VolumeDown</axis>
+      <axis id="5" limit="+1">VolumeUp</axis>
+      <axis id="4" limit="-1">AnalogSeekBack</axis>
+      <axis id="4" limit="+1">AnalogSeekForward</axis>
+      <axis id="3" limit="0">ScrollUp</axis>
+      <axis id="6" limit="0">ScrollDown</axis>
+    </joystick>
+
+    <joystick name="Sony PLAYSTATION(R)3 Controller">   
+      <altname>PS3 Controller</altname>
+      <button id="15">Select</button>                   
+      <button id="14">ParentDir</button>                
+      <button id="16">FullScreen</button>
+      <button id="13">Queue</button>
+      <button id="11">PreviousMenu</button>
+      <button id="8">Left</button>
+      <button id="6">Right</button>
+      <button id="5">Up</button>
+      <button id="7">Down</button>
+      <button id="2">Screenshot</button>
+      <button id="3">XBMC.ActivateWindow(ShutdownMenu)</button>
+      <button id="4">XBMC.ActivateWindow(PlayerControls)</button>
+      <axis id="4" limit="+1">VolumeDown</axis>
+      <axis id="4" limit="-1">VolumeUp</axis>
+      <axis id="1" limit="+1">AnalogSeekForward</axis>
+      <axis id="1" limit="-1">AnalogSeekBack</axis>
+      <axis id="13" limit="+1">ScrollUp</axis>
+      <axis id="14" limit="+1">ScrollDown</axis>
+    </joystick>
+
+    <keyboard>
+      <p>Play</p>
+      <q>Queue</q>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <left>Left</left>
+      <right>Right</right>
+      <up>Up</up>
+      <down>Down</down>
+      <pageup>PageUp</pageup>
+      <pagedown>PageDown</pagedown>
+      <return>Select</return>
+      <backspace>ParentDir</backspace>
+      <m>ActivateWindow(PlayerControls)</m>
+      <s>ActivateWindow(shutdownmenu)</s>
+      <escape>PreviousMenu</escape>
+      <i>Info</i>
+      <menu>ContextMenu</menu>
+      <space>Pause</space>
+      <x>Stop</x>
+      <period>SkipNext</period>
+      <comma>SkipPrevious</comma>
+      <tab>FullScreen</tab>
+      <printscreen>Screenshot</printscreen>
+      <minus>VolumeDown</minus>
+      <plus>VolumeUp</plus>
+      <zero>Number0</zero>
+      <one>Number1</one>
+      <two>Number2</two>
+      <three>Number3</three>
+      <four>Number4</four>
+      <five>Number5</five>
+      <six>Number6</six>
+      <seven>Number7</seven>
+      <eight>Number8</eight>
+      <nine>Number9</nine>
+      <backslash>ToggleFullScreen</backslash>
+      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
+      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+      <browser_refresh></browser_refresh>
+      <browser_search></browser_search>
+      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
+      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
+      <play_pause>Pause</play_pause>
+      <stop>Stop</stop>
+      <volume_up>VolumeUp</volume_up>
+      <volume_mute>Mute</volume_mute>
+      <volume_down>VolumeDown</volume_down>
+      <next_track>SkipNext</next_track>
+      <prev_track>SkipPrevious</prev_track>
+      <launch_mail></launch_mail>
+      <key id="61620"></key> <!-- same as above, launch_mail, but using button code (based on vkey id) -->
+      <end>XBMC.ShutDown()</end>
+    </keyboard>
+  </global>
+
+
+  <Home>
+    <gamepad>
+      <black>XBMC.Skin.ToggleSetting(HomeViewToggle)</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="3">XBMC.Skin.ToggleSetting(HomeViewToggle)</button>
+    </joystick>
+    
+    <remote>
+      <menu>XBMC.Skin.ToggleSetting(HomeViewToggle)</menu>
+      <info>XBMC.ActivateWindow(SystemInfo)</info>
+      <clear>XBMC.ActivateWindow(Weather)</clear>
+      <hash>XBMC.ActivateWindow(Settings)</hash>
+    </remote>
+
+    <keyboard>
+      <i>info</i>
+    </keyboard>
+  </Home>
+  
+
+  <MyFiles>
+    <gamepad>
+      <Y>Highlight</Y>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="5">Highlight</button>
+    </joystick>
+
+    <remote>
+      <zero>Delete</zero>
+      <one>Highlight</one>
+      <four>Copy</four>
+      <seven>Move</seven>
+      <clear>Delete</clear>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Highlight</space>
+      <delete>Delete</delete>
+      <c>Copy</c>
+      <m>Move</m>
+      <r>Rename</r>
+    </keyboard>
+  </MyFiles>
+  
+
+  <MyMusicPlaylist>
+    <gamepad>
+      <Y>Delete</Y>
+      <black>Playlist</black> <!-- Close playlist -->
+      <back>Playlist</back>   <!-- Close playlist -->
+      <B>Playlist</B>         <!-- Close playlist -->
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Playlist</button>
+      <button id="3">Playlist</button>
+      <button id="17">Playlist</button>
+      <button id="5">Delete</button>
+     </joystick>
+    
+    <remote>
+      <back>Playlist</back> <!-- Close playlist -->
+      <clear>Delete</clear>
+      <zero>Delete</zero>
+      <two>MoveItemUp</two>
+      <five>MoveItemDown</five>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Playlist</space> <!-- Close playlist -->
+      <delete>Delete</delete>
+      <u>MoveItemUp</u>
+      <d>MoveItemDown</d>
+    </keyboard>
+  </MyMusicPlaylist>
+
+  <MyMusicPlaylistEditor>
+    <keyboard>
+      <u>MoveItemUp</u>
+      <d>MoveItemDown</d>
+      <delete>Delete</delete>
+    </keyboard>
+
+    <gamepad>
+      <Y>Queue</Y>
+    </gamepad>
+    <remote>
+      <zero>Queue</zero>
+    </remote>
+  </MyMusicPlaylistEditor>
+  
+  <MyMusicFiles>
+    <gamepad>
+      <Y>Queue</Y>
+      <black>Playlist</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="3">Playlist</button>
+      <button id="5">Queue</button>
+     </joystick>
+
+     <remote>
+      <zero>Queue</zero>
+      <star>Queue</star>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Playlist</space>
+      <q>Queue</q>
+    </keyboard>
+  </MyMusicFiles>
+
+
+  <MyMusicLibrary>
+    <gamepad>
+      <Y>Queue</Y>
+      <black>Playlist</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="3">Playlist</button>
+      <button id="5">Queue</button>
+     </joystick>
+    
+     <remote>
+      <zero>Queue</zero>
+      <star>Queue</star>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Playlist</space>
+      <q>Queue</q>
+    </keyboard>
+  </MyMusicLibrary>
+
+
+  <FullscreenVideo>
+    <remote>
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <up>BigStepForward</up>
+      <down>BigStepBack</down>
+      <back>SmallStepBack</back>
+      <menu>OSD</menu>
+      <start>OSD</start>
+      <title>CodecInfo</title>
+      <info>Info</info>
+      <enter>AspectRatio</enter>
+      <select>AspectRatio</select>
+   </remote>
+
+    <gamepad>
+      <A>Pause</A>
+      <B>Stop</B>
+      <Y>AspectRatio</Y>
+      <black>CodecInfo</black>
+      <white>Info</white>
+      <back>SmallStepBack</back>
+      <start>OSD</start>
+      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
+      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
+      <dpadleft>StepBack</dpadleft>
+      <dpadright>StepForward</dpadright>
+      <dpadup>BigStepForward</dpadup>
+      <dpaddown>BigStepBack</dpaddown>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">Pause</button>
+      <button id="2">Stop</button>
+      <button id="3">CodecInfo</button>
+      <button id="5">AspectRatio</button>
+      <button id="6">Info</button>
+      <button id="9">OSD</button>
+      <button id="13">BigStepForward</button>
+      <button id="14">StepForward</button>
+      <button id="15">BigStepBack</button>
+      <button id="16">StepBack</button>
+      <button id="17">SmallStepBack</button>
+      <axis id="3" limit="0">AnalogRewind</axis>
+      <axis id="6" limit="0">AnalogFastForward</axis>
+    </joystick>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>StepForward</period>
+      <comma>StepBack</comma>
+      <backspace>SmallStepBack</backspace>
+      <opensquarebracket>BigStepForward</opensquarebracket>
+      <closesquarebracket>BigStepBack</closesquarebracket>
+      <return>OSD</return>
+      <m>OSD</m>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <o>ShowTime</o>
+      <z>AspectRatio</z>
+      <s>ShowSubtitles</s>
+      <l>NextSubtitle</l>      
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <up>BigStepForward</up>
+      <down>BigStepBack</down>
+    </keyboard>
+  </FullscreenVideo>
+
+
+  <FullscreenInfo>
+    <remote>
+      <title>CodecInfo</title>
+      <info>Close</info>
+   </remote>
+
+    <gamepad>
+      <B>Close</B>
+      <black>CodecInfo</black>
+      <white>Close</white>
+      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
+      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Close</button>
+      <button id="3">CodecInfo</button>
+      <button id="6">Close</button>
+      <axis id="3" limit="0">AnalogRewind</axis>
+      <axis id="6" limit="0">AnalogFastForward</axis>
+    </joystick>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>StepForward</period>
+      <backspace>Close</backspace>
+      <t>Close</t>
+      <i>CodecInfo</i>
+    </keyboard>
+  </FullscreenInfo>
+
+  <PlayerControls>
+    <gamepad>
+      <back>Close</back>
+      <start>Close</start>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+    <altname>Mad Catz MicroCON</altname>
+    <altname>Logitech Xbox Cordless Controller</altname>
+       <button id="9">Close</button>
+      <button id="17">Close</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+    </remote>
+  </PlayerControls>
+
+
+  <Visualisation>
+    <remote>
+      <left>PreviousPreset</left>
+      <right>NextPreset</right>
+      <up>IncreaseRating</up>
+      <down>DecreaseRating</down>
+      <back>LockPreset</back>
+      <title>ShowPreset</title>
+      <select>XBMC.ActivateWindow(VisualisationPresetList)</select>
+      <menu>XBMC.ActivateWindow(MusicOSD)</menu>
+      <start>OSD</start>
+      <info>Info</info>
+    </remote>
+
+    <gamepad>
+      <A>Pause</A>
+      <B>Stop</B>
+      <Y>XBMC.ActivateWindow(VisualisationPresetList)</Y>
+      <black>ShowPreset</black>
+      <white>Info</white>
+      <start>XBMC.ActivateWindow(MusicOSD)</start>
+      <back>LockPreset</back>
+      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
+      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
+      <dpadleft>SkipPrevious</dpadleft>
+      <dpadright>SkipNext</dpadright>
+      <dpadup>NextPreset</dpadup>
+      <dpaddown>PreviousPreset</dpaddown>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">Pause</button>
+      <button id="2">Stop</button>
+      <button id="3">ShowPreset</button>
+      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
+      <button id="6">Info</button>
+      <button id="9">XBMC.ActivateWindow(MusicOSD)</button>
+      <button id="13">NextPreset</button>
+      <button id="14">SkipNext</button>
+      <button id="15">PreviousPreset</button>
+      <button id="16">SkipPrevious</button>
+      <axis id="3" limit="0">AnalogRewind</axis>
+      <axis id="6" limit="0">AnalogFastForward</axis>
+   </joystick>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>SkipNext</period>
+      <comma>SkipPrevious</comma>
+      <return>ActivateWindow(MusicOSD)</return>
+      <m>ActivateWindow(MusicOSD)</m>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <p>ActivateWindow(VisualisationPresetList)</p>
+      <v>ActivateWindow(VisualisationSettings)</v>
+      <n>ActivateWindow(MusicPlaylist)</n>
+      <left>SkipPrevious</left>
+      <right>SkipNext</right>
+      <up>IncreaseRating</up>
+      <down>DecreaseRating</down>
+      <!--<back>NextPreset</back>!-->
+      <s>ShowPreset</s>
+      <l>LockPreset</l>
+    </keyboard>
+  </Visualisation>
+
+  <MusicOSD>
+    <gamepad>
+      <back>Close</back>
+      <start>Close</start>
+      <black>ShowPreset</black>
+      <white>Info</white>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="17">Close</button>
+      <button id="19">Close</button>
+      <button id="3">ShowPreset</button>
+      <button id="6">Info</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+      <title>Info</title>
+      <info>ShowPreset</info>
+    </remote>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>SkipNext</period>
+      <comma>SkipPrevious</comma>
+      <m>Close</m>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <p>ActivateWindow(VisualisationPresetList)</p>
+      <v>ActivateWindow(VisualisationSettings)</v>
+      <n>ActivateWindow(MusicPlaylist)</n>
+    </keyboard>
+  </MusicOSD>
+
+
+  <VisualisationSettings>
+    <gamepad>
+      <B>Close</B>
+      <back>Close</back>
+      <start>Close</start>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Close</button>
+      <button id="3">Close</button>
+      <button id="9">Close</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+    </remote>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>SkipNext</period>
+      <comma>SkipPrevious</comma>
+      <m>Close</m>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <p>ActivateWindow(VisualisationPresetList)</p>
+      <v>Close</v>
+      <n>ActivateWindow(MusicPlaylist)</n>
+    </keyboard>
+  </VisualisationSettings>
+
+
+  <VisualisationPresetList>
+    <gamepad>
+      <B>Close</B>
+      <back>Close</back>
+      <start>Close</start>
+      <Y>Close</Y>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Close</button>
+      <button id="3">Close</button>
+      <button id="5">Close</button>
+      <button id="9">Close</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+    </remote>
+
+    <keyboard>
+      <f>FastForward</f>
+      <r>Rewind</r>
+      <period>SkipNext</period>
+      <comma>SkipPrevious</comma>
+      <m>Close</m>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <p>Close</p>
+      <v>Close</v>
+      <n>ActivateWindow(MusicPlaylist)</n>
+    </keyboard>
+  </VisualisationPresetList>
+
+
+  <SlideShow>
+    <gamepad>
+      <A>Pause</A>
+      <B>Stop</B>
+      <Y>Rotate</Y>
+      <X>ZoomNormal</X>
+      <black>CodecInfo</black>
+      <white>Info</white>
+      <righttrigger>NextPicture</righttrigger>
+      <lefttrigger>PreviousPicture</lefttrigger>
+      <dpadleft>PreviousPicture</dpadleft>
+      <dpadright>NextPicture</dpadright>
+      <dpadup>ZoomIn</dpadup>
+      <dpaddown>ZoomOut</dpaddown>
+      <leftthumbstick>AnalogMove</leftthumbstick>
+      <back>Stop</back>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">Pause</button>
+      <button id="2">Stop</button>
+      <button id="3">CodecInfo</button>
+      <button id="4">ZoomNormal</button>
+      <button id="5">Rotate</button>
+      <button id="6">Info</button>
+      <button id="13">ZoomIn</button>
+      <button id="14">NextPicture</button>
+      <button id="15">ZoomOut</button>
+      <button id="16">PreviousPicture</button>
+      <button id="17">Stop</button>
+    </joystick>
+
+    <remote>
+      <zero>ZoomNormal</zero>
+      <one>ZoomLevel1</one>
+      <two>ZoomLevel2</two>
+      <three>ZoomLevel3</three>
+      <four>ZoomLevel4</four>
+      <five>ZoomLevel5</five>
+      <six>ZoomLevel6</six>
+      <seven>ZoomLevel7</seven>
+      <eight>ZoomLevel8</eight>
+      <nine>ZoomLevel9</nine>
+      <info>CodecInfo</info>
+      <skipplus>NextPicture</skipplus>
+      <skipminus>PreviousPicture</skipminus>
+      <title>Info</title>
+      <select>Rotate</select>
+      <back>PreviousMenu</back>
+    </remote>
+
+    <keyboard>
+      <zero>ZoomNormal</zero>
+      <one>ZoomLevel1</one>
+      <two>ZoomLevel2</two>
+      <three>ZoomLevel3</three>
+      <four>ZoomLevel4</four>
+      <five>ZoomLevel5</five>
+      <six>ZoomLevel6</six>
+      <seven>ZoomLevel7</seven>
+      <eight>ZoomLevel8</eight>
+      <nine>ZoomLevel9</nine>
+      <i>CodecInfo</i>
+      <t>Info</t>
+      <period>NextPicture</period>
+      <comma>PreviousPicture</comma>
+      <plus>ZoomIn</plus>
+      <minus>ZoomOut</minus>
+      <r>Rotate</r>
+    </keyboard>
+  </SlideShow>
+
+
+  <ScreenCalibration>
+    <gamepad>
+      <leftthumbstick>AnalogMove</leftthumbstick>
+      <A>NextCalibration</A>
+      <black>ResetCalibration</black>
+      <white>NextResolution</white>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">NextCalibration</button>
+      <button id="3">ResetCalibration</button>
+      <button id="6">NextResolution</button>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <select>NextCalibration</select>
+      <enter>NextCalibration</enter>
+      <zero>ResetCalibration</zero>
+      <display>NextResolution</display>
+      <xbox>NextResolution</xbox>
+    </remote>
+
+    <keyboard>
+      <return>NextCalibration</return>
+      <d>ResetCalibration</d>
+      <r>NextResolution</r>
+    </keyboard>
+  </ScreenCalibration>
+
+
+  <GUICalibration>
+    <gamepad>
+      <leftthumbstick>AnalogMove</leftthumbstick>
+      <A>NextCalibration</A>
+      <black>ResetCalibration</black>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="1">NextCalibration</button>
+      <button id="3">ResetCalibration</button>
+      <button id="6">NextResolution</button>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <select>NextCalibration</select>
+      <enter>NextCalibration</enter>
+      <zero>ResetCalibration</zero>
+    </remote>
+
+    <keyboard>
+      <return>NextCalibration</return>
+      <d>ResetCalibration</d>
+    </keyboard>
+  </GUICalibration>
+
+
+  <SelectDialog>
+    <gamepad>
+      <back>Close</back>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="17">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+    </remote>
+
+    <keyboard>
+      <escape>Close</escape>
+    </keyboard>
+  </SelectDialog>
+  
+
+  <VideoOSD>
+    <gamepad>
+      <start>Close</start>
+      <back>PreviousMenu</back>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Close</button>
+      <button id="17">PreviousMenu</button>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+      <menu>Close</menu>
+      <start>Close</start>
+    </remote>
+
+    <keyboard>
+      <backspace>HideSubMenu</backspace>
+      <escape>Close</escape>
+    </keyboard>
+  </VideoOSD>
+
+  <VideoMenu>
+    <gamepad>
+      <Y>AspectRatio</Y>
+      <B>Stop</B>
+      <start>OSD</start>
+      <back>PreviousMenu</back>
+      <white>Info</white>
+      <black>CodecInfo</black>
+      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
+      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>      
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="5">AspectRatio</button>
+      <button id="2">Stop</button>
+      <button id="9">OSD</button>
+      <button id="17">PreviousMenu</button>
+      <button id="6">Info</button>
+      <button id="3">CodecInfo</button>
+    </joystick>
+
+    <remote>
+      <menu>OSD</menu>
+      <back>PreviousMenu</back>
+      <info>Info</info>
+      <title>CodecInfo</title>
+      <zero>Number0</zero>
+      <one>Number1</one>
+      <two>Number2</two>
+      <three>Number3</three>
+      <four>Number4</four>
+      <five>Number5</five>
+      <six>Number6</six>
+      <seven>Number7</seven>
+      <eight>Number8</eight>
+      <nine>Number9</nine>
+    </remote>
+
+    <keyboard>
+      <return>Select</return>
+      <backspace>PreviousMenu</backspace>
+    </keyboard>
+  </VideoMenu>
+
+
+  <OSDVideoSettings>
+    <gamepad>
+      <X></X>
+      <Y>AspectRatio</Y>
+      <B>Close</B>
+      <back>Close</back>
+      <start>Close</start>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="4"></button>
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+      <button id="17">Close</button>
+      <button id="19">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+      <menu>Close</menu>
+      <start>Close</start>
+    </remote>
+
+    <keyboard>
+      <backspace>HideSubMenu</backspace>
+      <escape>Close</escape>
+    </keyboard>
+  </OSDVideoSettings>
+
+  <OSDAudioSettings>
+    <gamepad>
+      <X></X>
+      <Y>AspectRatio</Y>
+      <B>Close</B>
+      <back>Close</back>
+      <start>Close</start>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="4"></button>
+      <button id="5">AspectRatio</button>
+      <button id="2">Close</button>
+      <button id="17">Close</button>
+      <button id="19">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+      <menu>Close</menu>
+      <start>Close</start>
+    </remote>
+
+    <keyboard>
+      <backspace>HideSubMenu</backspace>
+      <escape>Close</escape>
+    </keyboard>
+  </OSDAudioSettings>
+
+  <VideoBookmarks>
+    <gamepad>
+      <X></X>
+      <Y>Delete</Y>
+      <B>Close</B>
+      <back>Close</back>
+      <start>Close</start>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="4"></button>
+      <button id="5">Delete</button>
+      <button id="2">Close</button>
+      <button id="17">Close</button>
+      <button id="19">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+      <menu>Close</menu>
+      <start>Close</start>
+      <zero>Delete</zero>
+    </remote>
+
+    <keyboard>
+      <backspace>HideSubMenu</backspace>
+      <escape>Close</escape>
+    </keyboard>
+  </VideoBookmarks>
+  
+
+  <MyVideoLibrary>
+    <gamepad>
+      <black>Delete</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="3">Delete</button>
+    </joystick>
+
+    <remote>
+      <zero>Delete</zero>
+      <clear>Delete</clear>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <delete>Delete</delete>
+      <space>Playlist</space>
+    </keyboard>
+  </MyVideoLibrary>
+
+
+  <MyVideoFiles>
+    <gamepad>
+      <Y>Queue</Y>
+      <black>Playlist</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="5">Queue</button>
+      <button id="3">Playlist</button>
+    </joystick>
+
+    <remote>
+      <zero>Queue</zero>
+      <star>Queue</star>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Playlist</space>
+      <q>Queue</q>
+    </keyboard>
+  </MyVideoFiles>
+
+
+  <MyVideoPlaylist>
+    <gamepad>
+      <Y>Delete</Y>
+      <black>Playlist</black> <!-- Close playlist -->
+      <back>Playlist</back>   <!-- Close playlist -->
+      <B>Playlist</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="5">Delete</button>
+      <button id="3">Playlist</button>
+      <button id="17">Playlist</button>
+      <button id="2">Playlist</button>
+    </joystick>
+
+    <remote>
+      <back>Playlist</back> <!-- Close playlist -->
+      <clear>Delete</clear>
+      <zero>Delete</zero>
+      <two>MoveItemUp</two>
+      <five>MoveItemDown</five>
+      <three>VolumeUp</three>
+      <six>VolumeDown</six>
+      <nine>Mute</nine>
+    </remote>
+
+    <keyboard>
+      <space>Playlist</space> <!-- Close playlist -->
+      <delete>Delete</delete>
+      <u>MoveItemUp</u>
+      <d>MoveItemDown</d>
+    </keyboard>
+  </MyVideoPlaylist>
+
+
+  <VirtualKeyboard>
+    <gamepad>
+      <start>Enter</start>
+      <B>BackSpace</B>
+      <Y>Shift</Y>
+      <X>Symbols</X>
+      <lefttrigger>CursorLeft</lefttrigger>
+      <righttrigger>CursorRight</righttrigger>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Enter</button>
+      <button id="2">BackSpace</button>
+      <button id="5">Shift</button>
+      <button id="4">Symbols</button>
+    </joystick>
+
+    <remote>
+      <back>BackSpace</back>
+      <star>Shift</star>
+      <hash>Symbols</hash>
+      <zero>Number0</zero>
+      <one>Number1</one>
+      <two>Number2</two>
+      <three>Number3</three>
+      <four>Number4</four>
+      <five>Number5</five>
+      <six>Number6</six>
+      <seven>Number7</seven>
+      <eight>Number8</eight>
+      <nine>Number9</nine>
+      <pageminus>CursorLeft</pageminus>
+      <pageplus>CursorRight</pageplus>
+    </remote>
+  </VirtualKeyboard>
+
+
+  <XlinkKai>
+    <gamepad>
+      <righttrigger>NextPicture</righttrigger> <!-- Next Tab -->
+      <lefttrigger>PreviousPicture</lefttrigger> <!-- Previous Tab -->
+    </gamepad>
+  </XlinkKai>
+
+
+  <ContextMenu>
+    <gamepad>
+      <white>Close</white>
+      <B>Close</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="6">Close</button>
+      <button id="2">Close</button>
+    </joystick>
+
+    <remote>
+      <title>Close</title>
+      <back>Close</back>
+    </remote>
+
+    <keyboard>
+      <menu>Close</menu>
+    </keyboard>
+  </ContextMenu>
+
+  <FileStackingDialog>
+    <remote>
+      <back>Close</back>
+    </remote>
+  </FileStackingDialog>
+
+
+
+
+  <Scripts>
+    <gamepad>
+      <black>XBMC.ActivateWindow(ScriptsDebugInfo)</black>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="3">XBMC.ActivateWindow(ScriptsDebugInfo)</button>
+    </joystick>
+
+    <remote>
+      <info>XBMC.ActivateWindow(ScriptsDebugInfo)</info>
+    </remote>
+
+    <keyboard>
+      <i>XBMC.ActivateWindow(ScriptsDebugInfo)</i>
+    </keyboard>
+  </Scripts>
+
+
+  <ScriptsDebugInfo>
+    <gamepad>
+      <white>Info</white> <!-- clears debug python info -->
+    </gamepad>
+
+    <remote>
+      <info>Info</info> <!-- clears debug python info -->
+    </remote>
+
+    <keyboard>
+      <i>Info</i> <!-- clears debug python info -->
+    </keyboard>
+  </ScriptsDebugInfo>
+
+
+  <NumericInput>
+    <gamepad>
+      <B>BackSpace</B>
+      <start>Enter</start>
+      <lefttrigger>SkipPrevious</lefttrigger>
+      <righttrigger>SkipNext</righttrigger>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">BackSpace</button>
+      <button id="9">Enter</button>
+    </joystick>
+
+    <remote>
+      <zero>Number0</zero>
+      <one>Number1</one>
+      <two>Number2</two>
+      <three>Number3</three>
+      <four>Number4</four>
+      <five>Number5</five>
+      <six>Number6</six>
+      <seven>Number7</seven>
+      <eight>Number8</eight>
+      <nine>Number9</nine>
+      <back>BackSpace</back>
+    </remote>
+  </NumericInput>
+
+
+  <GamepadInput>
+    <gamepad>
+      <start>Stop</start> <!-- Enter Password -->
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Stop</button> <!-- Enter Password -->
+    </joystick>
+
+  </GamepadInput>
+
+  <Weather>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+    
+  </Weather>
+
+  <Settings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </Settings>
+
+  <MyPicturesSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </MyPicturesSettings>
+
+  <MyProgramsSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </MyProgramsSettings>
+
+  <MyWeatherSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </MyWeatherSettings>
+
+  <MyMusicSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </MyMusicSettings>
+
+  <SystemSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </SystemSettings>
+
+  <MyVideosSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </MyVideosSettings>
+
+  <NetworkSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </NetworkSettings>
+
+  <AppearanceSettings>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </AppearanceSettings>
+
+  <Profiles>
+    <gamepad>
+      <B>PreviousMenu</B>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </Profiles>
+
+  <systeminfo>
+    <gamepad>
+      <B>PreviousMenu</B>	
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </systeminfo>
+
+  <shutdownmenu>
+    <gamepad>
+      <B>PreviousMenu</B>	
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </shutdownmenu>
+
+  <submenu>
+    <gamepad>
+      <B>PreviousMenu</B>	
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <back>PreviousMenu</back>
+    </remote>
+  </submenu>
+
+  <MusicInformation>
+    <gamepad>
+      <B>Close</B>	
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+    </remote>
+  </MusicInformation>
+
+  <MovieInformation>
+    <gamepad>
+      <B>Close</B>	
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="2">Close</button>
+    </joystick>
+
+    <remote>
+      <back>Close</back>
+    </remote>
+  </MovieInformation>
+
+  <LockSettings>
+    <gamepad>
+      <start>Close</start>
+      <B>PreviousMenu</B>
+      <back>PreviousMenu</back>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Close</button>
+      <button id="2">PreviousMenu</button>
+      <button id="17">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+      <back>PreviousMenu</back>
+    </remote>
+  </LockSettings>
+
+  <ProfileSettings>
+    <gamepad>
+      <start>Close</start>
+      <B>PreviousMenu</B>
+      <back>PreviousMenu</back>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Close</button>
+      <button id="2">PreviousMenu</button>
+      <button id="17">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+      <back>PreviousMenu</back>
+    </remote>
+  </ProfileSettings>
+  <TrainerSettings>
+    <gamepad>
+      <start>Close</start>
+      <B>PreviousMenu</B>
+      <back>PreviousMenu</back>
+    </gamepad>
+
+    <joystick name="Microsoft Xbox Controller S">
+      <altname>Mad Catz MicroCON</altname>
+      <altname>Logitech Xbox Cordless Controller</altname>
+      <button id="9">Close</button>
+      <button id="2">PreviousMenu</button>
+      <button id="17">PreviousMenu</button>
+    </joystick>
+
+    <remote>
+      <menu>Close</menu>
+      <back>PreviousMenu</back>
+    </remote>
+  </TrainerSettings>
+  <PictureInfo>
+    <gamepad>
+      <dpadleft>PreviousPicture</dpadleft>
+      <dpadright>NextPicture</dpadright>
+      <black>Close</black>
+    </gamepad>
+
+    <remote>
+      <skipplus>NextPicture</skipplus>
+      <skipminus>PreviousPicture</skipminus>
+      <info>Close</info>
+    </remote>
+
+    <keyboard>
+      <period>NextPicture</period>
+      <comma>PreviousPicture</comma>
+      <i>Close</i>
+    </keyboard>
+  </PictureInfo>
+</keymap>
+
+

Added: branches/linuxport/XBMC/system/Lircmap.xml
===================================================================
--- branches/linuxport/XBMC/system/Lircmap.xml	                        (rev 0)
+++ branches/linuxport/XBMC/system/Lircmap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -0,0 +1,144 @@
+<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
+
+<lircmap>
+	<remote device="mceusb">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="XboxDVDDongle">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="Microsoft_Xbox">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="PinnacleSysPCTVRemote">
+		<play>Play</play>
+		<pause>pause</pause>
+		<stop>Stop</stop>
+		<forward>FForward</forward>
+		<reverse>Rewind</reverse>
+		<left>Vol-Rew</left>
+		<right>Vol+FF</right>
+		<up>Chan+Play</up>
+		<down>Chan-Stop</down>
+		<pageplus>channel+</pageplus>
+		<pageminus>channel-</pageminus>
+		<select>middle</select>
+		<back>undo</back>
+		<menu>Menu</menu>
+		<title>L</title>
+		<info>Info</info>
+		<skipplus>next</skipplus>
+		<display>Fullscreen</display>
+		<record>Record</record>
+		<volumeplus>vol+</volumeplus>
+		<volumeminus>vol-</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+</lircmap>

Deleted: branches/linuxport/XBMC/userdata/IRSSmap.xml
===================================================================
--- branches/linuxport/XBMC/userdata/IRSSmap.xml	2008-07-15 00:29:14 UTC (rev 14097)
+++ branches/linuxport/XBMC/userdata/IRSSmap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -1,46 +0,0 @@
-<!-- This file contains the mapping of IR Server Suite keys to XBMC keys used in Keymap.xml  -->
-
-<irssmap>
-	<remote device="Microsoft MCE">
-		<pause>31719</pause> <!-- pause -->
-		<stop>31718</stop> <!-- stop -->
-		<play>31721</play> <!-- play -->
-		<forward>31723</forward> <!-- forward -->
-		<reverse>31722</reverse> <!-- reverse -->
-		<left>31711</left> <!-- left -->
-		<right>31710</right> <!-- right -->
-		<up>31713</up> <!-- up -->
-		<down>31712</down> <!-- down -->
-		<select>31709</select> <!-- ok -->
-		<pageplus>31725</pageplus> <!-- channel up -->
-		<pageminus>31724</pageminus> <!-- channel down -->
-		<back>31708</back> <!-- previous -->
-		<menu>31707</menu> <!-- dvd menu -->
-		<title>31671</title> <!-- recorded tv -->
-		<info>31728</info> <!-- info -->
-		<skipplus>31717</skipplus> <!-- skip -->
-		<skipminus>31716</skipminus> <!-- repeat -->
-		<display>31705</display> <!-- guide -->
-		<start>31730</start> <!-- start -->
-		<record>31720</record> <!-- record -->
-		<volumeplus>31727</volumeplus> <!-- volume up -->
-		<volumeminus>31726</volumeminus> <!-- volume down -->
-		<mute>31729</mute> <!-- mute -->
-		<power>31642</power> <!-- tv power -->
-		<mytv>31706</mytv> <!-- live tv -->
-		<one>31742</one>
-		<two>31741</two>
-		<three>31740</three>
-		<four>31739</four>
-		<five>31738</five>
-		<six>31737</six>
-		<seven>31736</seven>
-		<eight>31735</eight>
-		<nine>31734</nine>
-		<zero>31743</zero>
-		<mytv>31652</mytv> <!-- red -->
-		<mymusic>31651</mymusic> <!-- green -->
-		<mypictures>31650</mypictures> <!-- yellow -->
-		<myvideo>31649</myvideo> <!-- blue -->
-	</remote>
-</irssmap>

Deleted: branches/linuxport/XBMC/userdata/Keymap.xml
===================================================================
--- branches/linuxport/XBMC/userdata/Keymap.xml	2008-07-15 00:29:14 UTC (rev 14097)
+++ branches/linuxport/XBMC/userdata/Keymap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -1,1590 +0,0 @@
-<!-- This file contains the mapping of keys (gamepad, remote, and keyboard) to actions within XBMC -->
-<!-- The <global> section is a fall through - they will only be used if the button is not          -->
-<!-- used in the current window's section.  Note that there is only handling                       -->
-<!-- for a single action per button at this stage.                                                 -->
-<!-- For joystick/gamepad configuration under linux/win32, see below as it differs from xbox       -->
-<!-- gamepads.                                                                                     -->
-
-<!-- The format is:                      -->
-<!--    <device>                         -->
-<!--      <button>action</button>        -->
-<!--    </device>                        -->
-
-<!-- To map keys from other remotes using the RCA 5 protocol, you may add <universalremote> blocks -->
-<!-- In this case, the tags used are <obc#> where # is the original button code (OBC) of the key -->
-<!-- You set it up by adding a <universalremote> block to the window or <global> section:       -->
-<!--    <universalremote>             -->
-<!--       <obc45>Stop</obc45>         -->
-<!--    </universalremote>            -->
-<!-- To find out the OBC's of your remote, try enabling the <displayremotecodes> tag in AdvancedSettings.xml -->
-
-<!-- Note that the action can be a built-in function.                 -->
-<!--  eg <B>XBMC.ActivateWindow(MyMusic)"</B>                         -->
-<!-- would automatically go to My Music on the press of the B button. -->
-
-<!-- Joysticks / Gamepads:                                                                    -->
-<!--   See the sample PS3 controller configuration below for the format.                      -->
-<!--                                                                                          -->
-<!--  Joystick Name:                                                                          -->
-<!--   Do 'cat /proc/bus/input/devices' or see your xbmc log file  to find the names of       -->
-<!--   detected joysticks. The name used in the configuration should match the detected name. -->
-<!--                                                                                          -->
-<!--  Button Ids:                                                                             -->
-<!--   'id' is the button ID used by SDL. Joystick button ids of connected joysticks appear   -->
-<!--   in xbmc.log when they are pressed. Use your log to map custom buttons to actions.      -->
-<!--                                                                                          -->
-<!--  Axis Ids / Analog Controls                                                              -->
-<!--   Coming soon.                                                                           -->
-
-<keymap>
-  <global>
-    <remote>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-      <play>Play</play>
-      <pause>Pause</pause>
-      <stop>Stop</stop>
-      <forward>FastForward</forward>
-      <reverse>Rewind</reverse>
-      <left>Left</left>
-      <right>Right</right>
-      <up>Up</up>
-      <down>Down</down>
-      <select>Select</select>
-      <pageplus>PageUp</pageplus>
-      <pageminus>PageDown</pageminus>
-      <back>ParentDir</back>
-      <menu>PreviousMenu</menu>
-      <title>ContextMenu</title>
-      <info>Info</info>
-      <skipplus>SkipNext</skipplus>
-      <skipminus>SkipPrevious</skipminus>
-      <display>FullScreen</display>
-      <start>PreviousMenu</start>
-      <record>Screenshot</record>
-      <volumeplus>VolumeUp</volumeplus>
-      <volumeminus>VolumeDown</volumeminus>
-      <mute>Mute</mute>
-      <power>XBMC.ShutDown()</power>
-      <myvideo>XBMC.ActivateWindow(MyVideos)</myvideo>
-      <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
-      <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>
-      <mytv>XBMC.ActivateWindow(Home)</mytv>
-    </remote>
-
-    <gamepad>
-      <A>Select</A>
-      <B>ParentDir</B>
-      <X>FullScreen</X>
-      <Y>Queue</Y>
-      <white>ContextMenu</white>
-      <black></black>
-      <start>XBMC.ActivateWindow(PlayerControls)</start>
-      <back>PreviousMenu</back>
-      <dpadleft>Left</dpadleft>
-      <dpadright>Right</dpadright>
-      <dpadup>Up</dpadup>
-      <dpaddown>Down</dpaddown>
-      <leftthumbbutton>Screenshot</leftthumbbutton>
-      <rightthumbbutton>XBMC.ActivateWindow(ShutdownMenu)</rightthumbbutton>
-      <leftanalogtrigger>ScrollUp</leftanalogtrigger>
-      <rightanalogtrigger>ScrollDown</rightanalogtrigger>
-      <rightthumbstickleft>AnalogSeekBack</rightthumbstickleft>
-      <rightthumbstickright>AnalogSeekForward</rightthumbstickright>
-      <rightthumbstickup>VolumeUp</rightthumbstickup>
-      <rightthumbstickdown>VolumeDown</rightthumbstickdown>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">Select</button>
-      <button id="2">ParentDir</button>
-      <button id="3"></button>
-      <button id="4">FullScreen</button>
-      <button id="5">Queue</button>
-      <button id="6">ContextMenu</button>
-      <button id="7"></button>
-      <button id="8"></button>
-      <button id="9">XBMC.ActivateWindow(PlayerControls)</button>
-      <button id="10"></button>
-      <button id="11">Screenshot</button>
-      <button id="12">XBMC.ActivateWindow(ShutdownMenu)</button>
-      <button id="13">Up</button>
-      <button id="14">Right</button>
-      <button id="15">Down</button>
-      <button id="16">Left</button>
-      <button id="17">PreviousMenu</button>
-      <axis id="5" limit="-1">VolumeDown</axis>
-      <axis id="5" limit="+1">VolumeUp</axis>
-      <axis id="4" limit="-1">AnalogSeekBack</axis>
-      <axis id="4" limit="+1">AnalogSeekForward</axis>
-      <axis id="3" limit="0">ScrollUp</axis>
-      <axis id="6" limit="0">ScrollDown</axis>
-    </joystick>
-
-    <joystick name="Sony PLAYSTATION(R)3 Controller">   
-      <altname>PS3 Controller</altname>
-      <button id="15">Select</button>                   
-      <button id="14">ParentDir</button>                
-      <button id="16">FullScreen</button>
-      <button id="13">Queue</button>
-      <button id="11">PreviousMenu</button>
-      <button id="8">Left</button>
-      <button id="6">Right</button>
-      <button id="5">Up</button>
-      <button id="7">Down</button>
-      <button id="2">Screenshot</button>
-      <button id="3">XBMC.ActivateWindow(ShutdownMenu)</button>
-      <button id="4">XBMC.ActivateWindow(PlayerControls)</button>
-      <axis id="4" limit="+1">VolumeDown</axis>
-      <axis id="4" limit="-1">VolumeUp</axis>
-      <axis id="1" limit="+1">AnalogSeekForward</axis>
-      <axis id="1" limit="-1">AnalogSeekBack</axis>
-      <axis id="13" limit="+1">ScrollUp</axis>
-      <axis id="14" limit="+1">ScrollDown</axis>
-    </joystick>
-
-    <keyboard>
-      <p>Play</p>
-      <q>Queue</q>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <left>Left</left>
-      <right>Right</right>
-      <up>Up</up>
-      <down>Down</down>
-      <pageup>PageUp</pageup>
-      <pagedown>PageDown</pagedown>
-      <return>Select</return>
-      <backspace>ParentDir</backspace>
-      <m>ActivateWindow(PlayerControls)</m>
-      <s>ActivateWindow(shutdownmenu)</s>
-      <escape>PreviousMenu</escape>
-      <i>Info</i>
-      <menu>ContextMenu</menu>
-      <space>Pause</space>
-      <x>Stop</x>
-      <period>SkipNext</period>
-      <comma>SkipPrevious</comma>
-      <tab>FullScreen</tab>
-      <printscreen>Screenshot</printscreen>
-      <minus>VolumeDown</minus>
-      <plus>VolumeUp</plus>
-      <zero>Number0</zero>
-      <one>Number1</one>
-      <two>Number2</two>
-      <three>Number3</three>
-      <four>Number4</four>
-      <five>Number5</five>
-      <six>Number6</six>
-      <seven>Number7</seven>
-      <eight>Number8</eight>
-      <nine>Number9</nine>
-      <backslash>ToggleFullScreen</backslash>
-      <browser_home>XBMC.ActivateWindow(Home)</browser_home>
-      <browser_favorites>ActivateWindow(Favourites)</browser_favorites>
-      <browser_refresh></browser_refresh>
-      <browser_search></browser_search>
-      <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
-      <launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
-      <play_pause>Pause</play_pause>
-      <stop>Stop</stop>
-      <volume_up>VolumeUp</volume_up>
-      <volume_mute>Mute</volume_mute>
-      <volume_down>VolumeDown</volume_down>
-      <next_track>SkipNext</next_track>
-      <prev_track>SkipPrevious</prev_track>
-      <launch_mail></launch_mail>
-      <key id="61620"></key> <!-- same as above, launch_mail, but using button code (based on vkey id) -->
-      <end>XBMC.ShutDown()</end>
-    </keyboard>
-  </global>
-
-
-  <Home>
-    <gamepad>
-      <black>XBMC.Skin.ToggleSetting(HomeViewToggle)</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="3">XBMC.Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-    
-    <remote>
-      <menu>XBMC.Skin.ToggleSetting(HomeViewToggle)</menu>
-      <info>XBMC.ActivateWindow(SystemInfo)</info>
-      <clear>XBMC.ActivateWindow(Weather)</clear>
-      <hash>XBMC.ActivateWindow(Settings)</hash>
-    </remote>
-
-    <keyboard>
-      <i>info</i>
-    </keyboard>
-  </Home>
-  
-
-  <MyFiles>
-    <gamepad>
-      <Y>Highlight</Y>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="5">Highlight</button>
-    </joystick>
-
-    <remote>
-      <zero>Delete</zero>
-      <one>Highlight</one>
-      <four>Copy</four>
-      <seven>Move</seven>
-      <clear>Delete</clear>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Highlight</space>
-      <delete>Delete</delete>
-      <c>Copy</c>
-      <m>Move</m>
-      <r>Rename</r>
-    </keyboard>
-  </MyFiles>
-  
-
-  <MyMusicPlaylist>
-    <gamepad>
-      <Y>Delete</Y>
-      <black>Playlist</black> <!-- Close playlist -->
-      <back>Playlist</back>   <!-- Close playlist -->
-      <B>Playlist</B>         <!-- Close playlist -->
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Playlist</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
-      <button id="5">Delete</button>
-     </joystick>
-    
-    <remote>
-      <back>Playlist</back> <!-- Close playlist -->
-      <clear>Delete</clear>
-      <zero>Delete</zero>
-      <two>MoveItemUp</two>
-      <five>MoveItemDown</five>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Playlist</space> <!-- Close playlist -->
-      <delete>Delete</delete>
-      <u>MoveItemUp</u>
-      <d>MoveItemDown</d>
-    </keyboard>
-  </MyMusicPlaylist>
-
-  <MyMusicPlaylistEditor>
-    <keyboard>
-      <u>MoveItemUp</u>
-      <d>MoveItemDown</d>
-      <delete>Delete</delete>
-    </keyboard>
-
-    <gamepad>
-      <Y>Queue</Y>
-    </gamepad>
-    <remote>
-      <zero>Queue</zero>
-    </remote>
-  </MyMusicPlaylistEditor>
-  
-  <MyMusicFiles>
-    <gamepad>
-      <Y>Queue</Y>
-      <black>Playlist</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="3">Playlist</button>
-      <button id="5">Queue</button>
-     </joystick>
-
-     <remote>
-      <zero>Queue</zero>
-      <star>Queue</star>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Playlist</space>
-      <q>Queue</q>
-    </keyboard>
-  </MyMusicFiles>
-
-
-  <MyMusicLibrary>
-    <gamepad>
-      <Y>Queue</Y>
-      <black>Playlist</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="3">Playlist</button>
-      <button id="5">Queue</button>
-     </joystick>
-    
-     <remote>
-      <zero>Queue</zero>
-      <star>Queue</star>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Playlist</space>
-      <q>Queue</q>
-    </keyboard>
-  </MyMusicLibrary>
-
-
-  <FullscreenVideo>
-    <remote>
-      <left>StepBack</left>
-      <right>StepForward</right>
-      <up>BigStepForward</up>
-      <down>BigStepBack</down>
-      <back>SmallStepBack</back>
-      <menu>OSD</menu>
-      <start>OSD</start>
-      <title>CodecInfo</title>
-      <info>Info</info>
-      <enter>AspectRatio</enter>
-      <select>AspectRatio</select>
-   </remote>
-
-    <gamepad>
-      <A>Pause</A>
-      <B>Stop</B>
-      <Y>AspectRatio</Y>
-      <black>CodecInfo</black>
-      <white>Info</white>
-      <back>SmallStepBack</back>
-      <start>OSD</start>
-      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
-      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
-      <dpadleft>StepBack</dpadleft>
-      <dpadright>StepForward</dpadright>
-      <dpadup>BigStepForward</dpadup>
-      <dpaddown>BigStepBack</dpaddown>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="5">AspectRatio</button>
-      <button id="6">Info</button>
-      <button id="9">OSD</button>
-      <button id="13">BigStepForward</button>
-      <button id="14">StepForward</button>
-      <button id="15">BigStepBack</button>
-      <button id="16">StepBack</button>
-      <button id="17">SmallStepBack</button>
-      <axis id="3" limit="0">AnalogRewind</axis>
-      <axis id="6" limit="0">AnalogFastForward</axis>
-    </joystick>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>StepForward</period>
-      <comma>StepBack</comma>
-      <backspace>SmallStepBack</backspace>
-      <opensquarebracket>BigStepForward</opensquarebracket>
-      <closesquarebracket>BigStepBack</closesquarebracket>
-      <return>OSD</return>
-      <m>OSD</m>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <o>ShowTime</o>
-      <z>AspectRatio</z>
-      <s>ShowSubtitles</s>
-      <l>NextSubtitle</l>      
-      <left>StepBack</left>
-      <right>StepForward</right>
-      <up>BigStepForward</up>
-      <down>BigStepBack</down>
-    </keyboard>
-  </FullscreenVideo>
-
-
-  <FullscreenInfo>
-    <remote>
-      <title>CodecInfo</title>
-      <info>Close</info>
-   </remote>
-
-    <gamepad>
-      <B>Close</B>
-      <black>CodecInfo</black>
-      <white>Close</white>
-      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
-      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Close</button>
-      <button id="3">CodecInfo</button>
-      <button id="6">Close</button>
-      <axis id="3" limit="0">AnalogRewind</axis>
-      <axis id="6" limit="0">AnalogFastForward</axis>
-    </joystick>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>StepForward</period>
-      <backspace>Close</backspace>
-      <t>Close</t>
-      <i>CodecInfo</i>
-    </keyboard>
-  </FullscreenInfo>
-
-  <PlayerControls>
-    <gamepad>
-      <back>Close</back>
-      <start>Close</start>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-    <altname>Mad Catz MicroCON</altname>
-    <altname>Logitech Xbox Cordless Controller</altname>
-       <button id="9">Close</button>
-      <button id="17">Close</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-    </remote>
-  </PlayerControls>
-
-
-  <Visualisation>
-    <remote>
-      <left>PreviousPreset</left>
-      <right>NextPreset</right>
-      <up>IncreaseRating</up>
-      <down>DecreaseRating</down>
-      <back>LockPreset</back>
-      <title>ShowPreset</title>
-      <select>XBMC.ActivateWindow(VisualisationPresetList)</select>
-      <menu>XBMC.ActivateWindow(MusicOSD)</menu>
-      <start>OSD</start>
-      <info>Info</info>
-    </remote>
-
-    <gamepad>
-      <A>Pause</A>
-      <B>Stop</B>
-      <Y>XBMC.ActivateWindow(VisualisationPresetList)</Y>
-      <black>ShowPreset</black>
-      <white>Info</white>
-      <start>XBMC.ActivateWindow(MusicOSD)</start>
-      <back>LockPreset</back>
-      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
-      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
-      <dpadleft>SkipPrevious</dpadleft>
-      <dpadright>SkipNext</dpadright>
-      <dpadup>NextPreset</dpadup>
-      <dpaddown>PreviousPreset</dpaddown>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">ShowPreset</button>
-      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="9">XBMC.ActivateWindow(MusicOSD)</button>
-      <button id="13">NextPreset</button>
-      <button id="14">SkipNext</button>
-      <button id="15">PreviousPreset</button>
-      <button id="16">SkipPrevious</button>
-      <axis id="3" limit="0">AnalogRewind</axis>
-      <axis id="6" limit="0">AnalogFastForward</axis>
-   </joystick>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>SkipNext</period>
-      <comma>SkipPrevious</comma>
-      <return>ActivateWindow(MusicOSD)</return>
-      <m>ActivateWindow(MusicOSD)</m>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <p>ActivateWindow(VisualisationPresetList)</p>
-      <v>ActivateWindow(VisualisationSettings)</v>
-      <n>ActivateWindow(MusicPlaylist)</n>
-      <left>SkipPrevious</left>
-      <right>SkipNext</right>
-      <up>IncreaseRating</up>
-      <down>DecreaseRating</down>
-      <!--<back>NextPreset</back>!-->
-      <s>ShowPreset</s>
-      <l>LockPreset</l>
-    </keyboard>
-  </Visualisation>
-
-  <MusicOSD>
-    <gamepad>
-      <back>Close</back>
-      <start>Close</start>
-      <black>ShowPreset</black>
-      <white>Info</white>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
-      <button id="3">ShowPreset</button>
-      <button id="6">Info</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-      <title>Info</title>
-      <info>ShowPreset</info>
-    </remote>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>SkipNext</period>
-      <comma>SkipPrevious</comma>
-      <m>Close</m>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <p>ActivateWindow(VisualisationPresetList)</p>
-      <v>ActivateWindow(VisualisationSettings)</v>
-      <n>ActivateWindow(MusicPlaylist)</n>
-    </keyboard>
-  </MusicOSD>
-
-
-  <VisualisationSettings>
-    <gamepad>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="9">Close</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-    </remote>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>SkipNext</period>
-      <comma>SkipPrevious</comma>
-      <m>Close</m>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <p>ActivateWindow(VisualisationPresetList)</p>
-      <v>Close</v>
-      <n>ActivateWindow(MusicPlaylist)</n>
-    </keyboard>
-  </VisualisationSettings>
-
-
-  <VisualisationPresetList>
-    <gamepad>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-      <Y>Close</Y>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-      <button id="5">Close</button>
-      <button id="9">Close</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-    </remote>
-
-    <keyboard>
-      <f>FastForward</f>
-      <r>Rewind</r>
-      <period>SkipNext</period>
-      <comma>SkipPrevious</comma>
-      <m>Close</m>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <p>Close</p>
-      <v>Close</v>
-      <n>ActivateWindow(MusicPlaylist)</n>
-    </keyboard>
-  </VisualisationPresetList>
-
-
-  <SlideShow>
-    <gamepad>
-      <A>Pause</A>
-      <B>Stop</B>
-      <Y>Rotate</Y>
-      <X>ZoomNormal</X>
-      <black>CodecInfo</black>
-      <white>Info</white>
-      <righttrigger>NextPicture</righttrigger>
-      <lefttrigger>PreviousPicture</lefttrigger>
-      <dpadleft>PreviousPicture</dpadleft>
-      <dpadright>NextPicture</dpadright>
-      <dpadup>ZoomIn</dpadup>
-      <dpaddown>ZoomOut</dpaddown>
-      <leftthumbstick>AnalogMove</leftthumbstick>
-      <back>Stop</back>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">Info</button>
-      <button id="13">ZoomIn</button>
-      <button id="14">NextPicture</button>
-      <button id="15">ZoomOut</button>
-      <button id="16">PreviousPicture</button>
-      <button id="17">Stop</button>
-    </joystick>
-
-    <remote>
-      <zero>ZoomNormal</zero>
-      <one>ZoomLevel1</one>
-      <two>ZoomLevel2</two>
-      <three>ZoomLevel3</three>
-      <four>ZoomLevel4</four>
-      <five>ZoomLevel5</five>
-      <six>ZoomLevel6</six>
-      <seven>ZoomLevel7</seven>
-      <eight>ZoomLevel8</eight>
-      <nine>ZoomLevel9</nine>
-      <info>CodecInfo</info>
-      <skipplus>NextPicture</skipplus>
-      <skipminus>PreviousPicture</skipminus>
-      <title>Info</title>
-      <select>Rotate</select>
-      <back>PreviousMenu</back>
-    </remote>
-
-    <keyboard>
-      <zero>ZoomNormal</zero>
-      <one>ZoomLevel1</one>
-      <two>ZoomLevel2</two>
-      <three>ZoomLevel3</three>
-      <four>ZoomLevel4</four>
-      <five>ZoomLevel5</five>
-      <six>ZoomLevel6</six>
-      <seven>ZoomLevel7</seven>
-      <eight>ZoomLevel8</eight>
-      <nine>ZoomLevel9</nine>
-      <i>CodecInfo</i>
-      <t>Info</t>
-      <period>NextPicture</period>
-      <comma>PreviousPicture</comma>
-      <plus>ZoomIn</plus>
-      <minus>ZoomOut</minus>
-      <r>Rotate</r>
-    </keyboard>
-  </SlideShow>
-
-
-  <ScreenCalibration>
-    <gamepad>
-      <leftthumbstick>AnalogMove</leftthumbstick>
-      <A>NextCalibration</A>
-      <black>ResetCalibration</black>
-      <white>NextResolution</white>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">NextCalibration</button>
-      <button id="3">ResetCalibration</button>
-      <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <select>NextCalibration</select>
-      <enter>NextCalibration</enter>
-      <zero>ResetCalibration</zero>
-      <display>NextResolution</display>
-      <xbox>NextResolution</xbox>
-    </remote>
-
-    <keyboard>
-      <return>NextCalibration</return>
-      <d>ResetCalibration</d>
-      <r>NextResolution</r>
-    </keyboard>
-  </ScreenCalibration>
-
-
-  <GUICalibration>
-    <gamepad>
-      <leftthumbstick>AnalogMove</leftthumbstick>
-      <A>NextCalibration</A>
-      <black>ResetCalibration</black>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="1">NextCalibration</button>
-      <button id="3">ResetCalibration</button>
-      <button id="6">NextResolution</button>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <select>NextCalibration</select>
-      <enter>NextCalibration</enter>
-      <zero>ResetCalibration</zero>
-    </remote>
-
-    <keyboard>
-      <return>NextCalibration</return>
-      <d>ResetCalibration</d>
-    </keyboard>
-  </GUICalibration>
-
-
-  <SelectDialog>
-    <gamepad>
-      <back>Close</back>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="17">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-    </remote>
-
-    <keyboard>
-      <escape>Close</escape>
-    </keyboard>
-  </SelectDialog>
-  
-
-  <VideoOSD>
-    <gamepad>
-      <start>Close</start>
-      <back>PreviousMenu</back>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Close</button>
-      <button id="17">PreviousMenu</button>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-      <menu>Close</menu>
-      <start>Close</start>
-    </remote>
-
-    <keyboard>
-      <backspace>HideSubMenu</backspace>
-      <escape>Close</escape>
-    </keyboard>
-  </VideoOSD>
-
-  <VideoMenu>
-    <gamepad>
-      <Y>AspectRatio</Y>
-      <B>Stop</B>
-      <start>OSD</start>
-      <back>PreviousMenu</back>
-      <white>Info</white>
-      <black>CodecInfo</black>
-      <leftanalogtrigger>AnalogRewind</leftanalogtrigger>
-      <rightanalogtrigger>AnalogFastForward</rightanalogtrigger>      
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="5">AspectRatio</button>
-      <button id="2">Stop</button>
-      <button id="9">OSD</button>
-      <button id="17">PreviousMenu</button>
-      <button id="6">Info</button>
-      <button id="3">CodecInfo</button>
-    </joystick>
-
-    <remote>
-      <menu>OSD</menu>
-      <back>PreviousMenu</back>
-      <info>Info</info>
-      <title>CodecInfo</title>
-      <zero>Number0</zero>
-      <one>Number1</one>
-      <two>Number2</two>
-      <three>Number3</three>
-      <four>Number4</four>
-      <five>Number5</five>
-      <six>Number6</six>
-      <seven>Number7</seven>
-      <eight>Number8</eight>
-      <nine>Number9</nine>
-    </remote>
-
-    <keyboard>
-      <return>Select</return>
-      <backspace>PreviousMenu</backspace>
-    </keyboard>
-  </VideoMenu>
-
-
-  <OSDVideoSettings>
-    <gamepad>
-      <X></X>
-      <Y>AspectRatio</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="4"></button>
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
-    </remote>
-
-    <keyboard>
-      <backspace>HideSubMenu</backspace>
-      <escape>Close</escape>
-    </keyboard>
-  </OSDVideoSettings>
-
-  <OSDAudioSettings>
-    <gamepad>
-      <X></X>
-      <Y>AspectRatio</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="4"></button>
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
-    </remote>
-
-    <keyboard>
-      <backspace>HideSubMenu</backspace>
-      <escape>Close</escape>
-    </keyboard>
-  </OSDAudioSettings>
-
-  <VideoBookmarks>
-    <gamepad>
-      <X></X>
-      <Y>Delete</Y>
-      <B>Close</B>
-      <back>Close</back>
-      <start>Close</start>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="4"></button>
-      <button id="5">Delete</button>
-      <button id="2">Close</button>
-      <button id="17">Close</button>
-      <button id="19">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-      <menu>Close</menu>
-      <start>Close</start>
-      <zero>Delete</zero>
-    </remote>
-
-    <keyboard>
-      <backspace>HideSubMenu</backspace>
-      <escape>Close</escape>
-    </keyboard>
-  </VideoBookmarks>
-  
-
-  <MyVideoLibrary>
-    <gamepad>
-      <black>Delete</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="3">Delete</button>
-    </joystick>
-
-    <remote>
-      <zero>Delete</zero>
-      <clear>Delete</clear>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <delete>Delete</delete>
-      <space>Playlist</space>
-    </keyboard>
-  </MyVideoLibrary>
-
-
-  <MyVideoFiles>
-    <gamepad>
-      <Y>Queue</Y>
-      <black>Playlist</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="5">Queue</button>
-      <button id="3">Playlist</button>
-    </joystick>
-
-    <remote>
-      <zero>Queue</zero>
-      <star>Queue</star>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Playlist</space>
-      <q>Queue</q>
-    </keyboard>
-  </MyVideoFiles>
-
-
-  <MyVideoPlaylist>
-    <gamepad>
-      <Y>Delete</Y>
-      <black>Playlist</black> <!-- Close playlist -->
-      <back>Playlist</back>   <!-- Close playlist -->
-      <B>Playlist</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="5">Delete</button>
-      <button id="3">Playlist</button>
-      <button id="17">Playlist</button>
-      <button id="2">Playlist</button>
-    </joystick>
-
-    <remote>
-      <back>Playlist</back> <!-- Close playlist -->
-      <clear>Delete</clear>
-      <zero>Delete</zero>
-      <two>MoveItemUp</two>
-      <five>MoveItemDown</five>
-      <three>VolumeUp</three>
-      <six>VolumeDown</six>
-      <nine>Mute</nine>
-    </remote>
-
-    <keyboard>
-      <space>Playlist</space> <!-- Close playlist -->
-      <delete>Delete</delete>
-      <u>MoveItemUp</u>
-      <d>MoveItemDown</d>
-    </keyboard>
-  </MyVideoPlaylist>
-
-
-  <VirtualKeyboard>
-    <gamepad>
-      <start>Enter</start>
-      <B>BackSpace</B>
-      <Y>Shift</Y>
-      <X>Symbols</X>
-      <lefttrigger>CursorLeft</lefttrigger>
-      <righttrigger>CursorRight</righttrigger>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Enter</button>
-      <button id="2">BackSpace</button>
-      <button id="5">Shift</button>
-      <button id="4">Symbols</button>
-    </joystick>
-
-    <remote>
-      <back>BackSpace</back>
-      <star>Shift</star>
-      <hash>Symbols</hash>
-      <zero>Number0</zero>
-      <one>Number1</one>
-      <two>Number2</two>
-      <three>Number3</three>
-      <four>Number4</four>
-      <five>Number5</five>
-      <six>Number6</six>
-      <seven>Number7</seven>
-      <eight>Number8</eight>
-      <nine>Number9</nine>
-      <pageminus>CursorLeft</pageminus>
-      <pageplus>CursorRight</pageplus>
-    </remote>
-  </VirtualKeyboard>
-
-
-  <XlinkKai>
-    <gamepad>
-      <righttrigger>NextPicture</righttrigger> <!-- Next Tab -->
-      <lefttrigger>PreviousPicture</lefttrigger> <!-- Previous Tab -->
-    </gamepad>
-  </XlinkKai>
-
-
-  <ContextMenu>
-    <gamepad>
-      <white>Close</white>
-      <B>Close</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="6">Close</button>
-      <button id="2">Close</button>
-    </joystick>
-
-    <remote>
-      <title>Close</title>
-      <back>Close</back>
-    </remote>
-
-    <keyboard>
-      <menu>Close</menu>
-    </keyboard>
-  </ContextMenu>
-
-  <FileStackingDialog>
-    <remote>
-      <back>Close</back>
-    </remote>
-  </FileStackingDialog>
-
-
-
-
-  <Scripts>
-    <gamepad>
-      <black>XBMC.ActivateWindow(ScriptsDebugInfo)</black>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="3">XBMC.ActivateWindow(ScriptsDebugInfo)</button>
-    </joystick>
-
-    <remote>
-      <info>XBMC.ActivateWindow(ScriptsDebugInfo)</info>
-    </remote>
-
-    <keyboard>
-      <i>XBMC.ActivateWindow(ScriptsDebugInfo)</i>
-    </keyboard>
-  </Scripts>
-
-
-  <ScriptsDebugInfo>
-    <gamepad>
-      <white>Info</white> <!-- clears debug python info -->
-    </gamepad>
-
-    <remote>
-      <info>Info</info> <!-- clears debug python info -->
-    </remote>
-
-    <keyboard>
-      <i>Info</i> <!-- clears debug python info -->
-    </keyboard>
-  </ScriptsDebugInfo>
-
-
-  <NumericInput>
-    <gamepad>
-      <B>BackSpace</B>
-      <start>Enter</start>
-      <lefttrigger>SkipPrevious</lefttrigger>
-      <righttrigger>SkipNext</righttrigger>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">BackSpace</button>
-      <button id="9">Enter</button>
-    </joystick>
-
-    <remote>
-      <zero>Number0</zero>
-      <one>Number1</one>
-      <two>Number2</two>
-      <three>Number3</three>
-      <four>Number4</four>
-      <five>Number5</five>
-      <six>Number6</six>
-      <seven>Number7</seven>
-      <eight>Number8</eight>
-      <nine>Number9</nine>
-      <back>BackSpace</back>
-    </remote>
-  </NumericInput>
-
-
-  <GamepadInput>
-    <gamepad>
-      <start>Stop</start> <!-- Enter Password -->
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Stop</button> <!-- Enter Password -->
-    </joystick>
-
-  </GamepadInput>
-
-  <Weather>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-    
-  </Weather>
-
-  <Settings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </Settings>
-
-  <MyPicturesSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyPicturesSettings>
-
-  <MyProgramsSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyProgramsSettings>
-
-  <MyWeatherSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyWeatherSettings>
-
-  <MyMusicSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyMusicSettings>
-
-  <SystemSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </SystemSettings>
-
-  <MyVideosSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </MyVideosSettings>
-
-  <NetworkSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </NetworkSettings>
-
-  <AppearanceSettings>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </AppearanceSettings>
-
-  <Profiles>
-    <gamepad>
-      <B>PreviousMenu</B>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </Profiles>
-
-  <systeminfo>
-    <gamepad>
-      <B>PreviousMenu</B>	
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </systeminfo>
-
-  <shutdownmenu>
-    <gamepad>
-      <B>PreviousMenu</B>	
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </shutdownmenu>
-
-  <submenu>
-    <gamepad>
-      <B>PreviousMenu</B>	
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <back>PreviousMenu</back>
-    </remote>
-  </submenu>
-
-  <MusicInformation>
-    <gamepad>
-      <B>Close</B>	
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-    </remote>
-  </MusicInformation>
-
-  <MovieInformation>
-    <gamepad>
-      <B>Close</B>	
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="2">Close</button>
-    </joystick>
-
-    <remote>
-      <back>Close</back>
-    </remote>
-  </MovieInformation>
-
-  <LockSettings>
-    <gamepad>
-      <start>Close</start>
-      <B>PreviousMenu</B>
-      <back>PreviousMenu</back>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-      <back>PreviousMenu</back>
-    </remote>
-  </LockSettings>
-
-  <ProfileSettings>
-    <gamepad>
-      <start>Close</start>
-      <B>PreviousMenu</B>
-      <back>PreviousMenu</back>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-      <back>PreviousMenu</back>
-    </remote>
-  </ProfileSettings>
-  <TrainerSettings>
-    <gamepad>
-      <start>Close</start>
-      <B>PreviousMenu</B>
-      <back>PreviousMenu</back>
-    </gamepad>
-
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <button id="9">Close</button>
-      <button id="2">PreviousMenu</button>
-      <button id="17">PreviousMenu</button>
-    </joystick>
-
-    <remote>
-      <menu>Close</menu>
-      <back>PreviousMenu</back>
-    </remote>
-  </TrainerSettings>
-  <PictureInfo>
-    <gamepad>
-      <dpadleft>PreviousPicture</dpadleft>
-      <dpadright>NextPicture</dpadright>
-      <black>Close</black>
-    </gamepad>
-
-    <remote>
-      <skipplus>NextPicture</skipplus>
-      <skipminus>PreviousPicture</skipminus>
-      <info>Close</info>
-    </remote>
-
-    <keyboard>
-      <period>NextPicture</period>
-      <comma>PreviousPicture</comma>
-      <i>Close</i>
-    </keyboard>
-  </PictureInfo>
-</keymap>
-
-

Deleted: branches/linuxport/XBMC/userdata/Lircmap.xml
===================================================================
--- branches/linuxport/XBMC/userdata/Lircmap.xml	2008-07-15 00:29:14 UTC (rev 14097)
+++ branches/linuxport/XBMC/userdata/Lircmap.xml	2008-07-15 05:08:58 UTC (rev 14098)
@@ -1,144 +0,0 @@
-<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
-
-<lircmap>
-	<remote device="mceusb">
-		<pause>Pause</pause>
-		<stop>Stop</stop>
-		<forward>Forward</forward>
-		<reverse>Rewind</reverse>
-		<left>Left</left>
-		<right>Right</right>
-		<up>Up</up>
-		<down>Down</down>
-		<select>OK</select>
-		<pageplus>ChanUp</pageplus>
-		<pageminus>ChanDown</pageminus>
-		<back>Back</back>
-		<menu>PreviousMenu</menu>
-		<title>Play</title>
-		<info>More</info>
-		<skipplus>Skip</skipplus>
-		<skipminus>Replay</skipminus>
-		<display>Teletext</display>
-		<start>Home</start>
-		<record>Record</record>
-		<volumeplus>VolUp</volumeplus>
-		<volumeminus>VolDown</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<myvideo>Videos</myvideo>
-		<mymusic>Music</mymusic>
-		<mypictures>Pictures</mypictures>
-		<mytv>TV</mytv>
-		<one>One</one>
-		<two>Two</two>
-		<three>Three</three>
-		<four>Four</four>
-		<five>Five</five>
-		<six>Six</six>
-		<seven>Seven</seven>
-		<eight>Eight</eight>
-		<nine>Nine</nine>
-		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
-	</remote>
-	
-	<remote device="XboxDVDDongle">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="Microsoft_Xbox">
-		<play>PLAY</play>
-		<pause>PAUSE</pause>
-		<stop>STOP</stop>
-		<forward>FORWARD</forward>
-		<reverse>REVERSE</reverse>
-		<left>LEFT</left>
-		<right>RIGHT</right>
-		<up>UP</up>
-		<down>DOWN</down>
-		<select>SELECT</select>
-		<back>BACK</back>
-		<menu>MENU</menu>
-		<title>TITLE</title>
-		<info>INFO</info>
-		<skipplus>SKIP+</skipplus>
-		<skipminus>SKIP-</skipminus>
-		<display>DISPLAY</display>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-
-	<remote device="PinnacleSysPCTVRemote">
-		<play>Play</play>
-		<pause>pause</pause>
-		<stop>Stop</stop>
-		<forward>FForward</forward>
-		<reverse>Rewind</reverse>
-		<left>Vol-Rew</left>
-		<right>Vol+FF</right>
-		<up>Chan+Play</up>
-		<down>Chan-Stop</down>
-		<pageplus>channel+</pageplus>
-		<pageminus>channel-</pageminus>
-		<select>middle</select>
-		<back>undo</back>
-		<menu>Menu</menu>
-		<title>L</title>
-		<info>Info</info>
-		<skipplus>next</skipplus>
-		<display>Fullscreen</display>
-		<record>Record</record>
-		<volumeplus>vol+</volumeplus>
-		<volumeminus>vol-</volumeminus>
-		<mute>Mute</mute>
-		<power>Power</power>
-		<one>1</one>
-		<two>2</two>
-		<three>3</three>
-		<four>4</four>
-		<five>5</five>
-		<six>6</six>
-		<seven>7</seven>
-		<eight>8</eight>
-		<nine>9</nine>
-		<zero>0</zero>
-	</remote>
-</lircmap>

Modified: branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp	2008-07-15 00:29:14 UTC (rev 14097)
+++ branches/linuxport/XBMC/xbmc/ButtonTranslator.cpp	2008-07-15 05:08:58 UTC (rev 14098)
@@ -39,26 +39,55 @@
 
 bool CButtonTranslator::Load()
 {
-  // load our xml file, and fill up our mapping tables
-  TiXmlDocument xmlDoc;
+  translatorMap.clear();
 
   // Load the config file
   CStdString keymapPath;
   //CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Keymap.xml", keymapPath);
+  keymapPath = _P("Q:\\system\\keymap.xml");
+  bool success = LoadKeymap(keymapPath);
   keymapPath = g_settings.GetUserDataItem("Keymap.xml");
+  success = LoadKeymap(keymapPath);
+
+  if (!success)
+  {
+    g_LoadErrorStr.Format("Error loading keymap: %s", keymapPath.c_str());
+    return false;
+  }
+
+#ifdef HAS_LIRC
+#ifdef _LINUX
+#define REMOTEMAP "Lircmap.xml"
+#else
+#define REMOTEMAP "IRSSmap.xml"
+#endif
+  CStdString lircmapPath = CUtil::AddFileToFolder(_P("Q:\\system"), REMOTEMAP);
+  success = LoadLircMap(lircmapPath);
+  lircmapPath = g_settings.GetUserDataItem(REMOTEMAP);
+  success |= LoadLircMap(lircmapPath);
+  if (!success)
+    return false;
+#endif
+
+  // Done!
+  return true;
+}
+
+bool CButtonTranslator::LoadKeymap(const CStdString &keymapPath)
+{
+  TiXmlDocument xmlDoc;
+
   CLog::Log(LOGINFO, "Loading %s", keymapPath.c_str());
   if (!xmlDoc.LoadFile(keymapPath))
   {
-    g_LoadErrorStr.Format("%s, Line %d\n%s", keymapPath.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
+    CLog::Log(LOGERROR, "Error loading keymap: %s, Line %d\n%s", keymapPath.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
     return false;
   }
-
-  translatorMap.clear();
   TiXmlElement* pRoot = xmlDoc.RootElement();
   CStdString strValue = pRoot->Value();
   if ( strValue != "keymap")
   {

@@ Diff output truncated at 100000 characters. @@

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

Revision: 14100
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14100&view=rev
Author:   jmarshallnz
Date:     2008-07-15 01:57:52 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
removed: Unneeded control types that only xlink kai used.

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/GUIMessage.cpp
    branches/linuxport/XBMC/guilib/GUIMessage.h
    branches/linuxport/XBMC/guilib/GUISpinControl.h
    branches/linuxport/XBMC/guilib/GuiControlFactory.cpp
    branches/linuxport/XBMC/guilib/Makefile
    branches/linuxport/XBMC/guilib/guilib_win32.vcproj
    branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/control.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp

Removed Paths:
-------------
    branches/linuxport/XBMC/guilib/GUIConsoleControl.cpp
    branches/linuxport/XBMC/guilib/GUIConsoleControl.h
    branches/linuxport/XBMC/guilib/GUIItem.cpp
    branches/linuxport/XBMC/guilib/GUIItem.h
    branches/linuxport/XBMC/guilib/GUIList.cpp
    branches/linuxport/XBMC/guilib/GUIList.h
    branches/linuxport/XBMC/guilib/GUIListControlEx.cpp
    branches/linuxport/XBMC/guilib/GUIListControlEx.h
    branches/linuxport/XBMC/guilib/GUIListExItem.cpp
    branches/linuxport/XBMC/guilib/GUIListExItem.h
    branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.cpp
    branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.h

Deleted: branches/linuxport/XBMC/guilib/GUIConsoleControl.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIConsoleControl.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIConsoleControl.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,144 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "GUIConsoleControl.h"
-#include "GUIWindowManager.h"
-#include "utils/CharsetConverter.h"
-#include "GUITextLayout.h"
-
-
-#define CONSOLE_LINE_SPACING 1.0f
-
-CGUIConsoleControl::CGUIConsoleControl(DWORD dwParentID, DWORD dwControlId,
-                                       float posX, float posY, float width, float height,
-                                       const CLabelInfo& labelInfo,
-                                       const CGUIInfoColor &penColor1, const CGUIInfoColor &penColor2, const CGUIInfoColor &penColor3, const CGUIInfoColor &penColor4)
-    : CGUIControl(dwParentID, dwControlId, posX, posY, width, height)
-{
-  m_label = labelInfo;
-  // TODO: conversion from infocolor -> fixed color occurs here. This will need remedying if Kai
-  //       (or this control) is resurrected.
-  m_palette.push_back(penColor1);
-  m_palette.push_back(penColor2);
-  m_palette.push_back(penColor3);
-  m_palette.push_back(penColor4);
-
-  if (m_label.font)
-    m_fFontHeight = m_label.font->GetLineHeight();
-
-  m_nMaxLines = (DWORD)(height / (m_fFontHeight + CONSOLE_LINE_SPACING));
-  m_dwLineCounter = 0;
-  m_dwFrameCounter = 0;
-
-  Line line;
-  line.text = "";
-  line.colour = 0;
-
-  for (int i = 0; i < m_nMaxLines; i++)
-  {
-    m_lines.push_back(line);
-  }
-
-  ControlType = GUICONTROL_CONSOLE;
-}
-
-CGUIConsoleControl::~CGUIConsoleControl(void)
-{}
-
-void CGUIConsoleControl::PreAllocResources()
-{
-  CGUIControl::PreAllocResources();
-}
-
-void CGUIConsoleControl::AllocResources()
-{
-  CGUIControl::AllocResources();
-}
-
-void CGUIConsoleControl::FreeResources()
-{
-  CGUIControl::FreeResources();
-}
-
-void CGUIConsoleControl::Render()
-{
-  m_dwFrameCounter++;
-
-  /* Debugging
-  if (m_dwFrameCounter%500==0)
-  {
-   CStdString strDebug = "Okay, so perhaps the name 'Magic Box' is slightly misleading - this nifty little attachment isn't much use if you're looking to produce rabbits out of thin air or saw your XBOX in half without destroying it.  What it does do, though, is provide XBOX owners with the opportunity to plugin in their favourite joypad (or, as the box puts it, 'use your familiar and loving controller') instead of a regular XBOX one.  It takes Saturn, Dreamcast and all PS2 pads and joysticks - including the rather meaty Hori one also shown on this page - which means that the excuse of not being use to the controller when you're being thrashed at Pro Evolution Soccer, Street Fighter II, Tony Hawk or any other game that's best played on a PS2 pad no longer applies.  As invaluable a peripheral as they come, we'd recommend buying four... and some spares besides.";
-   Write(strDebug,0xFF00FF00);
-  }*/
-
-  FLOAT fTextX = (FLOAT) m_posX;
-  FLOAT fTextY = (FLOAT) m_posY;
-
-  // queue up our new lines
-  for (unsigned int line = 0; line < m_queuedLines.size(); line++)
-    AddLine(m_queuedLines[line].text, m_queuedLines[line].colour);
-  m_queuedLines.clear();
-
-  for (int nLine = 0; nLine < m_nMaxLines; nLine++)
-  {
-    INT nIndex = (m_dwLineCounter + nLine) % m_nMaxLines;
-
-    Line& line = m_lines[nIndex];
-
-    CGUITextLayout::DrawText(m_label.font, fTextX, fTextY, line.colour, 0, line.text, 0);
-
-    fTextY += m_fFontHeight + CONSOLE_LINE_SPACING;
-  }
-  CGUIControl::Render();
-}
-
-void CGUIConsoleControl::AddLine(CStdString& aLine, DWORD aColour)
-{
-  Line line;
-  line.text = aLine;
-  line.colour = aColour;
-
-  // determine which line appears at the bottom of the console
-  INT nIndex = m_dwLineCounter % m_nMaxLines;
-
-  m_lines[nIndex] = line;
-
-  m_dwLineCounter++;
-}
-
-void CGUIConsoleControl::Clear()
-{
-  for (int nIndex = 0; nIndex < m_nMaxLines; nIndex++)
-  {
-    m_lines[nIndex].text.clear();
-  }
-  m_queuedLines.clear();
-}
-
-void CGUIConsoleControl::Write(CStdString& aString, INT nPaletteIndex)
-{
-  Line line;
-  line.text = aString;
-  line.colour = GetPenColor(nPaletteIndex);
-  m_queuedLines.push_back(line);
-}
-

Deleted: branches/linuxport/XBMC/guilib/GUIConsoleControl.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIConsoleControl.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIConsoleControl.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,91 +0,0 @@
-/*!
-\file GUIConsoleControl.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIConsoleControl_H
-#define GUILIB_GUIConsoleControl_H
-
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "GUIControl.h"
-
-/*!
- \ingroup controls
- \brief 
- */
-class CGUIConsoleControl : public CGUIControl
-{
-public:
-
-  CGUIConsoleControl(DWORD dwParentID, DWORD dwControlId,
-                     float posX, float posY, float width, float height,
-                     const CLabelInfo &labelInfo,
-                     const CGUIInfoColor &penColor1, const CGUIInfoColor &penColor2,
-                     const CGUIInfoColor &penColor3, const CGUIInfoColor &penColor4);
-
-  virtual ~CGUIConsoleControl(void);
-
-  virtual void Render();
-
-  virtual void PreAllocResources();
-  virtual void AllocResources();
-  virtual void FreeResources();
-  virtual bool CanFocus() const { return false; };
-
-  void Clear();
-  void Write(CStdString& aString, INT nPaletteIndex = 0);
-
-protected:
-
-  void AddLine(CStdString& aString, DWORD aColour);
-
-  DWORD GetPenColor(INT nPaletteIndex)
-  {
-    return nPaletteIndex < (INT)m_palette.size() ? m_palette[nPaletteIndex] : 0xFF808080;
-  };
-
-protected:
-
-  struct Line
-  {
-    CStdString text;
-    DWORD colour;
-  };
-
-  typedef std::vector<Line> LINEVECTOR;
-  LINEVECTOR m_lines;
-  LINEVECTOR m_queuedLines;
-
-  typedef std::vector<D3DCOLOR> PALETTE;
-  PALETTE m_palette;
-
-  INT m_nMaxLines;
-  DWORD m_dwLineCounter;
-  DWORD m_dwFrameCounter;
-
-  FLOAT m_fFontHeight;
-  CLabelInfo m_label;
-};
-#endif

Deleted: branches/linuxport/XBMC/guilib/GUIItem.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIItem.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIItem.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,47 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "GUIItem.h"
-
-CGUIItem::CGUIItem(CStdString& aItemName)
-{
-  m_strName = aItemName;
-  m_dwCookie = 0;
-}
-
-CGUIItem::~CGUIItem(void)
-{}
-
-CStdString CGUIItem::GetName()
-{
-  return m_strName;
-}
-
-void CGUIItem::SetCookie(DWORD aCookie)
-{
-  m_dwCookie = aCookie;
-}
-
-DWORD CGUIItem::GetCookie()
-{
-  return m_dwCookie;
-}

Deleted: branches/linuxport/XBMC/guilib/GUIItem.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIItem.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIItem.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,68 +0,0 @@
-/*!
-\file GUIItem.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIItem_H
-#define GUILIB_GUIItem_H
-
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-class CGUIItem
-{
-public:
-  class RenderContext
-  {
-  public:
-    RenderContext()
-    {
-      m_positionX = m_positionY = 0;
-      m_bFocused = false;
-    };
-    virtual ~RenderContext(){};
-
-    float m_positionX;
-    float m_positionY;
-    bool m_bFocused;
-  };
-
-  CGUIItem(CStdString& aItemName);
-  virtual ~CGUIItem(void);
-  virtual void AllocResources() {}
-  virtual void FreeResources() {}
-  virtual void OnPaint(CGUIItem::RenderContext* pContext) = 0;
-  virtual void GetDisplayText(CStdString& aString)
-  {
-    aString = m_strName;
-  };
-
-  CStdString GetName();
-  void SetCookie(DWORD aCookie);
-  DWORD GetCookie();
-
-protected:
-  DWORD m_dwCookie;
-  CStdString m_strName;
-};
-#endif

Deleted: branches/linuxport/XBMC/guilib/GUIList.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIList.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIList.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,157 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
- 
-#include "include.h"
-#include "GUIList.h"
-#include <algorithm>
-
-CGUIList::CGUIList()
-{
-  m_comparision = NULL;
-  InitializeCriticalSection(&m_critical);
-}
-
-CGUIList::~CGUIList(void)
-{
-  Clear();
-
-  DeleteCriticalSection(&m_critical);
-}
-
-CGUIItem* CGUIList::Find(CStdString aListItemLabel)
-{
-  EnterCriticalSection(&m_critical);
-
-  CGUIItem* pItem = NULL;
-
-  if (m_listitems.size() > 0)
-  {
-    GUILISTITERATOR iterator = m_listitems.begin();
-    while (iterator != m_listitems.end())
-    {
-      if (aListItemLabel.Compare((*iterator)->GetName()) == 0)
-      {
-        pItem = (*iterator);
-        break;
-      }
-
-      iterator++;
-    }
-  }
-
-  LeaveCriticalSection(&m_critical);
-
-  return pItem;
-}
-
-void CGUIList::Add(CGUIItem* aListItem)
-{
-  EnterCriticalSection(&m_critical);
-  m_listitems.push_back(aListItem);
-  LeaveCriticalSection(&m_critical);
-}
-
-void CGUIList::Remove(CStdString aListItemLabel)
-{
-  EnterCriticalSection(&m_critical);
-
-  if (m_listitems.size() > 0)
-  {
-    GUILISTITERATOR iterator = m_listitems.begin();
-    while (iterator != m_listitems.end())
-    {
-      if (aListItemLabel.Compare((*iterator)->GetName()) == 0)
-      {
-        try
-        {
-          delete *iterator;
-        }
-        catch (...)
-        {
-          // OutputDebugString("Unable to free stuff\r\n");
-        }
-
-        m_listitems.erase(iterator);
-        break;
-      }
-
-      iterator++;
-    }
-  }
-
-  LeaveCriticalSection(&m_critical);
-}
-
-void CGUIList::Clear()
-{
-  EnterCriticalSection(&m_critical);
-
-  if (m_listitems.size() > 0)
-  {
-    GUILISTITERATOR iterator = m_listitems.begin();
-    while (iterator != m_listitems.end())
-    {
-      delete *iterator;
-      iterator = m_listitems.erase(iterator);
-    }
-  }
-
-  LeaveCriticalSection(&m_critical);
-}
-
-int CGUIList::Size()
-{
-  EnterCriticalSection(&m_critical);
-
-  int sizeOfList = m_listitems.size();
-
-  LeaveCriticalSection(&m_critical);
-
-  return sizeOfList;
-}
-
-void CGUIList::Release()
-{
-  LeaveCriticalSection(&m_critical);
-}
-
-CGUIList::GUILISTITEMS& CGUIList::Lock()
-{
-  EnterCriticalSection(&m_critical);
-  return m_listitems;
-}
-
-void CGUIList::SetSortingAlgorithm(GUILISTITEMCOMPARISONFUNC aFunction)
-{
-  m_comparision = aFunction;
-}
-
-void CGUIList::Sort()
-{
-  EnterCriticalSection(&m_critical);
-
-  if (m_comparision)
-  {
-    sort(m_listitems.begin(), m_listitems.end(), m_comparision );
-  }
-
-  LeaveCriticalSection(&m_critical);
-}

Deleted: branches/linuxport/XBMC/guilib/GUIList.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIList.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIList.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,62 +0,0 @@
-/*!
-\file GUIList.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIListEx_H
-#define GUILIB_GUIListEx_H
-
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "GUIItem.h"
-
-class CGUIList
-{
-public:
-  typedef bool (*GUILISTITEMCOMPARISONFUNC) (CGUIItem* pObject1, CGUIItem* pObject2);
-  typedef std::vector<CGUIItem*> GUILISTITEMS;
-  typedef std::vector<CGUIItem*> ::iterator GUILISTITERATOR;
-
-  CGUIList();
-  virtual ~CGUIList(void);
-
-  virtual void Add(CGUIItem* aListItem);
-  virtual void Remove(CStdString aListItemLabel);
-  virtual void Clear();
-  virtual int Size();
-
-  GUILISTITEMS& Lock();
-  CGUIItem* Find(CStdString aListItemLabel);
-  void Release();
-
-  void SetSortingAlgorithm(GUILISTITEMCOMPARISONFUNC aFunction);
-  void Sort();
-
-protected:
-  CRITICAL_SECTION m_critical;
-  GUILISTITEMS m_listitems;
-  GUILISTITEMCOMPARISONFUNC m_comparision;
-};
-
-#endif

Deleted: branches/linuxport/XBMC/guilib/GUIListControlEx.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListControlEx.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIListControlEx.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,664 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "GUIListControlEx.h"
-
-
-#define CONTROL_LIST  0
-#define CONTROL_UPDOWN 9998
-CGUIListControlEx::CGUIListControlEx(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height,
-                                     float spinWidth, float spinHeight,
-                                     const CImage& textureUp, const CImage& textureDown,
-                                     const CImage& textureUpFocus, const CImage& textureDownFocus,
-                                     const CLabelInfo& spinInfo, float spinX, float spinY,
-                                     const CLabelInfo& labelInfo, const CLabelInfo& labelInfo2,
-                                     const CImage& textureButton, const CImage& textureButtonFocus)
-    : CGUIControl(dwParentID, dwControlId, posX, posY, width, height)
-    , m_upDown(dwControlId, CONTROL_UPDOWN, 0, 0, spinWidth, spinHeight, textureUp, textureDown, textureUpFocus, textureDownFocus, spinInfo, SPIN_CONTROL_TYPE_INT)
-    , m_imgButton(dwControlId, 0, posX, posY, width, height, textureButtonFocus, textureButton, labelInfo)
-{
-  m_upDown.SetSpinAlign(XBFONT_CENTER_Y | XBFONT_RIGHT, 0);
-  m_pList = NULL;
-  m_iOffset = 0;
-  m_iItemsPerPage = 10;
-  m_itemHeight = 10;
-  m_label = labelInfo;
-  m_label2 = labelInfo2;
-  m_iSelect = CONTROL_LIST;
-  m_iCursorY = 0;
-  m_strSuffix = "|";
-  m_imageWidth = 16;
-  m_imageHeight = 16;
-  m_spaceBetweenItems = 4;
-  m_bUpDownVisible = true; // show the spin control by default
-
-  m_spinPosX = spinX;
-  m_spinPosY = spinY;
-  ControlType = GUICONTROL_LISTEX;
-}
-
-CGUIListControlEx::~CGUIListControlEx(void)
-{
-}
-
-void CGUIListControlEx::Render()
-{
-  if ( m_pList && m_label.font )
-  {
-    float posY = m_posY;
-    CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-    for (int i = 0; i < m_iItemsPerPage; i++)
-    {
-      float posX = m_posX;
-      if (i + m_iOffset < (int)list.size() )
-      {
-        CGUIItem* pItem = list[i + m_iOffset];
-
-        // create a list item rendering context
-        CGUIListExItem::RenderContext context;
-        context.m_positionX = posX;
-        context.m_positionY = posY;
-        context.m_bFocused = (i == m_iCursorY && HasFocus() && m_iSelect == CONTROL_LIST);
-        context.m_bActive = (i == m_iCursorY);
-        context.m_pButton = &m_imgButton;
-        context.m_label = m_label;
-
-        // render the list item
-        pItem->OnPaint(&context);
-
-        posY += m_itemHeight + m_spaceBetweenItems;
-      }
-    }
-    if (m_bUpDownVisible)
-    {
-      int iPages = list.size() / m_iItemsPerPage;
-
-      if (list.size() % m_iItemsPerPage)
-      {
-        iPages++;
-      }
-      m_upDown.SetPosition(m_posX + m_spinPosX, m_posY + m_spinPosY);
-      m_upDown.SetRange(1, iPages);
-      m_upDown.SetValue(GetPage(list.size()));
-      m_upDown.Render();
-    }
-    m_pList->Release();
-  }
-  CGUIControl::Render();
-}
-
-// returns which page we are on
-int CGUIListControlEx::GetPage(int listSize)
-{
-  if (m_iOffset >= listSize - m_iItemsPerPage)
-  {
-    m_iOffset = listSize - m_iItemsPerPage;
-    if (m_iOffset <= 0)
-    {
-      m_iOffset = 0;
-      return 1;
-    }
-    if (listSize % m_iItemsPerPage)
-      return listSize / m_iItemsPerPage + 1;
-    else
-      return listSize / m_iItemsPerPage;
-  }
-  else
-    return m_iOffset / m_iItemsPerPage + 1;
-}
-
-bool CGUIListControlEx::OnAction(const CAction &action)
-{
-  // track state before action
-  int iOldItem = m_iCursorY + m_iOffset;
-
-  switch (action.wID)
-  {
-  case ACTION_PAGE_UP:
-    OnPageUp();
-    return true;
-    break;
-
-  case ACTION_PAGE_DOWN:
-    OnPageDown();
-    return true;
-    break;
-
-    /* TODO: doesn't bloody work does it ;-)
-             if you scroll up/down it often crashes and locks up XBMC
-
-    // smooth scrolling (for analog controls)
-    case ACTION_SCROLL_UP:
-    {
-     m_fSmoothScrollOffset+=action.fAmount1*action.fAmount1;
-     while (m_fSmoothScrollOffset>0.4)
-     {
-      m_fSmoothScrollOffset-=0.4f;
-      if (m_iOffset>0 && m_iCursorY<=m_iItemsPerPage/2)
-      {
-       m_iOffset--;
-      }
-      else if (m_iCursorY>0)
-      {
-       m_iCursorY--;
-      }
-     }
-    }
-    break;
-    case ACTION_SCROLL_DOWN:
-    {
-     CGUIList::GUILISTITEMS& list = m_pList->Lock();
-     m_fSmoothScrollOffset+=action.fAmount1*action.fAmount1;
-     while (m_fSmoothScrollOffset>0.4)
-     {
-      m_fSmoothScrollOffset-=0.4f;
-      if (m_iOffset + m_iItemsPerPage < (int)list.size() && m_iCursorY>=m_iItemsPerPage/2)
-      {
-       m_iOffset++;
-      }
-      else if (m_iCursorY<m_iItemsPerPage-1 && m_iOffset + m_iCursorY < (int)list.size()-1)
-      {
-       m_iCursorY++;
-      }
-     }
-    }
-    break;
-    */
-
-  case ACTION_SELECT_ITEM:
-    {
-      // generate a control clicked event
-      if (m_iSelect == CONTROL_LIST)
-      { // Don't know what to do, so send to our parent window.
-        CGUIMessage msg(GUI_MSG_CLICKED, GetID(), GetParentID(), action.wID);
-        return SendWindowMessage(msg);
-      }
-      else
-      { // send action to the page control
-        return m_upDown.OnAction(action);
-      }
-    }
-    break;
-  }
-
-  // call the base class
-  bool handled = CGUIControl::OnAction(action);
-
-  // post event notifications
-  switch (action.wID)
-  {
-  case ACTION_MOVE_UP:
-  case ACTION_MOVE_DOWN:
-    {
-      int iNewItem = m_iCursorY + m_iOffset;
-
-      // determine of the item selection within list control has changed
-      if (iOldItem != iNewItem)
-      {
-        // generate control selection changed event
-        CGUIMessage msg(GUI_MSG_SELCHANGED, GetID(), GetParentID(), iOldItem, iNewItem);
-        return SendWindowMessage(msg);
-      }
-      break;
-    }
-  }
-  return handled;
-}
-
-bool CGUIListControlEx::OnMessage(CGUIMessage& message)
-{
-  if (message.GetControlId() == GetID() )
-  {
-    if (message.GetSenderId() == CONTROL_UPDOWN)
-    {
-      if (message.GetMessage() == GUI_MSG_CLICKED)
-      {
-        CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-        m_iOffset = (m_upDown.GetValue() - 1) * m_iItemsPerPage;
-        while (m_iOffset + m_iCursorY >= (int)list.size()) m_iCursorY--;
-
-        m_pList->Release();
-      }
-    }
-
-    if (message.GetMessage() == GUI_MSG_LOSTFOCUS ||
-        message.GetMessage() == GUI_MSG_SETFOCUS)
-    {
-      m_iSelect = CONTROL_LIST;
-    }
-
-    if (message.GetMessage() == GUI_MSG_LABEL_BIND)
-    {
-      CGUIList* pNewList = (CGUIList*) message.GetLPVOID();
-      if (!m_pList)
-        m_pList = pNewList;
-      else
-      {
-        CGUIList* pOldList = m_pList;
-        pOldList->Lock();
-        m_pList = pNewList;
-        pOldList->Release();
-      }
-    }
-
-    if (message.GetMessage() == GUI_MSG_ITEM_SELECTED)
-    {
-      if (!m_pList)
-        return false;
-
-      CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-      if ((int)list.size() > m_iCursorY + m_iOffset)
-      {
-        message.SetParam1(m_iCursorY + m_iOffset);
-        message.SetLPVOID(list[m_iCursorY + m_iOffset]);
-      }
-      else
-      {
-        m_iCursorY = m_iOffset = 0;
-      }
-
-      m_pList->Release();
-    }
-
-    if (message.GetMessage() == GUI_MSG_ITEM_SELECT)
-    {
-      if (!m_pList)
-        return false;
-
-      CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-      if (message.GetParam1() < list.size())
-      {
-        int iPage = 1;
-        m_iOffset = 0;
-        m_iCursorY = message.GetParam1();
-
-        while (m_iCursorY >= m_iItemsPerPage)
-        {
-          iPage++;
-          m_iOffset += m_iItemsPerPage;
-          m_iCursorY -= m_iItemsPerPage;
-        }
-
-        m_upDown.SetValue(iPage);
-      }
-
-      m_pList->Release();
-    }
-  }
-
-  if ( CGUIControl::OnMessage(message) )
-  {
-    return true;
-  }
-
-  return false;
-}
-
-void CGUIListControlEx::PreAllocResources()
-{
-  if (!m_label.font) return ;
-  CGUIControl::PreAllocResources();
-  m_upDown.PreAllocResources();
-  m_imgButton.PreAllocResources();
-}
-
-void CGUIListControlEx::AllocResources()
-{
-  if (!m_label.font)
-  {
-    return ;
-  }
-
-  CGUIControl::AllocResources();
-  m_upDown.AllocResources();
-
-  m_imgButton.AllocResources();
-  SetWidth(m_width);
-  SetHeight(m_height);
-}
-
-void CGUIListControlEx::FreeResources()
-{
-  CGUIControl::FreeResources();
-  m_upDown.FreeResources();
-  m_imgButton.FreeResources();
-}
-
-void CGUIListControlEx::DynamicResourceAlloc(bool bOnOff)
-{
-  CGUIControl::DynamicResourceAlloc(bOnOff);
-  m_upDown.DynamicResourceAlloc(bOnOff);
-  //  Image will be reloaded all the time
-  //m_imgButton.DynamicResourceAlloc(bOnOff);
-}
-
-void CGUIListControlEx::OnRight()
-{
-  if (m_iSelect == CONTROL_LIST)
-  {
-    if (m_upDown.GetMaximum() > 1)
-    {
-      m_iSelect = CONTROL_UPDOWN;
-      m_upDown.SetFocus(true);
-    }
-    else
-    {
-      CGUIControl::OnRight();
-    }
-  }
-  else if (!m_upDown.IsFocusedOnUp())
-    m_upDown.OnRight();
-  else
-  { // focus on our list and do the base move right
-    m_upDown.SetFocus(false);
-    m_iSelect = CONTROL_LIST;
-    CGUIControl::OnRight();
-  }
-}
-
-void CGUIListControlEx::OnLeft()
-{
-  if (m_iSelect == CONTROL_LIST)
-    CGUIControl::OnLeft();
-  else if (m_upDown.IsFocusedOnUp())
-    m_upDown.OnLeft();
-  else
-  {
-    m_iSelect = CONTROL_LIST;
-    m_upDown.SetFocus(false);
-  }
-}
-
-void CGUIListControlEx::OnUp()
-{
-  if (m_iSelect == CONTROL_LIST)
-  {
-    if (m_iCursorY > 0)
-    {
-      m_iCursorY--;
-    }
-    else if (m_iCursorY == 0 && m_iOffset)
-    {
-      m_iOffset--;
-    }
-    else if (m_pList && (m_dwControlUp == 0 || m_dwControlUp == GetID()))
-    {
-      // move 2 last item in list
-
-      /* No longer done, on recommendation of Sollie
-      CGUIList::GUILISTITEMS& list = m_pList->Lock();
-      CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), GetID(), list.size() - 1);
-      OnMessage(msg);
-      m_pList->Release();
-      */
-    }
-    else
-    {
-      CGUIControl::OnUp();
-    }
-  }
-  else
-  { // focus the list again
-    m_upDown.SetFocus(false);
-    m_iSelect = CONTROL_LIST;
-  }
-}
-
-void CGUIListControlEx::OnDown()
-{
-  if ((m_iSelect == CONTROL_LIST) && (m_pList))
-  {
-    CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-    if (m_iCursorY + 1 < m_iItemsPerPage)
-    {
-      if (m_iOffset + 1 + m_iCursorY < (int)list.size())
-      {
-        m_iCursorY++;
-      }
-      else if(m_dwControlDown == 0 || m_dwControlDown == GetID())
-      {
-        /* No longer done, on recommendation of Sollie
-        // move first item in list
-        CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), GetID(), 0);
-        OnMessage(msg);
-        */
-      }
-      else
-      {
-        CGUIControl::OnDown();
-      }
-    }
-    else
-    {
-      if (m_iOffset + 1 + m_iCursorY < (int)list.size())
-      {
-        m_iOffset++;
-
-        int iPage = 1;
-        int iSel = m_iOffset + m_iCursorY;
-        while (iSel >= m_iItemsPerPage)
-        {
-          iPage++;
-          iSel -= m_iItemsPerPage;
-        }
-        m_upDown.SetValue(iPage);
-      }
-      else if(m_dwControlDown == 0 || m_dwControlDown == GetID())
-      {
-        /* No longer done, on recommendation of Sollie
-        // move first item in list
-        CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), GetID(), 0);
-        OnMessage(msg);
-        */
-      }
-      else
-      {
-        CGUIControl::OnDown();
-      }
-
-    }
-    m_pList->Release();
-  }
-  else
-  {
-    // move down off our control
-    m_upDown.SetFocus(false);
-    CGUIControl::OnDown();
-  }
-}
-
-void CGUIListControlEx::SetScrollySuffix(const CStdString& strSuffix)
-{
-  m_strSuffix = strSuffix;
-}
-
-
-void CGUIListControlEx::OnPageUp()
-{
-  int iPage = m_upDown.GetValue();
-  if (iPage > 1)
-  {
-    iPage--;
-    m_upDown.SetValue(iPage);
-    m_iOffset = (m_upDown.GetValue() - 1) * m_iItemsPerPage;
-  }
-  else
-  {
-    // already on page 1, then select the 1st item
-    m_iCursorY = 0;
-  }
-}
-
-void CGUIListControlEx::OnPageDown()
-{
-  if (!m_pList)
-  {
-    return ;
-  }
-
-  CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-  int iPages = list.size() / m_iItemsPerPage;
-  if (list.size() % m_iItemsPerPage)
-    iPages++;
-
-  int iPage = m_upDown.GetValue();
-  if (iPage + 1 <= iPages)
-  {
-    iPage++;
-    m_upDown.SetValue(iPage);
-    m_iOffset = (m_upDown.GetValue() - 1) * m_iItemsPerPage;
-  }
-  else
-  {
-    // already on last page, move 2 last item in list
-    CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), GetID(), list.size() - 1);
-    OnMessage(msg);
-  }
-
-  if (m_iOffset + m_iCursorY >= (int)list.size() )
-  {
-    m_iCursorY = (int)(list.size() - m_iOffset) - 1;
-  }
-
-  m_pList->Release();
-}
-
-
-
-
-void CGUIListControlEx::SetImageDimensions(float width, float height)
-{
-  m_imageWidth = width;
-  m_imageHeight = height;
-}
-
-void CGUIListControlEx::SetItemHeight(float height)
-{
-  m_itemHeight = height;
-}
-
-void CGUIListControlEx::SetSpaceBetweenItems(float spaceBetweenItems)
-{
-  m_spaceBetweenItems = spaceBetweenItems;
-}
-
-CStdString CGUIListControlEx::GetDescription() const
-{
-  if (!m_pList)
-    return "";
-
-  CGUIList::GUILISTITEMS& list = m_pList->Lock();
-
-  CStdString strLabel;
-  int iItem = m_iCursorY + m_iOffset;
-  if (iItem >= 0 && iItem < (int)list.size())
-  {
-    CGUIItem* pItem = list[iItem];
-    strLabel = pItem->GetName();
-  }
-
-  m_pList->Release();
-
-  return strLabel;
-}
-
-void CGUIListControlEx::SetPageControlVisible(bool bVisible)
-{
-  m_bUpDownVisible = bVisible;
-  return ;
-}
-
-//TODO: Add OnMouseOver() and possibly HitTest() and SelectItemFromPoint from
-// CGUIListControl
-bool CGUIListControlEx::OnMouseOver(const CPoint &point)
-{
-  return CGUIControl::OnMouseOver(point);
-}
-
-bool CGUIListControlEx::OnMouseClick(DWORD dwButton, const CPoint &point)
-{
-  return CGUIControl::OnMouseClick(dwButton, point);
-}
-
-bool CGUIListControlEx::CanFocus() const
-{
-  //if (!m_pList)
-  //  return false;
-
-  //if (m_pList->Size()<=0)
-  //  return false;
-
-  return CGUIControl::CanFocus();
-}
-
-void CGUIListControlEx::SetPosition(float posX, float posY)
-{
-  // offset our spin control by the appropriate amount
-  float spinOffsetX = m_upDown.GetXPosition() - GetXPosition();
-  float spinOffsetY = m_upDown.GetYPosition() - GetYPosition();
-  CGUIControl::SetPosition(posX, posY);
-  m_upDown.SetPosition(GetXPosition() + spinOffsetX, GetYPosition() + spinOffsetY);
-}
-
-void CGUIListControlEx::SetWidth(float width)
-{
-  float spinOffsetX = m_upDown.GetXPosition() - GetXPosition() - GetWidth();
-  CGUIControl::SetWidth(width);
-  m_upDown.SetPosition(GetXPosition() + GetWidth() + spinOffsetX, m_upDown.GetYPosition());
-
-  m_imgButton.SetWidth(m_width);
-}
-
-void CGUIListControlEx::SetHeight(float height)
-{
-  float spinOffsetY = m_upDown.GetYPosition() - GetYPosition() - GetHeight();
-  CGUIControl::SetHeight(height);
-  m_upDown.SetPosition(m_upDown.GetXPosition(), GetYPosition() + GetHeight() + spinOffsetY);
-
-  m_imgButton.SetHeight(m_itemHeight);
-  float fActualItemHeight = m_itemHeight + m_spaceBetweenItems;
-  float fTotalHeight = m_height - m_upDown.GetHeight() - 5;
-  m_iItemsPerPage = (int)(fTotalHeight / fActualItemHeight );
-  m_upDown.SetRange(1, 1);
-  m_upDown.SetValue(1);
-}
-
-
-void CGUIListControlEx::SetPulseOnSelect(bool pulse)
-{
-  m_imgButton.SetPulseOnSelect(pulse);
-  m_upDown.SetPulseOnSelect(pulse);
-  CGUIControl::SetPulseOnSelect(pulse);
-}
-
-void CGUIListControlEx::SetNavigation(DWORD dwUp, DWORD dwDown, DWORD dwLeft, DWORD dwRight)
-{
-  CGUIControl::SetNavigation(dwUp, dwDown, dwLeft, dwRight);
-  m_upDown.SetNavigation(GetID(), dwDown, GetID(), dwRight);
-}
-

Deleted: branches/linuxport/XBMC/guilib/GUIListControlEx.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListControlEx.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIListControlEx.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,108 +0,0 @@
-/*!
-\file GUIListControlEx.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIListControlEx_H
-#define GUILIB_GUIListControlEx_H
-
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "GUISpinControl.h"
-#include "GUIButtonControl.h"
-#include "GUIListExItem.h"
-#include "GUIList.h"
-
-/*!
- \ingroup controls
- \brief 
- */
-class CGUIListControlEx : public CGUIControl
-{
-public:
-  CGUIListControlEx(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height,
-                    float spinWidth, float spinHeight,
-                    const CImage& textureUp, const CImage& textureDown,
-                    const CImage& textureUpFocus, const CImage& textureDownFocus,
-                    const CLabelInfo& spinInfo, float spinX, float spinY,
-                    const CLabelInfo& labelInfo, const CLabelInfo& labelInfo2,
-                    const CImage& button, const CImage& buttonFocus);
-
-  virtual ~CGUIListControlEx(void);
-  virtual void Render();
-  virtual bool OnAction(const CAction &action);
-  virtual bool OnMouseOver(const CPoint &point);
-  virtual bool OnMouseClick(DWORD dwButton, const CPoint &point);
-  virtual bool OnMessage(CGUIMessage& message);
-
-  virtual bool CanFocus() const;
-
-  virtual void PreAllocResources();
-  virtual void AllocResources() ;
-  virtual void FreeResources() ;
-  virtual void DynamicResourceAlloc(bool bOnOff);
-  virtual void SetPosition(float posX, float posY);
-  virtual void SetWidth(float width);
-  virtual void SetHeight(float height);
-  virtual void SetPulseOnSelect(bool pulse);
-  virtual void SetNavigation(DWORD dwUp, DWORD dwDown, DWORD dwLeft, DWORD dwRight);
-
-  void SetScrollySuffix(const CStdString& wstrSuffix);
-  void SetImageDimensions(float width, float height);
-  void SetItemHeight(float height);
-  void SetSpaceBetweenItems(float spaceBetweenItems);
-  void SetPageControlVisible(bool bVisible);
-  virtual CStdString GetDescription() const;
-
-protected:
-
-  virtual void OnRight();
-  virtual void OnLeft();
-  virtual void OnDown();
-  virtual void OnUp();
-  void OnPageUp();
-  void OnPageDown();
-  int GetPage(int listSize);
-
-  float m_spinPosX;
-  float m_spinPosY;
-  float m_spaceBetweenItems;
-  float m_imageWidth;
-  float m_imageHeight;
-  float m_itemHeight;
-  float m_smoothScrollOffset;
-  int m_iOffset;
-  int m_iItemsPerPage;
-  int m_iSelect;
-  int m_iCursorY;
-  bool m_bUpDownVisible;
-  CLabelInfo m_label;
-  CLabelInfo m_label2;
-
-  CGUISpinControl m_upDown;
-  CGUIButtonControl m_imgButton;
-  std::string m_strSuffix;
-  CGUIList* m_pList;
-};
-#endif

Deleted: branches/linuxport/XBMC/guilib/GUIListExItem.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListExItem.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIListExItem.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,142 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "GUIListExItem.h"
-#include "utils/CharsetConverter.h"
-
-CGUIListExItem::CGUIListExItem(CStdString& aItemName) : CGUIItem(aItemName)
-{
-  m_pIcon = NULL;
-  m_dwFocusedDuration = 0;
-  m_dwFrameCounter = 0;
-}
-
-CGUIListExItem::~CGUIListExItem(void)
-{
-  if (m_pIcon)
-  {
-    m_pIcon->FreeResources();
-    delete m_pIcon;
-  }
-}
-
-void CGUIListExItem::SetIcon(CGUIImage* pImage)
-{
-  if (m_pIcon)
-  {
-    m_pIcon->FreeResources();
-    delete m_pIcon;
-  }
-
-  m_pIcon = pImage;
-}
-
-void CGUIListExItem::AllocResources()
-{
-  CGUIItem::AllocResources();
-
-  if (m_pIcon)
-  {
-    m_pIcon->AllocResources();
-  }
-}
-
-void CGUIListExItem::FreeResources()
-{
-  CGUIItem::FreeResources();
-
-  if (m_pIcon)
-  {
-    m_pIcon->FreeResources();
-  }
-}
-
-void CGUIListExItem::SetIcon(float width, float height, const CStdString& aTexture)
-{
-  if (m_pIcon)
-  {
-    m_pIcon->FreeResources();
-    delete m_pIcon;
-  }
-
-  m_pIcon = new CGUIImage(0, 0, 0, 0, width, height, aTexture, 0x0);
-  m_pIcon->AllocResources();
-}
-
-void CGUIListExItem::OnPaint(CGUIItem::RenderContext* pContext)
-{
-  m_dwFrameCounter++;
-
-  CGUIListExItem::RenderContext* pDC = (CGUIListExItem::RenderContext*)pContext;
-  if (pDC)
-  {
-    // if focused increment the frame counter, otherwise reset it
-    m_dwFocusedDuration = pDC->m_bFocused ? (m_dwFocusedDuration + 1) : 0;
-
-    float posX = pDC->m_positionX;
-    float posY = pDC->m_positionY;
-
-    if (pDC->m_pButton)
-    {
-      // render control
-      pDC->m_pButton->SetAlpha(0xFF);
-      pDC->m_pButton->SetFocus(pDC->m_bFocused);
-      if (!pDC->m_bFocused && pDC->m_bActive)
-      { // listcontrolex is not focused, yet we have an active item, so render it focused
-        // but around 55% transparent.
-        pDC->m_pButton->SetAlpha(0x60);
-        pDC->m_pButton->SetFocus(true);
-      }
-      pDC->m_pButton->SetPosition(posX, posY);
-      pDC->m_pButton->Render();
-      posX += 8;
-    }
-
-    if (m_pIcon)
-    {
-      // render the icon (centered vertically)
-      m_pIcon->SetPosition(posX, posY + ((int)pDC->m_pButton->GetHeight() - (int)m_pIcon->GetHeight()) / 2);
-      m_pIcon->Render();
-    }
-
-    posX += m_pIcon->GetWidth();
-
-    if (pDC->m_label.font)
-    {
-      // render the text
-      DWORD dwColor = pDC->m_bFocused ? pDC->m_label.selectedColor : pDC->m_label.textColor;
-
-      CStdString strDisplayText;
-      GetDisplayText(strDisplayText);
-
-      CGUITextLayout layout(pDC->m_label.font, false);
-      layout.Update(strDisplayText);
-
-      float fPosX = posX + pDC->m_pButton->GetLabelInfo().offsetX;
-      float fPosY = posY + pDC->m_pButton->GetLabelInfo().offsetY;
-      if (pDC->m_pButton->GetLabelInfo().align & XBFONT_CENTER_Y)
-        fPosY = posY + pDC->m_pButton->GetHeight() * 0.5f;
-      layout.Render(fPosX, fPosY, 0, dwColor, 0, pDC->m_pButton->GetLabelInfo().align, pDC->m_pButton->GetWidth());
-    }
-  }
-}
-

Deleted: branches/linuxport/XBMC/guilib/GUIListExItem.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListExItem.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIListExItem.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,71 +0,0 @@
-/*!
-\file GUIListExItem.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIListExItem_H
-#define GUILIB_GUIListExItem_H
-
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "GUIButtonControl.h"
-#include "GUIItem.h"
-
-/*!
- \ingroup controls
- \brief 
- */
-class CGUIListExItem : public CGUIItem
-{
-public:
-class RenderContext : public CGUIItem::RenderContext
-  {
-  public:
-    RenderContext()
-    {
-      m_pButton = NULL;
-      m_bActive = FALSE;
-    };
-    virtual ~RenderContext(){};
-
-    CGUIButtonControl* m_pButton;
-    CLabelInfo m_label;
-    bool m_bActive;
-  };
-
-  CGUIListExItem(CStdString& aItemName);
-  virtual ~CGUIListExItem(void);
-  virtual void AllocResources();
-  virtual void FreeResources();
-  virtual void OnPaint(CGUIItem::RenderContext* pContext);
-  void SetIcon(CGUIImage* pImage);
-  void SetIcon(float width, float height, const CStdString& aTexture);
-  DWORD GetFramesFocused() { return m_dwFocusedDuration; };
-
-protected:
-  CGUIImage* m_pIcon;
-  DWORD m_dwFocusedDuration;
-  DWORD m_dwFrameCounter;
-};
-#endif

Modified: branches/linuxport/XBMC/guilib/GUIMessage.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIMessage.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIMessage.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -66,18 +66,6 @@
   m_lpVoid = vis;
 }
 
-//#ifdef HAS_KAI_VOICE
-CGUIMessage::CGUIMessage(DWORD dwMsg, DWORD dwSenderID, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, CGUIList* list)
-{
-  m_dwMessage = dwMsg;
-  m_dwSenderID = dwSenderID;
-  m_dwControlID = dwControlID;
-  m_dwParam1 = dwParam1;
-  m_dwParam2 = dwParam2;
-  m_lpVoid = list;
-}
-//#endif
-
 CGUIMessage::CGUIMessage(const CGUIMessage& msg)
 {
   *this = msg;

Modified: branches/linuxport/XBMC/guilib/GUIMessage.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIMessage.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUIMessage.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -216,9 +216,6 @@
 class CGUIListItem; typedef boost::shared_ptr<CGUIListItem> CGUIListItemPtr;
 class CFileItemList;
 class CVisualisation;
-//#ifdef HAS_KAI_VOICE
-class CGUIList;
-//#endif
 
 /*!
  \ingroup winmsg
@@ -231,9 +228,6 @@
   CGUIMessage(DWORD dwMsg, DWORD dwSenderId, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, CFileItemList* item);
   CGUIMessage(DWORD dwMsg, DWORD dwSenderId, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, const CGUIListItemPtr &item);
   CGUIMessage(DWORD dwMsg, DWORD dwSenderId, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, CVisualisation* vis);
-//#ifdef HAS_KAI_VOICE
-  CGUIMessage(DWORD dwMsg, DWORD dwSenderId, DWORD dwControlID, DWORD dwParam1, DWORD dwParam2, CGUIList* vis);
-//#endif
   CGUIMessage(const CGUIMessage& msg);
   virtual ~CGUIMessage(void);
   const CGUIMessage& operator = (const CGUIMessage& msg);

Modified: branches/linuxport/XBMC/guilib/GUISpinControl.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUISpinControl.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GUISpinControl.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -79,7 +79,6 @@
   float GetSpinHeight() const { return m_imgspinUp.GetHeight(); };
   void SetFloatInterval(float fInterval);
   void SetShowRange(bool bOnoff) ;
-  void SetBuddyControlID(DWORD dwBuddyControlID);
   void SetShowOnePage(bool showOnePage) { m_showOnePage = showOnePage; };
   void Clear();
   virtual CStdString GetDescription() const;

Modified: branches/linuxport/XBMC/guilib/GuiControlFactory.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GuiControlFactory.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/GuiControlFactory.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -26,8 +26,6 @@
 #include "GUIRadioButtonControl.h"
 #include "GUISpinControl.h"
 #include "GUIRSSControl.h"
-#include "GUIConsoleControl.h"
-#include "GUIListControlEx.h"
 #include "guiImage.h"
 #include "GUIBorderedImage.h"
 #include "GUILabelControl.h"
@@ -594,7 +592,6 @@
   CImage textureRadioFocus, textureRadioNoFocus;
   CImage imageNoFocus, imageFocus;
   DWORD dwColorKey = 0;
-  CStdString strSuffix = "";
   FRECT borderSize = { 0, 0, 0, 0};
 
   float controlOffsetX = 0;
@@ -604,9 +601,6 @@
   float sliderWidth = 150, sliderHeight = 16;
   float textureWidthBig = 128;
   float textureHeightBig = 128;
-#ifdef HAS_KAI
-  DWORD dwBuddyControlID = 0;
-#endif
   float textureHeight = 30;
   float textureWidth = 80;
   float itemWidthBig = 150;
@@ -910,8 +904,6 @@
   GetFloat(pControlNode, "rangemax", rMax);
   GetColor(pControlNode, "colorkey", dwColorKey);
 
-  XMLUtils::GetString(pControlNode, "suffix", strSuffix);
-
   GetFloat(pControlNode, "itemwidth", itemWidth);
   GetFloat(pControlNode, "itemheight", itemHeight);
   GetFloat(pControlNode, "spacebetweenitems", spaceBetweenItems);
@@ -1124,12 +1116,6 @@
     else
       CLog::Log(LOGERROR,"invalid rss url set referenced in skin");
   }
-  else if (strType == "console")
-  {
-    control = new CGUIConsoleControl(
-      dwParentId, id, posX, posY, width, height,
-      labelInfo, labelInfo.textColor, labelInfo2.textColor, textColor3, labelInfo.selectedColor);
-  }
   else if (strType == "button")
   {
     control = new CGUIButtonControl(
@@ -1339,22 +1325,6 @@
     return pControl;
   }
 #endif
-  else if (strType == "listcontrolex")
-  {
-    control = new CGUIListControlEx(
-      dwParentId, id, posX, posY, width, height,
-      spinWidth, spinHeight,
-      textureUp, textureDown,
-      textureUpFocus, textureDownFocus,
-      spinInfo, spinPosX, spinPosY,
-      labelInfo, labelInfo2,
-      textureNoFocus, textureFocus);
-
-    ((CGUIListControlEx*)control)->SetScrollySuffix(strSuffix);
-    ((CGUIListControlEx*)control)->SetImageDimensions(itemWidth, itemHeight);
-    ((CGUIListControlEx*)control)->SetItemHeight(textureHeight);
-    ((CGUIListControlEx*)control)->SetSpaceBetweenItems(spaceBetweenItems);
-  }
   else if (strType == "textbox")
   {
     control = new CGUITextBox(

Modified: branches/linuxport/XBMC/guilib/Makefile
===================================================================
--- branches/linuxport/XBMC/guilib/Makefile	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/Makefile	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,6 +1,6 @@
 INCLUDES=-I. -Icommon -I../xbmc -I../xbmc/cores -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL
 
-SRCS=ActionManager.cpp AnimatedGif.cpp AudioContext.cpp DirectXGraphics.cpp GraphicContext.cpp GUIAudioManager.cpp GUIBaseContainer.cpp GUIButtonControl.cpp GUIButtonScroller.cpp GUICheckMarkControl.cpp GUIConsoleControl.cpp GUIControl.cpp GuiControlFactory.cpp GUIControlGroup.cpp GUIControlGroupList.cpp GUIDialog.cpp GUIEditControl.cpp GUIFadeLabelControl.cpp GUIFixedListContainer.cpp GUIFont.cpp GUIFontManager.cpp GUIFontTTF.cpp guiImage.cpp GUIIncludes.cpp GUIItem.cpp GUILabelControl.cpp GUIListContainer.cpp GUIListControlEx.cpp GUIList.cpp GUIListExItem.cpp GUIListGroup.cpp GUIListItem.cpp GUIListItemLayout.cpp GUIMessage.cpp GUIMoverControl.cpp GUIMultiImage.cpp GUIPanelContainer.cpp GUIProgressControl.cpp GUIRadioButtonControl.cpp GUIResizeControl.cpp GUIRSSControl.cpp GUIScrollBarControl.cpp GUISelectButtonControl.cpp GUISettingsSliderControl.cpp GUISliderControl.cpp GUISpinControl.cpp GUISpinControlEx.cpp GUIStandardWindow.cpp GUITextBox.cpp GUIToggleButtonControl.cpp GUIVideoControl.cpp GUIVisualisationControl.cpp GUIWindow.cpp GUIWindowManager.cpp GUIWrappingListContainer.cpp include.cpp IWindowManagerCallback.cpp Key.cpp LocalizeStrings.cpp SkinInfo.cpp TextureBundle.cpp TextureManager.cpp VisibleEffect.cpp XMLUtils.cpp GUISound.cpp GUIColorManager.cpp Surface.cpp FrameBufferObject.cpp Shader.cpp GUILargeImage.cpp GUIListLabel.cpp GUIBorderedImage.cpp GUITextLayout.cpp GUIMultiSelectText.cpp GUIInfoColor.cpp
+SRCS=ActionManager.cpp AnimatedGif.cpp AudioContext.cpp DirectXGraphics.cpp GraphicContext.cpp GUIAudioManager.cpp GUIBaseContainer.cpp GUIButtonControl.cpp GUIButtonScroller.cpp GUICheckMarkControl.cpp GUIControl.cpp GuiControlFactory.cpp GUIControlGroup.cpp GUIControlGroupList.cpp GUIDialog.cpp GUIEditControl.cpp GUIFadeLabelControl.cpp GUIFixedListContainer.cpp GUIFont.cpp GUIFontManager.cpp GUIFontTTF.cpp guiImage.cpp GUIIncludes.cpp GUILabelControl.cpp GUIListContainer.cpp GUIListGroup.cpp GUIListItem.cpp GUIListItemLayout.cpp GUIMessage.cpp GUIMoverControl.cpp GUIMultiImage.cpp GUIPanelContainer.cpp GUIProgressControl.cpp GUIRadioButtonControl.cpp GUIResizeControl.cpp GUIRSSControl.cpp GUIScrollBarControl.cpp GUISelectButtonControl.cpp GUISettingsSliderControl.cpp GUISliderControl.cpp GUISpinControl.cpp GUISpinControlEx.cpp GUIStandardWindow.cpp GUITextBox.cpp GUIToggleButtonControl.cpp GUIVideoControl.cpp GUIVisualisationControl.cpp GUIWindow.cpp GUIWindowManager.cpp GUIWrappingListContainer.cpp include.cpp IWindowManagerCallback.cpp Key.cpp LocalizeStrings.cpp SkinInfo.cpp TextureBundle.cpp TextureManager.cpp VisibleEffect.cpp XMLUtils.cpp GUISound.cpp GUIColorManager.cpp Surface.cpp FrameBufferObject.cpp Shader.cpp GUILargeImage.cpp GUIListLabel.cpp GUIBorderedImage.cpp GUITextLayout.cpp GUIMultiSelectText.cpp GUIInfoColor.cpp
 
 LIB=guilib.a
 

Modified: branches/linuxport/XBMC/guilib/guilib_win32.vcproj
===================================================================
--- branches/linuxport/XBMC/guilib/guilib_win32.vcproj	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/guilib/guilib_win32.vcproj	2008-07-15 08:57:52 UTC (rev 14100)
@@ -240,9 +240,6 @@
 				RelativePath=".\GUIColorManager.cpp">
 			</File>
 			<File
-				RelativePath=".\GUIConsoleControl.cpp">
-			</File>
-			<File
 				RelativePath=".\GUIControl.cpp">
 			</File>
 			<File
@@ -285,27 +282,15 @@
 				RelativePath=".\GUIInfoColor.cpp">
 			</File>
 			<File
-				RelativePath=".\GUIItem.cpp">
-			</File>
-			<File
 				RelativePath=".\GUILabelControl.cpp">
 			</File>
 			<File
 				RelativePath=".\GUILargeImage.cpp">
 			</File>
 			<File
-				RelativePath=".\GUIList.cpp">
-			</File>
-			<File
 				RelativePath=".\GUIListContainer.cpp">
 			</File>
 			<File
-				RelativePath=".\GUIListControlEx.cpp">
-			</File>
-			<File
-				RelativePath=".\GUIListExItem.cpp">
-			</File>
-			<File
 				RelativePath=".\GUIListGroup.cpp">
 			</File>
 			<File
@@ -479,9 +464,6 @@
 				RelativePath=".\GUIColorManager.h">
 			</File>
 			<File
-				RelativePath=".\GUIConsoleControl.h">
-			</File>
-			<File
 				RelativePath=".\GUIControl.h">
 			</File>
 			<File
@@ -524,27 +506,15 @@
 				RelativePath=".\GUIInfoColor.h">
 			</File>
 			<File
-				RelativePath=".\GUIItem.h">
-			</File>
-			<File
 				RelativePath=".\GUILabelControl.h">
 			</File>
 			<File
 				RelativePath=".\GUILargeImage.h">
 			</File>
 			<File
-				RelativePath=".\GUIList.h">
-			</File>
-			<File
 				RelativePath=".\GUIListContainer.h">
 			</File>
 			<File
-				RelativePath=".\GUIListControlEx.h">
-			</File>
-			<File
-				RelativePath=".\GUIListExItem.h">
-			</File>
-			<File
 				RelativePath=".\GUIListGroup.h">
 			</File>
 			<File

Modified: branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj
===================================================================
--- branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/project/VS2008Express/guilib.vcproj	2008-07-15 08:57:52 UTC (rev 14100)
@@ -219,10 +219,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIConsoleControl.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIControl.cpp"
 				>
 			</File>
@@ -279,10 +275,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIItem.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUILabelControl.cpp"
 				>
 			</File>
@@ -291,22 +283,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIList.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIListContainer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIListControlEx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\guilib\GUIListExItem.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIListGroup.cpp"
 				>
 			</File>
@@ -569,10 +549,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIConsoleControl.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIControl.h"
 				>
 			</File>
@@ -629,10 +605,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIItem.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUILabelControl.h"
 				>
 			</File>
@@ -641,22 +613,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIList.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIListContainer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\guilib\GUIListControlEx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\guilib\GUIListExItem.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\guilib\GUIListGroup.h"
 				>
 			</File>

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1221,7 +1221,6 @@
   //     Music/
   //       temp/
   //     0 .. F/
-  //     XLinkKai/
 
   CreateDirectory(g_settings.GetUserDataFolder().c_str(), NULL);
   CreateDirectory(g_settings.GetProfileUserDataFolder().c_str(), NULL);

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/control.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/control.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/control.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -180,7 +180,7 @@
     "List of Conditions - http://www.xboxmediacenter.com/wiki/index.php?title=List_of_Boolean_Conditions \n"
     "\n"
     "example:\n"
-    "  - self.button.setVisibleCondition('[System.KaiEnabled + !Skin.String(KAI)]', True)\n");
+    "  - self.button.setVisibleCondition('[Control.IsVisible(41) + !Control.IsVisible(12)]', True)\n");
 
   PyObject* Control_SetVisibleCondition(Control* self, PyObject* args)
   {

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -508,7 +508,7 @@
     "\"|\" as an OR operator, \"!\" as a NOT operator, and \"[\" and \"]\" to bracket expressions.\n"
     "\n"
     "example:\n"
-    "  - visible = xbmc.getCondVisibility('[System.KaiEnabled + !Skin.String(KAI)]')\n");
+    "  - visible = xbmc.getCondVisibility('[Control.IsVisible(41) + !Control.IsVisible(12)]')\n");
 
   PyObject* XBMC_GetCondVisibility(PyObject *self, PyObject *args)
   {

Deleted: branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.cpp	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.cpp	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,106 +0,0 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "stdafx.h"
-#include "MediaPacketQueue.h"
-
-
-CMediaPacketQueue::CMediaPacketQueue(CStdString& aName)
-{
-  m_strName = aName;
-  m_pBuffer = new BYTE[ MPQ_PACKET_SIZE * MPQ_MAX_PACKETS ];
-
-  Flush();
-}
-
-void CMediaPacketQueue::Flush()
-{
-  m_dwPacketR = 0;
-  m_dwPacketW = 0;
-
-  for ( int i = 0; i < MPQ_MAX_PACKETS; i++ )
-  {
-    // Initialize all the packets to be available
-    m_adwStatus[i] = XMEDIAPACKET_STATUS_SUCCESS;
-  }
-}
-
-CMediaPacketQueue::~CMediaPacketQueue(void)
-{
-  delete[] m_pBuffer;
-}
-
-bool CMediaPacketQueue::Write(LPBYTE pSource)
-{
-  if ( m_adwStatus[ m_dwPacketW ] != XMEDIAPACKET_STATUS_PENDING )
-  {
-    // Copy the data into the buffer
-    memcpy( m_pBuffer + m_dwPacketW * MPQ_PACKET_SIZE,
-            pSource, MPQ_PACKET_SIZE );
-
-    m_adwStatus[ m_dwPacketW ] = XMEDIAPACKET_STATUS_PENDING;
-
-    m_dwPacketW = ( m_dwPacketW + 1 ) % MPQ_MAX_PACKETS;
-    return true;
-  }
-
-  return false;
-}
-
-bool CMediaPacketQueue::Read(XMEDIAPACKET& aPacket)
-{
-  if ( m_adwStatus[ m_dwPacketR ] == XMEDIAPACKET_STATUS_PENDING ) //&&
-    //   m_dwPacketR != m_dwPacketW )
-  {
-    ZeroMemory(&aPacket, sizeof(XMEDIAPACKET));
-    aPacket.dwMaxSize = MPQ_PACKET_SIZE;
-    aPacket.pvBuffer = m_pBuffer + m_dwPacketR * MPQ_PACKET_SIZE;
-    aPacket.pdwStatus = &m_adwStatus[ m_dwPacketR ];
-
-    m_dwPacketR = ( m_dwPacketR + 1 ) % MPQ_MAX_PACKETS;
-    return true;
-  }
-
-  return false;
-}
-
-bool CMediaPacketQueue::IsEmpty()
-{
-  for ( int i = 0; i < MPQ_MAX_PACKETS; i++ )
-  {
-    if (m_adwStatus[i] != XMEDIAPACKET_STATUS_SUCCESS)
-      return false;
-  }
-  return true;
-}
-
-int CMediaPacketQueue::Size()
-{
-  int count = 0;
-  for ( int i = 0; i < MPQ_MAX_PACKETS; i++ )
-  {
-    if (m_adwStatus[i] != XMEDIAPACKET_STATUS_SUCCESS)
-      count++;
-  }
-  return count;
-}
-
-

Deleted: branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.h
===================================================================
--- branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.h	2008-07-15 08:08:21 UTC (rev 14099)
+++ branches/linuxport/XBMC/xbmc/xbox/MediaPacketQueue.h	2008-07-15 08:57:52 UTC (rev 14100)
@@ -1,58 +0,0 @@
-/*!
-\file MediaPacketQueue.h
-\brief 
-*/
-
-#ifndef MEDIAPACKETQUEUE_H
-#define MEDIAPACKETQUEUE_H
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#define MPQ_MAX_PACKETS 60
-#define MPQ_PACKET_SIZE 20
-
-class CMediaPacketQueue
-{
-public:
-
-  CMediaPacketQueue(CStdString& aQueueName);
-  virtual ~CMediaPacketQueue(void);
-
-  bool Write(LPBYTE pSource);
-  bool Read(XMEDIAPACKET& aPacket);
-
-  void Flush();
-
-  bool IsEmpty();
-  int Size();
-
-protected:
-
-  CStdString m_strName;
-
-  BYTE* m_pBuffer;
-  DWORD m_adwStatus[MPQ_MAX_PACKETS];
-  DWORD m_dwPacketR;
-  DWORD m_dwPacketW;
-};
-
-#endif


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

Revision: 14114
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14114&view=rev
Author:   elupus
Date:     2008-07-15 10:34:46 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: enabled sap announcement listener in windows build (VideoLAN client uses this to announce streams it is providing), to use add a share to the url "sap://", first access will start the listner, so you will not get any result at first access. if you return after a while any announced streams should show up.

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/system.h
    branches/linuxport/XBMC/project/VS2003/XBMC_PC.vcproj
    branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp

Modified: branches/linuxport/XBMC/guilib/system.h
===================================================================
--- branches/linuxport/XBMC/guilib/system.h	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/guilib/system.h	2008-07-15 17:34:46 UTC (rev 14114)
@@ -158,6 +158,7 @@
 #define HAS_FILESYSTEM_CDDA
 #define HAS_FILESYSTEM_RTV
 #define HAS_FILESYSTEM_DAAP
+#define HAS_FILESYSTEM_SAP
 #define HAS_DVD_DRIVE
 #define HAS_VISUALISATION
 #define HAS_CCXSTREAM

Modified: branches/linuxport/XBMC/project/VS2003/XBMC_PC.vcproj
===================================================================
--- branches/linuxport/XBMC/project/VS2003/XBMC_PC.vcproj	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/project/VS2003/XBMC_PC.vcproj	2008-07-15 17:34:46 UTC (rev 14114)
@@ -2708,6 +2708,18 @@
 					RelativePath="..\..\xbmc\FileSystem\RTVDirectory.h">
 				</File>
 				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPDirectory.cpp">
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPDirectory.h">
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPFile.cpp">
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPFile.h">
+				</File>				
+				<File
 					RelativePath="..\..\xbmc\FileSystem\ShoutcastDirectory.cpp">
 				</File>
 				<File

Modified: branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj
===================================================================
--- branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/project/VS2008Express/XBMC.vcproj	2008-07-15 17:34:46 UTC (rev 14114)
@@ -3750,6 +3750,22 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPDirectory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPDirectory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPFile.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\FileSystem\SAPFile.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\xbmc\FileSystem\ShoutcastDirectory.cpp"
 					>
 				</File>

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-15 17:34:46 UTC (rev 14114)
@@ -58,6 +58,9 @@
 #include "FileSystem/StackDirectory.h"
 #include "FileSystem/DllLibCurl.h"
 #include "FileSystem/CMythSession.h"
+#ifdef HAS_FILESYSTEM_SAP
+#include "FileSystem/SAPDirectory.h"
+#endif
 #include "utils/TuxBoxUtil.h"
 #include "utils/SystemInfo.h"
 #include "ApplicationRenderer.h"
@@ -3720,6 +3723,11 @@
     CLog::Log(LOGNOTICE, "stop daap clients");
     g_DaapClient.Release();
 #endif
+#ifdef HAS_FILESYSTEM_SAP
+    CLog::Log(LOGNOTICE, "stop sap announcement listener");
+    g_sapsessions.StopThread();
+#endif
+
     m_applicationMessenger.Cleanup();
 
     CLog::Log(LOGNOTICE, "clean cached files!");

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp	2008-07-15 17:34:46 UTC (rev 14114)
@@ -58,6 +58,9 @@
 #ifdef HAS_UPNP
 #include "UPnPDirectory.h"
 #endif
+#ifdef HAS_FILESYSTEM_SAP
+#include "SAPDirectory.h"
+#endif
 #include "../utils/Network.h"
 #include "ZipDirectory.h"
 #include "RarDirectory.h"
@@ -137,6 +140,9 @@
     if (strProtocol == "myth") return new CCMythDirectory();
     if (strProtocol == "cmyth") return new CCMythDirectory();
     if (strProtocol == "rss") return new CRSSDirectory();
+#ifdef HAS_FILESYSTEM_SAP
+    if (strProtocol == "sap") return new CSAPDirectory();
+#endif
   }
 
  return NULL;

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp	2008-07-15 17:26:02 UTC (rev 14113)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp	2008-07-15 17:34:46 UTC (rev 14114)
@@ -45,6 +45,9 @@
 #include "FileDAAP.h"
 #endif
 #endif
+#ifdef HAS_FILESYSTEM_SAP
+#include "SAPFile.h"
+#endif
 #ifdef HAS_MMS
 #include "FileMMS.h"
 #endif
@@ -125,6 +128,9 @@
 #endif
     else if (strProtocol == "myth") return new CCMythFile();
     else if (strProtocol == "cmyth") return new CCMythFile();
+#ifdef HAS_FILESYSTEM_SAP
+    else if (strProtocol == "sap") return new CSAPFile();
+#endif
   }
 
   return NULL;


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

Revision: 14126
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14126&view=rev
Author:   althekiller
Date:     2008-07-15 12:14:31 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: dos2unixed some files with mixed line endings and set svn:eol-style native

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
    branches/linuxport/XBMC/guilib/GUIBaseContainer.h
    branches/linuxport/XBMC/guilib/GUIColorManager.cpp
    branches/linuxport/XBMC/guilib/GUIColorManager.h
    branches/linuxport/XBMC/guilib/GUIControlGroup.cpp
    branches/linuxport/XBMC/guilib/GUIControlGroup.h
    branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp
    branches/linuxport/XBMC/guilib/GUIControlGroupList.h
    branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIFixedListContainer.h
    branches/linuxport/XBMC/guilib/GUIInfoColor.cpp
    branches/linuxport/XBMC/guilib/GUIInfoColor.h
    branches/linuxport/XBMC/guilib/GUILargeImage.cpp
    branches/linuxport/XBMC/guilib/GUILargeImage.h
    branches/linuxport/XBMC/guilib/GUIListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIListContainer.h
    branches/linuxport/XBMC/guilib/GUIListGroup.cpp
    branches/linuxport/XBMC/guilib/GUIListGroup.h
    branches/linuxport/XBMC/guilib/GUIListItemLayout.cpp
    branches/linuxport/XBMC/guilib/GUIListItemLayout.h
    branches/linuxport/XBMC/guilib/GUIListLabel.cpp
    branches/linuxport/XBMC/guilib/GUIListLabel.h
    branches/linuxport/XBMC/guilib/GUIMultiSelectText.cpp
    branches/linuxport/XBMC/guilib/GUIMultiSelectText.h
    branches/linuxport/XBMC/guilib/GUIPanelContainer.cpp
    branches/linuxport/XBMC/guilib/GUIPanelContainer.h
    branches/linuxport/XBMC/guilib/GUIScrollBarControl.cpp
    branches/linuxport/XBMC/guilib/GUIScrollBarControl.h
    branches/linuxport/XBMC/guilib/GUITextLayout.cpp
    branches/linuxport/XBMC/guilib/GUITextLayout.h
    branches/linuxport/XBMC/guilib/GUIWrappingListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIWrappingListContainer.h
    branches/linuxport/XBMC/guilib/Geometry.h
    branches/linuxport/XBMC/guilib/common/DirectInput.cpp
    branches/linuxport/XBMC/guilib/common/DirectInput.h
    branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.h
    branches/linuxport/XBMC/guilib/common/DirectInputMouse.cpp
    branches/linuxport/XBMC/guilib/common/DirectInputMouse.h
    branches/linuxport/XBMC/guilib/common/Keyboard.cpp
    branches/linuxport/XBMC/guilib/common/Mouse.cpp
    branches/linuxport/XBMC/guilib/common/Mouse.h
    branches/linuxport/XBMC/language/Esperanto/strings.xml
    branches/linuxport/XBMC/language/Slovak/strings.xml
    branches/linuxport/XBMC/project/Win32BuildSetup/tools/Unrar/license.txt
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogAccessPoints.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogPluginSettings.xml
    branches/linuxport/XBMC/system/scrapers/video/KinoPoisk.xml
    branches/linuxport/XBMC/system/scrapers/video/filmweb.xml
    branches/linuxport/XBMC/tools/Changelog/stdafx.h
    branches/linuxport/XBMC/tools/Scrap/Scraper.cpp
    branches/linuxport/XBMC/tools/Scrap/ScraperParser.cpp
    branches/linuxport/XBMC/tools/Scrap/ScraperParser.h
    branches/linuxport/XBMC/tools/Scrap/scrap.cpp
    branches/linuxport/XBMC/xbmc/Album.cpp
    branches/linuxport/XBMC/xbmc/ApplicationRenderer.cpp
    branches/linuxport/XBMC/xbmc/ApplicationRenderer.h
    branches/linuxport/XBMC/xbmc/BusyIndicator.h
    branches/linuxport/XBMC/xbmc/Edl.h
    branches/linuxport/XBMC/xbmc/FileSystem/ASAPFileDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/ASAPFileDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/DirectoryTuxBox.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/DirectoryTuxBox.h
    branches/linuxport/XBMC/xbmc/FileSystem/DllLibCMyth.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileTuxBox.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileTuxBox.h
    branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYear.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYear.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicFileDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicFileDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicSearchDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicSearchDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/NptXbmcFile.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeActor.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeActor.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeDirector.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeDirector.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeGenre.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeGenre.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRoot.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeStudio.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeStudio.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeYear.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeYear.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/QueryParams.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/QueryParams.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory.h
    branches/linuxport/XBMC/xbmc/GUIDialogContentSettings.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.h
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistRule.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h
    branches/linuxport/XBMC/xbmc/GUIWindowMusicPlaylistEditor.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
    branches/linuxport/XBMC/xbmc/LastFmManager.cpp
    branches/linuxport/XBMC/xbmc/LastFmManager.h
    branches/linuxport/XBMC/xbmc/MediaSource.cpp
    branches/linuxport/XBMC/xbmc/MediaSource.h
    branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderASAP.cpp
    branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderASAP.h
    branches/linuxport/XBMC/xbmc/PictureInfoLoader.cpp
    branches/linuxport/XBMC/xbmc/PictureInfoLoader.h
    branches/linuxport/XBMC/xbmc/PictureInfoTag.cpp
    branches/linuxport/XBMC/xbmc/PictureInfoTag.h
    branches/linuxport/XBMC/xbmc/PluginSettings.cpp
    branches/linuxport/XBMC/xbmc/ScraperSettings.h
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.h
    branches/linuxport/XBMC/xbmc/VideoInfoTag.cpp
    branches/linuxport/XBMC/xbmc/ViewDatabase.cpp
    branches/linuxport/XBMC/xbmc/ViewDatabase.h
    branches/linuxport/XBMC/xbmc/ViewState.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/LibraryLoader.h
    branches/linuxport/XBMC/xbmc/cores/DummyVideoPlayer.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RGBRendererV2.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RGBRendererV2.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderManager.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderManager.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderer.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderer.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/demux.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/stream.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/stream.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drms.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ffint.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ASAPCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ASAPCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CachingCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/XBMCCube.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/adp.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/adx.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/afc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/cube.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/cube.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/decode.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/dsp.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/pcm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/vag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/wamain.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/parse.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllASAP.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdpcm.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/gym_play.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/psg.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/psg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/ym2612.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/ym2612.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/APEtag.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/ID3v1.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/ID3v2.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Monkey.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 2/Sample 2.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 2/Sample 2.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 3/Sample 3.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Console.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Console.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Resource Script.rc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/Resource Script.rc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Assembly/Tools.inc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/stdafx.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/mpc_decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/DumbDLL.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/TimidityCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/winamp2/in2.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp
    branches/linuxport/XBMC/xbmc/id3v1genre.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXMLDialog.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXMLDialog.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Debug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Maps1/MapsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/XmlTest1Data.cpp
    branches/linuxport/XBMC/xbmc/lib/libcdio/mmc.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/cmyth_local.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h
    branches/linuxport/XBMC/xbmc/linux/ConvUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XSyncUtils.h
    branches/linuxport/XBMC/xbmc/utils/CPUInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/Fanart.cpp
    branches/linuxport/XBMC/xbmc/utils/TuxBoxUtil.cpp
    branches/linuxport/XBMC/xbmc/win32/NetworkWin32.cpp
    branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
    branches/linuxport/XBMC/xbmc/win32/WMIInterface.cpp
    branches/linuxport/XBMC/xbmc/win32/WMIInterface.h

Property Changed:
----------------
    branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
    branches/linuxport/XBMC/guilib/GUIBaseContainer.h
    branches/linuxport/XBMC/guilib/GUIColorManager.cpp
    branches/linuxport/XBMC/guilib/GUIColorManager.h
    branches/linuxport/XBMC/guilib/GUIControlGroup.cpp
    branches/linuxport/XBMC/guilib/GUIControlGroup.h
    branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp
    branches/linuxport/XBMC/guilib/GUIControlGroupList.h
    branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIFixedListContainer.h
    branches/linuxport/XBMC/guilib/GUIInfoColor.cpp
    branches/linuxport/XBMC/guilib/GUIInfoColor.h
    branches/linuxport/XBMC/guilib/GUILargeImage.cpp
    branches/linuxport/XBMC/guilib/GUILargeImage.h
    branches/linuxport/XBMC/guilib/GUIListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIListContainer.h
    branches/linuxport/XBMC/guilib/GUIListGroup.cpp
    branches/linuxport/XBMC/guilib/GUIListGroup.h
    branches/linuxport/XBMC/guilib/GUIListItemLayout.cpp
    branches/linuxport/XBMC/guilib/GUIListItemLayout.h
    branches/linuxport/XBMC/guilib/GUIListLabel.cpp
    branches/linuxport/XBMC/guilib/GUIListLabel.h
    branches/linuxport/XBMC/guilib/GUIMultiSelectText.cpp
    branches/linuxport/XBMC/guilib/GUIMultiSelectText.h
    branches/linuxport/XBMC/guilib/GUIPanelContainer.cpp
    branches/linuxport/XBMC/guilib/GUIPanelContainer.h
    branches/linuxport/XBMC/guilib/GUIScrollBarControl.cpp
    branches/linuxport/XBMC/guilib/GUIScrollBarControl.h
    branches/linuxport/XBMC/guilib/GUITextLayout.cpp
    branches/linuxport/XBMC/guilib/GUITextLayout.h
    branches/linuxport/XBMC/guilib/GUIWrappingListContainer.cpp
    branches/linuxport/XBMC/guilib/GUIWrappingListContainer.h
    branches/linuxport/XBMC/guilib/Geometry.h
    branches/linuxport/XBMC/guilib/common/DirectInput.cpp
    branches/linuxport/XBMC/guilib/common/DirectInput.h
    branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.h
    branches/linuxport/XBMC/guilib/common/DirectInputMouse.cpp
    branches/linuxport/XBMC/guilib/common/DirectInputMouse.h
    branches/linuxport/XBMC/guilib/common/Keyboard.cpp
    branches/linuxport/XBMC/guilib/common/Mouse.cpp
    branches/linuxport/XBMC/guilib/common/Mouse.h
    branches/linuxport/XBMC/language/Slovak/strings.xml
    branches/linuxport/XBMC/project/Win32BuildSetup/tools/Unrar/license.txt
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogAccessPoints.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogPluginSettings.xml
    branches/linuxport/XBMC/system/scrapers/video/KinoPoisk.xml
    branches/linuxport/XBMC/system/scrapers/video/filmweb.xml
    branches/linuxport/XBMC/tools/Changelog/stdafx.h
    branches/linuxport/XBMC/tools/Scrap/Scraper.cpp
    branches/linuxport/XBMC/tools/Scrap/ScraperParser.cpp
    branches/linuxport/XBMC/tools/Scrap/ScraperParser.h
    branches/linuxport/XBMC/tools/Scrap/scrap.cpp
    branches/linuxport/XBMC/xbmc/Album.cpp
    branches/linuxport/XBMC/xbmc/ApplicationRenderer.cpp
    branches/linuxport/XBMC/xbmc/ApplicationRenderer.h
    branches/linuxport/XBMC/xbmc/BusyIndicator.h
    branches/linuxport/XBMC/xbmc/Edl.h
    branches/linuxport/XBMC/xbmc/FileSystem/ASAPFileDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/ASAPFileDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/DirectoryTuxBox.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/DirectoryTuxBox.h
    branches/linuxport/XBMC/xbmc/FileSystem/DllLibCMyth.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileTuxBox.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileTuxBox.h
    branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYear.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYear.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicFileDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicFileDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicSearchDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MusicSearchDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/NptXbmcFile.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeActor.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeActor.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeDirector.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeDirector.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeGenre.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeGenre.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeRoot.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeStudio.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeStudio.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeYear.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeYear.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/QueryParams.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/QueryParams.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory.h
    branches/linuxport/XBMC/xbmc/GUIDialogContentSettings.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.h
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistRule.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h
    branches/linuxport/XBMC/xbmc/GUIWindowMusicPlaylistEditor.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
    branches/linuxport/XBMC/xbmc/LastFmManager.cpp
    branches/linuxport/XBMC/xbmc/LastFmManager.h
    branches/linuxport/XBMC/xbmc/MediaSource.cpp
    branches/linuxport/XBMC/xbmc/MediaSource.h
    branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderASAP.cpp
    branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderASAP.h
    branches/linuxport/XBMC/xbmc/PictureInfoLoader.cpp
    branches/linuxport/XBMC/xbmc/PictureInfoLoader.h
    branches/linuxport/XBMC/xbmc/PictureInfoTag.cpp
    branches/linuxport/XBMC/xbmc/PictureInfoTag.h
    branches/linuxport/XBMC/xbmc/PluginSettings.cpp
    branches/linuxport/XBMC/xbmc/ScraperSettings.h
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.h
    branches/linuxport/XBMC/xbmc/VideoInfoTag.cpp
    branches/linuxport/XBMC/xbmc/ViewDatabase.cpp
    branches/linuxport/XBMC/xbmc/ViewDatabase.h
    branches/linuxport/XBMC/xbmc/ViewState.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/LibraryLoader.h
    branches/linuxport/XBMC/xbmc/cores/DummyVideoPlayer.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RGBRendererV2.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RGBRendererV2.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderManager.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderManager.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderer.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/WinRenderer.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/AACCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/demux.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/stream.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/stream.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drms.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ffint.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ASAPCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ASAPCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CachingCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/XBMCCube.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/adp.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/adx.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/afc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/cube.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/cube.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/decode.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/dsp.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/pcm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/vag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/wamain.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/parse.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllASAP.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllAdpcm.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/XBMCGYM.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/gym_play.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/psg.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/psg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/ym2612.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/ym2612.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/APEtag.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Info.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Test.cfg
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/APEtag/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/ID3v1.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Info.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Test.cfg
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v1/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/ID3v2.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Info.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Test.cfg
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/ID3v2/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Info.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Main.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Monkey.pas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Test.cfg
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Test.dof
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Monkey/Test.dpr
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/3rd Party/TMonkey (Delphi)/Readme.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze/Sample 1/Sample 1.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Analyze/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 1/Sample 1.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 2/Sample 2.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Compress/Sample 2/Sample 2.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 1/Sample 1.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 1/Sample 1.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 2/Sample 2.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 2/Sample 2.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 3/Sample 3.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Decompress/Sample 3/Sample 3.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/APETag.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/All.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/IO.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/MACDll.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/MACLib.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Shared/SmartPtr.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Console.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Console.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Console.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/Resource Script.rc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Console/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Credits.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/History.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/License.htm
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/MACDll.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/Resource Script.rc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACDll/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompress.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompress.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompressCore.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompressCore.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompressCreate.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APECompressCreate.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEDecompress.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEDecompress.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEHeader.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEHeader.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEInfo.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APEInfo.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APELink.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APELink.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APESimple.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APETag.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/APETag.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Assembly/Assembly.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Assembly/Assembly.nas
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Assembly/NNFilterAsm.lst
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Assembly/Tools.inc
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/BitArray.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/BitArray.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACLib.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACProgressHelper.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MACProgressHelper.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MD5.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MD5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/MultichannelNNFilter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/NNFilter.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/NNFilter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/NewPredictor.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/NewPredictor.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/APEDecompressCore.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/APEDecompressCore.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/APEDecompressOld.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/APEDecompressOld.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/Anti-Predictor.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/Anti-Predictor.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/AntiPredictorExtraHigh.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/AntiPredictorFast.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/AntiPredictorHigh.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/AntiPredictorNormal.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/UnBitArrayOld.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/UnBitArrayOld.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/UnMAC.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Old/UnMAC.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Predictor.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/Prepare.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/ScaledFirstOrderFilter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/StartFilter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/UnBitArray.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/UnBitArray.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/UnBitArrayBase.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/UnBitArrayBase.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/WAVInputSource.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/MACLib/WAVInputSource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Readme.htm
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/APEInfoDialog.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/APEInfoDialog.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/All.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/CharacterHelper.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/CharacterHelper.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/CircleBuffer.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/CircleBuffer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/GlobalFunctions.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/GlobalFunctions.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/ID3Genres.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/IO.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/NoWindows.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/RollBuffer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/SmartPtr.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/StdLibFileIO.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/StdLibFileIO.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/StdString.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/Unicows.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/WAVInfoDialog.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/WAVInfoDialog.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/WinFileIO.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MACDll/Source/Shared/WinFileIO.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/MadMp3Decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/stdafx.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/mpc_decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/vc6/dumb/DumbDLL.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/TimidityCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/winamp2/in2.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp
    branches/linuxport/XBMC/xbmc/id3v1genre.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXMLDialog.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXMLDialog.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Debug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Maps1/MapsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Threads1/ThreadsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/XmlTest1Data.cpp
    branches/linuxport/XBMC/xbmc/lib/libcdio/mmc.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/cmyth_local.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/proginfo.c
    branches/linuxport/XBMC/xbmc/lib/libexif/libexif.h
    branches/linuxport/XBMC/xbmc/linux/ConvUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XSyncUtils.h
    branches/linuxport/XBMC/xbmc/utils/CPUInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/Fanart.cpp
    branches/linuxport/XBMC/xbmc/utils/TuxBoxUtil.cpp
    branches/linuxport/XBMC/xbmc/win32/NetworkWin32.cpp
    branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
    branches/linuxport/XBMC/xbmc/win32/WMIInterface.cpp
    branches/linuxport/XBMC/xbmc/win32/WMIInterface.h

Modified: branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -145,7 +145,7 @@
       }
       if (message.GetMessage() == GUI_MSG_LABEL_ADD && message.GetItem())
       {
-        CGUIListItemPtr item = message.GetItem();
+        CGUIListItemPtr item = message.GetItem();
         m_items.push_back(item);
         if (m_pageControl)
         {
@@ -293,8 +293,8 @@
 
 CGUIListItemLayout *CGUIBaseContainer::GetFocusedLayout() const
 {
-  CGUIListItemPtr item = GetListItem(0);
-  if (item.get()) return item->GetFocusedLayout();
+  CGUIListItemPtr item = GetListItem(0);
+  if (item.get()) return item->GetFocusedLayout();
   return NULL;
 }
 
@@ -369,7 +369,7 @@
       int selected = GetSelectedItem();
       if (selected >= 0 && selected < (int)m_items.size())
       {
-        CFileItemPtr item = boost::static_pointer_cast<CFileItem>(m_items[selected]);
+        CFileItemPtr item = boost::static_pointer_cast<CFileItem>(m_items[selected]);
         // multiple action strings are concat'd together, separated with " , "
         vector<CStdString> actions;
         StringUtils::SplitString(item->m_strPath, " , ", actions);
@@ -406,7 +406,7 @@
   int item = GetSelectedItem();
   if (item >= 0 && item < (int)m_items.size())
   {
-    CGUIListItemPtr pItem = m_items[item];
+    CGUIListItemPtr pItem = m_items[item];
     if (pItem->m_bIsFolder)
       strLabel.Format("[%s]", pItem->GetLabel().c_str());
     else
@@ -502,12 +502,12 @@
     Reset();
     for (unsigned int i = 0; i < m_staticItems.size(); ++i)
     {
-      CFileItemPtr item = boost::static_pointer_cast<CFileItem>(m_staticItems[i]);
+      CFileItemPtr item = boost::static_pointer_cast<CFileItem>(m_staticItems[i]);
       // m_idepth is used to store the visibility condition
       if (!item->m_idepth || g_infoManager.GetBool(item->m_idepth, GetParentID()))
       {
         m_items.push_back(item);
-        if (item.get() == lastItem)
+        if (item.get() == lastItem)
           m_lastItem = lastItem;
       }
     }
@@ -624,7 +624,7 @@
     g_SkinInfo.ResolveIncludes(item);
     if (item->FirstChild())
     {
-      CFileItemPtr newItem;
+      CFileItemPtr newItem;
       // check whether we're using the more verbose method...
       TiXmlNode *click = item->FirstChild("onclick");
       if (click && click->FirstChild())
@@ -637,7 +637,7 @@
         const char *id = item->Attribute("id");
         int visibleCondition = 0;
         CGUIControlFactory::GetConditionalVisibility(item, visibleCondition);
-        newItem.reset(new CFileItem(CGUIControlFactory::FilterLabel(label)));
+        newItem.reset(new CFileItem(CGUIControlFactory::FilterLabel(label)));
         // multiple action strings are concat'd together, separated with " , "
         vector<CStdString> actions;
         CGUIControlFactory::GetMultipleString(item, "onclick", actions);
@@ -657,7 +657,7 @@
         const char *thumb = item->Attribute("thumb");
         const char *icon = item->Attribute("icon");
         const char *id = item->Attribute("id");
-        newItem.reset(new CFileItem(label ? CGUIControlFactory::FilterLabel(label) : ""));
+        newItem.reset(new CFileItem(label ? CGUIControlFactory::FilterLabel(label) : ""));
         newItem->m_strPath = item->FirstChild()->Value();
         if (label2) newItem->SetLabel2(CGUIControlFactory::FilterLabel(label2));
         if (thumb) newItem->SetThumbnailImage(thumb);
@@ -717,7 +717,7 @@
   CLog::Log(LOGDEBUG, "%s for container %u", __FUNCTION__, GetID());
   for (unsigned int i = 0; i < m_items.size(); ++i)
   {
-    CGUIListItemPtr item = m_items[i];
+    CGUIListItemPtr item = m_items[i];
     if (item->GetFocusedLayout()) item->GetFocusedLayout()->DumpTextureUse();
     if (item->GetLayout()) item->GetLayout()->DumpTextureUse();
   }
@@ -804,7 +804,7 @@
   case CONTAINER_NUM_ITEMS:
     {
       unsigned int numItems = GetNumItems();
-      if (numItems && m_items[0]->IsFileItem() && (boost::static_pointer_cast<CFileItem>(m_items[0]))->IsParentFolder())
+      if (numItems && m_items[0]->IsFileItem() && (boost::static_pointer_cast<CFileItem>(m_items[0]))->IsParentFolder())
         label.Format("%u", numItems-1);
       else
         label.Format("%u", numItems);


Property changes on: branches/linuxport/XBMC/guilib/GUIBaseContainer.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIBaseContainer.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIBaseContainer.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIBaseContainer.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,8 +1,8 @@
-/*!
-\file GUIListContainer.h
-\brief 
-*/
-
+/*!
+\file GUIListContainer.h
+\brief 
+*/
+
 #pragma once
 
 /*
@@ -24,138 +24,138 @@
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *  http://www.gnu.org/copyleft/gpl.html
  *
- */
-
-#include "GUIControl.h"
-#include "GUIListItemLayout.h"
-#include "boost/shared_ptr.hpp"
-
-typedef boost::shared_ptr<CGUIListItem> CGUIListItemPtr;
-
-enum VIEW_TYPE { VIEW_TYPE_NONE = 0,
-                 VIEW_TYPE_LIST,
-                 VIEW_TYPE_ICON,
-                 VIEW_TYPE_BIG_LIST,
-                 VIEW_TYPE_BIG_ICON,
-                 VIEW_TYPE_WIDE,
-                 VIEW_TYPE_BIG_WIDE,
-                 VIEW_TYPE_WRAP,
-                 VIEW_TYPE_BIG_WRAP,
-                 VIEW_TYPE_AUTO,
-                 VIEW_TYPE_MAX };
-/*!
- \ingroup controls
- \brief 
- */
-
-class CGUIBaseContainer : public CGUIControl
-{
-public:
-  CGUIBaseContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, ORIENTATION orientation, int scrollTime);
-  virtual ~CGUIBaseContainer(void);
-
-  virtual bool OnAction(const CAction &action);
-  virtual void OnDown();
-  virtual void OnUp();
-  virtual void OnLeft();
-  virtual void OnRight();
-  virtual bool OnMouseOver(const CPoint &point);
-  virtual bool OnMouseClick(DWORD dwButton, const CPoint &point);
-  virtual bool OnMouseDoubleClick(DWORD dwButton, const CPoint &point);
-  virtual bool OnMouseWheel(char wheel, const CPoint &point);
-  virtual bool OnMessage(CGUIMessage& message);
-  virtual void SetFocus(bool bOnOff);
-  virtual void AllocResources();
-  virtual void FreeResources();
-  virtual void UpdateVisibility(const CGUIListItem *item = NULL);
-
-  virtual unsigned int GetRows() const;
-  
-  virtual bool HasNextPage() const;
-  virtual bool HasPreviousPage() const;
-
-  void SetPageControl(DWORD id);
-
-  virtual CStdString GetDescription() const;
-  virtual void SaveStates(std::vector<CControlState> &states);
-  virtual int GetSelectedItem() const;
-
-  virtual void DoRender(DWORD currentTime);
-  void LoadLayout(TiXmlElement *layout);
-  void LoadContent(TiXmlElement *content);
-
-  VIEW_TYPE GetType() const { return m_type; };
-  const CStdString &GetLabel() const { return m_label; };
-  void SetType(VIEW_TYPE type, const CStdString &label);
-
-  virtual bool IsContainer() const { return true; };
-  CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const;
-
-  virtual bool GetCondition(int condition, int data) const;
-  CStdString GetLabel(int info) const;
-
-#ifdef _DEBUG
-  virtual void DumpTextureUse();
-#endif
-protected:
-  bool OnClick(DWORD actionID);
-  virtual bool SelectItemFromPoint(const CPoint &point);
-  virtual void RenderItem(float posX, float posY, CGUIListItem *item, bool focused);
-  virtual void Scroll(int amount);
-  virtual bool MoveDown(bool wrapAround);
-  virtual bool MoveUp(bool wrapAround);
-  virtual void MoveToItem(int item);
-  virtual void ValidateOffset();
-  virtual int  CorrectOffset(int offset, int cursor) const;
-  virtual void UpdateLayout(bool refreshAllItems = false);
-  virtual void CalculateLayout();
-  virtual void SelectItem(int item) {};
-  virtual void Reset();
-  virtual unsigned int GetNumItems() const { return m_items.size(); };
-  virtual int GetCurrentPage() const;
-  bool InsideLayout(const CGUIListItemLayout *layout, const CPoint &point);
-
-  inline float Size() const;
-  void MoveToRow(int row);
-  void FreeMemory(int keepStart, int keepEnd);
-  void GetCurrentLayouts();
-  CGUIListItemLayout *GetFocusedLayout() const;
-
-  int m_offset;
-  int m_cursor;
-  float m_analogScrollCount;
-
-  ORIENTATION m_orientation;
-  int m_itemsPerPage;
-
-  std::vector< CGUIListItemPtr > m_items;
-  typedef std::vector<CGUIListItemPtr> ::iterator iItems;
-  CGUIListItem *m_lastItem;
-
-  DWORD m_pageControl;
-
-  DWORD m_renderTime;
-
-  std::vector<CGUIListItemLayout> m_layouts;
-  std::vector<CGUIListItemLayout> m_focusedLayouts;
-
-  CGUIListItemLayout *m_layout;
-  CGUIListItemLayout *m_focusedLayout;
-
-  virtual void ScrollToOffset(int offset);
-  DWORD m_scrollLastTime;
-  int   m_scrollTime;
-  float m_scrollSpeed;
-  float m_scrollOffset;
-
-  VIEW_TYPE m_type;
-  CStdString m_label;
-
-  bool m_staticContent;
-  std::vector<CGUIListItemPtr> m_staticItems;
-  bool m_wasReset;  // true if we've received a Reset message until we've rendered once.  Allows
-                    // us to make sure we don't tell the infomanager that we've been moving when
-                    // the "movement" was simply due to the list being repopulated (thus cursor position
-                    // changing around)
-};
-
+ */
+
+#include "GUIControl.h"
+#include "GUIListItemLayout.h"
+#include "boost/shared_ptr.hpp"
+
+typedef boost::shared_ptr<CGUIListItem> CGUIListItemPtr;
+
+enum VIEW_TYPE { VIEW_TYPE_NONE = 0,
+                 VIEW_TYPE_LIST,
+                 VIEW_TYPE_ICON,
+                 VIEW_TYPE_BIG_LIST,
+                 VIEW_TYPE_BIG_ICON,
+                 VIEW_TYPE_WIDE,
+                 VIEW_TYPE_BIG_WIDE,
+                 VIEW_TYPE_WRAP,
+                 VIEW_TYPE_BIG_WRAP,
+                 VIEW_TYPE_AUTO,
+                 VIEW_TYPE_MAX };
+/*!
+ \ingroup controls
+ \brief 
+ */
+
+class CGUIBaseContainer : public CGUIControl
+{
+public:
+  CGUIBaseContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, ORIENTATION orientation, int scrollTime);
+  virtual ~CGUIBaseContainer(void);
+
+  virtual bool OnAction(const CAction &action);
+  virtual void OnDown();
+  virtual void OnUp();
+  virtual void OnLeft();
+  virtual void OnRight();
+  virtual bool OnMouseOver(const CPoint &point);
+  virtual bool OnMouseClick(DWORD dwButton, const CPoint &point);
+  virtual bool OnMouseDoubleClick(DWORD dwButton, const CPoint &point);
+  virtual bool OnMouseWheel(char wheel, const CPoint &point);
+  virtual bool OnMessage(CGUIMessage& message);
+  virtual void SetFocus(bool bOnOff);
+  virtual void AllocResources();
+  virtual void FreeResources();
+  virtual void UpdateVisibility(const CGUIListItem *item = NULL);
+
+  virtual unsigned int GetRows() const;
+  
+  virtual bool HasNextPage() const;
+  virtual bool HasPreviousPage() const;
+
+  void SetPageControl(DWORD id);
+
+  virtual CStdString GetDescription() const;
+  virtual void SaveStates(std::vector<CControlState> &states);
+  virtual int GetSelectedItem() const;
+
+  virtual void DoRender(DWORD currentTime);
+  void LoadLayout(TiXmlElement *layout);
+  void LoadContent(TiXmlElement *content);
+
+  VIEW_TYPE GetType() const { return m_type; };
+  const CStdString &GetLabel() const { return m_label; };
+  void SetType(VIEW_TYPE type, const CStdString &label);
+
+  virtual bool IsContainer() const { return true; };
+  CGUIListItemPtr GetListItem(int offset, unsigned int flag = 0) const;
+
+  virtual bool GetCondition(int condition, int data) const;
+  CStdString GetLabel(int info) const;
+
+#ifdef _DEBUG
+  virtual void DumpTextureUse();
+#endif
+protected:
+  bool OnClick(DWORD actionID);
+  virtual bool SelectItemFromPoint(const CPoint &point);
+  virtual void RenderItem(float posX, float posY, CGUIListItem *item, bool focused);
+  virtual void Scroll(int amount);
+  virtual bool MoveDown(bool wrapAround);
+  virtual bool MoveUp(bool wrapAround);
+  virtual void MoveToItem(int item);
+  virtual void ValidateOffset();
+  virtual int  CorrectOffset(int offset, int cursor) const;
+  virtual void UpdateLayout(bool refreshAllItems = false);
+  virtual void CalculateLayout();
+  virtual void SelectItem(int item) {};
+  virtual void Reset();
+  virtual unsigned int GetNumItems() const { return m_items.size(); };
+  virtual int GetCurrentPage() const;
+  bool InsideLayout(const CGUIListItemLayout *layout, const CPoint &point);
+
+  inline float Size() const;
+  void MoveToRow(int row);
+  void FreeMemory(int keepStart, int keepEnd);
+  void GetCurrentLayouts();
+  CGUIListItemLayout *GetFocusedLayout() const;
+
+  int m_offset;
+  int m_cursor;
+  float m_analogScrollCount;
+
+  ORIENTATION m_orientation;
+  int m_itemsPerPage;
+
+  std::vector< CGUIListItemPtr > m_items;
+  typedef std::vector<CGUIListItemPtr> ::iterator iItems;
+  CGUIListItem *m_lastItem;
+
+  DWORD m_pageControl;
+
+  DWORD m_renderTime;
+
+  std::vector<CGUIListItemLayout> m_layouts;
+  std::vector<CGUIListItemLayout> m_focusedLayouts;
+
+  CGUIListItemLayout *m_layout;
+  CGUIListItemLayout *m_focusedLayout;
+
+  virtual void ScrollToOffset(int offset);
+  DWORD m_scrollLastTime;
+  int   m_scrollTime;
+  float m_scrollSpeed;
+  float m_scrollOffset;
+
+  VIEW_TYPE m_type;
+  CStdString m_label;
+
+  bool m_staticContent;
+  std::vector<CGUIListItemPtr> m_staticItems;
+  bool m_wasReset;  // true if we've received a Reset message until we've rendered once.  Allows
+                    // us to make sure we don't tell the infomanager that we've been moving when
+                    // the "movement" was simply due to the list being repopulated (thus cursor position
+                    // changing around)
+};
+


Property changes on: branches/linuxport/XBMC/guilib/GUIBaseContainer.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIColorManager.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIColorManager.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIColorManager.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -19,96 +19,96 @@
  *
  */
 
-#include "include.h"
-#include "GUIColorManager.h"
-#include "Util.h"
-#include "SkinInfo.h"
-
-CGUIColorManager g_colorManager;
-
-CGUIColorManager::CGUIColorManager(void)
-{
-}
-
-CGUIColorManager::~CGUIColorManager(void)
-{
-  Clear();
-}
-
-void CGUIColorManager::Clear()
-{
-  m_colors.clear();
-}
-
-// load the color file in
-void CGUIColorManager::Load(const CStdString &colorFile)
-{
-  Clear();
-
-  // first load the default color map if it exists
-  CStdString path, basePath;
-  CUtil::AddFileToFolder(g_SkinInfo.GetBaseDir(), "colors", basePath);
-  CUtil::AddFileToFolder(basePath, "defaults.xml", path);
-
-  TiXmlDocument xmlDoc;
-  if (xmlDoc.LoadFile(PTH_IC(path.c_str())))
-    LoadXML(xmlDoc);
-
-  // now the color map requested
-  if (colorFile.CompareNoCase("SKINDEFAULT") == 0)
-    return; // nothing to do
-
-  CUtil::AddFileToFolder(basePath, colorFile, path);
-  CLog::Log(LOGINFO, "Loading colors from %s", path.c_str());
-
-  if (xmlDoc.LoadFile(path.c_str()))
-    LoadXML(xmlDoc);
-}
-
-bool CGUIColorManager::LoadXML(TiXmlDocument &xmlDoc)
-{
-  TiXmlElement* pRootElement = xmlDoc.RootElement();
-
-  CStdString strValue = pRootElement->Value();
-  if (strValue != CStdString("colors"))
-  {
-    CLog::Log(LOGERROR, "color file doesnt start with <colors>");
-    return false;
-  }
-
-  const TiXmlElement *color = pRootElement->FirstChildElement("color");
-
-  while (color)
-  {
-    if (color->FirstChild() && color->Attribute("name"))
-    {
-      DWORD value = 0xffffffff;
-      sscanf(color->FirstChild()->Value(), "%x", (unsigned int*) &value);
-      CStdString name = color->Attribute("name");
-      iColor it = m_colors.find(name);
-      if (it != m_colors.end())
-        (*it).second = value;
-      else
-        m_colors.insert(make_pair(name, value));
-    }
-    color = color->NextSiblingElement("color");
-  }
-  return true;
-}
-
-// lookup a color and return it's hex value
-DWORD CGUIColorManager::GetColor(const CStdString &color) const
-{
-  // look in our color map
-  CStdString trimmed(color);
-  trimmed.TrimLeft("= ");
-  icColor it = m_colors.find(trimmed);
-  if (it != m_colors.end())
-    return (*it).second;
-
-  // try converting hex directly
-  DWORD value = 0;
-  sscanf(trimmed.c_str(), "%x", &value);
-  return value;
-}
-
+#include "include.h"
+#include "GUIColorManager.h"
+#include "Util.h"
+#include "SkinInfo.h"
+
+CGUIColorManager g_colorManager;
+
+CGUIColorManager::CGUIColorManager(void)
+{
+}
+
+CGUIColorManager::~CGUIColorManager(void)
+{
+  Clear();
+}
+
+void CGUIColorManager::Clear()
+{
+  m_colors.clear();
+}
+
+// load the color file in
+void CGUIColorManager::Load(const CStdString &colorFile)
+{
+  Clear();
+
+  // first load the default color map if it exists
+  CStdString path, basePath;
+  CUtil::AddFileToFolder(g_SkinInfo.GetBaseDir(), "colors", basePath);
+  CUtil::AddFileToFolder(basePath, "defaults.xml", path);
+
+  TiXmlDocument xmlDoc;
+  if (xmlDoc.LoadFile(PTH_IC(path.c_str())))
+    LoadXML(xmlDoc);
+
+  // now the color map requested
+  if (colorFile.CompareNoCase("SKINDEFAULT") == 0)
+    return; // nothing to do
+
+  CUtil::AddFileToFolder(basePath, colorFile, path);
+  CLog::Log(LOGINFO, "Loading colors from %s", path.c_str());
+
+  if (xmlDoc.LoadFile(path.c_str()))
+    LoadXML(xmlDoc);
+}
+
+bool CGUIColorManager::LoadXML(TiXmlDocument &xmlDoc)
+{
+  TiXmlElement* pRootElement = xmlDoc.RootElement();
+
+  CStdString strValue = pRootElement->Value();
+  if (strValue != CStdString("colors"))
+  {
+    CLog::Log(LOGERROR, "color file doesnt start with <colors>");
+    return false;
+  }
+
+  const TiXmlElement *color = pRootElement->FirstChildElement("color");
+
+  while (color)
+  {
+    if (color->FirstChild() && color->Attribute("name"))
+    {
+      DWORD value = 0xffffffff;
+      sscanf(color->FirstChild()->Value(), "%x", (unsigned int*) &value);
+      CStdString name = color->Attribute("name");
+      iColor it = m_colors.find(name);
+      if (it != m_colors.end())
+        (*it).second = value;
+      else
+        m_colors.insert(make_pair(name, value));
+    }
+    color = color->NextSiblingElement("color");
+  }
+  return true;
+}
+
+// lookup a color and return it's hex value
+DWORD CGUIColorManager::GetColor(const CStdString &color) const
+{
+  // look in our color map
+  CStdString trimmed(color);
+  trimmed.TrimLeft("= ");
+  icColor it = m_colors.find(trimmed);
+  if (it != m_colors.end())
+    return (*it).second;
+
+  // try converting hex directly
+  DWORD value = 0;
+  sscanf(trimmed.c_str(), "%x", &value);
+  return value;
+}
+


Property changes on: branches/linuxport/XBMC/guilib/GUIColorManager.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIColorManager.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIColorManager.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIColorManager.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,13 +1,13 @@
-/*!
-\file GUIColorManager.h
-\brief 
-*/
-
-#ifndef GUILIB_COLORMANAGER_H
-#define GUILIB_COLORMANAGER_H
-
-#pragma once
+/*!
+\file GUIColorManager.h
+\brief 
+*/
 
+#ifndef GUILIB_COLORMANAGER_H
+#define GUILIB_COLORMANAGER_H
+
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -28,34 +28,34 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-/*!
- \ingroup textures
- \brief 
- */
-class CGUIColorManager
-{
-public:
-  CGUIColorManager(void);
-  virtual ~CGUIColorManager(void);
-
-  void Load(const CStdString &colorFile);
-
-  DWORD GetColor(const CStdString &color) const;
-
-  void Clear();
-
-protected:
-  bool LoadXML(TiXmlDocument &xmlDoc);
-
-  std::map<CStdString, DWORD> m_colors;
-  typedef std::map<CStdString, DWORD>::iterator iColor;
-  typedef std::map<CStdString, DWORD>::const_iterator icColor;
-};
-
-/*!
- \ingroup textures
- \brief 
- */
-extern CGUIColorManager g_colorManager;
-#endif
+
+/*!
+ \ingroup textures
+ \brief 
+ */
+class CGUIColorManager
+{
+public:
+  CGUIColorManager(void);
+  virtual ~CGUIColorManager(void);
+
+  void Load(const CStdString &colorFile);
+
+  DWORD GetColor(const CStdString &color) const;
+
+  void Clear();
+
+protected:
+  bool LoadXML(TiXmlDocument &xmlDoc);
+
+  std::map<CStdString, DWORD> m_colors;
+  typedef std::map<CStdString, DWORD>::iterator iColor;
+  typedef std::map<CStdString, DWORD>::const_iterator icColor;
+};
+
+/*!
+ \ingroup textures
+ \brief 
+ */
+extern CGUIColorManager g_colorManager;
+#endif


Property changes on: branches/linuxport/XBMC/guilib/GUIColorManager.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIControlGroup.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIControlGroup.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIControlGroup.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -19,518 +19,518 @@
  *
  */
 
-#include "include.h"
-#include "GUIControlGroup.h"
-
-using namespace std;
-
-CGUIControlGroup::CGUIControlGroup(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height)
-: CGUIControl(dwParentID, dwControlId, posX, posY, width, height)
-{
-  m_defaultControl = 0;
-  m_focusedControl = 0;
-  m_renderTime = 0;
-  m_renderFocusedLast = false;
-  ControlType = GUICONTROL_GROUP;
-}
-
-CGUIControlGroup::~CGUIControlGroup(void)
-{
-  ClearAll();
-}
-
-void CGUIControlGroup::PreAllocResources()
-{
-  CGUIControl::PreAllocResources();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    if (!control->IsDynamicallyAllocated())
-      control->PreAllocResources();
-  }
-}
-
-void CGUIControlGroup::AllocResources()
-{
-  CGUIControl::AllocResources();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    if (!control->IsDynamicallyAllocated())
-      control->AllocResources();
-  }
-}
-
-void CGUIControlGroup::FreeResources()
-{
-  CGUIControl::FreeResources();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    control->FreeResources();
-  }
-}
-
-void CGUIControlGroup::DynamicResourceAlloc(bool bOnOff)
-{
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    control->DynamicResourceAlloc(bOnOff);
-  }
-}
-
-void CGUIControlGroup::Render()
-{
-  g_graphicsContext.SetOrigin(m_posX, m_posY);
-  CGUIControl *focusedControl = NULL;
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    control->UpdateVisibility();
-    if (m_renderFocusedLast && control->HasFocus())
-      focusedControl = control;
-    else
-      control->DoRender(m_renderTime);
-  }
-  if (focusedControl)
-    focusedControl->DoRender(m_renderTime);
-  CGUIControl::Render();
-  g_graphicsContext.RestoreOrigin();
-}
-
-bool CGUIControlGroup::OnAction(const CAction &action)
-{
-  ASSERT(false);  // unimplemented
-  return false;
-}
-
-bool CGUIControlGroup::HasFocus() const
-{
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    if (control->HasFocus())
-      return true;
-  }
-  return false;
-}
-
-bool CGUIControlGroup::OnMessage(CGUIMessage& message)
-{
-  switch (message.GetMessage() )
-  {
-  case GUI_MSG_ITEM_SELECT:
-    {
-      if (message.GetControlId() == GetID())
-      {
-        m_focusedControl = message.GetParam1();
-        return true;
-      }
-      break;
-    }
-  case GUI_MSG_ITEM_SELECTED:
-    {
-      if (message.GetControlId() == GetID())
-      {
-        message.SetParam1(m_focusedControl);
-        return true;
-      }
-      break;
-    }
-  case GUI_MSG_FOCUSED:
-    { // a control has been focused
-      m_focusedControl = message.GetControlId();
-      SetFocus(true);
-      // tell our parent thatwe have focus
-      if (m_parentControl)
-        m_parentControl->OnMessage(message);
-      else
-        SendWindowMessage(message);
-      return true;
-    }
-  case GUI_MSG_SETFOCUS:
-    {
-      // first try our last focused control...
-      if (m_focusedControl)
-      {
-        CGUIControl *control = GetFirstFocusableControl(m_focusedControl);
-        if (control)
-        {
-          CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
-          return control->OnMessage(msg);
-        }
-      }
-      // ok, no previously focused control, try the default control first
-      if (m_defaultControl)
-      {
-        CGUIControl *control = GetFirstFocusableControl(m_defaultControl);
-        if (control)
-        {
-          CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
-          return control->OnMessage(msg);
-        }
-      }
-      // no success with the default control, so just find one to focus
-      CGUIControl *control = GetFirstFocusableControl(0);
-      if (control)
-      {
-        CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
-        return control->OnMessage(msg);
-      }
-      // unsuccessful
-      return false;
-      break;
-    }
-  case GUI_MSG_LOSTFOCUS:
-    {
-      // set all subcontrols unfocused
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-        (*it)->SetFocus(false);
-      if (!HasID(message.GetParam1()))
-      { // we don't have the new id, so unfocus
-        SetFocus(false);
-        if (m_parentControl)
-          m_parentControl->OnMessage(message);
-      }
-      return true;
-    }
-    break;
-  case GUI_MSG_PAGE_CHANGE:
-  case GUI_MSG_REFRESH_THUMBS:
-  case GUI_MSG_REFRESH_LIST:
-    { // send to all child controls (make sure the target is the control id)
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      {
-        CGUIMessage msg(message.GetMessage(), message.GetSenderId(), (*it)->GetID(), message.GetParam1());
-        (*it)->OnMessage(msg);
-      }
-      return true;
-    }
-    break;
-  }
-  bool handled(false);
-  //not intented for any specific control, send to all childs and our base handler.
-  if (message.GetControlId() == 0)
-  {
-    for (iControls it = m_children.begin();it != m_children.end(); ++it)
-    {
-      CGUIControl* control = *it;
-      handled |= control->OnMessage(message);
-    }
-    return CGUIControl::OnMessage(message) || handled;
-  }
-  // if it's intended for us, then so be it
-  if (message.GetControlId() == GetID())
-    return CGUIControl::OnMessage(message);
-
-  // else, see if a child matches, and send to the child control if so
-  for (iControls it = m_children.begin();it != m_children.end(); ++it)
-  {
-    CGUIControl* control = *it;
-    if (control->HasVisibleID(message.GetControlId()))
-    {
-      if (control->OnMessage(message))
-        return true;
-    }
-  }
-  // Unhandled - send to all matching invisible controls as well
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl* control = *it;
-    if (control->HasID(message.GetControlId()))
-    {
-      if (control->OnMessage(message))
-        handled = true;
-    }
-  }
-  return handled;
-}
-
-bool CGUIControlGroup::CanFocus() const
-{
-  if (!CGUIControl::CanFocus()) return false;
-  // see if we have any children that can be focused
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    if ((*it)->CanFocus())
-      return true;
-  }
-  return false;
-}
-
-void CGUIControlGroup::DoRender(DWORD currentTime)
-{
-  m_renderTime = currentTime;
-  CGUIControl::DoRender(currentTime);
-}
-
-void CGUIControlGroup::SetInitialVisibility()
-{
-  CGUIControl::SetInitialVisibility();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->SetInitialVisibility();
-}
-
-void CGUIControlGroup::QueueAnimation(ANIMATION_TYPE animType)
-{
-  CGUIControl::QueueAnimation(animType);
-  // send window level animations to our children as well
-  if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
-  {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      (*it)->QueueAnimation(animType);
-  }
-}
-
-void CGUIControlGroup::ResetAnimation(ANIMATION_TYPE animType)
-{
-  CGUIControl::ResetAnimation(animType);
-  // send window level animations to our children as well
-  if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
-  {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      (*it)->ResetAnimation(animType);
-  }
-}
-
-void CGUIControlGroup::ResetAnimations()
-{ // resets all animations, regardless of condition
-  CGUIControl::ResetAnimations();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->ResetAnimations();
-}
-
-bool CGUIControlGroup::IsAnimating(ANIMATION_TYPE animType)
-{
-  if (CGUIControl::IsAnimating(animType))
-    return true;
-
-  if (IsVisible())
-  {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    {
-      if ((*it)->IsAnimating(animType))
-        return true;
-    }
-  }
-  return false;
-}
-
-bool CGUIControlGroup::HasAnimation(ANIMATION_TYPE animType)
-{
-  if (CGUIControl::HasAnimation(animType))
-    return true;
-
-  if (IsVisible())
-  {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    {
-      if ((*it)->HasAnimation(animType))
-        return true;
-    }
-  }
-  return false;
-}
-
-bool CGUIControlGroup::HitTest(const CPoint &point) const
-{
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *child = *it;
-    if (child->HitTest(point - CPoint(m_posX, m_posX)))
-      return true;
-  }
-  return false;
-}
-
-bool CGUIControlGroup::CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const
-{
-  if (!CGUIControl::CanFocus()) return false;
-  CPoint controlCoords(point);
-  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
-  for (crControls it = m_children.rbegin(); it != m_children.rend(); ++it)
-  {
-    CGUIControl *child = *it;
-    if (child->CanFocusFromPoint(controlCoords - CPoint(m_posX, m_posY), control, controlPoint))
-      return true;
-  }
-  *control = NULL;
-  return false;
-}
-
-void CGUIControlGroup::UnfocusFromPoint(const CPoint &point)
-{
-  CPoint controlCoords(point);
-  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *child = *it;
-    child->UnfocusFromPoint(controlCoords - CPoint(m_posX, m_posY));
-  }
-  CGUIControl::UnfocusFromPoint(point);
-}
-
-bool CGUIControlGroup::HasID(DWORD dwID) const
-{
-  if (CGUIControl::HasID(dwID)) return true;
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *child = *it;
-    if (child->HasID(dwID))
-      return true;
-  }
-  return false;
-}
-
-bool CGUIControlGroup::HasVisibleID(DWORD dwID) const
-{
-  // call base class first as the group may be the requested control
-  if (CGUIControl::HasVisibleID(dwID)) return true;
-  // if the group isn't visible, then none of it's children can be
-  if (!IsVisible()) return false;
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *child = *it;
-    if (child->HasVisibleID(dwID))
-      return true;
-  }
-  return false;
-}
-
-const CGUIControl* CGUIControlGroup::GetControl(int iControl) const
-{
-  const CGUIControl* pPotential=NULL;
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    const CGUIControl* pControl = *it;
-    if (pControl->IsGroup())
-    {
-      CGUIControlGroup *group = (CGUIControlGroup *)pControl;
-      const CGUIControl *control = group->GetControl(iControl);
-      if (control) pControl = control;
-    }
-    if ((int) pControl->GetID() == iControl) 
-    {
-      if (pControl->IsVisible())
-        return pControl;
-      else if (!pPotential)
-        pPotential = pControl;
-    }
-  }
-  return pPotential;
-}
-
-int CGUIControlGroup::GetFocusedControlID() const
-{
-  if (m_focusedControl) return m_focusedControl;
-  CGUIControl *control = GetFocusedControl();
-  if (control) return control->GetID();
-  return 0;
-}
-
-CGUIControl *CGUIControlGroup::GetFocusedControl() const
-{
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    const CGUIControl* control = *it;
-    if (control->HasFocus())
-    {
-      if (control->IsGroup())
-      {
-        CGUIControlGroup *group = (CGUIControlGroup *)control;
-        return group->GetFocusedControl();
-      }
-      return (CGUIControl *)control;
-    }
-  }
-  return NULL;
-}
-
-// in the case of id == 0, we don't match id
-CGUIControl *CGUIControlGroup::GetFirstFocusableControl(int id)
-{
-  if (!CanFocus()) return NULL;
-  if (id && id == (int) GetID()) return this; // we're focusable and they want us
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl* pControl = *it;
-    if (pControl->IsGroup())
-    {
-      CGUIControlGroup *group = (CGUIControlGroup *)pControl;
-      CGUIControl *control = group->GetFirstFocusableControl(id);
-      if (control) return control;
-    }
-    if ((!id || (int) pControl->GetID() == id) && pControl->CanFocus())
-      return pControl;
-  }
-  return NULL;
-}
-
-void CGUIControlGroup::AddControl(CGUIControl *control)
-{
-  if (!control) return;
-  m_children.push_back(control);
-  control->SetParentControl(this);
-}
-
-void CGUIControlGroup::SaveStates(vector<CControlState> &states)
-{
-  // save our state, and that of our children
-  states.push_back(CControlState(GetID(), m_focusedControl));
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->SaveStates(states);
-}
-
-// Note: This routine doesn't delete the control.  It just removes it from the control list
-bool CGUIControlGroup::RemoveControl(int id)
-{
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    if (control->IsGroup())
-    {
-      CGUIControlGroup *group = (CGUIControlGroup *)control;
-      if (group->RemoveControl(id))
-        return true;
-    }
-    if ((int) control->GetID() == id)
-    {
-      m_children.erase(it);
-      return true;
-    }
-  }
-  return false;
-}
-
-void CGUIControlGroup::ClearAll()
-{
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    delete control;
-  }
-  m_children.clear();
-}
-
-void CGUIControlGroup::GetContainers(vector<CGUIControl *> &containers) const
-{
-  for (ciControls it = m_children.begin();it != m_children.end(); ++it)
-  {
-    if ((*it)->IsContainer())
-      containers.push_back(*it);
-    else if ((*it)->IsGroup())
-      ((CGUIControlGroup *)(*it))->GetContainers(containers);
-  }
-}
-
-#ifdef _DEBUG
-void CGUIControlGroup::DumpTextureUse()
-{
-  CLog::Log(LOGDEBUG, "%s for controlgroup %u", __FUNCTION__, GetID());
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    (*it)->DumpTextureUse();
-  }
-}
+#include "include.h"
+#include "GUIControlGroup.h"
+
+using namespace std;
+
+CGUIControlGroup::CGUIControlGroup(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height)
+: CGUIControl(dwParentID, dwControlId, posX, posY, width, height)
+{
+  m_defaultControl = 0;
+  m_focusedControl = 0;
+  m_renderTime = 0;
+  m_renderFocusedLast = false;
+  ControlType = GUICONTROL_GROUP;
+}
+
+CGUIControlGroup::~CGUIControlGroup(void)
+{
+  ClearAll();
+}
+
+void CGUIControlGroup::PreAllocResources()
+{
+  CGUIControl::PreAllocResources();
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    if (!control->IsDynamicallyAllocated())
+      control->PreAllocResources();
+  }
+}
+
+void CGUIControlGroup::AllocResources()
+{
+  CGUIControl::AllocResources();
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    if (!control->IsDynamicallyAllocated())
+      control->AllocResources();
+  }
+}
+
+void CGUIControlGroup::FreeResources()
+{
+  CGUIControl::FreeResources();
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    control->FreeResources();
+  }
+}
+
+void CGUIControlGroup::DynamicResourceAlloc(bool bOnOff)
+{
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    control->DynamicResourceAlloc(bOnOff);
+  }
+}
+
+void CGUIControlGroup::Render()
+{
+  g_graphicsContext.SetOrigin(m_posX, m_posY);
+  CGUIControl *focusedControl = NULL;
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    control->UpdateVisibility();
+    if (m_renderFocusedLast && control->HasFocus())
+      focusedControl = control;
+    else
+      control->DoRender(m_renderTime);
+  }
+  if (focusedControl)
+    focusedControl->DoRender(m_renderTime);
+  CGUIControl::Render();
+  g_graphicsContext.RestoreOrigin();
+}
+
+bool CGUIControlGroup::OnAction(const CAction &action)
+{
+  ASSERT(false);  // unimplemented
+  return false;
+}
+
+bool CGUIControlGroup::HasFocus() const
+{
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    if (control->HasFocus())
+      return true;
+  }
+  return false;
+}
+
+bool CGUIControlGroup::OnMessage(CGUIMessage& message)
+{
+  switch (message.GetMessage() )
+  {
+  case GUI_MSG_ITEM_SELECT:
+    {
+      if (message.GetControlId() == GetID())
+      {
+        m_focusedControl = message.GetParam1();
+        return true;
+      }
+      break;
+    }
+  case GUI_MSG_ITEM_SELECTED:
+    {
+      if (message.GetControlId() == GetID())
+      {
+        message.SetParam1(m_focusedControl);
+        return true;
+      }
+      break;
+    }
+  case GUI_MSG_FOCUSED:
+    { // a control has been focused
+      m_focusedControl = message.GetControlId();
+      SetFocus(true);
+      // tell our parent thatwe have focus
+      if (m_parentControl)
+        m_parentControl->OnMessage(message);
+      else
+        SendWindowMessage(message);
+      return true;
+    }
+  case GUI_MSG_SETFOCUS:
+    {
+      // first try our last focused control...
+      if (m_focusedControl)
+      {
+        CGUIControl *control = GetFirstFocusableControl(m_focusedControl);
+        if (control)
+        {
+          CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
+          return control->OnMessage(msg);
+        }
+      }
+      // ok, no previously focused control, try the default control first
+      if (m_defaultControl)
+      {
+        CGUIControl *control = GetFirstFocusableControl(m_defaultControl);
+        if (control)
+        {
+          CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
+          return control->OnMessage(msg);
+        }
+      }
+      // no success with the default control, so just find one to focus
+      CGUIControl *control = GetFirstFocusableControl(0);
+      if (control)
+      {
+        CGUIMessage msg(GUI_MSG_SETFOCUS, GetParentID(), control->GetID());
+        return control->OnMessage(msg);
+      }
+      // unsuccessful
+      return false;
+      break;
+    }
+  case GUI_MSG_LOSTFOCUS:
+    {
+      // set all subcontrols unfocused
+      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+        (*it)->SetFocus(false);
+      if (!HasID(message.GetParam1()))
+      { // we don't have the new id, so unfocus
+        SetFocus(false);
+        if (m_parentControl)
+          m_parentControl->OnMessage(message);
+      }
+      return true;
+    }
+    break;
+  case GUI_MSG_PAGE_CHANGE:
+  case GUI_MSG_REFRESH_THUMBS:
+  case GUI_MSG_REFRESH_LIST:
+    { // send to all child controls (make sure the target is the control id)
+      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      {
+        CGUIMessage msg(message.GetMessage(), message.GetSenderId(), (*it)->GetID(), message.GetParam1());
+        (*it)->OnMessage(msg);
+      }
+      return true;
+    }
+    break;
+  }
+  bool handled(false);
+  //not intented for any specific control, send to all childs and our base handler.
+  if (message.GetControlId() == 0)
+  {
+    for (iControls it = m_children.begin();it != m_children.end(); ++it)
+    {
+      CGUIControl* control = *it;
+      handled |= control->OnMessage(message);
+    }
+    return CGUIControl::OnMessage(message) || handled;
+  }
+  // if it's intended for us, then so be it
+  if (message.GetControlId() == GetID())
+    return CGUIControl::OnMessage(message);
+
+  // else, see if a child matches, and send to the child control if so
+  for (iControls it = m_children.begin();it != m_children.end(); ++it)
+  {
+    CGUIControl* control = *it;
+    if (control->HasVisibleID(message.GetControlId()))
+    {
+      if (control->OnMessage(message))
+        return true;
+    }
+  }
+  // Unhandled - send to all matching invisible controls as well
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl* control = *it;
+    if (control->HasID(message.GetControlId()))
+    {
+      if (control->OnMessage(message))
+        handled = true;
+    }
+  }
+  return handled;
+}
+
+bool CGUIControlGroup::CanFocus() const
+{
+  if (!CGUIControl::CanFocus()) return false;
+  // see if we have any children that can be focused
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    if ((*it)->CanFocus())
+      return true;
+  }
+  return false;
+}
+
+void CGUIControlGroup::DoRender(DWORD currentTime)
+{
+  m_renderTime = currentTime;
+  CGUIControl::DoRender(currentTime);
+}
+
+void CGUIControlGroup::SetInitialVisibility()
+{
+  CGUIControl::SetInitialVisibility();
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    (*it)->SetInitialVisibility();
+}
+
+void CGUIControlGroup::QueueAnimation(ANIMATION_TYPE animType)
+{
+  CGUIControl::QueueAnimation(animType);
+  // send window level animations to our children as well
+  if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
+  {
+    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      (*it)->QueueAnimation(animType);
+  }
+}
+
+void CGUIControlGroup::ResetAnimation(ANIMATION_TYPE animType)
+{
+  CGUIControl::ResetAnimation(animType);
+  // send window level animations to our children as well
+  if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
+  {
+    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      (*it)->ResetAnimation(animType);
+  }
+}
+
+void CGUIControlGroup::ResetAnimations()
+{ // resets all animations, regardless of condition
+  CGUIControl::ResetAnimations();
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    (*it)->ResetAnimations();
+}
+
+bool CGUIControlGroup::IsAnimating(ANIMATION_TYPE animType)
+{
+  if (CGUIControl::IsAnimating(animType))
+    return true;
+
+  if (IsVisible())
+  {
+    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    {
+      if ((*it)->IsAnimating(animType))
+        return true;
+    }
+  }
+  return false;
+}
+
+bool CGUIControlGroup::HasAnimation(ANIMATION_TYPE animType)
+{
+  if (CGUIControl::HasAnimation(animType))
+    return true;
+
+  if (IsVisible())
+  {
+    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    {
+      if ((*it)->HasAnimation(animType))
+        return true;
+    }
+  }
+  return false;
+}
+
+bool CGUIControlGroup::HitTest(const CPoint &point) const
+{
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *child = *it;
+    if (child->HitTest(point - CPoint(m_posX, m_posX)))
+      return true;
+  }
+  return false;
+}
+
+bool CGUIControlGroup::CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const
+{
+  if (!CGUIControl::CanFocus()) return false;
+  CPoint controlCoords(point);
+  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
+  for (crControls it = m_children.rbegin(); it != m_children.rend(); ++it)
+  {
+    CGUIControl *child = *it;
+    if (child->CanFocusFromPoint(controlCoords - CPoint(m_posX, m_posY), control, controlPoint))
+      return true;
+  }
+  *control = NULL;
+  return false;
+}
+
+void CGUIControlGroup::UnfocusFromPoint(const CPoint &point)
+{
+  CPoint controlCoords(point);
+  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *child = *it;
+    child->UnfocusFromPoint(controlCoords - CPoint(m_posX, m_posY));
+  }
+  CGUIControl::UnfocusFromPoint(point);
+}
+
+bool CGUIControlGroup::HasID(DWORD dwID) const
+{
+  if (CGUIControl::HasID(dwID)) return true;
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *child = *it;
+    if (child->HasID(dwID))
+      return true;
+  }
+  return false;
+}
+
+bool CGUIControlGroup::HasVisibleID(DWORD dwID) const
+{
+  // call base class first as the group may be the requested control
+  if (CGUIControl::HasVisibleID(dwID)) return true;
+  // if the group isn't visible, then none of it's children can be
+  if (!IsVisible()) return false;
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *child = *it;
+    if (child->HasVisibleID(dwID))
+      return true;
+  }
+  return false;
+}
+
+const CGUIControl* CGUIControlGroup::GetControl(int iControl) const
+{
+  const CGUIControl* pPotential=NULL;
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    const CGUIControl* pControl = *it;
+    if (pControl->IsGroup())
+    {
+      CGUIControlGroup *group = (CGUIControlGroup *)pControl;
+      const CGUIControl *control = group->GetControl(iControl);
+      if (control) pControl = control;
+    }
+    if ((int) pControl->GetID() == iControl) 
+    {
+      if (pControl->IsVisible())
+        return pControl;
+      else if (!pPotential)
+        pPotential = pControl;
+    }
+  }
+  return pPotential;
+}
+
+int CGUIControlGroup::GetFocusedControlID() const
+{
+  if (m_focusedControl) return m_focusedControl;
+  CGUIControl *control = GetFocusedControl();
+  if (control) return control->GetID();
+  return 0;
+}
+
+CGUIControl *CGUIControlGroup::GetFocusedControl() const
+{
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    const CGUIControl* control = *it;
+    if (control->HasFocus())
+    {
+      if (control->IsGroup())
+      {
+        CGUIControlGroup *group = (CGUIControlGroup *)control;
+        return group->GetFocusedControl();
+      }
+      return (CGUIControl *)control;
+    }
+  }
+  return NULL;
+}
+
+// in the case of id == 0, we don't match id
+CGUIControl *CGUIControlGroup::GetFirstFocusableControl(int id)
+{
+  if (!CanFocus()) return NULL;
+  if (id && id == (int) GetID()) return this; // we're focusable and they want us
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl* pControl = *it;
+    if (pControl->IsGroup())
+    {
+      CGUIControlGroup *group = (CGUIControlGroup *)pControl;
+      CGUIControl *control = group->GetFirstFocusableControl(id);
+      if (control) return control;
+    }
+    if ((!id || (int) pControl->GetID() == id) && pControl->CanFocus())
+      return pControl;
+  }
+  return NULL;
+}
+
+void CGUIControlGroup::AddControl(CGUIControl *control)
+{
+  if (!control) return;
+  m_children.push_back(control);
+  control->SetParentControl(this);
+}
+
+void CGUIControlGroup::SaveStates(vector<CControlState> &states)
+{
+  // save our state, and that of our children
+  states.push_back(CControlState(GetID(), m_focusedControl));
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    (*it)->SaveStates(states);
+}
+
+// Note: This routine doesn't delete the control.  It just removes it from the control list
+bool CGUIControlGroup::RemoveControl(int id)
+{
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    if (control->IsGroup())
+    {
+      CGUIControlGroup *group = (CGUIControlGroup *)control;
+      if (group->RemoveControl(id))
+        return true;
+    }
+    if ((int) control->GetID() == id)
+    {
+      m_children.erase(it);
+      return true;
+    }
+  }
+  return false;
+}
+
+void CGUIControlGroup::ClearAll()
+{
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    delete control;
+  }
+  m_children.clear();
+}
+
+void CGUIControlGroup::GetContainers(vector<CGUIControl *> &containers) const
+{
+  for (ciControls it = m_children.begin();it != m_children.end(); ++it)
+  {
+    if ((*it)->IsContainer())
+      containers.push_back(*it);
+    else if ((*it)->IsGroup())
+      ((CGUIControlGroup *)(*it))->GetContainers(containers);
+  }
+}
+
+#ifdef _DEBUG
+void CGUIControlGroup::DumpTextureUse()
+{
+  CLog::Log(LOGDEBUG, "%s for controlgroup %u", __FUNCTION__, GetID());
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    (*it)->DumpTextureUse();
+  }
+}
 #endif


Property changes on: branches/linuxport/XBMC/guilib/GUIControlGroup.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIControlGroup.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIControlGroup.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIControlGroup.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,10 +1,10 @@
-/*!
-\file GUIControlGroup.h
-\brief 
-*/
-
-#pragma once
+/*!
+\file GUIControlGroup.h
+\brief 
+*/
 
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -25,75 +25,75 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-#include "GUIControl.h"
-
-/*!
- \ingroup controls
- \brief group of controls, useful for remembering last control + animating/hiding together
- */
-class CGUIControlGroup : public CGUIControl
-{
-public:
-  CGUIControlGroup(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height);
-  virtual ~CGUIControlGroup(void);
-  virtual void Render();
-  virtual bool OnAction(const CAction &action);
-  virtual bool OnMessage(CGUIMessage& message);
-  virtual bool HasFocus() const;
-  virtual void PreAllocResources();
-  virtual void AllocResources();
-  virtual void FreeResources();
-  virtual void DynamicResourceAlloc(bool bOnOff);
-  virtual bool CanFocus() const;
-
-  virtual bool HitTest(const CPoint &point) const;
-  virtual bool CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const;
-  virtual void UnfocusFromPoint(const CPoint &point);
-
-  virtual void SetInitialVisibility();
-
-  virtual void DoRender(DWORD currentTime);
-  virtual bool IsAnimating(ANIMATION_TYPE anim);
-  virtual bool HasAnimation(ANIMATION_TYPE anim);
-  virtual void QueueAnimation(ANIMATION_TYPE anim);
-  virtual void ResetAnimation(ANIMATION_TYPE anim);
-  virtual void ResetAnimations();
-
-  virtual bool HasID(DWORD dwID) const;
-  virtual bool HasVisibleID(DWORD dwID) const;
-
-  int GetFocusedControlID() const;
-  CGUIControl *GetFocusedControl() const;
-  const CGUIControl *GetControl(int id) const;
-  CGUIControl *GetFirstFocusableControl(int id);
-  void GetContainers(std::vector<CGUIControl *> &containers) const;
-
-  virtual void AddControl(CGUIControl *control);
-  virtual bool RemoveControl(int id);
-  virtual void ClearAll();
-  void SetDefaultControl(DWORD id) { m_defaultControl = id; };
-  void SetRenderFocusedLast(bool renderLast) { m_renderFocusedLast = renderLast; };
-
-  virtual void SaveStates(std::vector<CControlState> &states);
-
-  virtual bool IsGroup() const { return true; };
-
-#ifdef _DEBUG
-  virtual void DumpTextureUse();
-#endif
-protected:
-  // sub controls
-  std::vector<CGUIControl *> m_children;
-  typedef std::vector<CGUIControl *>::iterator iControls;
-  typedef std::vector<CGUIControl *>::const_iterator ciControls;
-  typedef std::vector<CGUIControl *>::const_reverse_iterator crControls;
-
-  int m_defaultControl;
-  int m_focusedControl;
-  bool m_renderFocusedLast;
-
-  // render time
-  DWORD m_renderTime;
-};
 
+#include "GUIControl.h"
+
+/*!
+ \ingroup controls
+ \brief group of controls, useful for remembering last control + animating/hiding together
+ */
+class CGUIControlGroup : public CGUIControl
+{
+public:
+  CGUIControlGroup(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height);
+  virtual ~CGUIControlGroup(void);
+  virtual void Render();
+  virtual bool OnAction(const CAction &action);
+  virtual bool OnMessage(CGUIMessage& message);
+  virtual bool HasFocus() const;
+  virtual void PreAllocResources();
+  virtual void AllocResources();
+  virtual void FreeResources();
+  virtual void DynamicResourceAlloc(bool bOnOff);
+  virtual bool CanFocus() const;
+
+  virtual bool HitTest(const CPoint &point) const;
+  virtual bool CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const;
+  virtual void UnfocusFromPoint(const CPoint &point);
+
+  virtual void SetInitialVisibility();
+
+  virtual void DoRender(DWORD currentTime);
+  virtual bool IsAnimating(ANIMATION_TYPE anim);
+  virtual bool HasAnimation(ANIMATION_TYPE anim);
+  virtual void QueueAnimation(ANIMATION_TYPE anim);
+  virtual void ResetAnimation(ANIMATION_TYPE anim);
+  virtual void ResetAnimations();
+
+  virtual bool HasID(DWORD dwID) const;
+  virtual bool HasVisibleID(DWORD dwID) const;
+
+  int GetFocusedControlID() const;
+  CGUIControl *GetFocusedControl() const;
+  const CGUIControl *GetControl(int id) const;
+  CGUIControl *GetFirstFocusableControl(int id);
+  void GetContainers(std::vector<CGUIControl *> &containers) const;
+
+  virtual void AddControl(CGUIControl *control);
+  virtual bool RemoveControl(int id);
+  virtual void ClearAll();
+  void SetDefaultControl(DWORD id) { m_defaultControl = id; };
+  void SetRenderFocusedLast(bool renderLast) { m_renderFocusedLast = renderLast; };
+
+  virtual void SaveStates(std::vector<CControlState> &states);
+
+  virtual bool IsGroup() const { return true; };
+
+#ifdef _DEBUG
+  virtual void DumpTextureUse();
+#endif
+protected:
+  // sub controls
+  std::vector<CGUIControl *> m_children;
+  typedef std::vector<CGUIControl *>::iterator iControls;
+  typedef std::vector<CGUIControl *>::const_iterator ciControls;
+  typedef std::vector<CGUIControl *>::const_reverse_iterator crControls;
+
+  int m_defaultControl;
+  int m_focusedControl;
+  bool m_renderFocusedLast;
+
+  // render time
+  DWORD m_renderTime;
+};
+


Property changes on: branches/linuxport/XBMC/guilib/GUIControlGroup.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -19,312 +19,312 @@
  *
  */
 
-#include "include.h"
-#include "GUIControlGroupList.h"
-#include "utils/GUIInfoManager.h"
-
-#define TIME_TO_SCROLL 200;
-
-CGUIControlGroupList::CGUIControlGroupList(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, float itemGap, DWORD pageControl, ORIENTATION orientation, bool useControlPositions)
-: CGUIControlGroup(dwParentID, dwControlId, posX, posY, width, height)
-{
-  m_itemGap = itemGap;
-  m_pageControl = pageControl;
-  m_offset = 0;
-  m_totalSize = 10;
-  m_orientation = orientation;
-  m_scrollOffset = 0;
-  m_scrollSpeed = 0;
-  m_useControlPositions = useControlPositions;
-  ControlType = GUICONTROL_GROUPLIST;
-}
-
-CGUIControlGroupList::~CGUIControlGroupList(void)
-{
-}
-
-void CGUIControlGroupList::Render()
-{
-  if (m_scrollSpeed != 0)
-  {
-    m_offset += m_scrollSpeed * (m_renderTime - m_scrollTime);
-    if ((m_scrollSpeed < 0 && m_offset < m_scrollOffset) ||
-        (m_scrollSpeed > 0 && m_offset > m_scrollOffset))
-    {
-      m_offset = m_scrollOffset;
-      m_scrollSpeed = 0;
-    }
-  }
-  m_scrollTime = m_renderTime;
-
-  ValidateOffset();
-  if (m_pageControl)
-  {
-    CGUIMessage message(GUI_MSG_LABEL_RESET, GetParentID(), m_pageControl, (DWORD)m_height, (DWORD)m_totalSize);
-    SendWindowMessage(message);
-    CGUIMessage message2(GUI_MSG_ITEM_SELECT, GetParentID(), m_pageControl, (DWORD)m_offset);
-    SendWindowMessage(message2);
-  }
-  // we run through the controls, rendering as we go
-  bool render(g_graphicsContext.SetClipRegion(m_posX, m_posY, m_width, m_height));
-  float pos = 0;
-  float focusedPos = 0;
-  CGUIControl *focusedControl = NULL;
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    // note we render all controls, even if they're offscreen, as then they'll be updated
-    // with respect to animations
-    CGUIControl *control = *it;
-    control->UpdateVisibility();
-    if (m_renderFocusedLast && control->HasFocus())
-    {
-      focusedControl = control;
-      focusedPos = pos;
-    }
-    else
-    {
-      if (m_orientation == VERTICAL)
-        g_graphicsContext.SetOrigin(m_posX, m_posY + pos - m_offset);
-      else
-        g_graphicsContext.SetOrigin(m_posX + pos - m_offset, m_posY);
-      control->DoRender(m_renderTime);
-    }
-    if (control->IsVisible())
-      pos += Size(control) + m_itemGap;
-    g_graphicsContext.RestoreOrigin();
-  }
-  if (focusedControl)
-  {
-    if (m_orientation == VERTICAL)
-      g_graphicsContext.SetOrigin(m_posX, m_posY + focusedPos - m_offset);
-    else
-      g_graphicsContext.SetOrigin(m_posX + focusedPos - m_offset, m_posY);
-    focusedControl->DoRender(m_renderTime);
-  }
-  if (render) g_graphicsContext.RestoreClipRegion();
-  CGUIControl::Render();
-}
-
-bool CGUIControlGroupList::OnMessage(CGUIMessage& message)
-{
-  switch (message.GetMessage() )
-  {
-  case GUI_MSG_FOCUSED:
-    { // a control has been focused
-      // scroll if we need to and update our page control
-      ValidateOffset();
-      float offset = 0;
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      {
-        CGUIControl *control = *it;
-        if (!control->IsVisible())
-          continue;
-        if (control->HasID(message.GetControlId()))
-        {
-          if (offset < m_offset)
-            ScrollTo(offset);
-          else if (offset + Size(control) > m_offset + Size())
-            ScrollTo(offset + Size(control) - Size());
-          break;
-        }
-        offset += Size(control) + m_itemGap;
-      }
-    }
-    break;
-  case GUI_MSG_SETFOCUS:
-    {
-      // we've been asked to focus.  We focus the last control if it's on this page,
-      // else we'll focus the first focusable control from our offset (after verifying it)
-      ValidateOffset();
-      // now check the focusControl's offset
-      float offset = 0;
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      {
-        CGUIControl *control = *it;
-        if (!control->IsVisible())
-          continue;
-        if (control->HasID(m_focusedControl))
-        {
-          if (offset >= m_offset && offset + Size(control) <= m_offset + Size())
-            return CGUIControlGroup::OnMessage(message);
-          break;
-        }
-        offset += Size(control) + m_itemGap;
-      }
-      // find the first control on this page
-      offset = 0;
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      {
-        CGUIControl *control = *it;
-        if (!control->IsVisible())
-          continue;
-        if (control->CanFocus() && offset >= m_offset && offset + Size(control) <= m_offset + Size())
-        {
-          m_focusedControl = control->GetID();
-          break;
-        }
-        offset += Size(control) + m_itemGap;
-      }
-    }
-    break;
-  case GUI_MSG_PAGE_CHANGE:
-    {
-      if (message.GetSenderId() == m_pageControl)
-      { // it's from our page control
-        ScrollTo((float)message.GetParam1());
-        return true;
-      }
-    }
-    break;
-  }
-  return CGUIControlGroup::OnMessage(message);
-}
-
-void CGUIControlGroupList::ValidateOffset()
-{
-  // calculate how many items we have on this page
-  m_totalSize = 0;
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *control = *it;
-    if (!control->IsVisible()) continue;
-    m_totalSize += Size(control) + m_itemGap;
-  }
-  if (m_totalSize > 0) m_totalSize -= m_itemGap;
-  // check our m_offset range
-  if (m_offset > m_totalSize - Size())
-    m_offset = m_totalSize - Size();
-  if (m_offset < 0) m_offset = 0;
-}
-
-void CGUIControlGroupList::AddControl(CGUIControl *control)
-{
-  // NOTE: We override control navigation here, but we don't override the <onleft> etc. builtins
-  //       if specified.
-  if (control)
-  { // set the navigation of items so that they form a list
-    if (m_orientation == VERTICAL)
-    {
-      DWORD upID = GetControlIdUp();
-      DWORD downID = GetControlIdDown();
-      if (m_children.size())
-      {
-        CGUIControl *top = m_children[0];
-        if (downID == GetID())
-          downID = top->GetID();
-        if (upID == GetID())
-          top->SetNavigation(control->GetID(), top->GetControlIdDown(), GetControlIdLeft(), GetControlIdRight());
-        CGUIControl *prev = m_children[m_children.size() - 1];
-        upID = prev->GetID();
-        prev->SetNavigation(prev->GetControlIdUp(), control->GetID(), GetControlIdLeft(), GetControlIdRight());
-      }
-      control->SetNavigation(upID, downID, GetControlIdLeft(), GetControlIdRight());
-    }
-    else
-    {
-
-      DWORD leftID = GetControlIdLeft();
-      DWORD rightID = GetControlIdRight();
-      if (m_children.size())
-      {
-        CGUIControl *left = m_children[0];
-        if (rightID == GetID())
-          rightID = left->GetID();
-        if (leftID == GetID())
-          left->SetNavigation(GetControlIdUp(), GetControlIdDown(), control->GetID(), left->GetControlIdRight());
-        CGUIControl *prev = m_children[m_children.size() - 1];
-        leftID = prev->GetID();
-        prev->SetNavigation(GetControlIdUp(), GetControlIdDown(), prev->GetControlIdLeft(), control->GetID());
-      }
-      control->SetNavigation(GetControlIdUp(), GetControlIdDown(), leftID, rightID);
-    }
-    // old versions of the grouplist used to set the positions of all controls
-    // directly.  The new version (with <usecontrolcoords>true</usecontrolcoords>)
-    // allows offsets to be set via the posx, posy coordinates.
-    if (!m_useControlPositions)
-      control->SetPosition(0,0);
-    CGUIControlGroup::AddControl(control);
-  }
-}
-
-void CGUIControlGroupList::ClearAll()
-{
-  CGUIControlGroup::ClearAll();
-  m_offset = 0;
-}
-
-inline float CGUIControlGroupList::Size(const CGUIControl *control) const
-{
-  return (m_orientation == VERTICAL) ? control->GetYPosition() + control->GetHeight() : control->GetXPosition() + control->GetWidth();
-}
-
-inline float CGUIControlGroupList::Size() const
-{
-  return (m_orientation == VERTICAL) ? m_height : m_width;
-}
-
-void CGUIControlGroupList::ScrollTo(float offset)
-{
-  m_scrollOffset = offset;
-  m_scrollSpeed = (m_scrollOffset - m_offset) / TIME_TO_SCROLL;
-}
-
-bool CGUIControlGroupList::CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const
-{
-  if (!CGUIControl::CanFocus()) return false;
-  float pos = 0;
-  CPoint controlCoords(point);
-  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    const CGUIControl *child = *it;
-    if (child->IsVisible())
-    {
-      if (pos + Size(child) > m_offset && pos < m_offset + Size())
-      { // we're on screen
-        float offsetX = m_orientation == VERTICAL ? m_posX : m_posX + pos - m_offset;
-        float offsetY = m_orientation == VERTICAL ? m_posY + pos - m_offset : m_posY;
-        if (child->CanFocusFromPoint(controlCoords - CPoint(offsetX, offsetY), control, controlPoint))
-          return true;
-      }
-      pos += Size(child) + m_itemGap;
-    }
-  }
-  *control = NULL;
-  return false;
-}
-
-void CGUIControlGroupList::UnfocusFromPoint(const CPoint &point)
-{
-  float pos = 0;
-  CPoint controlCoords(point);
-  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-  {
-    CGUIControl *child = *it;
-    if (child->IsVisible())
-    {
-      if (pos + Size(child) > m_offset && pos < m_offset + Size())
-      { // we're on screen
-        CPoint offset = (m_orientation == VERTICAL) ? CPoint(m_posX, m_posY + pos - m_offset) : CPoint(m_posX + pos - m_offset, m_posY);
-        child->UnfocusFromPoint(controlCoords - offset);
-      }
-      pos += Size(child) + m_itemGap;
-    }
-  }
-  CGUIControl::UnfocusFromPoint(point);
-}
-
-bool CGUIControlGroupList::GetCondition(int condition, int data) const
-{
-  switch (condition)
-  {
-  case CONTAINER_HAS_NEXT:
-    return (m_totalSize >= Size() && m_offset < m_totalSize - Size());
-  case CONTAINER_HAS_PREVIOUS:
-    return (m_offset > 0);
-  default:
-    return false;
-  }
-}
-
+#include "include.h"
+#include "GUIControlGroupList.h"
+#include "utils/GUIInfoManager.h"
+
+#define TIME_TO_SCROLL 200;
+
+CGUIControlGroupList::CGUIControlGroupList(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, float itemGap, DWORD pageControl, ORIENTATION orientation, bool useControlPositions)
+: CGUIControlGroup(dwParentID, dwControlId, posX, posY, width, height)
+{
+  m_itemGap = itemGap;
+  m_pageControl = pageControl;
+  m_offset = 0;
+  m_totalSize = 10;
+  m_orientation = orientation;
+  m_scrollOffset = 0;
+  m_scrollSpeed = 0;
+  m_useControlPositions = useControlPositions;
+  ControlType = GUICONTROL_GROUPLIST;
+}
+
+CGUIControlGroupList::~CGUIControlGroupList(void)
+{
+}
+
+void CGUIControlGroupList::Render()
+{
+  if (m_scrollSpeed != 0)
+  {
+    m_offset += m_scrollSpeed * (m_renderTime - m_scrollTime);
+    if ((m_scrollSpeed < 0 && m_offset < m_scrollOffset) ||
+        (m_scrollSpeed > 0 && m_offset > m_scrollOffset))
+    {
+      m_offset = m_scrollOffset;
+      m_scrollSpeed = 0;
+    }
+  }
+  m_scrollTime = m_renderTime;
+
+  ValidateOffset();
+  if (m_pageControl)
+  {
+    CGUIMessage message(GUI_MSG_LABEL_RESET, GetParentID(), m_pageControl, (DWORD)m_height, (DWORD)m_totalSize);
+    SendWindowMessage(message);
+    CGUIMessage message2(GUI_MSG_ITEM_SELECT, GetParentID(), m_pageControl, (DWORD)m_offset);
+    SendWindowMessage(message2);
+  }
+  // we run through the controls, rendering as we go
+  bool render(g_graphicsContext.SetClipRegion(m_posX, m_posY, m_width, m_height));
+  float pos = 0;
+  float focusedPos = 0;
+  CGUIControl *focusedControl = NULL;
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    // note we render all controls, even if they're offscreen, as then they'll be updated
+    // with respect to animations
+    CGUIControl *control = *it;
+    control->UpdateVisibility();
+    if (m_renderFocusedLast && control->HasFocus())
+    {
+      focusedControl = control;
+      focusedPos = pos;
+    }
+    else
+    {
+      if (m_orientation == VERTICAL)
+        g_graphicsContext.SetOrigin(m_posX, m_posY + pos - m_offset);
+      else
+        g_graphicsContext.SetOrigin(m_posX + pos - m_offset, m_posY);
+      control->DoRender(m_renderTime);
+    }
+    if (control->IsVisible())
+      pos += Size(control) + m_itemGap;
+    g_graphicsContext.RestoreOrigin();
+  }
+  if (focusedControl)
+  {
+    if (m_orientation == VERTICAL)
+      g_graphicsContext.SetOrigin(m_posX, m_posY + focusedPos - m_offset);
+    else
+      g_graphicsContext.SetOrigin(m_posX + focusedPos - m_offset, m_posY);
+    focusedControl->DoRender(m_renderTime);
+  }
+  if (render) g_graphicsContext.RestoreClipRegion();
+  CGUIControl::Render();
+}
+
+bool CGUIControlGroupList::OnMessage(CGUIMessage& message)
+{
+  switch (message.GetMessage() )
+  {
+  case GUI_MSG_FOCUSED:
+    { // a control has been focused
+      // scroll if we need to and update our page control
+      ValidateOffset();
+      float offset = 0;
+      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      {
+        CGUIControl *control = *it;
+        if (!control->IsVisible())
+          continue;
+        if (control->HasID(message.GetControlId()))
+        {
+          if (offset < m_offset)
+            ScrollTo(offset);
+          else if (offset + Size(control) > m_offset + Size())
+            ScrollTo(offset + Size(control) - Size());
+          break;
+        }
+        offset += Size(control) + m_itemGap;
+      }
+    }
+    break;
+  case GUI_MSG_SETFOCUS:
+    {
+      // we've been asked to focus.  We focus the last control if it's on this page,
+      // else we'll focus the first focusable control from our offset (after verifying it)
+      ValidateOffset();
+      // now check the focusControl's offset
+      float offset = 0;
+      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      {
+        CGUIControl *control = *it;
+        if (!control->IsVisible())
+          continue;
+        if (control->HasID(m_focusedControl))
+        {
+          if (offset >= m_offset && offset + Size(control) <= m_offset + Size())
+            return CGUIControlGroup::OnMessage(message);
+          break;
+        }
+        offset += Size(control) + m_itemGap;
+      }
+      // find the first control on this page
+      offset = 0;
+      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      {
+        CGUIControl *control = *it;
+        if (!control->IsVisible())
+          continue;
+        if (control->CanFocus() && offset >= m_offset && offset + Size(control) <= m_offset + Size())
+        {
+          m_focusedControl = control->GetID();
+          break;
+        }
+        offset += Size(control) + m_itemGap;
+      }
+    }
+    break;
+  case GUI_MSG_PAGE_CHANGE:
+    {
+      if (message.GetSenderId() == m_pageControl)
+      { // it's from our page control
+        ScrollTo((float)message.GetParam1());
+        return true;
+      }
+    }
+    break;
+  }
+  return CGUIControlGroup::OnMessage(message);
+}
+
+void CGUIControlGroupList::ValidateOffset()
+{
+  // calculate how many items we have on this page
+  m_totalSize = 0;
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *control = *it;
+    if (!control->IsVisible()) continue;
+    m_totalSize += Size(control) + m_itemGap;
+  }
+  if (m_totalSize > 0) m_totalSize -= m_itemGap;
+  // check our m_offset range
+  if (m_offset > m_totalSize - Size())
+    m_offset = m_totalSize - Size();
+  if (m_offset < 0) m_offset = 0;
+}
+
+void CGUIControlGroupList::AddControl(CGUIControl *control)
+{
+  // NOTE: We override control navigation here, but we don't override the <onleft> etc. builtins
+  //       if specified.
+  if (control)
+  { // set the navigation of items so that they form a list
+    if (m_orientation == VERTICAL)
+    {
+      DWORD upID = GetControlIdUp();
+      DWORD downID = GetControlIdDown();
+      if (m_children.size())
+      {
+        CGUIControl *top = m_children[0];
+        if (downID == GetID())
+          downID = top->GetID();
+        if (upID == GetID())
+          top->SetNavigation(control->GetID(), top->GetControlIdDown(), GetControlIdLeft(), GetControlIdRight());
+        CGUIControl *prev = m_children[m_children.size() - 1];
+        upID = prev->GetID();
+        prev->SetNavigation(prev->GetControlIdUp(), control->GetID(), GetControlIdLeft(), GetControlIdRight());
+      }
+      control->SetNavigation(upID, downID, GetControlIdLeft(), GetControlIdRight());
+    }
+    else
+    {
+
+      DWORD leftID = GetControlIdLeft();
+      DWORD rightID = GetControlIdRight();
+      if (m_children.size())
+      {
+        CGUIControl *left = m_children[0];
+        if (rightID == GetID())
+          rightID = left->GetID();
+        if (leftID == GetID())
+          left->SetNavigation(GetControlIdUp(), GetControlIdDown(), control->GetID(), left->GetControlIdRight());
+        CGUIControl *prev = m_children[m_children.size() - 1];
+        leftID = prev->GetID();
+        prev->SetNavigation(GetControlIdUp(), GetControlIdDown(), prev->GetControlIdLeft(), control->GetID());
+      }
+      control->SetNavigation(GetControlIdUp(), GetControlIdDown(), leftID, rightID);
+    }
+    // old versions of the grouplist used to set the positions of all controls
+    // directly.  The new version (with <usecontrolcoords>true</usecontrolcoords>)
+    // allows offsets to be set via the posx, posy coordinates.
+    if (!m_useControlPositions)
+      control->SetPosition(0,0);
+    CGUIControlGroup::AddControl(control);
+  }
+}
+
+void CGUIControlGroupList::ClearAll()
+{
+  CGUIControlGroup::ClearAll();
+  m_offset = 0;
+}
+
+inline float CGUIControlGroupList::Size(const CGUIControl *control) const
+{
+  return (m_orientation == VERTICAL) ? control->GetYPosition() + control->GetHeight() : control->GetXPosition() + control->GetWidth();
+}
+
+inline float CGUIControlGroupList::Size() const
+{
+  return (m_orientation == VERTICAL) ? m_height : m_width;
+}
+
+void CGUIControlGroupList::ScrollTo(float offset)
+{
+  m_scrollOffset = offset;
+  m_scrollSpeed = (m_scrollOffset - m_offset) / TIME_TO_SCROLL;
+}
+
+bool CGUIControlGroupList::CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const
+{
+  if (!CGUIControl::CanFocus()) return false;
+  float pos = 0;
+  CPoint controlCoords(point);
+  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
+  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    const CGUIControl *child = *it;
+    if (child->IsVisible())
+    {
+      if (pos + Size(child) > m_offset && pos < m_offset + Size())
+      { // we're on screen
+        float offsetX = m_orientation == VERTICAL ? m_posX : m_posX + pos - m_offset;
+        float offsetY = m_orientation == VERTICAL ? m_posY + pos - m_offset : m_posY;
+        if (child->CanFocusFromPoint(controlCoords - CPoint(offsetX, offsetY), control, controlPoint))
+          return true;
+      }
+      pos += Size(child) + m_itemGap;
+    }
+  }
+  *control = NULL;
+  return false;
+}
+
+void CGUIControlGroupList::UnfocusFromPoint(const CPoint &point)
+{
+  float pos = 0;
+  CPoint controlCoords(point);
+  m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
+  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  {
+    CGUIControl *child = *it;
+    if (child->IsVisible())
+    {
+      if (pos + Size(child) > m_offset && pos < m_offset + Size())
+      { // we're on screen
+        CPoint offset = (m_orientation == VERTICAL) ? CPoint(m_posX, m_posY + pos - m_offset) : CPoint(m_posX + pos - m_offset, m_posY);
+        child->UnfocusFromPoint(controlCoords - offset);
+      }
+      pos += Size(child) + m_itemGap;
+    }
+  }
+  CGUIControl::UnfocusFromPoint(point);
+}
+
+bool CGUIControlGroupList::GetCondition(int condition, int data) const
+{
+  switch (condition)
+  {
+  case CONTAINER_HAS_NEXT:
+    return (m_totalSize >= Size() && m_offset < m_totalSize - Size());
+  case CONTAINER_HAS_PREVIOUS:
+    return (m_offset > 0);
+  default:
+    return false;
+  }
+}
+


Property changes on: branches/linuxport/XBMC/guilib/GUIControlGroupList.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIControlGroupList.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIControlGroupList.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIControlGroupList.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,10 +1,10 @@
-/*!
-\file GUIControlGroupList.h
-\brief 
-*/
-
-#pragma once
+/*!
+\file GUIControlGroupList.h
+\brief 
+*/
 
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -25,44 +25,44 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-#include "GUIControlGroup.h"
-
-/*!
- \ingroup controls
- \brief list of controls that is scrollable
- */
-class CGUIControlGroupList : public CGUIControlGroup
-{
-public:
-  CGUIControlGroupList(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, float itemGap, DWORD pageControl, ORIENTATION orientation, bool useControlPositions);
-  virtual ~CGUIControlGroupList(void);
-  virtual void Render();
-  virtual bool OnMessage(CGUIMessage& message);
-  virtual bool CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const;
-  virtual void UnfocusFromPoint(const CPoint &point);
-
-  virtual void AddControl(CGUIControl *control);
-  virtual void ClearAll();
-
-  virtual bool GetCondition(int condition, int data) const;
-protected:
-  void ValidateOffset();
-  inline float Size(const CGUIControl *control) const;
-  inline float Size() const;
-  void ScrollTo(float offset);
-
-  float m_itemGap;
-  DWORD m_pageControl;
-
-  float m_offset; // measurement in pixels of our origin
-  float m_totalSize;
-
-  float m_scrollSpeed;
-  float m_scrollOffset;
-  DWORD m_scrollTime;
-
-  bool m_useControlPositions;
-  ORIENTATION m_orientation;
-};
-
+
+#include "GUIControlGroup.h"
+
+/*!
+ \ingroup controls
+ \brief list of controls that is scrollable
+ */
+class CGUIControlGroupList : public CGUIControlGroup
+{
+public:
+  CGUIControlGroupList(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, float itemGap, DWORD pageControl, ORIENTATION orientation, bool useControlPositions);
+  virtual ~CGUIControlGroupList(void);
+  virtual void Render();
+  virtual bool OnMessage(CGUIMessage& message);
+  virtual bool CanFocusFromPoint(const CPoint &point, CGUIControl **control, CPoint &controlPoint) const;
+  virtual void UnfocusFromPoint(const CPoint &point);
+
+  virtual void AddControl(CGUIControl *control);
+  virtual void ClearAll();
+
+  virtual bool GetCondition(int condition, int data) const;
+protected:
+  void ValidateOffset();
+  inline float Size(const CGUIControl *control) const;
+  inline float Size() const;
+  void ScrollTo(float offset);
+
+  float m_itemGap;
+  DWORD m_pageControl;
+
+  float m_offset; // measurement in pixels of our origin
+  float m_totalSize;
+
+  float m_scrollSpeed;
+  float m_scrollOffset;
+  DWORD m_scrollTime;
+
+  bool m_useControlPositions;
+  ORIENTATION m_orientation;
+};
+


Property changes on: branches/linuxport/XBMC/guilib/GUIControlGroupList.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -68,7 +68,7 @@
 
   float focusedPosX = 0;
   float focusedPosY = 0;
-  CGUIListItemPtr focusedItem;
+  CGUIListItemPtr focusedItem;
   int current = offset;
   while (posX < m_posX + m_width && posY < m_posY + m_height && m_items.size())
   {
@@ -86,7 +86,7 @@
         focusedItem = item;
       }
       else
-        RenderItem(posX, posY, item.get(), focused);
+        RenderItem(posX, posY, item.get(), focused);
     }
 
     // increment our position
@@ -99,7 +99,7 @@
   }
   // and render the focused item last (for overlapping purposes)
   if (focusedItem)
-    RenderItem(focusedPosX, focusedPosY, focusedItem.get(), true);
+    RenderItem(focusedPosX, focusedPosY, focusedItem.get(), true);
 
   g_graphicsContext.RestoreClipRegion();
 


Property changes on: branches/linuxport/XBMC/guilib/GUIFixedListContainer.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIFixedListContainer.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIFixedListContainer.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIFixedListContainer.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,10 +1,10 @@
-/*!
-\file GUIFixedListContainer.h
-\brief 
-*/
-
-#pragma once
+/*!
+\file GUIFixedListContainer.h
+\brief 
+*/
 
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -25,32 +25,32 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-#include "GUIBaseContainer.h"
-
-/*!
- \ingroup controls
- \brief 
- */
-class CGUIFixedListContainer : public CGUIBaseContainer
-{
-public:
-  CGUIFixedListContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, ORIENTATION orientation, int scrollTime, int fixedPosition);
-  virtual ~CGUIFixedListContainer(void);
-
-  virtual void Render();
-  virtual bool OnAction(const CAction &action);
-  virtual bool OnMessage(CGUIMessage& message);
-
-protected:
-  virtual void Scroll(int amount);
-  virtual bool MoveDown(bool wrapAround);
-  virtual bool MoveUp(bool wrapAround);
-  virtual void ValidateOffset();
-  virtual bool SelectItemFromPoint(const CPoint &point);
-  virtual void SelectItem(int item);
-  virtual bool HasNextPage() const;
-  virtual bool HasPreviousPage() const;
-  virtual int GetCurrentPage() const;
-};
-
+
+#include "GUIBaseContainer.h"
+
+/*!
+ \ingroup controls
+ \brief 
+ */
+class CGUIFixedListContainer : public CGUIBaseContainer
+{
+public:
+  CGUIFixedListContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, ORIENTATION orientation, int scrollTime, int fixedPosition);
+  virtual ~CGUIFixedListContainer(void);
+
+  virtual void Render();
+  virtual bool OnAction(const CAction &action);
+  virtual bool OnMessage(CGUIMessage& message);
+
+protected:
+  virtual void Scroll(int amount);
+  virtual bool MoveDown(bool wrapAround);
+  virtual bool MoveUp(bool wrapAround);
+  virtual void ValidateOffset();
+  virtual bool SelectItemFromPoint(const CPoint &point);
+  virtual void SelectItem(int item);
+  virtual bool HasNextPage() const;
+  virtual bool HasPreviousPage() const;
+  virtual int GetCurrentPage() const;
+};
+


Property changes on: branches/linuxport/XBMC/guilib/GUIFixedListContainer.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIInfoColor.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIInfoColor.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIInfoColor.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -19,63 +19,63 @@
  *
  */
 
-#include "include.h"
-#include "GUIInfoColor.h"
-#include "utils/CharsetConverter.h"
-#include "utils/GUIInfoManager.h"
-#include "LocalizeStrings.h"
-#include "GUIColorManager.h"
-
-using namespace std;
-
-CGUIInfoColor::CGUIInfoColor(DWORD color)
-{
-  m_color = color;
-  m_info = 0;
-}
-
-const CGUIInfoColor &CGUIInfoColor::operator=(DWORD color)
-{
-  m_color = color;
-  m_info = 0;
-  return *this;
-}
-
-const CGUIInfoColor &CGUIInfoColor::operator=(const CGUIInfoColor &color)
-{
-  m_color = color.m_color;
-  m_info = color.m_info;
-  return *this;
-}
-
-DWORD CGUIInfoColor::GetColor() const
-{
-  if (!m_info)
-    return m_color; // no infolabel so just return the stored color
-
-  // Expand the infolabel, and then convert it to a color
-  CStdString infoLabel(g_infoManager.GetLabel(m_info));
-  if (infoLabel.IsEmpty())
-    return 0;
-
-  // We now have an expanded label that we can convert into a color
-  int color;
-  sscanf(infoLabel.c_str(), "%x", (unsigned int*)&color);
-  return color;
-}
-
-void CGUIInfoColor::Parse(const CStdString &label)
-{
-  // Check for the standard $INFO[] block layout, and strip it if present
-  CStdString label2 = label;
-  if (label.Equals("-", false))
-    return;
-
-  if (label.Left(5).Equals("$INFO", false))
-    label2 = label.Mid(6, label.length()-7);
-
-  m_info = g_infoManager.TranslateString(label2);
-  if (!m_info)
-    m_color = g_colorManager.GetColor(label);
-}
-
+#include "include.h"
+#include "GUIInfoColor.h"
+#include "utils/CharsetConverter.h"
+#include "utils/GUIInfoManager.h"
+#include "LocalizeStrings.h"
+#include "GUIColorManager.h"
+
+using namespace std;
+
+CGUIInfoColor::CGUIInfoColor(DWORD color)
+{
+  m_color = color;
+  m_info = 0;
+}
+
+const CGUIInfoColor &CGUIInfoColor::operator=(DWORD color)
+{
+  m_color = color;
+  m_info = 0;
+  return *this;
+}
+
+const CGUIInfoColor &CGUIInfoColor::operator=(const CGUIInfoColor &color)
+{
+  m_color = color.m_color;
+  m_info = color.m_info;
+  return *this;
+}
+
+DWORD CGUIInfoColor::GetColor() const
+{
+  if (!m_info)
+    return m_color; // no infolabel so just return the stored color
+
+  // Expand the infolabel, and then convert it to a color
+  CStdString infoLabel(g_infoManager.GetLabel(m_info));
+  if (infoLabel.IsEmpty())
+    return 0;
+
+  // We now have an expanded label that we can convert into a color
+  int color;
+  sscanf(infoLabel.c_str(), "%x", (unsigned int*)&color);
+  return color;
+}
+
+void CGUIInfoColor::Parse(const CStdString &label)
+{
+  // Check for the standard $INFO[] block layout, and strip it if present
+  CStdString label2 = label;
+  if (label.Equals("-", false))
+    return;
+
+  if (label.Left(5).Equals("$INFO", false))
+    label2 = label.Mid(6, label.length()-7);
+
+  m_info = g_infoManager.TranslateString(label2);
+  if (!m_info)
+    m_color = g_colorManager.GetColor(label);
+}
+


Property changes on: branches/linuxport/XBMC/guilib/GUIInfoColor.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIInfoColor.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUIInfoColor.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIInfoColor.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,13 +1,13 @@
-/*!
-\file GUIInfoColor.h
-\brief 
-*/
-
-#ifndef GUILIB_GUIINFOCOLOR_H
-#define GUILIB_GUIINFOCOLOR_H
-
-#pragma once
+/*!
+\file GUIInfoColor.h
+\brief 
+*/
 
+#ifndef GUILIB_GUIINFOCOLOR_H
+#define GUILIB_GUIINFOCOLOR_H
+
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -28,22 +28,22 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-class CGUIInfoColor
-{
-public:
-  CGUIInfoColor(DWORD color = 0);
-
-  const CGUIInfoColor &operator=(const CGUIInfoColor &color);
-  const CGUIInfoColor &operator=(DWORD color);
-  operator DWORD() const { return GetColor(); };
-
-  void Parse(const CStdString &label);
-
-private:
-  DWORD GetColor() const;
-  int m_info;
-  DWORD m_color;
-};
-
-#endif
+
+class CGUIInfoColor
+{
+public:
+  CGUIInfoColor(DWORD color = 0);
+
+  const CGUIInfoColor &operator=(const CGUIInfoColor &color);
+  const CGUIInfoColor &operator=(DWORD color);
+  operator DWORD() const { return GetColor(); };
+
+  void Parse(const CStdString &label);
+
+private:
+  DWORD GetColor() const;
+  int m_info;
+  DWORD m_color;
+};
+
+#endif


Property changes on: branches/linuxport/XBMC/guilib/GUIInfoColor.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUILargeImage.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUILargeImage.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUILargeImage.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -163,8 +163,8 @@
 
 void CGUILargeImage::SetFileName(const CStdString& strFileName, bool setConstant)
 {
-  if (setConstant)
-    m_image.file.SetLabel(strFileName, "");
+  if (setConstant)
+    m_image.file.SetLabel(strFileName, "");
   // no fallback is required - it's handled at rendertime
   if (m_strFileName.Equals(strFileName)) return;
   // Don't completely free resources here - we may be just changing


Property changes on: branches/linuxport/XBMC/guilib/GUILargeImage.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUILargeImage.h
===================================================================
--- branches/linuxport/XBMC/guilib/GUILargeImage.h	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUILargeImage.h	2008-07-15 19:14:31 UTC (rev 14126)
@@ -1,10 +1,10 @@
-/*!
-\file GUILargeImage.h
-\brief 
-*/
-
-#pragma once
+/*!
+\file GUILargeImage.h
+\brief 
+*/
 
+#pragma once
+
 /*
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
@@ -25,34 +25,34 @@
  *  http://www.gnu.org/copyleft/gpl.html
  *
  */
-
-#include "guiImage.h"
-
-/*!
- \ingroup controls
- \brief 
- */
-
-class CGUILargeImage : public CGUIImage
-{
-public:
-  CGUILargeImage(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, const CImage& texture);
-  virtual ~CGUILargeImage(void);
-
-  virtual void PreAllocResources();
-  virtual void AllocResources();
-  virtual void FreeResources();
-  virtual void Render();
-  virtual void SetAspectRatio(const CAspectRatio &aspect);
-
-protected:
-  virtual void SetFileName(const CStdString &strFileName, bool setConstant = false);
-  virtual void AllocateOnDemand();
-  virtual void FreeTextures();
-  virtual int GetOrientation() const;
-
-  bool m_usingBundledTexture;
-  int m_orientation;
-  CGUIImage m_fallbackImage;
-};
-
+
+#include "guiImage.h"
+
+/*!
+ \ingroup controls
+ \brief 
+ */
+
+class CGUILargeImage : public CGUIImage
+{
+public:
+  CGUILargeImage(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, const CImage& texture);
+  virtual ~CGUILargeImage(void);
+
+  virtual void PreAllocResources();
+  virtual void AllocResources();
+  virtual void FreeResources();
+  virtual void Render();
+  virtual void SetAspectRatio(const CAspectRatio &aspect);
+
+protected:
+  virtual void SetFileName(const CStdString &strFileName, bool setConstant = false);
+  virtual void AllocateOnDemand();
+  virtual void FreeTextures();
+  virtual int GetOrientation() const;
+
+  bool m_usingBundledTexture;
+  int m_orientation;
+  CGUIImage m_fallbackImage;
+};
+


Property changes on: branches/linuxport/XBMC/guilib/GUILargeImage.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/GUIListContainer.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/GUIListContainer.cpp	2008-07-15 19:07:44 UTC (rev 14125)
+++ branches/linuxport/XBMC/guilib/GUIListContainer.cpp	2008-07-15 19:14:31 UTC (rev 14126)
@@ -19,343 +19,343 @@
  *
  */
 
-#include "include.h"
-#include "GUIListContainer.h"
-#include "GUIListItem.h"
-
-//#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-#include "utils/GUIInfoManager.h"
-//#endif
-
-CGUIListContainer::CGUIListContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height, ORIENTATION orientation, int scrollTime)
-    : CGUIBaseContainer(dwParentID, dwControlId, posX, posY, width, height, orientation, scrollTime)
-{
-  ControlType = GUICONTAINER_LIST;
-  m_type = VIEW_TYPE_LIST;
-//#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  m_spinControl = NULL;
-//#endif
-}
-
-CGUIListContainer::~CGUIListContainer(void)
-{
-}
-
-void CGUIListContainer::Render()
-{
-  ValidateOffset();
-
-  if (m_bInvalidated)
-    UpdateLayout();
-
-  if (!m_layout || !m_focusedLayout) return;
-
-  m_scrollOffset += m_scrollSpeed * (m_renderTime - m_scrollLastTime);
-  if ((m_scrollSpeed < 0 && m_scrollOffset < m_offset * m_layout->Size(m_orientation)) ||
-      (m_scrollSpeed > 0 && m_scrollOffset > m_offset * m_layout->Size(m_orientation)))
-  {
-    m_scrollOffset = m_offset * m_layout->Size(m_orientation);
-    m_scrollSpeed = 0;
-  }
-  m_scrollLastTime = m_renderTime;
-
-  int offset = (int)(m_scrollOffset / m_layout->Size(m_orientation));
-  // Free memory not used on screen at the moment, do this first so there's more memory for the new items.
-  FreeMemory(CorrectOffset(offset, 0), CorrectOffset(offset, m_itemsPerPage + 1));
-
-  g_graphicsContext.SetClipRegion(m_posX, m_posY, m_width, m_height);
-  float posX = m_posX;
-  float posY = m_posY;
-  // we offset our draw position to take into account scrolling and whether or not our focused
-  // item is offscreen "above" the list.
-  float drawOffset = offset * m_layout->Size(m_orientation) - m_scrollOffset;
-  if (offset > m_offset + m_cursor)
-    drawOffset += m_focusedLayout->Size(m_orientation) - m_layout->Size(m_orientation);
-
-  if (m_orientation == VERTICAL)
-    posY += drawOffset;
-  else
-    posX += drawOffset;
-
-  float focusedPosX = 0;
-  float focusedPosY = 0;
-  CGUIListItemPtr focusedItem;
-  int current = offset;
-  while (posX < m_posX + m_width && posY < m_posY + m_height && m_items.size())
-  {
-    if (current >= (int)m_items.size())
-      break;
-    CGUIListItemPtr item = m_items[current];
-    bool focused = (current == m_offset + m_cursor);
-    // render our item
-    if (focused)
-    {
-      focusedPosX = posX;
-      focusedPosY = posY;
-      focusedItem = item;
-    }
-    else
-      RenderItem(posX, posY, item.get(), focused);
-
-    // increment our position
-    if (m_orientation == VERTICAL)
-      posY += focused ? m_focusedLayout->Size(m_orientation) : m_layout->Size(m_orientation);
-    else
-      posX += focused ? m_focusedLayout->Size(m_orientation) : m_layout->Size(m_orientation);
-
-    current++;
-  }
-  // and render the focused item last (for overlapping purposes)
-  if (focusedItem)
-    RenderItem(focusedPosX, focusedPosY, focusedItem.get(), true);
-
-  g_graphicsContext.RestoreClipRegion();
-
-  if (m_pageControl)
-  { // tell our pagecontrol (scrollbar or whatever) to update
-    CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), m_pageControl, offset);
-    SendWindowMessage(msg);
-  }
-
-  CGUIBaseContainer::Render();
-}
-
-bool CGUIListContainer::OnAction(const CAction &action)
-{
-  switch (action.wID)
-  {
-  case ACTION_PAGE_UP:
-    {
-      if (m_offset == 0)
-      { // already on the first page, so move to the first item
-        SetCursor(0);
-      }
-      else
-      { // scroll up to the previous page
-        Scroll( -m_itemsPerPage);
-      }
-      return true;
-    }
-    break;
-  case ACTION_PAGE_DOWN:
-    {
-      if (m_offset == (int)m_items.size() - m_itemsPerPage || (int)m_items.size() < m_itemsPerPage)
-      { // already at the last page, so move to the last item.
-        SetCursor(m_items.size() - m_offset - 1);
-      }
-      else
-      { // scroll down to the next page
-        Scroll(m_itemsPerPage);
-      }
-      return true;
-    }
-    break;
-    // smooth scrolling (for analog controls)
-  case ACTION_SCROLL_UP:
-    {
-      m_analogScrollCount += action.fAmount1 * action.fAmount1;
-      bool handled = false;
-      while (m_analogScrollCount > 0.4)
-      {
-        handled = true;
-        m_analogScrollCount -= 0.4f;
-        if (m_offset > 0 && m_cursor <= m_itemsPerPage / 2)
-        {
-          Scroll(-1);
-        }
-        else if (m_cursor > 0)
-        {
-          SetCursor(m_cursor - 1);
-        }
-      }
-      return handled;
-    }
-    break;
-  case ACTION_SCROLL_DOWN:
-    {
-      m_analogScrollCount += action.fAmount1 * action.fAmount1;
-      bool handled = false;
-      while (m_analogScrollCount > 0.4)
-      {
-        handled = true;
-        m_analogScrollCount -= 0.4f;
-        if (m_offset + m_itemsPerPage < (int)m_items.size() && m_cursor >= m_itemsPerPage / 2)
-        {
-          Scroll(1);
-        }
-        else if (m_cursor < m_itemsPerPage - 1 && m_offset + m_cursor < (int)m_items.size() - 1)
-        {
-          SetCursor(m_cursor + 1);
-        }
-      }
-      return handled;
-    }
-    break;
-  }
-  return CGUIBaseContainer::OnAction(action);
-}
-
-bool CGUIListContainer::OnMessage(CGUIMessage& message)
-{
-  if (message.GetControlId() == GetID() )
-  {
-    if (message.GetMessage() == GUI_MSG_LABEL_RESET)
-    {
-      SetCursor(0);
-    }
-    else if (message.GetMessage() == GUI_MSG_ITEM_SELECT)
-    {
-      SelectItem(message.GetParam1());
-      return true;
-    }
-    else if (message.GetMessage() == GUI_MSG_SETFOCUS)
-    {
-      if (message.GetParam1()) // subfocus item is specified, so set the offset appropriately
-        m_cursor = (int)message.GetParam1() - 1;
-    }
-  }
-  return CGUIBaseContainer::OnMessage(message);
-}
-
-bool CGUIListContainer::MoveUp(bool wrapAround)
-{
-  if (m_cursor > 0)
-  {
-    SetCursor(m_cursor - 1);
-  }
-  else if (m_cursor == 0 && m_offset)
-  {
-    ScrollToOffset(m_offset - 1);
-  }
-  else if (wrapAround)
-  {
-    if (m_items.size() > 0)
-    { // move 2 last item in list, and set our container moving up
-      int offset = m_items.size() - m_itemsPerPage;
-      if (offset < 0) offset = 0;
-      SetCursor(m_items.size() - offset - 1);
-      ScrollToOffset(offset);
-      g_infoManager.SetContainerMoving(GetID(), -1);
-    }
-  }
-  else
-    return false;
-  return true;
-}
-
-bool CGUIListContainer::MoveDown(bool wrapAround)
-{
-  if (m_offset + m_cursor + 1 < (int)m_items.size())
-  {
-    if (m_cursor + 1 < m_itemsPerPage)
-    {
-      SetCursor(m_cursor + 1);
-    }
-    else
-    {
-      ScrollToOffset(m_offset + 1);
-    }
-  }
-  else if(wrapAround)
-  { // move first item in list, and set our container moving in the "down" direction
-    SetCursor(0);
-    ScrollToOffset(0);
-    g_infoManager.SetContainerMoving(GetID(), 1);
-  }
-  else
-    return false;
-  return true;
-}
-
-// scrolls the said amount
-void CGUIListContainer::Scroll(int amount)
-{
-  // increase or decrease the offset
-  int offset = m_offset + amount;
-  if (offset > (int)m_items.size() - m_itemsPerPage)
-  {
-    offset = m_items.size() - m_itemsPerPage;
-  }
-  if (offset < 0) offset = 0;
-  ScrollToOffset(offset);
-}
-
-void CGUIListContainer::ValidateOffset()
-{ // first thing is we check the range of m_offset
-  if (!m_layout) return;
-  if (m_offset > (int)m_items.size() - m_itemsPerPage)
-  {
-    m_offset = m_items.size() - m_itemsPerPage;
-    m_scrollOffset = m_offset * m_layout->Size(m_orientation);
-  }
-  if (m_offset < 0)
-  {
-    m_offset = 0;
-    m_scrollOffset = 0;
-  }
-}
-
-void CGUIListContainer::SetCursor(int cursor)
-{
-  if (cursor > m_itemsPerPage - 1) cursor = m_itemsPerPage - 1;
-  if (cursor < 0) cursor = 0;
-  if (!m_wasReset)
-    g_infoManager.SetContainerMoving(GetID(), cursor - m_cursor);
-  m_cursor = cursor;
-}
-
-void CGUIListContainer::SelectItem(int item)
-{
-  // Check that m_offset is valid
-  ValidateOffset();
-  // only select an item if it's in a valid range
-  if (item >= 0 && item < (int)m_items.size())
-  {
-    // Select the item requested
-    if (item >= m_offset && item < m_offset + m_itemsPerPage)
-    { // the item is on the current page, so don't change it.
-      SetCursor(item - m_offset);
-    }
-    else if (item < m_offset)
-    { // item is on a previous page - make it the first item on the page
-      SetCursor(0);
-      ScrollToOffset(item);
-    }
-    else // (item >= m_offset+m_itemsPerPage)
-    { // item is on a later page - make it the last item on the page
-      SetCursor(m_itemsPerPage - 1);
-      ScrollToOffset(item - m_cursor);
-    }
-  }
-}
-//#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-CGUIListContainer::CGUIListContainer(DWORD dwParentID, DWORD dwControlId, float posX, float posY, float width, float height,
-                                 const CLabelInfo& labelInfo, const CLabelInfo& labelInfo2,
-                                 const CImage& textureButton, const CImage& textureButtonFocus,
-                                 float textureHeight, float itemWidth, float itemHeight, float spaceBetweenItems, CGUIControl *pSpin)
-: CGUIBaseContainer(dwParentID, dwControlId, posX, posY, width, height, VERTICAL, 200) 
-{
-  CGUIListItemLayout layout;
-  layout.CreateListControlLayouts(width, textureHeight + spaceBetweenItems, false, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, 0, 0);
-  m_layouts.push_back(layout);
-  CStdString condition;
-  condition.Format("control.hasfocus(%i)", dwControlId);
-  CStdString condition2 = "!" + condition;
-  CGUIListItemLayout focusLayout;
-  focusLayout.CreateListControlLayouts(width, textureHeight + spaceBetweenItems, true, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, g_infoManager.TranslateString(condition2), g_infoManager.TranslateString(condition));
-  m_focusedLayouts.push_back(focusLayout);
-  m_height = floor(m_height / (textureHeight + spaceBetweenItems)) * (textureHeight + spaceBetweenItems);
-  m_spinControl = pSpin;
-  ControlType = GUICONTAINER_LIST;
-}
-//#endif
-
-bool CGUIListContainer::HasNextPage() const
-{
-  return (m_offset != (int)m_items.size() - m_itemsPerPage && (int)m_items.size() >= m_itemsPerPage);
-}
-

@@ Diff output truncated at 100000 characters. @@

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

Revision: 14128
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14128&view=rev
Author:   spiff_
Date:     2008-07-15 12:47:35 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: compile vorbis codec instead of keeping binary in svn (linux x86) 

Modified Paths:
--------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/configure
    branches/linuxport/XBMC/configure.in

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/Makefile
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/README.linux
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/AUTHORS
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/COPYING
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/HACKING
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/README
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/acinclude.m4
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/aclocal.m4
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/autogen.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/config.guess
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/config.sub
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/configure
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/changelog
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/control
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/copyright
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbis-dev.docs
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbis-dev.examples
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbis-dev.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbis0.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbisenc2.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/libvorbisfile3.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/debian/rules
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/components.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/draft-moffitt-vorbis-rtp-00.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/eightphase.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/evenlsp.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floor1-1.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floor1-2.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floor1-3.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floor1-4.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floor1_inverse_dB_table.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/floorval.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/fourphase.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/framing.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/helper.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/hufftree-under.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/hufftree.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/index.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/lspmap.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/oddlsp.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/oggstream.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/programming.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/residue-pack.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/residue2.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/squarepolar.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/stereo.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/stream.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/v-comment.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-clip.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-errors.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-fidelity.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-ogg.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-bitpack.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-codebook.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-floor0.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-floor1.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-intro.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-ref.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis-spec-res.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbis.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/index.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/overview.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/reference.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/style.css
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/vorbis_encode_ctl.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/vorbis_encode_init.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/vorbis_encode_init_vbr.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisenc/vorbis_info.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/OggVorbis_File.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/chaining_example_c.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/chainingexample.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/datastructures.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/decoding.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/example.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/exampleindex.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/fileinfo.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/index.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/initialization.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_bitrate.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_bitrate_instant.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_callbacks.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_clear.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_comment.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_info.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_open.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_open_callbacks.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_pcm_seek.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_pcm_tell.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_pcm_total.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_raw_seek.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_raw_tell.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_raw_total.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_read.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_read_float.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_seekable.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_serialnumber.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_streams.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_test.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_test_callbacks.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_test_open.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_time_seek.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_time_tell.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/ov_time_total.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/overview.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/reference.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/seekexample.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/seeking.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/seeking_test_c.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/seekingexample.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/style.css
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/vorbis_comment.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/vorbis_info.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisfile/vorbisfile_example_c.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/vorbisword2.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/wait.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/white-ogg.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/white-xifish.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/window1.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/doc/window2.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/chaining_example.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/decoder_example.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/encoder_example.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/seeking_example.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/examples/vorbisfile_example.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/codec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/vorbisenc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/include/vorbis/vorbisfile.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/install-sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/analysis.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/backends.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/barkmel.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/bitrate.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/bitrate.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/block.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/coupled/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/coupled/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/coupled/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/coupled/res_books_stereo.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/floor/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/floor/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/floor/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/floor/floor_books.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/uncoupled/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/uncoupled/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/uncoupled/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/books/uncoupled/res_books_uncoupled.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/codebook.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/codebook.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/codec_internal.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/envelope.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/envelope.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/floor0.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/floor1.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/highlevel.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/info.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lookup.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lookup.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lookup_data.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lookups.pl
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lpc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lpc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lsp.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/lsp.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/mapping0.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/masking.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/mdct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/mdct.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/misc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/floor_all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/psych_11.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/psych_16.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/psych_44.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/psych_8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/residue_16.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/residue_44.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/residue_44u.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/residue_8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_11.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_16.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_22.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_32.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_44.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_44u.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/modes/setup_X.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/os.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/psy.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/psy.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/psytune.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/registry.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/registry.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/res0.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/scales.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/sharedbook.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/smallft.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/smallft.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/synthesis.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/tone.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/vorbisenc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/vorbisfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/window.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/lib/window.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/libvorbis.spec
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/compat/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/compat/strdup.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/compat/sys/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/compat/sys/types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/decoder_example.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/encoder_example.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbis.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbis.mcp.exp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbisenc.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbisenc.mcp.exp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbisfile.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/libvorbisfile.mcp.exp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/macos/vorbis.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/missing
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/mkinstalldirs
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/todo.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vorbis.m4
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/auxpartition.pl
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/bookutil.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/bookutil.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/distribution.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/huffbuild.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/latticebuild.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/latticehint.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/latticepare.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/latticetune.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/residue_entropy
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/vqgen.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/vqgen.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/vq/vqsplit.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbis_dynamic.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbis_dynamic_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbis_static.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbis_static_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisenc_dynamic.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisenc_dynamic_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisenc_static.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisenc_static_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisfile_dynamic.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisfile_dynamic_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisfile_static.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/build_vorbisfile_static_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis.dsw
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis.sln
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis_dynamic.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis_dynamic.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis_static.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbis_static.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisenc.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisenc_dynamic.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisenc_dynamic.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisenc_static.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisenc_static.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisfile.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisfile_dynamic.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisfile_dynamic.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisfile_static.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/win32/vorbisfile_static.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/AUTHORS
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/CHANGES
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/COPYING
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/README
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/aclocal.m4
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/config.guess
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/config.sub
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/configure
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/changelog
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/control
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/copyright
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/libogg-dev.docs
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/libogg-dev.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/libogg0.README.Debian
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/libogg0.install
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/debian/rules
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/framing.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/index.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/bitpacking.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/datastructures.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/decoding.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/encoding.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/general.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/index.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_packet.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_packet_clear.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_bos.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_checksum_set.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_continued.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_eos.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_granulepos.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_packets.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_pageno.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_serialno.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_page_version.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_clear.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_destroy.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_eos.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_flush.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_init.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_packetin.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_packetout.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_pagein.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_pageout.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_reset.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_stream_state.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_buffer.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_clear.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_destroy.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_init.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_pageout.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_pageseek.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_reset.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_state.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/ogg_sync_wrote.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_adv.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_adv1.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_bits.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_buffer.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_bytes.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_get_buffer.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_look.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_look1.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_read.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_read1.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_readinit.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_reset.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_write.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_writeclear.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/oggpack_writeinit.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/overview.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/reference.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/style.css
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/vorbis_comment.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/ogg/vorbis_info.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/oggstream.html
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/stream.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/white-ogg.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/doc/white-xifish.png
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/config_types.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/ogg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/include/ogg/os_types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/install-sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/libogg.spec
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/compat/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/compat/strdup.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/compat/sys/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/compat/sys/types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/libogg.mcp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/macos/libogg.mcp.exp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/missing
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/mkinstalldirs
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/ogg.m4
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/src/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/src/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/src/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/src/bitwise.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/src/framing.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/Makefile.am
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/build_ogg_dynamic.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/build_ogg_dynamic_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/build_ogg_static.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/build_ogg_static_debug.bat
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg.def
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg.dsw
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg.sln
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_dynamic.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_dynamic.vcproj
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.dsp
    branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.vcproj

Removed Paths:
-------------
    branches/linuxport/XBMC/system/players/paplayer/vorbisfile-i486-linux.so

Modified: branches/linuxport/XBMC/Makefile.in
===================================================================
--- branches/linuxport/XBMC/Makefile.in	2008-07-15 19:46:11 UTC (rev 14127)
+++ branches/linuxport/XBMC/Makefile.in	2008-07-15 19:47:35 UTC (rev 14128)
@@ -1,4 +1,4 @@
-DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec xbmc/cores/paplayer/flac-1.2.1/ xbmc/cores/paplayer/MACDll
+DIRS=guilib xbmc xbmc/FileSystem xbmc/FileSystem/MusicDatabaseDirectory xbmc/FileSystem/VideoDatabaseDirectory xbmc/cores xbmc/cores/paplayer xbmc/cores/DllLoader xbmc/cores/DllLoader/exports xbmc/cores/DllLoader/exports/util xbmc/xbox xbmc/linux xbmc/visualizations xbmc/screensavers xbmc/utils guilib/common guilib/tinyXML xbmc/lib/sqLite xbmc/lib/libPython xbmc/lib/libPython/xbmcmodule xbmc/lib/libPython/linux xbmc/lib/libscrobbler xbmc/lib/UnrarXLib xbmc/lib/libGoAhead xbmc/lib/libUPnP xbmc/cores/dvdplayer xbmc/cores/dvdplayer/DVDSubtitles xbmc/cores/dvdplayer/DVDInputStreams xbmc/cores/dvdplayer/DVDCodecs xbmc/cores/dvdplayer/DVDCodecs/Audio xbmc/cores/dvdplayer/DVDCodecs/Video xbmc/cores/dvdplayer/DVDCodecs/Overlay xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc xbmc/cores/dvdplayer/DVDDemuxers xbmc/cores/VideoRenderers xbmc/cores/VideoRenderers/VideoShaders xbmc/cdrip xbmc/lib/libcmyth tools/EventClients xbmc/lib/libRTMP xbmc/cores/paplayer/AC3Codec xbmc/cores/paplayer/ADPCMCodec xbmc/cores/paplayer/AACCodec xbmc/cores/paplayer/CubeCodec xbmc/cores/paplayer/NSFCodec xbmc/cores/paplayer/MIDCodec xbmc/cores/paplayer/SIDCodec xbmc/cores/paplayer/WavPackCodec xbmc/cores/paplayer/GYMCodec xbmc/cores/paplayer/DCACodec xbmc/cores/paplayer/YMCodec xbmc/cores/paplayer/ModuleCodec xbmc/cores/paplayer/MPCCodec xbmc/cores/paplayer/SPCCodec xbmc/cores/paplayer/MP3Codec xbmc/cores/paplayer/flac-1.2.1/ xbmc/cores/paplayer/MACDll xbmc/cores/paplayer/vorbisfile
 
 LIBS=@LIBS@
 DEBUG_FLAGS=@DEBUG_FLAGS@
@@ -100,6 +100,7 @@
 	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 	$(MAKE) -C xbmc/cores/paplayer/SPCCodec
+	$(MAKE) -C xbmc/cores/paplayer/vorbisfile
 	$(MAKE) -C xbmc/cores/paplayer/WavPackCodec
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec
 	

Modified: branches/linuxport/XBMC/configure
===================================================================
--- branches/linuxport/XBMC/configure	2008-07-15 19:46:11 UTC (rev 14127)
+++ branches/linuxport/XBMC/configure	2008-07-15 19:47:35 UTC (rev 14128)
@@ -13164,6 +13164,8 @@
 
 
 
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -14264,6 +14266,8 @@
 pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd
 pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd
 pushd xbmc/cores/paplayer/flac-1.2.1; ./configure; popd
+pushd xbmc/cores/paplayer/vorbisfile/libvorbis; ./configure; popd
+pushd xbmc/cores/paplayer/vorbisfile/ogg; ./configure; popd
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.

Modified: branches/linuxport/XBMC/configure.in
===================================================================
--- branches/linuxport/XBMC/configure.in	2008-07-15 19:46:11 UTC (rev 14127)
+++ branches/linuxport/XBMC/configure.in	2008-07-15 19:47:35 UTC (rev 14128)
@@ -335,6 +335,8 @@
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MPCCodec; ./configure; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b; ./configure CFLAGS="-O3 -fPIC" CXXFLAGS="-O3 -fPIC"; popd])
 AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/flac-1.2.1; ./configure; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/vorbisfile/libvorbis; ./configure; popd])
+AC_CONFIG_COMMANDS_POST([pushd xbmc/cores/paplayer/vorbisfile/ogg; ./configure; popd])
 AC_OUTPUT
 
 final_message="$final_message\n  prefix:\t$prefix\n$dashes"

Deleted: branches/linuxport/XBMC/system/players/paplayer/vorbisfile-i486-linux.so
===================================================================
(Binary files differ)

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/Makefile	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/Makefile	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,9 @@
+vorbisfile-i486-linux.so:
+	make -C libvorbis
+	make -C ogg
+	gcc -shared -o $@ ogg/src/*.o libvorbis/lib/*.o `cat ../../DllLoader/exports/wrapper.def` ../../DllLoader/exports/wrapper.o && cp $@ ../../../../system/players/paplayer
+
+clean:
+	make -C libvorbis clean
+	make -C ogg clean
+	rm vorbisfile-i486-linux.so

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/README.linux
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/README.linux	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/README.linux	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,11 @@
+To compile:
+# cd libvorbis
+# chmod 755 configure
+# ./configure
+# make
+# cd ../ogg
+# chmod 755 configure
+# ./configure
+# make
+# cd ..
+# make vorbisfile-i486-linux.so

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/AUTHORS
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/AUTHORS	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/AUTHORS	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,3 @@
+Monty <monty@...>
+
+and the rest of the Xiph.org Foundation.

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/COPYING
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/COPYING	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/COPYING	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,28 @@
+Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/HACKING
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/HACKING	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/HACKING	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,48 @@
+Note that these instructions are *not* necessary for distribution
+tarballs; they have separate configure/build instructions.  
+
+Building this package from CVS is mainly intended for developers.
+General users should obtain official distribution packages; both
+source and binary distributions are available at
+http://www.vorbis.com/.
+
+-----
+
+These are *brief* instructions on how to build this package from CVS.
+Yes, there are details left out.
+
+There are generally four steps necessary when building from CVS (i.e.,
+a developer's copy):
+
+1. cvs checkout of the sources, or cvs update.  RTFM from your
+   favorite flavor of CVS documentation; information on the xiph.org
+   CVS repository can be found at http://www.xiph.org/cvs.html.
+
+2. [re-]generate files such as "configure" and "Makefile.in" with the
+   GNU autoconf/automake tools.  Run the "autogen.sh" script to
+   perform this step.  
+
+   *** IF YOU ARE NOT BUILDING WITH GNU MAKE *AND* GCC: you must set
+   the AUTOMAKE_FLAGS environment variable to "--include-deps"
+   before running autogen.sh.  For example:
+
+   csh% setenv AUTOMAKE_FLAGS --include-deps
+   csh% ./autogen.sh
+     or
+   sh% AUTOMAKE_FLAGS=--include-deps ./autogen.sh
+
+3. Run configure.  There are several options available; see
+   "./configure --help" for more information.
+
+4. Run "make" to build the source.  
+
+In general, steps 2 and 3 need to be re-run every time any of the
+following files are modified (either manually or by a cvs update):
+
+	  configure.in
+	  acinclude.m4
+
+Running "make clean" after running steps 2 and 3 is generally also
+advisable before running step 4.  It isn't *always* necessary, but
+unless you understand the workings of autoconf/automake, it's safest
+to just do it.

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.am
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.am	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.am	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+AUTOMAKE_OPTIONS = foreign dist-zip
+
+SUBDIRS = lib include doc examples win32 debian vq
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = vorbis.m4
+
+EXTRA_DIST = HACKING todo.txt macos \
+	autogen.sh libvorbis.spec vorbis.m4
+
+dist-hook:
+	rm -rf `find $(distdir)/macos -name CVS`
+
+debug:
+	$(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+	$(MAKE) all CFLAGS="@PROFILE@"

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.in
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.in	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/Makefile.in	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,389 @@
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+DEBUG = @DEBUG@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+EXEEXT = @EXEEXT@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+PACKAGE = @PACKAGE@
+PROFILE = @PROFILE@
+RANLIB = @RANLIB@
+STRIP = @STRIP@
+VERSION = @VERSION@
+VE_LIB_AGE = @VE_LIB_AGE@
+VE_LIB_CURRENT = @VE_LIB_CURRENT@
+VE_LIB_REVISION = @VE_LIB_REVISION@
+VF_LIB_AGE = @VF_LIB_AGE@
+VF_LIB_CURRENT = @VF_LIB_CURRENT@
+VF_LIB_REVISION = @VF_LIB_REVISION@
+V_LIB_AGE = @V_LIB_AGE@
+V_LIB_CURRENT = @V_LIB_CURRENT@
+V_LIB_REVISION = @V_LIB_REVISION@
+pthread_lib = @pthread_lib@
+
+AUTOMAKE_OPTIONS = foreign dist-zip
+
+SUBDIRS = lib include doc examples win32 debian vq
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = vorbis.m4
+
+EXTRA_DIST = HACKING todo.txt macos 	autogen.sh libvorbis.spec vorbis.m4
+
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DATA =  $(m4data_DATA)
+
+DIST_COMMON =  README AUTHORS COPYING Makefile.am Makefile.in \
+acinclude.m4 aclocal.m4 config.guess config.sub configure configure.in \
+install-sh ltmain.sh missing mkinstalldirs
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in  acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+install-m4dataDATA: $(m4data_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
+	@list='$(m4data_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-m4dataDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(m4data_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" != "." || dot_seen=yes; \
+	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-zip: distdir
+	-chmod -R a+r $(distdir)
+	zip -rq $(distdir).zip $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	zip -rq $(distdir).zip $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am: install-m4dataDATA
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am: uninstall-m4dataDATA
+uninstall: uninstall-recursive
+all-am: Makefile $(DATA)
+all-redirect: all-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs)  $(DESTDIR)$(m4datadir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am:  clean-tags clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am:  distclean-tags distclean-generic clean-am
+	-rm -f libtool
+
+distclean: distclean-recursive
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f config.status
+
+.PHONY: uninstall-m4dataDATA install-m4dataDATA install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+dist-hook:
+	rm -rf `find $(distdir)/macos -name CVS`
+
+debug:
+	$(MAKE) all CFLAGS="@DEBUG@"
+
+profile:
+	$(MAKE) all CFLAGS="@PROFILE@"
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/README
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/README	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/README	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,140 @@
+********************************************************************
+*                                                                  *
+* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+*                                                                  *
+* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002             *
+* by the Xiph.org Foundation, http://www.xiph.org/                 *
+*                                                                  *
+********************************************************************
+
+NEW AND IMPORTANT:
+
+If you're used to the source distribution from the first two beta
+releases, things are now rearranged a bit.  Specifically, the
+'vorbis' CVS module contains only the libvorbis, libvorbisfile, and
+libvorbisenc libraries.  Because Ogg bitstreams are to be used by other 
+Ogg codecs, Ogg framing and streaming functionality is now in libogg 
+(the 'ogg' CVS module).  Vorbis utilities are in 'vorbis-tools' and various
+player plugins are in 'vorbis-plugins'.  For now, you'll need to check
+out these other modules seperately. (Note: the xmms plugin is in the xmms
+CVS tree in xmms/Input/vorbis.)
+
+Secondly, the Ogg/Vorbis build systems now use automake.  Instead of
+'./configure; make', the proper build sequence (in each module) is
+'./autogen.sh; make'.
+
+You will also need the newest versions of autoconf, automake, and libtool
+in order to compile vorbis from CVS.  configure scripts are provided for you
+in tarball distributions.
+
+WHAT'S HERE:
+
+This source distribution includes libvorbis and an example
+encoder/player to demonstrate use of libvorbis and documentation on
+the Ogg Vorbis audio coding format.
+
+Directory:
+
+./lib  		The source for the libraries, a BSD-license implementation
+		of the public domain Ogg Vorbis audio encoding format.
+
+./include       Library API headers
+
+./debian        Rules/spec files for building Debian .deb packages
+
+./doc           Vorbis documentation
+
+./examples	Example code illustrating programmatic use of libvorbis, 
+		libvorbisfile and libvorbisenc
+
+./mac 		Codewarrior project files and build tweaks for MacOS.
+
+./macosx 	Project files for MacOS X.
+
+./win32		Win32 projects files and build automation
+
+./vq 		Internal utilities for training/building new LSP/residue 
+		and auxiliary codebooks.
+
+WHAT IS VORBIS:
+
+Vorbis is a general purpose audio and music encoding format
+contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
+MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
+proprietary formats such as RealAudio G2 and Windows' flavor of the
+month), the Vorbis CODEC specification belongs to the public domain.
+All the technical details are published and documented, and any
+software entity may make full use of the format without royalty or
+patent concerns.
+
+This package contains:
+
+.) libvorbis, a BSD-style license software implementation of
+the Vorbis specification by the Xiph.Org Foundation (http://www.xiph.org/) 
+
+.) libvorbisfile, a BSD-style license convenience library
+built on Vorbis designed to simplify common uses and a number of GPL
+example programs
+
+.) libvorbisenc, a BSD-style license library that provides a simple,
+programmatic encoding setup interface 
+
+.) example code making use of libogg, libvorbis, libvorbisfile and
+libvorbisenc
+
+CONTACT:
+
+The Ogg homepage is located at 'http://www.xiph.org/ogg/'.
+Vorbis's homepage is located at 'http://www.xiph.org/ogg/vorbis/'.
+Up to date technical documents, contact information, source code and
+pre-built utilities may be found there.
+
+BUILDING FROM CVS:
+
+./autogen.sh
+make 
+
+and as root if desired:
+
+make install
+
+This will install the vorbis libraries (static and shared) into
+/usr/local/lib, includes into /usr/local/include and API manpages
+(once we write some) into /usr/local/man.
+
+BUILDING FROM TARBALL DISTRIBUTIONS:
+
+./configure
+make
+
+and optionally (as root):
+make install
+
+BUILDING RPMS:
+
+after normal configuring:
+
+make dist
+rpm -ta libvorbis-<version>.tar.gz
+
+BUILDING ON MACOS 9:
+
+Vorbis on MacOS 9 is built using CodeWarrior 5.3.  To build it, first
+verify that the Ogg libraries are already built following the
+instructions in the Ogg module README.  Open vorbis/mac/libvorbis.mcp,
+switch to the "Targets" pane, select everything, and make the project.
+Do the same thing to build libvorbisenc.mcp, and libvorbisfile.mcp (in
+that order).  In vorbis/mac/Output you will now have both debug and final
+versions of Vorbis shared libraries to link your projects against.
+
+To build a project using Ogg Vorbis, add access paths to your
+CodeWarrior project for the ogg/include, ogg/mac/Output,
+vorbis/include, and vorbis/mac/Output folders.  Be sure that
+"interpret DOS and Unix paths" is turned on in your project; it can
+be found in the "access paths" pane in your project settings.  Now
+simply add the shared libraries you need to your project (OggLib and
+VorbisLib at least) and #include "ogg/ogg.h" and "vorbis/codec.h"
+wherever you need to access Ogg and Vorbis functionality.

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/acinclude.m4
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/acinclude.m4	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/acinclude.m4	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,106 @@
+# acinclude.m4
+# all .m4 files needed that might not be installed go here
+
+# Configure paths for libogg
+# Jack Moffitt <jack@...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
+dnl
+AC_DEFUN(XIPH_PATH_OGG,
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
+AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
+AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
+
+  if test "x$ogg_libraries" != "x" ; then
+    OGG_LIBS="-L$ogg_libraries"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_LIBS="-L$ogg_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    OGG_LIBS="-L$prefix/lib"
+  fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
+
+  if test "x$ogg_includes" != "x" ; then
+    OGG_CFLAGS="-I$ogg_includes"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_CFLAGS="-I$ogg_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    OGG_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Ogg)
+  no_ogg=""
+
+
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Ogg is sufficiently new.
+dnl
+      rm -f conf.oggtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg.h>
+
+int main ()
+{
+  system("touch conf.oggtest");
+  return 0;
+}
+
+],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oggtest ; then
+       :
+     else
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+       echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG_CFLAGS=""
+     OGG_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG_CFLAGS)
+  AC_SUBST(OGG_LIBS)
+  rm -f conf.oggtest
+])

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/aclocal.m4
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/aclocal.m4	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/vorbisfile/libvorbis/aclocal.m4	2008-07-15 19:47:35 UTC (rev 14128)
@@ -0,0 +1,3821 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# acinclude.m4
+# all .m4 files needed that might not be installed go here
+
+# Configure paths for libogg
+# Jack Moffitt <jack@...> 10-21-2000
+# Shamelessly stolen from Owen Taylor and Manish Singh
+
+dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
+dnl
+AC_DEFUN(XIPH_PATH_OGG,
+[dnl 
+dnl Get the cflags and libraries
+dnl
+AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
+AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
+AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
+
+  if test "x$ogg_libraries" != "x" ; then
+    OGG_LIBS="-L$ogg_libraries"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_LIBS="-L$ogg_prefix/lib"
+  elif test "x$prefix" != "xNONE" ; then
+    OGG_LIBS="-L$prefix/lib"
+  fi
+
+  OGG_LIBS="$OGG_LIBS -logg"
+
+  if test "x$ogg_includes" != "x" ; then
+    OGG_CFLAGS="-I$ogg_includes"
+  elif test "x$ogg_prefix" != "x" ; then
+    OGG_CFLAGS="-I$ogg_prefix/include"
+  elif test "x$prefix" != "xNONE"; then
+    OGG_CFLAGS="-I$prefix/include"
+  fi
+
+  AC_MSG_CHECKING(for Ogg)
+  no_ogg=""
+
+
+  if test "x$enable_oggtest" = "xyes" ; then
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $OGG_CFLAGS"
+    LIBS="$LIBS $OGG_LIBS"
+dnl
+dnl Now check if the installed Ogg is sufficiently new.
+dnl
+      rm -f conf.oggtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ogg/ogg.h>
+
+int main ()
+{
+  system("touch conf.oggtest");
+  return 0;
+}
+
+],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+  fi
+
+  if test "x$no_ogg" = "x" ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$1], , :, [$1])     
+  else
+     AC_MSG_RESULT(no)
+     if test -f conf.oggtest ; then
+       :
+     else
+       echo "*** Could not run Ogg test program, checking why..."
+       CFLAGS="$CFLAGS $OGG_CFLAGS"
+       LIBS="$LIBS $OGG_LIBS"
+       AC_TRY_LINK([
+#include <stdio.h>
+#include <ogg/ogg.h>
+],     [ return 0; ],
+       [ echo "*** The test program compiled, but did not run. This usually means"
+       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
+       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
+       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+       echo "*** is required on your system"
+       echo "***"
+       echo "*** If you have an old version installed, it is best to remove it, although"
+       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+       [ echo "*** The test program failed to compile or link. See the file config.log for the"
+       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
+       echo "*** or that you have moved Ogg since it was installed. In the latter case, you"
+       echo "*** may want to edit the ogg-config script: $OGG_CONFIG" ])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+     OGG_CFLAGS=""
+     OGG_LIBS=""
+     ifelse([$2], , :, [$2])
+  fi
+  AC_SUBST(OGG_CFLAGS)
+  AC_SUBST(OGG_LIBS)
+  rm -f conf.oggtest
+])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "[$]*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN([AM_MISSING_PROG],
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
+
+# serial 46 AC_PROG_LIBTOOL
+
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])
+
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+_LT_AC_PROG_ECHO_BACKSLASH
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    AC_PATH_MAGIC
+  fi
+  ;;
+esac
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE(libtool-lock,
+  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_SAVE
+     AC_LANG_C
+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_RESTORE])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+
+ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+
+  # recent cygwin and mingw systems supply a stub DllMain which the user
+  # can override, but on older systems we have to supply one
+  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+    [AC_TRY_LINK([],
+      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+      DllMain (0, 0, 0);],
+      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
+
+  case $host/$CC in
+  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+    # old mingw systems require "-dll" to link a DLL, while more recent ones
+    # require "-mdll"
+    SAVE_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -mdll"
+    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+    CFLAGS="$SAVE_CFLAGS" ;;
+  *-*-cygwin* | *-*-pw32*)
+    # cygwin systems need to pass --dll to the linker, and not link
+    # crt.o which will require a WinMain@... definition.
+    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+  esac
+  ;;
+  ])
+esac
+
+_LT_AC_LTCONFIG_HACK
+
+])
+
+# AC_LIBTOOL_HEADER_ASSERT
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
+[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
+    [lt_cv_func_assert_works],
+    [case $host in
+    *-*-solaris*)
+      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
+        case `$CC --version 2>/dev/null` in
+        [[12]].*) lt_cv_func_assert_works=no ;;
+        *)        lt_cv_func_assert_works=yes ;;
+        esac
+      fi
+      ;;
+    esac])
+
+if test "x$lt_cv_func_assert_works" = xyes; then
+  AC_CHECK_HEADERS(assert.h)
+fi
+])# AC_LIBTOOL_HEADER_ASSERT
+
+# _LT_AC_CHECK_DLFCN
+# --------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)
+])# _LT_AC_CHECK_DLFCN
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*) # Its linker distinguishes data from code symbols
+  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+solaris* | sysv5*)
+  symcode='[[BDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $host_os in
+mingw*)
+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  symcode='[[ABCDGISTW]]'
+fi
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+  rm -f conftest*
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+
+	  cat <<EOF >> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
+	  cat <<\EOF >> conftest.$ac_ext
+  {0, (lt_ptr) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  save_LIBS="$LIBS"
+	  save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$save_LIBS"
+	  CFLAGS="$save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    fi
+  else
+    echo "$progname: failed program was:" >&AC_FD_CC
+    cat conftest.$ac_ext >&5
+  fi
+  rm -f conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  global_symbol_to_cdecl=
+  global_symbol_to_c_name_address=
+else
+  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+fi
+if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+# ---------------------------------
+AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+[# Find the correct PATH separator.  Usually this is `:', but
+# DJGPP uses `;' like DOS.
+if test "X${PATH_SEPARATOR+set}" != Xset; then
+  UNAME=${UNAME-`uname 2>/dev/null`}
+  case X$UNAME in
+    *-DOS) lt_cv_sys_path_separator=';' ;;
+    *)     lt_cv_sys_path_separator=':' ;;
+  esac
+  PATH_SEPARATOR=$lt_cv_sys_path_separator
+fi
+])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+			      [AC_DIVERT_PUSH(NOTICE)])
+_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+echo=${ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+    then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+   test "X$echo_testing_string" = "X$echo_test_string"; then
+  :
+else
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for dir in $PATH /usr/ucb; do
+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+       test "X$echo_testing_string" = "X$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running configure again with it.
+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+	 test "X$echo_testing_string" = "X$echo_test_string"; then
+	# Cool, printf works
+	:
+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	   test "X$echo_testing_string" = 'X\t' &&
+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+      else
+	# maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+	  then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "[$]0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+AC_DIVERT_POP
+])# _LT_AC_PROG_ECHO_BACKSLASH
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+
+    exit (status);
+}]
+EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_unknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+# AC_LIBTOOL_DLOPEN_SELF
+# -------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+   ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+          [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      LDFLAGS="$LDFLAGS $link_static_flag"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+    	  lt_cv_dlopen_self_static, [dnl
+	  _LT_AC_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+AC_DEFUN([_LT_AC_LTCONFIG_HACK],
+[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+need_locks="$enable_libtool_lock"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+if test x"$host" != x"$build"; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+case $host_os in
+linux-gnu*) ;;
+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+# Allow CC to be a program name with arguments.
+set dummy $CC
+compiler="[$]2"
+
+AC_MSG_CHECKING([for objdir])
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+AC_MSG_RESULT($objdir)
+
+
+AC_ARG_WITH(pic,
+[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+pic_mode="$withval", pic_mode=default)
+test -z "$pic_mode" && pic_mode=default
+
+# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+# in isolation, and that seeing it set (from the cache) indicates that
+# the associated values are set (in the cache) correctly too.
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+AC_CACHE_VAL(lt_cv_prog_cc_pic,
+[ lt_cv_prog_cc_pic=
+  lt_cv_prog_cc_shlib=
+  lt_cv_prog_cc_wl=
+  lt_cv_prog_cc_static=
+  lt_cv_prog_cc_no_builtin=
+  lt_cv_prog_cc_can_build_shared=$can_build_shared
+
+  if test "$GCC" = yes; then
+    lt_cv_prog_cc_wl='-Wl,'
+    lt_cv_prog_cc_static='-static'
+
+    case $host_os in
+    aix*)
+      # Below there is a dirty hack to force normal static linking with -ldl
+      # The problem is because libdl dynamically linked with both libc and
+      # libC (AIX C++ library), which obviously doesn't included in libraries
+      # list by gcc. This cause undefined symbols with -static flags.
+      # This hack allows C programs to be linked with "-static -ldl", but
+      # not sure about C++ programs.
+      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+      ;;
+    amigaos*)
+      # FIXME: we need at least 68020 code to build shared libraries, but
+      # adding the `-m68020' flag to GCC prevents building anything better,
+      # like `-m68040'.
+      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+      ;;
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_cv_prog_cc_pic='-fno-common'
+      ;;
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	 lt_cv_prog_cc_pic=-Kconform_pic
+      fi
+      ;;
+    *)
+      lt_cv_prog_cc_pic='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for PIC flags for the system compiler.
+    case $host_os in
+    aix3* | aix4* | aix5*)
+      lt_cv_prog_cc_wl='-Wl,'
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_cv_prog_cc_static='-Bstatic'
+      else
+	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+      lt_cv_prog_cc_pic='+Z'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      # PIC (with -KPIC) is the default.
+      ;;
+
+    cygwin* | mingw* | pw32* | os2*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+      ;;
+
+    newsos6)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      # All OSF/1 code is PIC.
+      lt_cv_prog_cc_wl='-Wl,'
+      lt_cv_prog_cc_static='-non_shared'
+      ;;
+
+    sco3.2v5*)
+      lt_cv_prog_cc_pic='-Kpic'
+      lt_cv_prog_cc_static='-dn'
+      lt_cv_prog_cc_shlib='-belf'
+      ;;
+
+    solaris*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Wl,'
+      ;;
+
+    sunos4*)
+      lt_cv_prog_cc_pic='-PIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Qoption ld '
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      lt_cv_prog_cc_pic='-KPIC'
+      lt_cv_prog_cc_static='-Bstatic'
+      lt_cv_prog_cc_wl='-Wl,'
+      ;;
+
+    uts4*)
+      lt_cv_prog_cc_pic='-pic'
+      lt_cv_prog_cc_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_cv_prog_cc_pic='-Kconform_pic'
+	lt_cv_prog_cc_static='-Bstatic'
+      fi
+      ;;
+
+    *)
+      lt_cv_prog_cc_can_build_shared=no
+      ;;
+    esac
+  fi
+])
+if test -z "$lt_cv_prog_cc_pic"; then
+  AC_MSG_RESULT([none])
+else
+  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
+
+  # Check to make sure the pic_flag actually works.
+  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
+  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+    AC_TRY_COMPILE([], [], [dnl
+      case $host_os in
+      hpux9* | hpux10* | hpux11*)
+	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+	# they create non-PIC objects.  So, if there were any warnings, we
+	# assume that PIC is not supported.
+	if test -s conftest.err; then
+	  lt_cv_prog_cc_pic_works=no
+	else
+	  lt_cv_prog_cc_pic_works=yes
+	fi
+	;;
+      *)
+	lt_cv_prog_cc_pic_works=yes
+	;;
+      esac
+    ], [dnl
+      lt_cv_prog_cc_pic_works=no
+    ])
+    CFLAGS="$save_CFLAGS"
+  ])
+
+  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+    lt_cv_prog_cc_pic=
+    lt_cv_prog_cc_can_build_shared=no
+  else
+    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+  fi
+
+  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
+fi
+
+# Check for any special shared library compilation flags.
+if test -n "$lt_cv_prog_cc_shlib"; then
+  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
+  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
+  else
+   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
+    lt_cv_prog_cc_can_build_shared=no
+  fi
+fi
+
+AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
+AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
+  lt_cv_prog_cc_static_works=no
+  save_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
+  LDFLAGS="$save_LDFLAGS"
+])
+
+# Belt *and* braces to stop my trousers falling down:
+test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
+
+pic_flag="$lt_cv_prog_cc_pic"
+special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+wl="$lt_cv_prog_cc_wl"
+link_static_flag="$lt_cv_prog_cc_static"
+no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+can_build_shared="$lt_cv_prog_cc_can_build_shared"
+
+
+# Check to see if options -o and -c are simultaneously supported by compiler
+AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
+AC_CACHE_VAL([lt_cv_compiler_c_o], [
+$rm -r conftest 2>/dev/null
+mkdir conftest
+cd conftest
+echo "int some_variable = 0;" > conftest.$ac_ext
+mkdir out
+# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+# that will create temporary files in the current directory regardless of
+# the output directory.  Thus, making CWD read-only will cause this test
+# to fail, enabling locking or at least warning the user not to do parallel
+# builds.
+chmod -w .
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+compiler_c_o=no
+if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+  # The compiler can only warn and ignore the option if not recognized
+  # So say no if there are warnings
+  if test -s out/conftest.err; then
+    lt_cv_compiler_c_o=no
+  else
+    lt_cv_compiler_c_o=yes
+  fi
+else
+  # Append any errors to the config.log.
+  cat out/conftest.err 1>&AC_FD_CC
+  lt_cv_compiler_c_o=no
+fi
+CFLAGS="$save_CFLAGS"
+chmod u+w .
+$rm conftest* out/*
+rmdir out
+cd ..
+rmdir conftest
+$rm -r conftest 2>/dev/null
+])
+compiler_c_o=$lt_cv_compiler_c_o
+AC_MSG_RESULT([$compiler_c_o])
+
+if test x"$compiler_c_o" = x"yes"; then
+  # Check to see if we can write to a .lo
+  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
+  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
+  lt_cv_compiler_o_lo=no
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -c -o conftest.lo"
+  save_objext="$ac_objext"
+  ac_objext=lo
+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      lt_cv_compiler_o_lo=no
+    else
+      lt_cv_compiler_o_lo=yes
+    fi
+  ])
+  ac_objext="$save_objext"
+  CFLAGS="$save_CFLAGS"
+  ])
+  compiler_o_lo=$lt_cv_compiler_o_lo
+  AC_MSG_RESULT([$compiler_o_lo])
+else
+  compiler_o_lo=no
+fi
+
+# Check to see if we can do hard links to lock some files if needed
+hard_links="nottested"
+if test "$compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+if test "$GCC" = yes; then
+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+  compiler_rtti_exceptions=no
+  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+    if test -s conftest.err; then
+      compiler_rtti_exceptions=no
+    else
+      compiler_rtti_exceptions=yes
+    fi
+  ])
+  CFLAGS="$save_CFLAGS"
+  AC_MSG_RESULT([$compiler_rtti_exceptions])
+
+  if test "$compiler_rtti_exceptions" = "yes"; then
+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+  else
+    no_builtin_flag=' -fno-builtin'
+  fi
+fi
+
+# See if the linker supports building shared libraries.
+AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
+
+allow_undefined_flag=
+no_undefined_flag=
+need_lib_prefix=unknown
+need_version=unknown
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+archive_cmds=
+archive_expsym_cmds=
+old_archive_from_new_cmds=
+old_archive_from_expsyms_cmds=
+export_dynamic_flag_spec=
+whole_archive_flag_spec=
+thread_safe_flag_spec=
+hardcode_into_libs=no
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+hardcode_shlibpath_var=unsupported
+runpath_var=
+link_all_deplibs=unknown
+always_export_symbols=no
+export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+# include_expsyms should be a list of space-separated symbols to be *always*
+# included in the symbol list
+include_expsyms=
+# exclude_expsyms can be an egrep regular expression of symbols to exclude
+# it will be wrapped by ` (' and `)$', so one must not match beginning or
+# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+# as well as any symbol that contains `d'.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+# platforms (ab)use it in PIC code, but their linkers get confused if
+# the symbol is explicitly referenced.  Since portable code cannot
+# rely on this symbol name, it's probably fine to never include it in
+# preloaded symbol tables.
+extract_expsyms_cmds=
+
+case $host_os in
+cygwin* | mingw* | pw32*)
+  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+  # When not using gcc, we currently assume that we are using
+  # Microsoft Visual C++.
+  if test "$GCC" != yes; then
+    with_gnu_ld=no
+  fi
+  ;;
+openbsd*)
+  with_gnu_ld=no
+  ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # If archive_cmds runs LD, not CC, wlarc should be empty
+  wlarc='${wl}'
+
+  # See if GNU ld supports shared libraries.
+  case $host_os in
+  aix3* | aix4* | aix5*)
+    # On AIX, the GNU linker is very broken
+    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+    ld_shlibs=no
+    cat <<EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+
+    # Samuel A. Falvo II <kc5tja@...> reports
+    # that the semantics of dynamic libraries on AmigaOS, at least up
+    # to version 4, is to share data among multiple programs linked
+    # with the same dynamic library.  Since this doesn't match the
+    # behavior of shared libraries on other platforms, we can use
+    # them.
+    ld_shlibs=no
+    ;;
+
+  beos*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      allow_undefined_flag=unsupported
+      # Joseph Beckenbach <jrb3@...> says some releases of gcc
+      # support --undefined.  This deserves some investigation.  FIXME
+      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec='-L$libdir'
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+
+    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+      else $CC -o impgen impgen.c ; fi)~
+      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+
+    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+
+    # cygwin and mingw dlls have different entry points and sets of symbols
+    # to exclude.
+    # FIXME: what about values for MSVC?
+    dll_entry=__cygwin_dll_entry@...
+    dll_exclude_symbols=DllMain@...~
+    case $host_os in
+    mingw*)
+      # mingw values
+      dll_entry=_DllMainCRTStartup@...
+      dll_exclude_symbols=DllMain@...~
+      ;;
+    esac
+
+    # mingw and cygwin differ, and it's simplest to just exclude the union
+    # of the two symbol sets.
+    dll_exclude_symbols=DllMain@...
+
+    # recent cygwin and mingw systems supply a stub DllMain which the user
+    # can override, but on older systems we have to supply one (in ltdll.c)
+    if test "x$lt_cv_need_dllmain" = "xyes"; then
+      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
+	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+    else
+      ltdll_obj=
+      ltdll_cmds=
+    fi
+
+    # Extract the symbol export list from an `--export-all' def file,
+    # then regenerate the def file from the symbol export list, so that
+    # the compiled dll only exports the symbol export list.
+    # Be careful not to strip the DATA tag left be newer dlltools.
+    export_symbols_cmds="$ltdll_cmds"'
+      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+
+    # If the export-symbols file already is a .def file (1st line
+    # is EXPORTS), use it as is.
+    # If DATA tags from a recent dlltool are present, honour them!
+    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
+	cp $export_symbols $output_objdir/$soname-def;
+      else
+	echo EXPORTS > $output_objdir/$soname-def;
+	_lt_hint=1;
+	cat $export_symbols | while read symbol; do
+	 set dummy \$symbol;
+	 case \[$]# in
+	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
+	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+	 esac;
+	 _lt_hint=`expr 1 + \$_lt_hint`;
+	done;
+      fi~
+      '"$ltdll_cmds"'
+      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+      wlarc=
+    else
+      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    fi
+    ;;
+
+  solaris* | sysv5*)
+    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      ld_shlibs=no
+      cat <<EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+
+  sunos4*)
+    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    wlarc=
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+  esac
+
+  if test "$ld_shlibs" = yes; then
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    case $host_os in
+    cygwin* | mingw* | pw32*)
+      # dlltool doesn't understand --whole-archive et. al.
+      whole_archive_flag_spec=
+      ;;
+    *)
+      # ancient GNU ld didn't support --whole-archive et. al.
+      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+	whole_archive_flag_spec=
+      fi
+      ;;
+    esac
+  fi
+else
+  # PORTME fill in a description of your system's linker (not GNU ld)
+  case $host_os in
+  aix3*)
+    allow_undefined_flag=unsupported
+    always_export_symbols=yes
+    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+    # Note: this linker hardcodes the directories in LIBPATH if there
+    # are no directories specified by -L.
+    hardcode_minus_L=yes
+    if test "$GCC" = yes && test -z "$link_static_flag"; then
+      # Neither direct hardcoding nor static linking is supported with a
+      # broken collect2.
+      hardcode_direct=unsupported
+    fi
+    ;;
+
+  aix4* | aix5*)
+    if test "$host_cpu" = ia64; then
+      # On IA64, the linker does run time linking by default, so we don't
+      # have to do anything special.
+      aix_use_runtimelinking=no
+      exp_sym_flag='-Bexport'
+      no_entry_flag=""
+    else
+      aix_use_runtimelinking=no
+
+      # Test if we are trying to use run time linking or normal
+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+      # need to do runtime linking.
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	done
+      esac
+
+      exp_sym_flag='-bexport'
+      no_entry_flag='-bnoentry'
+    fi
+
+    # When large executables or shared objects are built, AIX ld can
+    # have problems creating the table of contents.  If linking a library
+    # or program results in "error TOC overflow" add -mminimal-toc to
+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+    hardcode_direct=yes
+    archive_cmds=''
+    hardcode_libdir_separator=':'
+    if test "$GCC" = yes; then
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	collect2name=`${CC} -print-prog-name=collect2`
+	if test -f "$collect2name" && \
+	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+	then
+	  # We have reworked collect2
+	  hardcode_direct=yes
+	else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	fi
+      esac
+
+      shared_flag='-shared'
+    else
+      # not using gcc
+      if test "$host_cpu" = ia64; then
+	shared_flag='${wl}-G'
+      else
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag='${wl}-G'
+	else
+	  shared_flag='${wl}-bM:SRE'
+	fi
+      fi
+    fi
+
+    # It seems that -bexpall can do strange things, so it is better to
+    # generate a list of symbols to export.
+    always_export_symbols=yes
+    if test "$aix_use_runtimelinking" = yes; then
+      # Warning - without using the other runtime loading flags (-brtl),
+      # -berok will link without error, but may produce a broken library.
+      allow_undefined_flag='-berok'
+      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+    else
+      if test "$host_cpu" = ia64; then
+	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	allow_undefined_flag="-z nodefs"
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+      else
+	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+	# Warning - without using the other run time loading flags,
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='${wl}-berok'
+	# This is a bit strange, but is similar to how AIX traditionally builds
+	# it's shared libraries.
+	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+      fi
+    fi
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    # see comment about different semantics on the GNU ld section
+    ld_shlibs=no
+    ;;
+
+  cygwin* | mingw* | pw32*)
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    # hardcode_libdir_flag_spec is actually meaningless, as there is
+    # no search path for DLLs.
+    hardcode_libdir_flag_spec=' '
+    allow_undefined_flag=unsupported
+    # Tell ltmain to make .lib files, not .a files.
+    libext=lib
+    # FIXME: Setting linknames here is a bad hack.
+    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+    # The linker will automatically build a .lib file if we build a DLL.
+    old_archive_from_new_cmds='true'
+    # FIXME: Should let the user specify the lib program.
+    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+    fix_srcfile_path='`cygpath -w "$srcfile"`'
+    ;;
+
+  darwin* | rhapsody*)
+    case "$host_os" in
+    rhapsody* | darwin1.[[012]])
+      allow_undefined_flag='-undefined suppress'
+      ;;
+    *) # Darwin 1.3 on
+      allow_undefined_flag='-flat_namespace -undefined suppress'
+      ;;
+    esac
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+    #	     `"' quotes if we put them in here... so don't!
+    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    # We need to add '_' to the symbols in $export_symbols first
+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load $convenience'
+    ;;
+
+  freebsd1*)
+    ld_shlibs=no
+    ;;
+
+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+  # support.  Future versions do this automatically, but an explicit c++rt0.o
+  # does not break anything, and helps significantly (at the cost of a little
+  # extra space).
+  freebsd2.2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+  freebsd2*)
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+  freebsd*)
+    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  hpux9* | hpux10* | hpux11*)
+    case $host_os in
+    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+    esac
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
+    export_dynamic_flag_spec='${wl}-E'
+    ;;
+
+  irix5* | irix6* | nonstopux*)
+    if test "$GCC" = yes; then
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    link_all_deplibs=yes
+    ;;
+
+  netbsd*)
+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    else
+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+    fi
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  newsos6)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_direct=yes
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    hardcode_shlibpath_var=no
+    ;;
+
+  openbsd*)
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+    else
+      case "$host_os" in
+      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_libdir_flag_spec='-R$libdir'
+        ;;
+      *)
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        ;;
+      esac
+    fi
+    ;;
+
+  os2*)
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    allow_undefined_flag=unsupported
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+    ;;
+
+  osf3*)
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    ;;
+
+  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+    if test "$GCC" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+      #Both c and cxx compiler support -rpath directly
+      hardcode_libdir_flag_spec='-rpath $libdir'
+    fi
+    hardcode_libdir_separator=:
+    ;;
+
+  sco3.2v5*)
+    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    hardcode_shlibpath_var=no
+    runpath_var=LD_RUN_PATH
+    hardcode_runpath_var=yes
+    export_dynamic_flag_spec='${wl}-Bexport'
+    ;;
+
+  solaris*)
+    # gcc --version < 3.0 without binutils cannot create self contained
+    # shared libraries reliably, requiring libgcc.a to resolve some of
+    # the object symbols generated in some cases.  Libraries that use
+    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+    # a copy of libgcc.a into every shared library to guarantee resolving
+    # such symbols causes other problems:  According to Tim Van Holder
+    # <tim.van.holder@...>, C++ libraries end up with a separate
+    # (to the application) exception stack for one thing.
+    no_undefined_flag=' -z defs'
+    if test "$GCC" = yes; then
+      case `$CC --version 2>/dev/null` in
+      [[12]].*)
+	cat <<EOF 1>&2
+
+*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+*** create self contained shared libraries on Solaris systems, without
+*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+*** -no-undefined support, which will at least allow you to build shared
+*** libraries.  However, you may find that when you link such libraries
+*** into an application without using GCC, you have to manually add
+*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+*** upgrade to a newer version of GCC.  Another option is to rebuild your
+*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
+
+EOF
+        no_undefined_flag=
+	;;
+      esac
+    fi
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_shlibpath_var=no
+    case $host_os in
+    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

@@ Diff output truncated at 100000 characters. @@

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

Revision: 14120
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14120&view=rev
Author:   althekiller
Date:     2008-07-15 11:34:24 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
changed: set svn:eol-style native

Modified Paths:
--------------
    branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
    branches/linuxport/XBMC/guilib/common/SDLJoystick.h
    branches/linuxport/XBMC/guilib/common/SDLKeyboard.h
    branches/linuxport/XBMC/guilib/system.h
    branches/linuxport/XBMC/language/German/keyboardmap.xml
    branches/linuxport/XBMC/language/Slovak/langinfo.xml
    branches/linuxport/XBMC/project/Win32BuildSetup/readme.txt
    branches/linuxport/XBMC/project/Win32BuildSetup/sources.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/3D_CoverView.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes_Dialogs.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes_Library.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogBusy.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogContentSettings.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogFavourites.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogFullScreenInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogPictureInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogSongInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogVideoScan.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyGameSaves.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyMusicPlaylistEditor.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyVideoNav.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/SmartPlaylistEditor.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/SmartPlaylistRule.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/defaults.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/3D_CoverView.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes_Dialogs.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes_Library.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/DialogBusy.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/SlideShow.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/Startup.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/colors/defaults.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/fonts/FrancophilSans_readme.txt
    branches/linuxport/XBMC/system/Keymap.xml
    branches/linuxport/XBMC/system/scrapers/music/allmusic.xml
    branches/linuxport/XBMC/system/scrapers/video/adultcdmovies.xml
    branches/linuxport/XBMC/system/scrapers/video/adultfilmdatabase.xml
    branches/linuxport/XBMC/system/scrapers/video/allocine.xml
    branches/linuxport/XBMC/system/scrapers/video/asiandb.xml
    branches/linuxport/XBMC/system/scrapers/video/culturalia.xml
    branches/linuxport/XBMC/system/scrapers/video/filmaffinity.xml
    branches/linuxport/XBMC/system/scrapers/video/filmstarts.xml
    branches/linuxport/XBMC/system/scrapers/video/filmup.xml
    branches/linuxport/XBMC/system/scrapers/video/imdb tv.xml
    branches/linuxport/XBMC/system/scrapers/video/imdb.xml
    branches/linuxport/XBMC/system/scrapers/video/jadedVideo.xml
    branches/linuxport/XBMC/system/scrapers/video/movie-xml.xml
    branches/linuxport/XBMC/system/scrapers/video/mtv.xml
    branches/linuxport/XBMC/system/scrapers/video/musicvideos.xml
    branches/linuxport/XBMC/system/scrapers/video/ofdb.xml
    branches/linuxport/XBMC/system/scrapers/video/tvcom.xml
    branches/linuxport/XBMC/system/scrapers/video/tvdb.xml
    branches/linuxport/XBMC/system/scrapers/video/tvrage.xml
    branches/linuxport/XBMC/tools/Changelog/Changelog.cpp
    branches/linuxport/XBMC/tools/Changelog/stdafx.cpp
    branches/linuxport/XBMC/tools/Fake Episode Maker/readme.txt
    branches/linuxport/XBMC/tools/Fake Episode Maker/shows.txt
    branches/linuxport/XBMC/tools/Scrap/RegExp.cpp
    branches/linuxport/XBMC/tools/Scrap/RegExp.h
    branches/linuxport/XBMC/tools/Scrap/Scraper.h
    branches/linuxport/XBMC/tools/Scrap/StdString.h
    branches/linuxport/XBMC/tools/Scrap/stdafx.cpp
    branches/linuxport/XBMC/tools/Scrap/stdafx.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinystr.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinystr.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxml.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxml.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxmlerror.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxmlparser.cpp
    branches/linuxport/XBMC/tools/XBMCLiveBuilder/Helpers/Copying.txt
    branches/linuxport/XBMC/tools/XBMCLiveBuilder/Helpers/ddchanges.txt
    branches/linuxport/XBMC/userdata/PictureIcon/Readme.txt
    branches/linuxport/XBMC/userdata/PictureIcon/picon.xml
    branches/linuxport/XBMC/visualisations/xbmc_vis.h
    branches/linuxport/XBMC/xbmc/Album.h
    branches/linuxport/XBMC/xbmc/Artist.h
    branches/linuxport/XBMC/xbmc/DllLibExif.h
    branches/linuxport/XBMC/xbmc/Favourites.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileFileReader.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/SAPDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.h
    branches/linuxport/XBMC/xbmc/GUIDialogBusy.h
    branches/linuxport/XBMC/xbmc/GUIDialogContentSettings.h
    branches/linuxport/XBMC/xbmc/GUIDialogFavourites.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogFavourites.h
    branches/linuxport/XBMC/xbmc/GUIDialogPictureInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogPictureInfo.h
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistEditor.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistEditor.h
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistRule.h
    branches/linuxport/XBMC/xbmc/GUIDialogSongInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSongInfo.h
    branches/linuxport/XBMC/xbmc/GUIDialogVideoScan.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogVideoScan.h
    branches/linuxport/XBMC/xbmc/GUIWindowMusicPlaylistEditor.h
    branches/linuxport/XBMC/xbmc/GUIWindowStartup.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowStartup.h
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h
    branches/linuxport/XBMC/xbmc/UPnP.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/Win32DllLoader.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/Win32DllLoader.h
    branches/linuxport/XBMC/xbmc/cores/mplayer/Win32DirectSound.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/analysis.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/bits.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/bits.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft_tab.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_1.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_10.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_11.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_2.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_3.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_4.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_6.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_7.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_9.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_sf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/common.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/common.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/drc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/drc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/error.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/error.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/filtbank.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/filtbank.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/fixed.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/hcr.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/huffman.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/huffman.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ic_predict.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ic_predict.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/include/faad.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/iq_table.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/is.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/is.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/kbd_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/lt_predict.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/lt_predict.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mdct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mdct.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mp4.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mp4.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ms.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ms.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/output.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/output.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pns.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pns.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pulse.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pulse.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/rvlc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/rvlc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dct.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_e_nf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_e_nf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_fbt.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_fbt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfadj.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfadj.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfgen.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfgen.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_huff.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_huff.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_noise.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf_c.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_syntax.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_syntax.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_tf_grid.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_tf_grid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sine_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/specrec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/specrec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_fb.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_fb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_ipqf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_ipqf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/structs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/syntax.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/syntax.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/tns.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/tns.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drms.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drmstables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4atom.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff_int_types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4meta.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4sample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4tagupdate.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4util.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/XBMC_README.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/in_xbadpcm.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/IN2.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/OUT.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/hist.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/wamain.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/XBMC_README.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/gym_play.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/readme.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/common.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/common.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/controls.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/controls.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/filter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/filter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/instrum.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/instrum.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/mix.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/mix.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/output.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/output.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/playmidi.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/playmidi.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/readmidi.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/readmidi.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/resample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/resample.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/sdl_a.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/sdl_c.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/tables.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/tables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timiditydll.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/dec_if.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/stdafx.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/COPYING.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/config_win32.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumb2wav.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumbout.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumbplay.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/aldumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/dumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/aldumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/dumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/it.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/make/dumbask.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/readme.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/release.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/atexit.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/duhlen.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/duhtag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/dumbfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/loadduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/makeduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rawsig.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/readduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/register.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rendduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rendsig.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/unload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/clickrem.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/memfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/resample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/sampbuf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/silence.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/stdfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itload2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itmisc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itorder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itread.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itread2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itrender.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itunload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadmod.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadmod2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loads3m.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loads3m2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadxm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadxm2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readmod.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readmod2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/reads3m.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/reads3m2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readxm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readxm2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/xmeffect.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/in_nsf.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/A2Misc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/APU.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/DSP.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/ReadMe.Txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SNESAPU.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SNESAPU.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SPC700.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/bits.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/changelog.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/extra1.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/extra2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/filters.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/float.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/license.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/md5.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/md5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/metadata.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/pack.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack3.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack3.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wavpack.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/words.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wputils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wputils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Depacker.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Depacker.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZH.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZHLIB.TXT
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZHXLIB.C
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmMusic.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmMusic.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmUserInterface.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ymload.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ymload.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/revision.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/replaygain_analysis.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/configure.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/configure.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/in_flac.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/infobox.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/infobox.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/playback.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/playback.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/tagz.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/tagz.h
    branches/linuxport/XBMC/xbmc/lib/boost/boost/assert.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/checked_delete.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/compiler/visualc.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/no_tr1/utility.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/platform/win32.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_compiler_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_platform_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_stdlib_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/stdlib/dinkumware.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/suffix.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/user.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/bad_weak_ptr.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/interlocked.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/shared_count.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_base.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_base_w32.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_impl.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_typeinfo.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/workaround.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/shared_ptr.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/throw_exception.hpp
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_26.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/example_nt/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_DEBUG.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_RELEASE.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PSP_Lib_C++.mcp.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaConnect/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/MediaCrawler.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/MediaCrawler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/StreamHandler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/PltMicroMediaController.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/PltMicroMediaController.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/Platinum.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltAction.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltAction.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltArgument.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltArgument.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceData.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceData.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDownloader.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDownloader.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltEvent.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltEvent.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLeaks.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLeaks.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLog.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLog.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltMetadataHandler.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltMetadataHandler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltRingBufferStream.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdpListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStateVariable.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStreamPump.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStreamPump.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltTaskManager.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltTaskManager.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltThreadTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnP.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnP.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnPHelper.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltVersion.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltXmlHelper.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnectSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/X_MS_MediaReceiverRegistrarSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/AVTransportSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/ConnectionManagerSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaControllerListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRendererSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/RenderingControlSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ConnectionManagerSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ContentDirectorySCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ContentDirectorywSearchSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowserListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaCache.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaCache.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaPlaylist.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaPlaylist.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServerSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/FileMediaServer/FileMediaServerTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/Http/HttpTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/LightSampleTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/PltLightSample.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/PltLightSample.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/MediaRenderer/MediaRendererTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/Ssdp/SsdpTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/SsdpProxy/SsdpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/SsdpProxy/SsdpProxy.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/TextToHeader/TextToHeader.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_DEBUG.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_RELEASE.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PSP_Lib_C++.mcp.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetConfig/NetConfig.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetEcho/NetEcho.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetPing/NetPing.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetPump/NetPump.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/Neptune.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptArray.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBase64.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBase64.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBufferedStreams.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBufferedStreams.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptCommon.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptCommon.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConfig.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConsole.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConstants.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDataBuffer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDataBuffer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDebug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDebug.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDirectory.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptFile.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptHttp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptHttp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptInterfaces.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptList.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptLogging.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptLogging.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMap.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMessaging.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMessaging.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptNetwork.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptResults.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptRingBuffer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptRingBuffer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSelectableMessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSerialPort.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSimpleMessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSimpleMessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSockets.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStack.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStrings.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStrings.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSystem.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptThreads.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTime.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTime.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTypes.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUri.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUri.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUtils.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUtils.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptVersion.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptXml.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptXml.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullHttpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullSerialPort.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PS3/NptPs3System.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptSelectableMessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcDebug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcEnvironment.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Symbian/NptSymbianSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Console.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Directory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32HttpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32MessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32MessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Network.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Queue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32SerialPort.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32System.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Threads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Threads.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceEnvironment.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceMain.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Xbox/NptXboxNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Arrays1/ArraysTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/BufferedStreams1/BufferedStreamsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Directory1/DirectoryTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/HttpClient1/HttpClientTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/HttpServer1/HttpServerTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Lists1/ListsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Logging1/LoggingTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Messages1/MessagesTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Messages2/MessagesTest2.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Misc1/MiscTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/RingBuffer1/RingBufferTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Strings1/StringsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Udp1/UdpTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Url1/UrlTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/XmlTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/big.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/test.xml
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/mysql_version.h
    branches/linuxport/XBMC/xbmc/lib/libsmb/libsmbclient_win32.h
    branches/linuxport/XBMC/xbmc/linux/XEventUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XEventUtils.h
    branches/linuxport/XBMC/xbmc/linux/XFileUtils.h
    branches/linuxport/XBMC/xbmc/linux/XTimeUtils.h
    branches/linuxport/XBMC/xbmc/utils/Fanart.h
    branches/linuxport/XBMC/xbmc/utils/LabelFormatter.cpp
    branches/linuxport/XBMC/xbmc/utils/LabelFormatter.h
    branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.h
    branches/linuxport/XBMC/xbmc/utils/ScraperParser.h
    branches/linuxport/XBMC/xbmc/utils/ScraperUrl.h
    branches/linuxport/XBMC/xbmc/utils/Stopwatch.cpp
    branches/linuxport/XBMC/xbmc/utils/Stopwatch.h
    branches/linuxport/XBMC/xbmc/utils/TuxBoxUtil.h
    branches/linuxport/XBMC/xbmc/utils/md5.c
    branches/linuxport/XBMC/xbmc/win32/MockXboxSymbols.h
    branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp
    branches/linuxport/XBMC/xbmc/win32/XBMC_PC.h
    branches/linuxport/XBMC/xbmc/win32/XCriticalSection.cpp
    branches/linuxport/XBMC/xbmc/win32/XCriticalSection.h
    branches/linuxport/XBMC/xbmc/win32/ntddcdrm.h
    branches/linuxport/XBMC/xbmc/win32/ntddstor.h
    branches/linuxport/XBMC/xbmc/win32/resource.h

Property Changed:
----------------
    branches/linuxport/XBMC/Makefile.in
    branches/linuxport/XBMC/Makefile.include.in
    branches/linuxport/XBMC/build.sh
    branches/linuxport/XBMC/config.h.in
    branches/linuxport/XBMC/configure.in
    branches/linuxport/XBMC/guilib/DirectXGraphics.cpp
    branches/linuxport/XBMC/guilib/DirectXGraphics.h
    branches/linuxport/XBMC/guilib/FrameBufferObject.cpp
    branches/linuxport/XBMC/guilib/FrameBufferObject.h
    branches/linuxport/XBMC/guilib/GUIBorderedImage.cpp
    branches/linuxport/XBMC/guilib/GUIBorderedImage.h
    branches/linuxport/XBMC/guilib/Shader.cpp
    branches/linuxport/XBMC/guilib/Shader.h
    branches/linuxport/XBMC/guilib/Surface.cpp
    branches/linuxport/XBMC/guilib/Surface.h
    branches/linuxport/XBMC/guilib/Tween.h
    branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
    branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
    branches/linuxport/XBMC/guilib/common/Keyboard.h
    branches/linuxport/XBMC/guilib/common/LIRC.cpp
    branches/linuxport/XBMC/guilib/common/LIRC.h
    branches/linuxport/XBMC/guilib/common/SDLJoystick.cpp
    branches/linuxport/XBMC/guilib/common/SDLJoystick.h
    branches/linuxport/XBMC/guilib/common/SDLKeyboard.cpp
    branches/linuxport/XBMC/guilib/common/SDLKeyboard.h
    branches/linuxport/XBMC/guilib/common/SDLMouse.cpp
    branches/linuxport/XBMC/guilib/common/SDLMouse.h
    branches/linuxport/XBMC/guilib/freetype2/include/freetype/ftoutln.h
    branches/linuxport/XBMC/guilib/system.h
    branches/linuxport/XBMC/language/English (US)/strings.xml
    branches/linuxport/XBMC/language/German/keyboardmap.xml
    branches/linuxport/XBMC/language/Slovak/langinfo.xml
    branches/linuxport/XBMC/project/Win32BuildSetup/readme.txt
    branches/linuxport/XBMC/project/Win32BuildSetup/sources.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/3D_CoverView.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes_Dialogs.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/CommonViewTypes_Library.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogBusy.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogContentSettings.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogFavourites.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogFullScreenInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogPictureInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogSongInfo.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/DialogVideoScan.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyGameSaves.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyMusicPlaylistEditor.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/MyVideoNav.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/SmartPlaylistEditor.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/SmartPlaylistRule.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL/defaults.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/3D_CoverView.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes_Dialogs.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/CommonViewTypes_Library.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/DialogBusy.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/SlideShow.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/PAL16x9/Startup.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/colors/defaults.xml
    branches/linuxport/XBMC/skin/Project Mayhem III/fonts/FrancophilSans_readme.txt
    branches/linuxport/XBMC/system/IRSSmap.xml
    branches/linuxport/XBMC/system/Keymap.xml
    branches/linuxport/XBMC/system/Lircmap.xml
    branches/linuxport/XBMC/system/scrapers/music/allmusic.xml
    branches/linuxport/XBMC/system/scrapers/video/adultcdmovies.xml
    branches/linuxport/XBMC/system/scrapers/video/adultfilmdatabase.xml
    branches/linuxport/XBMC/system/scrapers/video/allocine.xml
    branches/linuxport/XBMC/system/scrapers/video/asiandb.xml
    branches/linuxport/XBMC/system/scrapers/video/culturalia.xml
    branches/linuxport/XBMC/system/scrapers/video/filmaffinity.xml
    branches/linuxport/XBMC/system/scrapers/video/filmstarts.xml
    branches/linuxport/XBMC/system/scrapers/video/filmup.xml
    branches/linuxport/XBMC/system/scrapers/video/imdb tv.xml
    branches/linuxport/XBMC/system/scrapers/video/imdb.xml
    branches/linuxport/XBMC/system/scrapers/video/jadedVideo.xml
    branches/linuxport/XBMC/system/scrapers/video/movie-xml.xml
    branches/linuxport/XBMC/system/scrapers/video/mtv.xml
    branches/linuxport/XBMC/system/scrapers/video/musicvideos.xml
    branches/linuxport/XBMC/system/scrapers/video/ofdb.xml
    branches/linuxport/XBMC/system/scrapers/video/tvcom.xml
    branches/linuxport/XBMC/system/scrapers/video/tvdb.xml
    branches/linuxport/XBMC/system/scrapers/video/tvrage.xml
    branches/linuxport/XBMC/tools/Changelog/Changelog.cpp
    branches/linuxport/XBMC/tools/Changelog/stdafx.cpp
    branches/linuxport/XBMC/tools/EventClients/Clients/AppleRemote/AppleRemote.cpp
    branches/linuxport/XBMC/tools/EventClients/Clients/AppleRemote/AppleRemote.h
    branches/linuxport/XBMC/tools/EventClients/Clients/AppleRemote/XBox360.h
    branches/linuxport/XBMC/tools/EventClients/Clients/AppleRemote/iremoted.c
    branches/linuxport/XBMC/tools/EventClients/Clients/J2ME Client/build.xml
    branches/linuxport/XBMC/tools/EventClients/Clients/WiiRemote/WiiRemote.cpp
    branches/linuxport/XBMC/tools/EventClients/Clients/WiiRemote/WiiRemote.h
    branches/linuxport/XBMC/tools/EventClients/README.txt
    branches/linuxport/XBMC/tools/EventClients/examples/c++/example_button1.cpp
    branches/linuxport/XBMC/tools/EventClients/examples/c++/example_button2.cpp
    branches/linuxport/XBMC/tools/EventClients/examples/c++/example_log.cpp
    branches/linuxport/XBMC/tools/EventClients/examples/c++/example_mouse.cpp
    branches/linuxport/XBMC/tools/EventClients/examples/c++/example_notification.cpp
    branches/linuxport/XBMC/tools/EventClients/lib/c++/xbmcclient.h
    branches/linuxport/XBMC/tools/Fake Episode Maker/readme.txt
    branches/linuxport/XBMC/tools/Fake Episode Maker/shows.txt
    branches/linuxport/XBMC/tools/Linux/xbmc.sh.in
    branches/linuxport/XBMC/tools/Scrap/RegExp.cpp
    branches/linuxport/XBMC/tools/Scrap/RegExp.h
    branches/linuxport/XBMC/tools/Scrap/Scraper.h
    branches/linuxport/XBMC/tools/Scrap/StdString.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/curl.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/curlver.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/easy.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/mprintf.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/multi.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/stdcheaders.h
    branches/linuxport/XBMC/tools/Scrap/include/curl/types.h
    branches/linuxport/XBMC/tools/Scrap/stdafx.cpp
    branches/linuxport/XBMC/tools/Scrap/stdafx.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinystr.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinystr.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxml.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxml.h
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxmlerror.cpp
    branches/linuxport/XBMC/tools/Scrap/tinyXML/tinyxmlparser.cpp
    branches/linuxport/XBMC/tools/XBMCLiveBuilder/Helpers/Copying.txt
    branches/linuxport/XBMC/tools/XBMCLiveBuilder/Helpers/ddchanges.txt
    branches/linuxport/XBMC/tools/XBMCLiveBuilder/Image-creator/xbmc-ubuntu-hardy/install.sh
    branches/linuxport/XBMC/tools/XBMCTex/Makefile.in
    branches/linuxport/XBMC/tools/XBMCTex/Surface.cpp
    branches/linuxport/XBMC/tools/XBMCTex/Surface.h
    branches/linuxport/XBMC/tools/XBMCTex/SurfaceSDL.cpp
    branches/linuxport/XBMC/tools/XBMCTex/SurfaceSDL.h
    branches/linuxport/XBMC/tools/XBMCTex/XFileUtils.cpp
    branches/linuxport/XBMC/tools/XBMCTex/XFileUtils.h
    branches/linuxport/XBMC/tools/XBMCTex/XHandle.cpp
    branches/linuxport/XBMC/tools/XBMCTex/XHandle.h
    branches/linuxport/XBMC/tools/XBMCTex/XTimeUtils.cpp
    branches/linuxport/XBMC/tools/XBMCTex/XTimeUtils.h
    branches/linuxport/XBMC/tools/XBMCTex/cmdlineargs.h
    branches/linuxport/XBMC/tools/XBMCTex/stdint_win.h
    branches/linuxport/XBMC/tools/XBMCTex/xwinapi.cpp
    branches/linuxport/XBMC/tools/XBMCTex/xwinapi.h
    branches/linuxport/XBMC/userdata/ModeLines.xml
    branches/linuxport/XBMC/userdata/PictureIcon/Readme.txt
    branches/linuxport/XBMC/userdata/PictureIcon/picon.xml
    branches/linuxport/XBMC/visualisations/xbmc_vis.h
    branches/linuxport/XBMC/xbmc/Album.h
    branches/linuxport/XBMC/xbmc/Artist.cpp
    branches/linuxport/XBMC/xbmc/Artist.h
    branches/linuxport/XBMC/xbmc/DllLibExif.h
    branches/linuxport/XBMC/xbmc/Edl.cpp
    branches/linuxport/XBMC/xbmc/Favourites.cpp
    branches/linuxport/XBMC/xbmc/Favourites.h
    branches/linuxport/XBMC/xbmc/FileSystem/CMythDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/CMythDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/CMythFile.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/CMythFile.h
    branches/linuxport/XBMC/xbmc/FileSystem/CMythSession.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/CMythSession.h
    branches/linuxport/XBMC/xbmc/FileSystem/CacheMemBuffer.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/CacheMemBuffer.h
    branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileCache.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileFileReader.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileFileReader.h
    branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.h
    branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/ILiveTV.h
    branches/linuxport/XBMC/xbmc/FileSystem/RSSDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/RSSDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/SAPDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/UPnPVirtualPathDirectory.h
    branches/linuxport/XBMC/xbmc/GUIDialogAccessPoints.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogAccessPoints.h
    branches/linuxport/XBMC/xbmc/GUIDialogBusy.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogBusy.h
    branches/linuxport/XBMC/xbmc/GUIDialogContentSettings.h
    branches/linuxport/XBMC/xbmc/GUIDialogFavourites.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogFavourites.h
    branches/linuxport/XBMC/xbmc/GUIDialogFullScreenInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogFullScreenInfo.h
    branches/linuxport/XBMC/xbmc/GUIDialogPictureInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogPictureInfo.h
    branches/linuxport/XBMC/xbmc/GUIDialogPluginSettings.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistEditor.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistEditor.h
    branches/linuxport/XBMC/xbmc/GUIDialogSmartPlaylistRule.h
    branches/linuxport/XBMC/xbmc/GUIDialogSongInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSongInfo.h
    branches/linuxport/XBMC/xbmc/GUIDialogVideoScan.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogVideoScan.h
    branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePictures.h
    branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.h
    branches/linuxport/XBMC/xbmc/GUIViewStateScripts.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateScripts.h
    branches/linuxport/XBMC/xbmc/GUIWindowMusicPlaylistEditor.h
    branches/linuxport/XBMC/xbmc/GUIWindowStartup.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowStartup.h
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h
    branches/linuxport/XBMC/xbmc/KeyboardLayoutConfiguration.cpp
    branches/linuxport/XBMC/xbmc/KeyboardLayoutConfiguration.h
    branches/linuxport/XBMC/xbmc/PluginSettings.h
    branches/linuxport/XBMC/xbmc/ScraperSettings.cpp
    branches/linuxport/XBMC/xbmc/UPnP.h
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoTag.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/DllLoader-linux.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/LibraryLoader.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/SoLoader.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/SoLoader.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/Win32DllLoader.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/Win32DllLoader.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/exports_python_linux.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c
    branches/linuxport/XBMC/xbmc/cores/DllLoader/ldt_keeper.c
    branches/linuxport/XBMC/xbmc/cores/DllLoader/ldt_keeper.h
    branches/linuxport/XBMC/xbmc/cores/DllLoader/mmap_anon.c
    branches/linuxport/XBMC/xbmc/cores/DllLoader/mmap_anon.h
    branches/linuxport/XBMC/xbmc/cores/DummyVideoPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRenderer.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRenderer.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererATI.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererATI.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RenderFlags.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/BaseYUV2RGBShader.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/ALSADirectSound.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/libfaad/neaacdec.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/PortaudioDirectSound.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvCodec.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvFormat.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllPostProc.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllSwScale.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/avcodec.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/avformat.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/avio.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/avutil.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/common.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/integer.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/intfloat_readwrite.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/log.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/mathematics.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/mem.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/postprocess.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/rational.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/rgb2rgb.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/rtp.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/rtsp.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/rtspcodes.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/swscale.h
    branches/linuxport/XBMC/xbmc/cores/mplayer/Win32DirectSound.cpp
    branches/linuxport/XBMC/xbmc/cores/mplayer/Win32DirectSound.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/alac.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/decomp.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/demux.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/wavwriter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/alac_decoder/wavwriter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/analysis.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/bits.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/bits.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/cfft_tab.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_1.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_10.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_11.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_2.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_3.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_4.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_6.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_7.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_9.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/codebook/hcb_sf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/common.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/common.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/drc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/drc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/error.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/error.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/filtbank.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/filtbank.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/fixed.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/hcr.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/huffman.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/huffman.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ic_predict.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ic_predict.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/include/faad.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/iq_table.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/is.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/is.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/kbd_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/lt_predict.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/lt_predict.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mdct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mdct.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mp4.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/mp4.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ms.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ms.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/output.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/output.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pns.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pns.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pulse.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/pulse.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/rvlc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/rvlc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dct.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_dec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_e_nf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_e_nf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_fbt.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_fbt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfadj.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfadj.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfgen.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_hfgen.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_huff.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_huff.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_noise.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_qmf_c.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_syntax.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_syntax.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_tf_grid.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sbr_tf_grid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/sine_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/specrec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/specrec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_fb.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_fb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_ipqf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_ipqf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/ssr_win.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/structs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/syntax.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/syntax.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/tns.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/libfaad/tns.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drms.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/drmstables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4atom.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4ff_int_types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4meta.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4sample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4tagupdate.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/mp4ff/mp4util.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AACCodec/utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/XBMC_README.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/doc/liba52.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/include/a52.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/include/attributes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/include/audio_out.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/include/mm_accel.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/include/tendra.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/a52_internal.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/bit_allocate.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/bitstream.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/bitstream.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/downmix.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/imdct.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/parse.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/liba52/tables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/a52dec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/extract_a52.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/getopt.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/getopt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/gettimeofday.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/src/gettimeofday.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/vc++/a52.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/vc++/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/AC3Codec/vc++/inttypes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/in_xbadpcm.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/mywav.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/uXboxAdpcmDecoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec/uXboxAdpcmDecoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ADPCMCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/IN2.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/OUT.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/hist.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/CubeCodec/wamain.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/XBMC_README.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/doc/libdts.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/include/audio_out.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/include/dts.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/include/tendra.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/bitstream.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/bitstream.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/downmix.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/dts_internal.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables_adpcm.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables_fir.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables_huffman.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables_quantization.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/libdts/tables_vq.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/dtsdec.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/extract_dts.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/getopt.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/getopt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/gettimeofday.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/src/gettimeofday.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/vc++/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/vc++/dts.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DCACodec/vc++/inttypes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllTimidity.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllWMA.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/gym_play.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/GYMCodec/readme.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/common.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/common.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/controls.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/controls.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/filter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/filter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/instrum.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/instrum.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/mix.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/mix.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/output.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/output.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/playmidi.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/playmidi.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/readmidi.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/readmidi.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/resample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/resample.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/sdl_a.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/sdl_c.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/tables.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/tables.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timidity.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MIDCodec/timiditydll.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/dec_if.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/MADCodec/stdafx.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/bit.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/bit.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/config.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/fixed.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/fixed.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/frame.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/frame.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/global.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/huffman.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/huffman.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/layer12.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/layer12.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/layer3.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/layer3.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/libmad.list.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/minimad.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/msvc++/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/msvc++/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/msvc++/mad.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/stream.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/stream.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/synth.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/synth.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/timer.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/timer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/version.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3Codec/libmad-0.15.1b/version.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/COPYING.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/autogen.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/config/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/config.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mainpage.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/config_types.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/config_win32.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/huffman.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/internal.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/math.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/mpcdec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/reader.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/requant.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/include/mpcdec/streaminfo.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/huffsv46.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/huffsv7.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/idtag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/mpc_reader.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/requant.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/sample.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/streaminfo.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/synth_filter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/MPCCodec/src/xbmc_interface.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumb2wav.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumbout.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/examples/dumbplay.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/aldumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/dumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/aldumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/dumb.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/include/internal/it.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/make/config.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/make/config.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/make/dumbask.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/readme.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/release.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/atexit.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/duhlen.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/duhtag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/dumbfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/loadduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/makeduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rawsig.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/readduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/register.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rendduh.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/rendsig.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/core/unload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/clickrem.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/memfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/resample.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/sampbuf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/silence.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/helpers/stdfile.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itload2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itmisc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itorder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itread.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itread2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itrender.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/itunload.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadmod.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadmod2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loads3m.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loads3m2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadxm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/loadxm2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readmod.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readmod2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/reads3m.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/reads3m2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readxm.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/readxm2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/ModuleCodec/src/it/xmeffect.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/NoseFartDLL.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/in_nsf.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/cpu/nes6502/dis6502.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/cpu/nes6502/dis6502.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/cpu/nes6502/nes6502.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/cpu/nes6502/nes6502.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/f/nsf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/log.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/log.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/machine/nsf.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/machine/nsf.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/memguard.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/memguard.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/osd.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/fds_snd.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/fds_snd.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/fmopl.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/fmopl.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/mmc5_snd.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/mmc5_snd.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/nes_apu.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/nes_apu.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/vrc7_snd.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/vrc7_snd.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/vrcvisnd.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/sndhrdw/vrcvisnd.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/NSFCodec/src/version.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/RingHoldBuffer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/include/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/include/sidplay/builders/hardsid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/src/hardsid-builder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/src/hardsid-emu.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/src/hardsid-unix.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/src/hardsid-win.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/hardsid-builder/win/VC/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/include/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/include/sidplay/builders/resid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-builder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid-emu.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/src/resid.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/builders/resid-builder/win/VC/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidenv.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/Buffer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/SidTune.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/SmartPtr.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/c64env.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/component.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/event.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sid2types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidbuilder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidconfig.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidendian.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidint.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidplay2.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidtypes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/include/sidplay/sidusage.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/c64/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/c64/c64cia.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/c64/c64vic.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/c64/c64xsid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/config.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/event.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mixer.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/conf6510.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/cycle_based/mos6510c.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/cycle_based/sid6510c.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/mos6510.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/mos6510.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6510/opcodes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6526/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6526/mos6526.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos6526/mos6526.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos656x/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos656x/mos656x.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/mos656x/mos656x.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/nullsid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/player.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/player.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/psiddrv.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/reloc65.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sid6526/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sid6526/sid6526.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sid6526/sid6526.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidplay2.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/IconInfo.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/InfoFile.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/MUS.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/PP20.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/PP20.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/PP20_Defs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/PSID.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/SidTune.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/SidTuneCfg.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/SidTuneTools.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/SidTuneTools.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/p00.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/sidtune/prg.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/xsid/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/xsid/xsid.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/src/xsid/xsid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/config.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/libsidplay2.pc.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/libsidplay2.qpg.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/libsidplay2.spec.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/sidconfig.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/sidconfig.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/sidint.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/XBMCSID.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/sidconfig.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/sidint.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/sidplay/utils/SidDatabase.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/sidplay/utils/SidFilter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/sidplay/utils/SidTuneMod.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/sidplay/utils/SidUsage.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/include/sidplay/utils/libini.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/MD5/MD5.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/MD5/MD5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/MD5/MD5_Defs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/SidDatabase.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/SidFilter.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/SidTuneMod.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/SidUsage.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/ini/headings.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/ini/ini.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/ini/ini.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/ini/keys.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/ini/list.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/smm.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/src/smm0.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/libsidutils/win/VC/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/envelope.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/extfilt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/filter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/pot.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/sid.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/siddefs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/siddefs.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/spline.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/voice.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SIDCodec/resid/wave.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/A2Misc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/APU.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/DSP.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/ReadMe.Txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SNESAPU.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SNESAPU.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU/SPC700.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/Types.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/SPCCodec/lgpl.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/TimidityCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/bits.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/changelog.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/extra1.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/extra2.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/filters.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/float.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/license.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/md5.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/md5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/metadata.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/pack.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack3.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/unpack3.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wavpack.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/words.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wputils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/WavPackCodec/wputils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Depacker.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Depacker.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZH.H
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZHLIB.TXT
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/LZH/LZHXLIB.C
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/XBMCYM.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ym2149Ex.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmMusic.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmMusic.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmTypes.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/YmUserInterface.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ymload.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/Ymload.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/StSoundLibrary/digidrum.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/license.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/YMCodec/revision.txt
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/COPYING.GPL
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/autogen.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/build/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/config.h.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/configure.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/images/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/images/hw/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/doc/html/ru/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/file/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/decode/file/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/file/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/c/encode/file/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/file/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/decode/file/main.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/file/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/examples/cpp/encode/file/main.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/assert.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/callback.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/export.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/format.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/ordinals.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/stream_decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC/stream_encoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/encoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/export.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/FLAC++/metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/alloc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/getopt.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/cuesheet.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/file.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/picture.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/replaygain.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag/seektable.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/grabbag.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/replaygain_analysis.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/replaygain_synthesis.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/share/utf8.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/test_libs_common/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/test_libs_common/file_utils_flac.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/include/test_libs_common/metadata_utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/ltmain.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/m4/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/man/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/debug/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/debug/bin/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/debug/lib/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/release/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/release/bin/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/obj/release/lib/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/analyze.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/analyze.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/decode.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/decode.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/encode.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/encode.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/foreign_metadata.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/foreign_metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/iffscan.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/local_string_utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/local_string_utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/vorbiscomment.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/flac/vorbiscomment.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/bitmath.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/bitreader.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/bitwriter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/cpu.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/crc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/fixed.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/flac.pc.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/float.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/format.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ia32/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ia32/nasm.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/bitmath.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/bitreader.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/bitwriter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/cpu.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/crc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/fixed.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/float.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/format.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/lpc.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/md5.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/memory.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/ogg_decoder_aspect.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/ogg_encoder_aspect.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/ogg_helper.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/ogg_mapping.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/stream_encoder_framing.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/private/window.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/protected/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/protected/all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/protected/stream_decoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/include/protected/stream_encoder.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/lpc.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/md5.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/memory.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/metadata_iterators.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/metadata_object.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ogg_decoder_aspect.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ogg_encoder_aspect.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ogg_helper.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ogg_mapping.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/as/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/ppc/gas/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/stream_decoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/stream_encoder.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/stream_encoder_framing.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC/window.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/flac++.pc.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/metadata.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/stream_decoder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/libFLAC++/stream_encoder.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand_cuesheet.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand_picture.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand_seektable.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand_streaminfo.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/operations_shorthand_vorbiscomment.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/options.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/options.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/usage.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/usage.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/metaflac/utils.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/all.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/charset.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/charset.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/defs.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/dither.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/dither.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/replaygain.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/replaygain.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/tags.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_common/tags.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/configure.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/configure.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/in_flac.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/winamp2/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/include/winamp2/out.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/infobox.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/infobox.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/playback.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/playback.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/resource.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/tagz.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_winamp2/tagz.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/charset.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/charset.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/configure.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/configure.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/fileinfo.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/http.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/http.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/locale_hack.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/plugin.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/plugin.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/tag.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/plugin_xmms/tag.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/getopt/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/getopt/getopt.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/getopt/getopt1.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/cuesheet.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/file.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/picture.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/replaygain.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/grabbag/seektable.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_analysis/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_analysis/replaygain_analysis.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/include/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/include/private/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/include/private/fast_float_math_hack.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/replaygain_synthesis/replaygain_synthesis.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/charmaps.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/charset.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/charset.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/charset_test.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/charsetmap.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/iconvert.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/iconvert.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/makemap.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/share/utf8/utf8.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/cuesheet/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/cuesheet/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/picture/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_grabbag/picture/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/bitwriter.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/bitwriter.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/decoders.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/decoders.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/encoders.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/encoders.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/format.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/format.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/metadata.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/metadata_manip.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC/metadata_object.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/decoders.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/decoders.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/encoders.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/encoders.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/main.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/metadata.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/metadata.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/metadata_manip.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libFLAC++/metadata_object.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libs_common/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libs_common/file_utils_flac.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_libs_common/metadata_utils.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_seeking/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_seeking/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_streams/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/src/test_streams/main.c
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/strip_non_asm_libtool_args.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/cuesheets/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/flac-to-flac-metadata-test-files/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/metaflac-test-files/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/pictures/Makefile.in
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_bins.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_flac.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_grabbag.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_libFLAC++.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_libFLAC.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_metaflac.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_seeking.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/test/test_streams.sh
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp
    branches/linuxport/XBMC/xbmc/lib/UnrarXLib/uowners.cpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/assert.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/checked_delete.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/compiler/visualc.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/no_tr1/utility.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/platform/win32.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_compiler_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_platform_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/select_stdlib_config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/stdlib/dinkumware.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/suffix.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config/user.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/config.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/bad_weak_ptr.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/interlocked.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/shared_count.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_base.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_base_w32.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_counted_impl.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/sp_typeinfo.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/detail/workaround.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/shared_ptr.hpp
    branches/linuxport/XBMC/xbmc/lib/boost/boost/throw_exception.hpp
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/cgi/cgi0.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/embed/demo.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/embed/importexc.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/embed/loop.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/metaclasses/meta-vladimir.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/pysvr/pysvr.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/tix/INSTALL.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Demo/tix/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/commontex/typestruct.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/ext/noddy.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/ext/noddy2.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/ext/noddy3.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/ext/noddy4.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/ext/run-func.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/html/index.html.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/python-docs.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/tools/makesec.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/tools/push-docs.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/tools/sgmlconv/conversion.xml
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Doc/tools/update-docs.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/Python.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/abstract.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/bitset.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/boolobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/bufferobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/cStringIO.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/cellobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/ceval.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/classobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/cobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/codecs.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/compile.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/complexobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/datetime.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/descrobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/dictobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/enumobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/errcode.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/eval.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/fileobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/floatobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/frameobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/funcobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/genobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/graminit.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/grammar.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/import.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/intobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/intrcheck.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/iterobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/listobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/longintrepr.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/longobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/marshal.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/metagrammar.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/methodobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/modsupport.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/moduleobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/node.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/object.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/objimpl.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/opcode.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/osdefs.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/parsetok.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/patchlevel.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pgen.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pgenheaders.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/py_curses.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pydebug.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pyerrors.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pyfpe.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pygetopt.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pymactoolbox.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pymem.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pyport.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pystate.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pystrtod.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pythonrun.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/pythread.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/rangeobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/setobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/sliceobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/stringobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/structmember.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/structseq.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/symtable.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/sysmodule.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/timefuncs.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/token.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/traceback.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/tupleobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/ucnhash.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/unicodeobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Include/weakrefobject.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_01.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_02.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_03.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_04.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_05.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_06.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_07.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_08.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_09.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_10.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_11.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_12.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_12a.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_13.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_14.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_15.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_16.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_17.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_18.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_19.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_20.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_21.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_22.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_23.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_24.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_25.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_26.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_27.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_28.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_29.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_30.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_31.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_32.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_33.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_34.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_35.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_36.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_37.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_38.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_39.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_40.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_41.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_42.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_43.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/email/test/data/msg_44.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/CREDITS.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/HISTORY.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/NEWS.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/TODO.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/extend.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/idlelib/help.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/test/test.xml
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/test/test_doctest.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/test/test_doctest2.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Lib/test/tokenize_tests.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/BuildScript/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/BuildScript/resources/ReadMe.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/ColorPickermodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/Nav.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/OSATerminology.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/ae/_AEmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/ah/_AHmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/app/_Appmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/autoGIL.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/carbonevt/_CarbonEvtmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cf/_CFmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cf/pycfbridge.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cf/pycfbridge.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cg/CFMLateImport.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cg/CFMLateImport.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cg/_CGmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/cm/_Cmmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/ctl/_Ctlmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/dlg/_Dlgmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/drag/_Dragmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/evt/_Evtmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/file/_Filemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/fm/_Fmmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/folder/_Foldermodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/gestaltmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/help/_Helpmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/ibcarbon/_IBCarbon.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/icgluemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/icn/_Icnmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/launch/_Launchmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/list/_Listmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/macosmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/menu/_Menumodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/mlte/_Mltemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/osa/_OSAmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/qd/_Qdmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/qdoffs/_Qdoffsmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/qt/_Qtmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/res/_Resmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/scrap/_Scrapmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/snd/_Sndihooks.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/snd/_Sndmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/te/_TEmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/waste/wastemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Modules/win/_Winmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/Dist/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/Dist/resources/ReadMe.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/Extras.ReadMe.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/IDLE/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/FileSettings.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/MyAppDelegate.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/MyDocument.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/PreferencesWindowController.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/PythonLauncher/doscript.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/OSX/pythonw.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WEObjectHandlers.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WEObjectHandlers.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WETabHooks.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WETabHooks.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WETabs.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/WETabs.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/Wastemods/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/scripts/errors.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/scripts/mkestrres-errno.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Mac/scripts/mkestrres-macerrors.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Makefile.pre.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Misc/SpecialBuilds.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Misc/build.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Misc/pymemcompat.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Misc/setuid-prog.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/Setup.config.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_bisectmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_bsddb.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_codecsmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_csv.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_curses_panel.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_cursesmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_heapqmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_hotshot.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_localemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_randommodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_sre.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_ssl.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_testcapimodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_tkinter.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/_weakref.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/addrinfo.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/almodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/arraymodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/audioop.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/binascii.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/bsddbmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/bz2module.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cPickle.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cStringIO.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cdmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cgensupport.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cgensupport.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_cn.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_hk.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_iso2022.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_jp.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_kr.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/_codecs_tw.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/alg_jisx0201.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/cjkcodecs.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/emu_jisx0213_2000.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_cn.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_hk.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_jisx0213_pair.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_jp.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_kr.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/mappings_tw.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/multibytecodec.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cjkcodecs/multibytecodec.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/clmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cmathmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/collectionsmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/config.c.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/cryptmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/datetimemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/dbmmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/dlmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/errnomodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/ascii.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/asciitab.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/expat.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/expat_config.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/expat_external.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/iasciitab.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/internal.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/latin1tab.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/macconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/nametab.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/utf8tab.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/winconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmlparse.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmlrole.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmlrole.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmltok.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmltok.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmltok_impl.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmltok_impl.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/expat/xmltok_ns.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/fcntlmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/flmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/fmmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/fpectlmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/fpetestmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/gc_weakref.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/gcmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/gdbmmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/getaddrinfo.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/getbuildinfo.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/getnameinfo.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/getpath.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/glmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/grpmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/imageop.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/imgfile.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/itertoolsmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/linuxaudiodev.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/main.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/mathmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/md5.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/md5c.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/md5module.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/mmapmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/nismodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/operator.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/ossaudiodev.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/parsermodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/posixmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/puremodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/pwdmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/pyexpat.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/python.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/readline.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/regexmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/regexpr.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/regexpr.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/resource.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/rgbimgmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/selectmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/sgimodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/shamodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/signalmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/socketmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/socketmodule.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/sre.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/sre_constants.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/stropmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/structmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/sunaudiodev.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/svmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/symtablemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/syslogmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/termios.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/testcapi_long.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/threadmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/timemodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/timing.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/timingmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/tkappinit.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/unicodedata.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/unicodedata_db.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/unicodename_db.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/xxmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/xxsubtype.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/yuv.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/yuvconvert.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/zipimport.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Modules/zlibmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/abstract.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/boolobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/bufferobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/cellobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/classobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/cobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/complexobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/descrobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/dictnotes.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/dictobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/enumobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/fileobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/floatobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/frameobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/funcobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/genobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/intobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/iterobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/listobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/listsort.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/longobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/methodobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/moduleobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/object.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/obmalloc.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/rangeobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/setobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/sliceobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/stringobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/structseq.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/tupleobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/typeobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/unicodectype.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/unicodeobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/unicodetype_db.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Objects/weakrefobject.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/VC6/_ssl.mak
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/VC6/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/WinMain.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/_subprocess.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/_winreg.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/bdist_wininst/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/bdist_wininst/archive.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/bdist_wininst/extract.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/bdist_wininst/install.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/bdist_wininst/resource.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/config.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/dl_nt.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/dllbase_nt.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/empty.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/example_nt/example.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/example_nt/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/frozen_dllmain.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/getpathp.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/icons.mak
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/import_nt.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/make_versioninfo.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/msvcrtmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/config.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/dlfcn.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/dlfcn.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/dllentry.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/getpathp.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/pyconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2emx/pythonpm.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2vacpp/config.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2vacpp/getpathp.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2vacpp/pyconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/os2vacpp/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/pyconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/w9xpopen.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PC/winsound.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PCbuild/BUILDno.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PCbuild/_ssl.mak
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/PCbuild/readme.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/acceler.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/bitset.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/firstsets.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/grammar.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/grammar.mak
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/grammar1.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/intrcheck.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/listnode.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/metagrammar.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/myreadline.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/node.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/parser.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/parser.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/parsetok.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/pgen.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/pgenmain.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/printgrammar.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/tokenizer.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/tokenizer.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Parser/tokenizer_pgen.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/atof.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/bltinmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/ceval.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/codecs.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/compile.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dup2.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_aix.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_atheos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_beos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_dl.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_hpux.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_next.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_os2.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_shlib.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_stub.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/dynload_win.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/errors.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/exceptions.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/fmod.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/frozen.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/frozenmain.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/future.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getargs.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getcompiler.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getcopyright.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getcwd.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getmtime.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getopt.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getplatform.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/getversion.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/graminit.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/hypot.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/import.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/importdl.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/importdl.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/mactoolboxglue.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/marshal.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/memmove.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/modsupport.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/mysnprintf.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/mystrtoul.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/pyfpe.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/pystate.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/pystrtod.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/pythonrun.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/sigcheck.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/strdup.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/strerror.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/strtod.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/structmember.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/symtable.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/sysmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_atheos.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_beos.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_cthread.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_foobar.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_lwp.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_nt.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_os2.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_pth.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_pthread.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_sgi.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_solaris.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/thread_wince.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Python/traceback.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Modules/config.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Modules/drawfmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Modules/getpath_riscos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Modules/riscosmodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Modules/swimodule.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Python/dynload_riscos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Python/getcwd_riscos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/Python/getmtime_riscos.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/pyconfig.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/sleep.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/unixstuff.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/RISCOS/unixstuff.h
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/buildbot/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/buildbot/kill_python.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/compiler/ast.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/faqwiz/move-faqwiz.sh
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/framer/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/framer/TODO.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/msi/README.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/msi/msisupport.c
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/msi/msisupport.mak
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/X/rgb.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/X/xlicense.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/html40colors.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/namedcolors.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/webcolors.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/Tools/pynche/websafe.txt
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/configure.in
    branches/linuxport/XBMC/xbmc/lib/libPython/Python/pyconfig.h.in
    branches/linuxport/XBMC/xbmc/lib/libPython/linux/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libPython/linux/wrapper_python.c
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/winxml.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/winxml.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/AMFObject.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/AMFObject.h
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.h
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmppacket.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmppacket.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_active.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_audio.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_byteorder.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_cdrom.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_config.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_cpuinfo.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_endian.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_error.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_events.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_getenv.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_image.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_joystick.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_keyboard.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_keysym.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_loadso.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_main.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_mixer.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_mouse.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_mutex.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_name.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_opengl.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_platform.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_quit.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_rotozoom.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_rwops.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_stdinc.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_syswm.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_thread.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_timer.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_types.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_version.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/SDL_video.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/begin_code.h
    branches/linuxport/XBMC/xbmc/lib/libSDL-OSX/SDL/close_code.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Makefile.in
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_DEBUG.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_RELEASE.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/CodeWarrior/PSP_Lib_C++.mcp.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Build/Targets/mipsel-psp-linux/Common.mak
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaConnect/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/MediaCrawler.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/MediaCrawler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/StreamHandler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MediaCrawler/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/PltMicroMediaController.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/PltMicroMediaController.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Apps/MicroMediaController/main.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/Platinum.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/Platinum.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltAction.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltAction.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltArgument.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltArgument.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPoint.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltCtrlPointTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDatagramStream.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceData.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceData.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDeviceHost.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDownloader.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltDownloader.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltEvent.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltEvent.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpClientTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLeaks.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLeaks.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLog.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltLog.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltMetadataHandler.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltMetadataHandler.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltRingBufferStream.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltRingBufferStream.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltSsdpListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStateVariable.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStreamPump.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltStreamPump.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltTaskManager.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltTaskManager.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltThreadTask.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltThreadTask.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnP.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnP.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltUPnPHelper.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltVersion.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltXmlHelper.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnectSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/X_MS_MediaReceiverRegistrarSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/AVTransportSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/ConnectionManagerSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaControllerListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRendererSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/RenderingControlSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ConnectionManagerSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ContentDirectorySCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/ContentDirectorywSearchSCPD.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltFileMediaServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowser.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaBrowserListener.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaCache.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaCache.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaPlaylist.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaPlaylist.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServerSCPDs.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/FileMediaServer/FileMediaServerTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/Http/HttpTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/LightSampleTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/PltLightSample.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/LightSample/PltLightSample.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/MediaRenderer/MediaRendererTest.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tests/Ssdp/SsdpTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/SsdpProxy/SsdpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/SsdpProxy/SsdpProxy.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Tools/TextToHeader/TextToHeader.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_DEBUG.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PREFIX_PSP_RELEASE.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Build/Targets/mipsel-psp-linux/CodeWarrior/PSP_Lib_C++.mcp.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetConfig/NetConfig.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetEcho/NetEcho.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetPing/NetPing.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Apps/NetPump/NetPump.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/Neptune.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/Neptune.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptArray.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBase64.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBase64.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBufferedStreams.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptBufferedStreams.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptCommon.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptCommon.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConfig.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConsole.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptConstants.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDataBuffer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDataBuffer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDebug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDebug.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDefs.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptDirectory.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptFile.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptHttp.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptHttp.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptInterfaces.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptList.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptList.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptLogging.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptLogging.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMap.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMessaging.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptMessaging.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptNetwork.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptReferences.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptResults.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptRingBuffer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptRingBuffer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSelectableMessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSerialPort.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSimpleMessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSimpleMessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSockets.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSockets.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStack.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStreams.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStreams.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStrings.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptStrings.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptSystem.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptThreads.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTime.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTime.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptTypes.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUri.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUri.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUtils.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptUtils.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptVersion.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptXml.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptXml.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptZip.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core/NptZip.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullHttpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullSerialPort.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Null/NptNullThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PS3/NptPs3System.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/PSP/NptPSPThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixDirectory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptPosixThreads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Posix/NptSelectableMessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcDebug.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcEnvironment.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/StdC/NptStdcFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Symbian/NptSymbianSystem.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Console.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Directory.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32HttpProxy.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32MessageQueue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32MessageQueue.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Network.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Network.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Queue.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32SerialPort.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32System.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Threads.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Win32/NptWin32Threads.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceConsole.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceEnvironment.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/WinCE/NptWinceMain.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Xbox/NptXboxNetwork.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Xbox/NptXboxNetwork.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Arrays1/ArraysTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/BufferedStreams1/BufferedStreamsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Directory1/DirectoryTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/HttpClient1/HttpClientTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/HttpServer1/HttpServerTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Lists1/ListsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Logging1/LoggingTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Messages1/MessagesTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Messages2/MessagesTest2.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Misc1/MiscTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/RingBuffer1/RingBufferTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Strings1/StringsTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Udp1/UdpTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Url1/UrlTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/XmlTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/big.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/test.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Xml1/unicode.xml
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Zip1/ZipTest1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/Tests/Zip1/ZipTestData1.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/adler32.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/compress.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/crc32.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/crc32.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/deflate.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/deflate.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/infback.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inffast.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inffast.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inffixed.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inflate.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inflate.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inftrees.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/inftrees.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/trees.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/trees.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/zconf.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/zconf.in.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/zlib.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/zutil.c
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/ThirdParty/zlib-1.2.3/zutil.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_bitmap.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_cache.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_font.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_fontconfig.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_library.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_mp.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_types.h
    branches/linuxport/XBMC/xbmc/lib/libass/ass_utils.h
    branches/linuxport/XBMC/xbmc/lib/libass/help_mp.h
    branches/linuxport/XBMC/xbmc/lib/libass/mp_msg.h
    branches/linuxport/XBMC/xbmc/lib/libass/mputils.h
    branches/linuxport/XBMC/xbmc/lib/libass/msvc.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/audio.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/cdio_config.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/cdio_confw32.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/ecma_167.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/posix.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/rock.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/udf.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/udf_file.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/udf_time.h
    branches/linuxport/XBMC/xbmc/lib/libcdio/utf8.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/my_alloc.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/my_list.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/mysql.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/mysql_com.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/mysql_time.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/mysql_version.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/Win32/include/mysql/typelib.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/alloc.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/bookmark.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/cmyth.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/commbreak.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/connection.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/debug.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/debug_refmem.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/event.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/file.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/freespace.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/keyframe.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/livetv.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mvp_atomic.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mvp_debug.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mvp_refmem.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mvp_string.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mysql_query.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/mythtv_mysql.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/posmap.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/proglist.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/rec_num.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/recorder.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/refmem_local.h
    branches/linuxport/XBMC/xbmc/lib/libcmyth/ringbuf.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/socket.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/timestamp.c
    branches/linuxport/XBMC/xbmc/lib/libcmyth/tvguide.c
    branches/linuxport/XBMC/xbmc/lib/libenca/enca.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/avcodec.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/avformat.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/avio.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/avutil.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/common.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/integer.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/intfloat_readwrite.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/libavcodec/avcodec.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/libavutil/avutil.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/log.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/mathematics.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/mem.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/postprocess.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/rational.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/rgb2rgb.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/rtp.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/rtsp.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/rtspcodes.h
    branches/linuxport/XBMC/xbmc/lib/libffmpeg-OSX/swscale.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_channelscan.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_control.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_device.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_discover.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_os.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_pkt.h
    branches/linuxport/XBMC/xbmc/lib/libhdhomerun/hdhomerun_video.h
    branches/linuxport/XBMC/xbmc/lib/libpcre/pcre.h
    branches/linuxport/XBMC/xbmc/lib/libpcre/pcre_internal.h
    branches/linuxport/XBMC/xbmc/lib/libpcre/ucp.h
    branches/linuxport/XBMC/xbmc/lib/libpcre/ucpinternal.h
    branches/linuxport/XBMC/xbmc/lib/libpcre/ucptable.h
    branches/linuxport/XBMC/xbmc/lib/libportaudio/pa_mac_core.h
    branches/linuxport/XBMC/xbmc/lib/libportaudio/portaudio.h
    branches/linuxport/XBMC/xbmc/lib/libshout/confw32.h
    branches/linuxport/XBMC/xbmc/lib/libshout/external.h
    branches/linuxport/XBMC/xbmc/lib/libshout/srconfig.h
    branches/linuxport/XBMC/xbmc/lib/libshout/srtypes.h
    branches/linuxport/XBMC/xbmc/lib/libsmb/libsmbclient_win32.h
    branches/linuxport/XBMC/xbmc/lib/zlib/zconf.h
    branches/linuxport/XBMC/xbmc/lib/zlib/zlib.h
    branches/linuxport/XBMC/xbmc/linux/CPortAudio.cpp
    branches/linuxport/XBMC/xbmc/linux/CPortAudio.h
    branches/linuxport/XBMC/xbmc/linux/ConvUtils.h
    branches/linuxport/XBMC/xbmc/linux/HalManager.cpp
    branches/linuxport/XBMC/xbmc/linux/HalManager.h
    branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.cpp
    branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.h
    branches/linuxport/XBMC/xbmc/linux/LinuxResourceCounter.cpp
    branches/linuxport/XBMC/xbmc/linux/LinuxResourceCounter.h
    branches/linuxport/XBMC/xbmc/linux/LinuxTimezone.cpp
    branches/linuxport/XBMC/xbmc/linux/LinuxTimezone.h
    branches/linuxport/XBMC/xbmc/linux/NetworkLinux.cpp
    branches/linuxport/XBMC/xbmc/linux/NetworkLinux.h
    branches/linuxport/XBMC/xbmc/linux/PlatformDefs.h
    branches/linuxport/XBMC/xbmc/linux/PlatformInclude.h
    branches/linuxport/XBMC/xbmc/linux/XCriticalSection.cpp
    branches/linuxport/XBMC/xbmc/linux/XCriticalSection.h
    branches/linuxport/XBMC/xbmc/linux/XEventUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XEventUtils.h
    branches/linuxport/XBMC/xbmc/linux/XFileUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XFileUtils.h
    branches/linuxport/XBMC/xbmc/linux/XHandle.cpp
    branches/linuxport/XBMC/xbmc/linux/XHandle.h
    branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp
    branches/linuxport/XBMC/xbmc/linux/XLCDproc.h
    branches/linuxport/XBMC/xbmc/linux/XMemUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XMemUtils.h
    branches/linuxport/XBMC/xbmc/linux/XRandR.cpp
    branches/linuxport/XBMC/xbmc/linux/XRandR.h
    branches/linuxport/XBMC/xbmc/linux/XSyncUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XThreadUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XThreadUtils.h
    branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp
    branches/linuxport/XBMC/xbmc/linux/XTimeUtils.h
    branches/linuxport/XBMC/xbmc/linux/getdelim.c
    branches/linuxport/XBMC/xbmc/linux/getdelim.h
    branches/linuxport/XBMC/xbmc/osx/AppleRemote.h
    branches/linuxport/XBMC/xbmc/osx/AppleRemoteKeys.h
    branches/linuxport/XBMC/xbmc/osx/CocoaToCppThunk.cpp
    branches/linuxport/XBMC/xbmc/osx/CocoaToCppThunk.h
    branches/linuxport/XBMC/xbmc/osx/CocoaUtils.h
    branches/linuxport/XBMC/xbmc/osx/XBMCHelper.cpp
    branches/linuxport/XBMC/xbmc/osx/XBMCHelper.h
    branches/linuxport/XBMC/xbmc/osx/XBMCMain.h
    branches/linuxport/XBMC/xbmc/utils/BitstreamStats.cpp
    branches/linuxport/XBMC/xbmc/utils/BitstreamStats.h
    branches/linuxport/XBMC/xbmc/utils/CPUInfo.h
    branches/linuxport/XBMC/xbmc/utils/Fanart.h
    branches/linuxport/XBMC/xbmc/utils/LabelFormatter.cpp
    branches/linuxport/XBMC/xbmc/utils/LabelFormatter.h
    branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.h
    branches/linuxport/XBMC/xbmc/utils/Network.cpp
    branches/linuxport/XBMC/xbmc/utils/Network.h
    branches/linuxport/XBMC/xbmc/utils/PCMAmplifier.cpp
    branches/linuxport/XBMC/xbmc/utils/PCMAmplifier.h
    branches/linuxport/XBMC/xbmc/utils/PerformanceSample.cpp
    branches/linuxport/XBMC/xbmc/utils/PerformanceSample.h
    branches/linuxport/XBMC/xbmc/utils/PerformanceStats.cpp
    branches/linuxport/XBMC/xbmc/utils/PerformanceStats.h
    branches/linuxport/XBMC/xbmc/utils/RssFeed.cpp
    branches/linuxport/XBMC/xbmc/utils/RssFeed.h
    branches/linuxport/XBMC/xbmc/utils/ScraperParser.cpp
    branches/linuxport/XBMC/xbmc/utils/ScraperParser.h
    branches/linuxport/XBMC/xbmc/utils/ScraperUrl.cpp
    branches/linuxport/XBMC/xbmc/utils/ScraperUrl.h
    branches/linuxport/XBMC/xbmc/utils/Stopwatch.cpp
    branches/linuxport/XBMC/xbmc/utils/Stopwatch.h
    branches/linuxport/XBMC/xbmc/utils/TuxBoxUtil.h
    branches/linuxport/XBMC/xbmc/utils/md5.c
    branches/linuxport/XBMC/xbmc/win32/MockXboxSymbols.h
    branches/linuxport/XBMC/xbmc/win32/NetworkWin32.h
    branches/linuxport/XBMC/xbmc/win32/PlatformInclude.h
    branches/linuxport/XBMC/xbmc/win32/WIN32XBPythonDll.cpp
    branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp
    branches/linuxport/XBMC/xbmc/win32/XBMC_PC.h
    branches/linuxport/XBMC/xbmc/win32/XCriticalSection.cpp
    branches/linuxport/XBMC/xbmc/win32/XCriticalSection.h
    branches/linuxport/XBMC/xbmc/win32/inttypes.h
    branches/linuxport/XBMC/xbmc/win32/ntddcdrm.h
    branches/linuxport/XBMC/xbmc/win32/ntddstor.h
    branches/linuxport/XBMC/xbmc/win32/resource.h
    branches/linuxport/XBMC/xbmc/win32/stdint.h
    branches/linuxport/XBMC/xbmc-xrandr.c
    branches/linuxport/XBMC/xbmc_setup_fedoracore6.sh


Property changes on: branches/linuxport/XBMC/Makefile.in
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/Makefile.include.in
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/build.sh
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/config.h.in
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/configure.in
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/DirectXGraphics.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/DirectXGraphics.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/FrameBufferObject.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/FrameBufferObject.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/GUIBorderedImage.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/GUIBorderedImage.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/Shader.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/Shader.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/Surface.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/Surface.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/Tween.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,260 +1,260 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "DirectInputKeyboard.h"
-#include "DirectInput.h"
-
-#ifndef HAS_SDL
-#define KEY_DELAY_TIME 120 // ms
-
-#define FRAME_DELAY 8
-
-CLowLevelKeyboard::CCLowLevelKeyboardKeyboard()
-{
-  ZeroMemory(m_keystate, sizeof(BYTE) * 256);
-  m_keyboard = NULL;
-  m_keyDownLastFrame = 0;
-  m_bShift = false;
-  m_bCtrl = false;
-  m_bAlt = false;
-  m_bRAlt = false;
-  m_cAscii = '\0';CKeyboard
-  m_bInitialized = false;
-}
-
-CLowLevelKeyboard::~CLowLevelKeyboard()
-{
-  if (m_keyboard)
-    m_keyboard->Release();
-}
-
-void CLowLevelKeyboard::Initialize(HWND hWnd)
-{
-  if (m_bInitialized)
-    return;
-
-  if (FAILED(g_directInput.Initialize(hWnd)))
-    return;
-
-  if (FAILED(g_directInput.Get()->CreateDevice(GUID_SysKeyboard, &m_keyboard, NULL)))
-    return;
-  
-  if (FAILED(m_keyboard->SetDataFormat(&c_dfDIKeyboard)))
-    return;
-  
-  if (FAILED(m_keyboard->SetCooperativeLevel(hWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE)))
-    return;
-
-  m_bInitialized = true;
-
-  Acquire();
-}
-
-void CLowLevelKeyboard::Update()
-{
-  m_cAscii = 0;
-  m_bShift = false;
-  m_bCtrl = false;
-  m_bAlt = false;
-  m_bRAlt = false;
-  m_VKey = 0;
-
-  ZeroMemory(m_keystate, sizeof(BYTE)* 256);
-  if (S_OK == m_keyboard->GetDeviceState(sizeof(unsigned char[256]), (LPVOID)m_keystate))
-  {
-    // only a press
-    if (m_keyDownLastFrame + KEY_DELAY_TIME > timeGetTime())
-      return;
-
-    // qualifying keys
-    if (KeyDown(DIK_LCONTROL) || KeyDown(DIK_RCONTROL))
-      m_bCtrl = true;
-    if (KeyDown(DIK_LSHIFT) || KeyDown(DIK_RSHIFT))
-      m_bShift = true;
-    if (KeyDown(DIK_LALT) || KeyDown(DIK_RALT))
-      m_bAlt = true;
-    if (KeyDown(DIK_RALT))
-      m_bRAlt = true;
-    if (KeyDown(DIK_CAPSLOCK))
-      m_bShift = !m_bShift;
-
-    // TODO: Should add more keys in this routine
-    if (KeyDown(DIK_A)) m_cAscii = 'A';
-    else if (KeyDown(DIK_B)) m_cAscii = 'B';
-    else if (KeyDown(DIK_C)) m_cAscii = 'C';
-    else if (KeyDown(DIK_D)) m_cAscii = 'D';
-    else if (KeyDown(DIK_E)) m_cAscii = 'E';
-    else if (KeyDown(DIK_F)) m_cAscii = 'F';
-    else if (KeyDown(DIK_G)) m_cAscii = 'G';
-    else if (KeyDown(DIK_H)) m_cAscii = 'H';
-    else if (KeyDown(DIK_I)) m_cAscii = 'I';
-    else if (KeyDown(DIK_J)) m_cAscii = 'J';
-    else if (KeyDown(DIK_K)) m_cAscii = 'K';
-    else if (KeyDown(DIK_L)) m_cAscii = 'L';
-    else if (KeyDown(DIK_M)) m_cAscii = 'M';
-    else if (KeyDown(DIK_N)) m_cAscii = 'N';
-    else if (KeyDown(DIK_O)) m_cAscii = 'O';
-    else if (KeyDown(DIK_P)) m_cAscii = 'P';
-    else if (KeyDown(DIK_Q)) m_cAscii = 'Q';
-    else if (KeyDown(DIK_R)) m_cAscii = 'R';
-    else if (KeyDown(DIK_S)) m_cAscii = 'S';
-    else if (KeyDown(DIK_T)) m_cAscii = 'T';
-    else if (KeyDown(DIK_U)) m_cAscii = 'U';
-    else if (KeyDown(DIK_V)) m_cAscii = 'V';
-    else if (KeyDown(DIK_W)) m_cAscii = 'W';
-    else if (KeyDown(DIK_X)) m_cAscii = 'X';
-    else if (KeyDown(DIK_Y)) m_cAscii = 'Y';
-    else if (KeyDown(DIK_Z)) m_cAscii = 'Z';
-    else if (KeyDown(DIK_1)) { m_VKey = 0x60; m_cAscii = m_bShift ? '!' : '1'; }
-    else if (KeyDown(DIK_2)) { m_VKey = 0x61; m_cAscii = m_bShift ? '@' : '2'; }
-    else if (KeyDown(DIK_3)) { m_VKey = 0x62; m_cAscii = m_bShift ? '#' : '3'; }
-    else if (KeyDown(DIK_4)) { m_VKey = 0x63; m_cAscii = m_bShift ? '$' : '4'; }
-    else if (KeyDown(DIK_5)) { m_VKey = 0x64; m_cAscii = m_bShift ? '%' : '5'; }
-    else if (KeyDown(DIK_6)) { m_VKey = 0x65; m_cAscii = m_bShift ? '^' : '6'; }
-    else if (KeyDown(DIK_7)) { m_VKey = 0x66; m_cAscii = m_bShift ? '&' : '7'; }
-    else if (KeyDown(DIK_8)) { m_VKey = 0x67; m_cAscii = m_bShift ? '*' : '8'; }
-    else if (KeyDown(DIK_9)) { m_VKey = 0x68; m_cAscii = m_bShift ? '(' : '9'; }
-    else if (KeyDown(DIK_0)) { m_VKey = 0x69; m_cAscii = m_bShift ? ')' : '0'; }
-    else if (KeyDown(DIK_RETURN)) m_VKey = 0x0D;
-    else if (KeyDown(DIK_NUMPADENTER)) m_VKey = 0x6C;
-    else if (KeyDown(DIK_ESCAPE)) m_VKey = 0x1B;
-    else if (KeyDown(DIK_TAB)) m_VKey = 0x09;
-    else if (KeyDown(DIK_SPACE)) m_VKey = 0x20;
-    else if (KeyDown(DIK_LEFT)) m_VKey = 0x25; // alias for DIK_LEFTARROW
-    else if (KeyDown(DIK_RIGHT)) m_VKey = 0x27; // alias for DIK_RIGHTARROW
-    else if (KeyDown(DIK_UP)) m_VKey = 0x26; // alias for DIK_UPARROW
-    else if (KeyDown(DIK_DOWN)) m_VKey = 0x28; // alias for DIK_DOWNARROW
-    else if (KeyDown(DIK_INSERT)) m_VKey = 0x2D;
-    else if (KeyDown(DIK_DELETE)) m_VKey = 0x2E;
-    else if (KeyDown(DIK_HOME)) m_VKey = 0x24;
-    else if (KeyDown(DIK_END)) m_VKey = 0x23;
-    else if (KeyDown(DIK_F1)) m_VKey = 0x70;
-    else if (KeyDown(DIK_F2)) m_VKey = 0x71;
-    else if (KeyDown(DIK_F3)) m_VKey = 0x72;
-    else if (KeyDown(DIK_F4)) m_VKey = 0x73;
-    else if (KeyDown(DIK_F5)) m_VKey = 0x74;
-    else if (KeyDown(DIK_F6)) m_VKey = 0x75;
-    else if (KeyDown(DIK_F7)) m_VKey = 0x76;
-    else if (KeyDown(DIK_F8)) m_VKey = 0x77;
-    else if (KeyDown(DIK_F9)) m_VKey = 0x78;
-    else if (KeyDown(DIK_F10)) m_VKey = 0x79;
-    else if (KeyDown(DIK_F11)) m_VKey = 0x7a;
-    else if (KeyDown(DIK_F12)) m_VKey = 0x7b;
-
-    else if (KeyDown(DIK_NUMPAD0)) m_VKey = 0x60;
-    else if (KeyDown(DIK_NUMPAD1)) m_VKey = 0x61;
-    else if (KeyDown(DIK_NUMPAD2)) m_VKey = 0x62;
-    else if (KeyDown(DIK_NUMPAD3)) m_VKey = 0x63;
-    else if (KeyDown(DIK_NUMPAD4)) m_VKey = 0x64;
-    else if (KeyDown(DIK_NUMPAD5)) m_VKey = 0x65;
-    else if (KeyDown(DIK_NUMPAD6)) m_VKey = 0x66;
-    else if (KeyDown(DIK_NUMPAD7)) m_VKey = 0x67;
-    else if (KeyDown(DIK_NUMPAD8)) m_VKey = 0x68;
-    else if (KeyDown(DIK_NUMPAD9)) m_VKey = 0x69;
-    else if (KeyDown(DIK_NUMPADSTAR)) m_VKey = 0x6a; // alias for DIK_MULTIPLY
-    else if (KeyDown(DIK_NUMPADPLUS)) m_VKey = 0x6b; // alias for DIK_ADD
-    else if (KeyDown(DIK_NUMPADMINUS)) m_VKey = 0x6d; // alias for DIK_SUBTRACT
-    else if (KeyDown(DIK_NUMPADPERIOD)) m_VKey = 0x6e; // alias for DIK_DECIMAL
-    else if (KeyDown(DIK_NUMPADSLASH)) m_VKey = 0x6f;
-    else if (KeyDown(DIK_PGUP)) m_VKey = 0x21; // alias for DIK_PRIOR
-    else if (KeyDown(DIK_PGDN)) m_VKey = 0x22; // alias for DIK_NEXT
-    else if (KeyDown(DIK_SYSRQ)) m_VKey = 0x2a;
-    else if (KeyDown(DIK_BACKSPACE)) m_VKey = 0x08; // alias for DIK_BACK
-    else if (KeyDown(DIK_APPS)) m_VKey = 0x5d;
-    else if (KeyDown(DIK_PAUSE)) m_VKey = 0x13;
-    else if (KeyDown(DIK_CAPSLOCK)) m_VKey = 0x20; // ???
-    else if (KeyDown(DIK_NUMLOCK)) m_VKey = 0x90;
-    else if (KeyDown(DIK_SCROLL)) m_VKey = 0x91;
-    else if (KeyDown(DIK_SEMICOLON)) { m_VKey = 0xba; m_cAscii = m_bShift ? ':' : ';'; } // DIK_COLON handled, too
-    else if (KeyDown(DIK_EQUALS)) { m_VKey = 0xbb; m_cAscii = m_bShift ? '+' : '='; }
-    else if (KeyDown(DIK_COMMA)) { m_VKey = 0xbc; m_cAscii = m_bShift ? '<' : ','; }
-    else if (KeyDown(DIK_MINUS)) { m_VKey = 0xbd; m_cAscii = m_bShift ? '_' : '-'; } // DIK_UNDERLINE handled, too
-    else if (KeyDown(DIK_PERIOD)) { m_VKey = 0xbe; m_cAscii = m_bShift ? '>' : '.'; }
-    else if (KeyDown(DIK_DIVIDE)) { m_VKey = 0xbf; m_cAscii = m_bShift ? '?' : '/'; }
-    else if (KeyDown(DIK_SLASH)) { m_VKey = 0xbf; m_cAscii = m_bShift ? '?' : '/'; }
-    else if (KeyDown(DIK_GRAVE)) { m_VKey = 0xc0; m_cAscii = m_bShift ? '~' : '`'; }
-    else if (KeyDown(DIK_LBRACKET)) { m_VKey = 0xeb; m_cAscii = m_bShift ? '{' : '['; }
-    else if (KeyDown(DIK_BACKSLASH)) { m_VKey = 0xec; m_cAscii = m_bShift ? '|' : '\\'; }
-    else if (KeyDown(DIK_RBRACKET)) { m_VKey = 0xed; m_cAscii = m_bShift ? '}' : ']'; }
-    else if (KeyDown(DIK_APOSTROPHE)) { m_VKey = 0xee; m_cAscii = m_bShift ? '"' : '\''; }
-    else if (KeyDown(DIK_LSHIFT)) m_VKey = 0xa0;
-    else if (KeyDown(DIK_RSHIFT)) m_VKey = 0xa1;
-    else if (KeyDown(DIK_LCONTROL)) m_VKey = 0xa2;
-    else if (KeyDown(DIK_RCONTROL)) m_VKey = 0xa3;
-    else if (KeyDown(DIK_LALT)) m_VKey = 0xa4; // alias for DIK_LMENU
-    else if (KeyDown(DIK_RALT)) m_VKey = 0xa5; // alias for DIK_RMENU
-    else if (KeyDown(DIK_LWIN)) m_VKey = 0x5b;
-    else if (KeyDown(DIK_RWIN)) m_VKey = 0x5c;
-
-    // FIXME TESTME
-    else if (KeyDown(DIK_F13)) m_VKey = 0x7c;
-    else if (KeyDown(DIK_F14)) m_VKey = 0x7d;
-    else if (KeyDown(DIK_F15)) m_VKey = 0x7e;
-
-    else if (KeyDown(DIK_NEXTTRACK)) m_VKey = 0xb0; 
-    else if (KeyDown(DIK_PREVTRACK)) m_VKey = 0xb1; 
-    else if (KeyDown(DIK_MEDIASTOP)) m_VKey = 0xb2; 
-    else if (KeyDown(DIK_PLAYPAUSE)) m_VKey = 0xb3; 
-    else if (KeyDown(DIK_MAIL)) m_VKey = 0xb4; 
-    else if (KeyDown(DIK_MEDIASELECT)) m_VKey = 0xb5; 
-    else if (KeyDown(DIK_MYCOMPUTER)) m_VKey = 0xb6; // App1
-    else if (KeyDown(DIK_CALCULATOR)) m_VKey = 0xb7; // App2
-    else if (KeyDown(DIK_MUTE)) m_VKey = 0xad; 
-    else if (KeyDown(DIK_STOP)) m_VKey = 0xa9; // browser stop
-    else if (KeyDown(DIK_VOLUMEDOWN)) m_VKey = 0xae; 
-    else if (KeyDown(DIK_VOLUMEUP)) m_VKey = 0xaf; 
-    else if (KeyDown(DIK_WEBBACK)) m_VKey = 0xa6; 
-    else if (KeyDown(DIK_WEBFAVORITES)) m_VKey = 0xab; 
-    else if (KeyDown(DIK_WEBFORWARD)) m_VKey = 0xa7; 
-    else if (KeyDown(DIK_WEBHOME)) m_VKey = 0xac; 
-    else if (KeyDown(DIK_WEBREFRESH)) m_VKey = 0xa8; 
-    else if (KeyDown(DIK_WEBSEARCH)) m_VKey = 0xaa; 
-    else if (KeyDown(DIK_WEBSTOP)) m_VKey = 0xa9; 
-    else if (KeyDown(DIK_OEM_102)) m_VKey = 0xe2; // 0x56 
-
-    // TODO: Add more keys (eg NEC ones)
-
-//    else if (KeyDown(DIK_UNDERLINE)) { m_VKey = 0xbd; m_cAscii = '_'; }
-//    else if (KeyDown(DIK_COLON)) { m_VKey = 0xba; m_cAscii = ':'; }
-
-    // TODO: Not sure if this is correct - can we have vkey's that correspond
-    //       with the ascii value?
-    if (m_cAscii && !m_VKey)
-    {
-      m_VKey = m_cAscii;
-      if (!m_bShift)
-        m_cAscii = tolower(m_cAscii);
-    }
-
-    // reset frame count
-    if (m_VKey)
-      m_keyDownLastFrame = timeGetTime();
-  }  
-}
-
-void CLowLevelKeyboard::Acquire()
-{
-  if (m_keyboard)
-    m_keyboard->Acquire();
-}
-
-#endif
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "include.h"
+#include "DirectInputKeyboard.h"
+#include "DirectInput.h"
+
+#ifndef HAS_SDL
+#define KEY_DELAY_TIME 120 // ms
+
+#define FRAME_DELAY 8
+
+CLowLevelKeyboard::CCLowLevelKeyboardKeyboard()
+{
+  ZeroMemory(m_keystate, sizeof(BYTE) * 256);
+  m_keyboard = NULL;
+  m_keyDownLastFrame = 0;
+  m_bShift = false;
+  m_bCtrl = false;
+  m_bAlt = false;
+  m_bRAlt = false;
+  m_cAscii = '\0';CKeyboard
+  m_bInitialized = false;
+}
+
+CLowLevelKeyboard::~CLowLevelKeyboard()
+{
+  if (m_keyboard)
+    m_keyboard->Release();
+}
+
+void CLowLevelKeyboard::Initialize(HWND hWnd)
+{
+  if (m_bInitialized)
+    return;
+
+  if (FAILED(g_directInput.Initialize(hWnd)))
+    return;
+
+  if (FAILED(g_directInput.Get()->CreateDevice(GUID_SysKeyboard, &m_keyboard, NULL)))
+    return;
+  
+  if (FAILED(m_keyboard->SetDataFormat(&c_dfDIKeyboard)))
+    return;
+  
+  if (FAILED(m_keyboard->SetCooperativeLevel(hWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE)))
+    return;
+
+  m_bInitialized = true;
+
+  Acquire();
+}
+
+void CLowLevelKeyboard::Update()
+{
+  m_cAscii = 0;
+  m_bShift = false;
+  m_bCtrl = false;
+  m_bAlt = false;
+  m_bRAlt = false;
+  m_VKey = 0;
+
+  ZeroMemory(m_keystate, sizeof(BYTE)* 256);
+  if (S_OK == m_keyboard->GetDeviceState(sizeof(unsigned char[256]), (LPVOID)m_keystate))
+  {
+    // only a press
+    if (m_keyDownLastFrame + KEY_DELAY_TIME > timeGetTime())
+      return;
+
+    // qualifying keys
+    if (KeyDown(DIK_LCONTROL) || KeyDown(DIK_RCONTROL))
+      m_bCtrl = true;
+    if (KeyDown(DIK_LSHIFT) || KeyDown(DIK_RSHIFT))
+      m_bShift = true;
+    if (KeyDown(DIK_LALT) || KeyDown(DIK_RALT))
+      m_bAlt = true;
+    if (KeyDown(DIK_RALT))
+      m_bRAlt = true;
+    if (KeyDown(DIK_CAPSLOCK))
+      m_bShift = !m_bShift;
+
+    // TODO: Should add more keys in this routine
+    if (KeyDown(DIK_A)) m_cAscii = 'A';
+    else if (KeyDown(DIK_B)) m_cAscii = 'B';
+    else if (KeyDown(DIK_C)) m_cAscii = 'C';
+    else if (KeyDown(DIK_D)) m_cAscii = 'D';
+    else if (KeyDown(DIK_E)) m_cAscii = 'E';
+    else if (KeyDown(DIK_F)) m_cAscii = 'F';
+    else if (KeyDown(DIK_G)) m_cAscii = 'G';
+    else if (KeyDown(DIK_H)) m_cAscii = 'H';
+    else if (KeyDown(DIK_I)) m_cAscii = 'I';
+    else if (KeyDown(DIK_J)) m_cAscii = 'J';
+    else if (KeyDown(DIK_K)) m_cAscii = 'K';
+    else if (KeyDown(DIK_L)) m_cAscii = 'L';
+    else if (KeyDown(DIK_M)) m_cAscii = 'M';
+    else if (KeyDown(DIK_N)) m_cAscii = 'N';
+    else if (KeyDown(DIK_O)) m_cAscii = 'O';
+    else if (KeyDown(DIK_P)) m_cAscii = 'P';
+    else if (KeyDown(DIK_Q)) m_cAscii = 'Q';
+    else if (KeyDown(DIK_R)) m_cAscii = 'R';
+    else if (KeyDown(DIK_S)) m_cAscii = 'S';
+    else if (KeyDown(DIK_T)) m_cAscii = 'T';
+    else if (KeyDown(DIK_U)) m_cAscii = 'U';
+    else if (KeyDown(DIK_V)) m_cAscii = 'V';
+    else if (KeyDown(DIK_W)) m_cAscii = 'W';
+    else if (KeyDown(DIK_X)) m_cAscii = 'X';
+    else if (KeyDown(DIK_Y)) m_cAscii = 'Y';
+    else if (KeyDown(DIK_Z)) m_cAscii = 'Z';
+    else if (KeyDown(DIK_1)) { m_VKey = 0x60; m_cAscii = m_bShift ? '!' : '1'; }
+    else if (KeyDown(DIK_2)) { m_VKey = 0x61; m_cAscii = m_bShift ? '@' : '2'; }
+    else if (KeyDown(DIK_3)) { m_VKey = 0x62; m_cAscii = m_bShift ? '#' : '3'; }
+    else if (KeyDown(DIK_4)) { m_VKey = 0x63; m_cAscii = m_bShift ? '$' : '4'; }
+    else if (KeyDown(DIK_5)) { m_VKey = 0x64; m_cAscii = m_bShift ? '%' : '5'; }
+    else if (KeyDown(DIK_6)) { m_VKey = 0x65; m_cAscii = m_bShift ? '^' : '6'; }
+    else if (KeyDown(DIK_7)) { m_VKey = 0x66; m_cAscii = m_bShift ? '&' : '7'; }
+    else if (KeyDown(DIK_8)) { m_VKey = 0x67; m_cAscii = m_bShift ? '*' : '8'; }
+    else if (KeyDown(DIK_9)) { m_VKey = 0x68; m_cAscii = m_bShift ? '(' : '9'; }
+    else if (KeyDown(DIK_0)) { m_VKey = 0x69; m_cAscii = m_bShift ? ')' : '0'; }
+    else if (KeyDown(DIK_RETURN)) m_VKey = 0x0D;
+    else if (KeyDown(DIK_NUMPADENTER)) m_VKey = 0x6C;
+    else if (KeyDown(DIK_ESCAPE)) m_VKey = 0x1B;
+    else if (KeyDown(DIK_TAB)) m_VKey = 0x09;
+    else if (KeyDown(DIK_SPACE)) m_VKey = 0x20;
+    else if (KeyDown(DIK_LEFT)) m_VKey = 0x25; // alias for DIK_LEFTARROW
+    else if (KeyDown(DIK_RIGHT)) m_VKey = 0x27; // alias for DIK_RIGHTARROW
+    else if (KeyDown(DIK_UP)) m_VKey = 0x26; // alias for DIK_UPARROW
+    else if (KeyDown(DIK_DOWN)) m_VKey = 0x28; // alias for DIK_DOWNARROW
+    else if (KeyDown(DIK_INSERT)) m_VKey = 0x2D;
+    else if (KeyDown(DIK_DELETE)) m_VKey = 0x2E;
+    else if (KeyDown(DIK_HOME)) m_VKey = 0x24;
+    else if (KeyDown(DIK_END)) m_VKey = 0x23;
+    else if (KeyDown(DIK_F1)) m_VKey = 0x70;
+    else if (KeyDown(DIK_F2)) m_VKey = 0x71;
+    else if (KeyDown(DIK_F3)) m_VKey = 0x72;
+    else if (KeyDown(DIK_F4)) m_VKey = 0x73;
+    else if (KeyDown(DIK_F5)) m_VKey = 0x74;
+    else if (KeyDown(DIK_F6)) m_VKey = 0x75;
+    else if (KeyDown(DIK_F7)) m_VKey = 0x76;
+    else if (KeyDown(DIK_F8)) m_VKey = 0x77;
+    else if (KeyDown(DIK_F9)) m_VKey = 0x78;
+    else if (KeyDown(DIK_F10)) m_VKey = 0x79;
+    else if (KeyDown(DIK_F11)) m_VKey = 0x7a;
+    else if (KeyDown(DIK_F12)) m_VKey = 0x7b;
+
+    else if (KeyDown(DIK_NUMPAD0)) m_VKey = 0x60;
+    else if (KeyDown(DIK_NUMPAD1)) m_VKey = 0x61;
+    else if (KeyDown(DIK_NUMPAD2)) m_VKey = 0x62;
+    else if (KeyDown(DIK_NUMPAD3)) m_VKey = 0x63;
+    else if (KeyDown(DIK_NUMPAD4)) m_VKey = 0x64;
+    else if (KeyDown(DIK_NUMPAD5)) m_VKey = 0x65;
+    else if (KeyDown(DIK_NUMPAD6)) m_VKey = 0x66;
+    else if (KeyDown(DIK_NUMPAD7)) m_VKey = 0x67;
+    else if (KeyDown(DIK_NUMPAD8)) m_VKey = 0x68;
+    else if (KeyDown(DIK_NUMPAD9)) m_VKey = 0x69;
+    else if (KeyDown(DIK_NUMPADSTAR)) m_VKey = 0x6a; // alias for DIK_MULTIPLY
+    else if (KeyDown(DIK_NUMPADPLUS)) m_VKey = 0x6b; // alias for DIK_ADD
+    else if (KeyDown(DIK_NUMPADMINUS)) m_VKey = 0x6d; // alias for DIK_SUBTRACT
+    else if (KeyDown(DIK_NUMPADPERIOD)) m_VKey = 0x6e; // alias for DIK_DECIMAL
+    else if (KeyDown(DIK_NUMPADSLASH)) m_VKey = 0x6f;
+    else if (KeyDown(DIK_PGUP)) m_VKey = 0x21; // alias for DIK_PRIOR
+    else if (KeyDown(DIK_PGDN)) m_VKey = 0x22; // alias for DIK_NEXT
+    else if (KeyDown(DIK_SYSRQ)) m_VKey = 0x2a;
+    else if (KeyDown(DIK_BACKSPACE)) m_VKey = 0x08; // alias for DIK_BACK
+    else if (KeyDown(DIK_APPS)) m_VKey = 0x5d;
+    else if (KeyDown(DIK_PAUSE)) m_VKey = 0x13;
+    else if (KeyDown(DIK_CAPSLOCK)) m_VKey = 0x20; // ???
+    else if (KeyDown(DIK_NUMLOCK)) m_VKey = 0x90;
+    else if (KeyDown(DIK_SCROLL)) m_VKey = 0x91;
+    else if (KeyDown(DIK_SEMICOLON)) { m_VKey = 0xba; m_cAscii = m_bShift ? ':' : ';'; } // DIK_COLON handled, too
+    else if (KeyDown(DIK_EQUALS)) { m_VKey = 0xbb; m_cAscii = m_bShift ? '+' : '='; }
+    else if (KeyDown(DIK_COMMA)) { m_VKey = 0xbc; m_cAscii = m_bShift ? '<' : ','; }
+    else if (KeyDown(DIK_MINUS)) { m_VKey = 0xbd; m_cAscii = m_bShift ? '_' : '-'; } // DIK_UNDERLINE handled, too
+    else if (KeyDown(DIK_PERIOD)) { m_VKey = 0xbe; m_cAscii = m_bShift ? '>' : '.'; }
+    else if (KeyDown(DIK_DIVIDE)) { m_VKey = 0xbf; m_cAscii = m_bShift ? '?' : '/'; }
+    else if (KeyDown(DIK_SLASH)) { m_VKey = 0xbf; m_cAscii = m_bShift ? '?' : '/'; }
+    else if (KeyDown(DIK_GRAVE)) { m_VKey = 0xc0; m_cAscii = m_bShift ? '~' : '`'; }
+    else if (KeyDown(DIK_LBRACKET)) { m_VKey = 0xeb; m_cAscii = m_bShift ? '{' : '['; }
+    else if (KeyDown(DIK_BACKSLASH)) { m_VKey = 0xec; m_cAscii = m_bShift ? '|' : '\\'; }
+    else if (KeyDown(DIK_RBRACKET)) { m_VKey = 0xed; m_cAscii = m_bShift ? '}' : ']'; }
+    else if (KeyDown(DIK_APOSTROPHE)) { m_VKey = 0xee; m_cAscii = m_bShift ? '"' : '\''; }
+    else if (KeyDown(DIK_LSHIFT)) m_VKey = 0xa0;
+    else if (KeyDown(DIK_RSHIFT)) m_VKey = 0xa1;
+    else if (KeyDown(DIK_LCONTROL)) m_VKey = 0xa2;
+    else if (KeyDown(DIK_RCONTROL)) m_VKey = 0xa3;
+    else if (KeyDown(DIK_LALT)) m_VKey = 0xa4; // alias for DIK_LMENU
+    else if (KeyDown(DIK_RALT)) m_VKey = 0xa5; // alias for DIK_RMENU
+    else if (KeyDown(DIK_LWIN)) m_VKey = 0x5b;
+    else if (KeyDown(DIK_RWIN)) m_VKey = 0x5c;
+
+    // FIXME TESTME
+    else if (KeyDown(DIK_F13)) m_VKey = 0x7c;
+    else if (KeyDown(DIK_F14)) m_VKey = 0x7d;
+    else if (KeyDown(DIK_F15)) m_VKey = 0x7e;
+
+    else if (KeyDown(DIK_NEXTTRACK)) m_VKey = 0xb0; 
+    else if (KeyDown(DIK_PREVTRACK)) m_VKey = 0xb1; 
+    else if (KeyDown(DIK_MEDIASTOP)) m_VKey = 0xb2; 
+    else if (KeyDown(DIK_PLAYPAUSE)) m_VKey = 0xb3; 
+    else if (KeyDown(DIK_MAIL)) m_VKey = 0xb4; 
+    else if (KeyDown(DIK_MEDIASELECT)) m_VKey = 0xb5; 
+    else if (KeyDown(DIK_MYCOMPUTER)) m_VKey = 0xb6; // App1
+    else if (KeyDown(DIK_CALCULATOR)) m_VKey = 0xb7; // App2
+    else if (KeyDown(DIK_MUTE)) m_VKey = 0xad; 
+    else if (KeyDown(DIK_STOP)) m_VKey = 0xa9; // browser stop
+    else if (KeyDown(DIK_VOLUMEDOWN)) m_VKey = 0xae; 
+    else if (KeyDown(DIK_VOLUMEUP)) m_VKey = 0xaf; 
+    else if (KeyDown(DIK_WEBBACK)) m_VKey = 0xa6; 
+    else if (KeyDown(DIK_WEBFAVORITES)) m_VKey = 0xab; 
+    else if (KeyDown(DIK_WEBFORWARD)) m_VKey = 0xa7; 
+    else if (KeyDown(DIK_WEBHOME)) m_VKey = 0xac; 
+    else if (KeyDown(DIK_WEBREFRESH)) m_VKey = 0xa8; 
+    else if (KeyDown(DIK_WEBSEARCH)) m_VKey = 0xaa; 
+    else if (KeyDown(DIK_WEBSTOP)) m_VKey = 0xa9; 
+    else if (KeyDown(DIK_OEM_102)) m_VKey = 0xe2; // 0x56 
+
+    // TODO: Add more keys (eg NEC ones)
+
+//    else if (KeyDown(DIK_UNDERLINE)) { m_VKey = 0xbd; m_cAscii = '_'; }
+//    else if (KeyDown(DIK_COLON)) { m_VKey = 0xba; m_cAscii = ':'; }
+
+    // TODO: Not sure if this is correct - can we have vkey's that correspond
+    //       with the ascii value?
+    if (m_cAscii && !m_VKey)
+    {
+      m_VKey = m_cAscii;
+      if (!m_bShift)
+        m_cAscii = tolower(m_cAscii);
+    }
+
+    // reset frame count
+    if (m_VKey)
+      m_keyDownLastFrame = timeGetTime();
+  }  
+}
+
+void CLowLevelKeyboard::Acquire()
+{
+  if (m_keyboard)
+    m_keyboard->Acquire();
+}
+
+#endif


Property changes on: branches/linuxport/XBMC/guilib/common/DirectInputKeyboard.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,417 +1,417 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "IRServerSuite.h"
-#include "IrssMessage.h"
-#include "ButtonTranslator.h"
-#include "log.h"
-#include "Settings.h"
-
-#define IRSS_PORT 24000
-
-CRemoteControl g_RemoteControl;
-
-CRemoteControl::CRemoteControl()
-{
-  m_bInitialized = false;
-  m_isConnecting = false;
-  Reset();
-}
-
-CRemoteControl::~CRemoteControl()
-{
-  Close();
-}
-
-void CRemoteControl::Close()
-{
-  if (m_socket)
-  {
-    if (m_bInitialized)
-    {
-      m_bInitialized = false;
-      CIrssMessage message(IRSSMT_UnregisterClient, IRSSMF_Request | IRSSMF_ForceNotRespond);
-      SendPacket(message);
-    }
-    shutdown(m_socket, SD_BOTH);
-    closesocket(m_socket);
-  }
-}
-
-void CRemoteControl::Reset()
-{
-  m_isHolding = false;
-  m_button = 0;
-}
-
-bool CRemoteControl::Initialize()
-{
-  //trying to connect when there is nothing to connect to is kinda slow so kick it off in a thread.
-  Create();
-  return true;
-}
-
-void CRemoteControl::Process()
-{
-  Connect();
-}
-
-bool CRemoteControl::Connect()
-{
-  m_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (m_socket == INVALID_SOCKET)
-  {
-    return false; //Couldn't create the socket
-  }  
-  // Get the local host information
-  hostent* localHost = gethostbyname("");
-  char* localIP = inet_ntoa (*(struct in_addr *)*localHost->h_addr_list);
-
-  SOCKADDR_IN target;
-  memset(&target, 0, sizeof(SOCKADDR_IN));
-
-  target.sin_family = AF_INET;
-  target.sin_addr.s_addr = inet_addr(localIP);
-  target.sin_port = htons (IRSS_PORT);
-
-  if (connect(m_socket, (SOCKADDR *)&target, sizeof(target)) == SOCKET_ERROR)
-  {
-    return false; //Couldn't connect, irss not available
-  }
-
-  u_long iMode = 1; //non-blocking
-  ioctlsocket(m_socket, FIONBIO, &iMode);
-
-  //register
-  CIrssMessage mess(IRSSMT_RegisterClient, IRSSMF_Request);
-  if (!SendPacket(mess))
-  {
-    CLog::Log(LOGERROR, "IRServerSuite: failed to send RegisterClient packet.");
-    return false;
-  }
-  m_isConnecting = true;
-  return true;
-}
-
-bool CRemoteControl::SendPacket(CIrssMessage& message)
-{
-  int iSize = 0;
-  char* bytes = message.ToBytes(iSize);
-  char buffer[4];
-  uint32_t len = htonl(iSize);
-  memcpy(&buffer[0], &len, 4);
-  bool bResult = WriteN(&buffer[0], 4);
-  if (bResult)
-  {
-    bResult = WriteN(bytes, iSize);
-  }
-  delete[] bytes;
-  if (!bResult)
-  {
-    Close();
-    return false;
-  }
-  return true;
-}
-
-
-void CRemoteControl::Update()
-{
-  if (!m_bInitialized && !m_isConnecting)
-  {
-    return;
-  }
-
-  CIrssMessage mess;
-  if (!ReadPacket(mess))
-  {
-    return;
-  }
-  switch (mess.GetType())
-  {
-  case IRSSMT_RegisterClient:
-    m_isConnecting = false;
-    if ((mess.GetFlags() & IRSSMF_Success) != IRSSMF_Success)
-    {
-      //uh oh, it failed to register
-      Close();
-      CLog::Log(LOGERROR, "IRServerSuite: failed to register XBMC as a client.");
-    }
-    else
-    {
-      m_bInitialized = true;
-      //request info about receivers
-      CIrssMessage mess(IRSSMT_DetectedReceivers, IRSSMF_Request);
-      if (!SendPacket(mess))
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
-      }
-      mess.SetType(IRSSMT_AvailableReceivers);
-      if (!SendPacket(mess))
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
-      }
-      mess.SetType(IRSSMT_ActiveReceivers);
-      if (!SendPacket(mess))
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
-      }
-    }
-    break;
-  case IRSSMT_RemoteEvent:
-    HandleRemoteEvent(mess);
-    break;
-  case IRSSMT_Error:
-    //I suppose the errormessage is in the packet somewhere...
-    CLog::Log(LOGERROR, "IRServerSuite: we got an error message.");
-    break;
-  case IRSSMT_ServerShutdown:
-    Close();
-    break;
-  case IRSSMT_ServerSuspend:
-    //should we do something?
-    break;
-  case IRSSMT_ServerResume:
-    //should we do something?
-    break;
-  case IRSSMT_AvailableReceivers:
-    {
-      uint32_t size = mess.GetDataSize();
-      if (size > 0)
-      {
-        char* data = mess.GetData();
-        char* availablereceivers = new char[size + 1];
-        memcpy(availablereceivers, data, size);
-        availablereceivers[size] = '\0';
-        CLog::Log(LOGINFO, "IRServerSuite: Available receivers: %s", availablereceivers);
-        delete[] availablereceivers;
-      }
-    }
-    break;
-  case IRSSMT_DetectedReceivers:
-    {
-      uint32_t size = mess.GetDataSize();
-      if (size > 0)
-      {
-        char* data = mess.GetData();
-        char* detectedreceivers = new char[size + 1];
-        memcpy(detectedreceivers, data, size);
-        detectedreceivers[size] = '\0';
-        CLog::Log(LOGINFO, "IRServerSuite: Detected receivers: %s", detectedreceivers);
-        delete[] detectedreceivers;
-      }
-    }
-    break;
-  case IRSSMT_ActiveReceivers:
-    {
-      uint32_t size = mess.GetDataSize();
-      if (size > 0)
-      {
-        char* data = mess.GetData();
-        char* activereceivers = new char[size + 1];
-        memcpy(activereceivers, data, size);
-        activereceivers[size] = '\0';
-        CLog::Log(LOGINFO, "IRServerSuite: Active receivers: %s", activereceivers);
-        delete[] activereceivers;
-      }
-    }
-    break;
-  }
-}
-
-bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
-{
-  try
-  {
-    //flag should be notify, maybe check it?
-    char* data = message.GetData();
-    uint32_t datalen = message.GetDataSize();
-    char* deviceName;
-    char* keycode;
-    uint32_t devicenamelength;
-    uint32_t keycodelength;
-    if (datalen == 0)
-    {
-      CLog::Log(LOGERROR, "IRServerSuite: no data in remote message.");
-      return false;
-    }
-    if (datalen <= 8)
-    {
-      //seems to be version 1.0.4.1, only keycode is sent, use Microsoft MCE mapping??
-      devicenamelength = 13;
-      deviceName = new char[devicenamelength + 1];
-      sprintf(deviceName, "Microsoft MCE"); 
-      keycodelength = datalen;
-      keycode = new char[keycodelength + 1];
-      memcpy(keycode, data, keycodelength);
-    }
-    else
-    {
-      //first 4 bytes is devicename length
-      memcpy(&devicenamelength, data, 4);
-      //devicename itself
-      if (datalen < 4 + devicenamelength)
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
-        return false;
-      }
-      deviceName = new char[devicenamelength + 1];
-      memcpy(deviceName, data + 4, devicenamelength);
-      if (datalen < 8 + devicenamelength)
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
-        return false;
-      }
-      //next 4 bytes is keycode length
-      memcpy(&keycodelength, data + 4 + devicenamelength, 4);
-      //keycode itself
-      if (datalen < 8 + devicenamelength + keycodelength)
-      {
-        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
-        delete[] deviceName;
-        return false;
-      }
-      keycode = new char[keycodelength + 1];
-      memcpy(keycode, data + 8 + devicenamelength, keycodelength);
-    }
-    deviceName[devicenamelength] = '\0';
-    keycode[keycodelength] = '\0';
-    //translate to a buttoncode xbmc understands
-    m_button = g_buttonTranslator.TranslateLircRemoteString(deviceName, keycode);
-    if (g_advancedSettings.m_logLevel == LOG_LEVEL_DEBUG_FREEMEM)
-    {
-      CLog::Log(LOGINFO, "IRServerSuite, RemoteEvent: %s %s", deviceName, keycode);
-    }
-    delete[] deviceName;
-    delete[] keycode;
-    return true;
-  }
-  catch(...)
-  {
-    CLog::Log(LOGERROR, "IRServerSuite: exception while processing RemoteEvent.");
-    return false;
-  }
-}
-
-int CRemoteControl::ReadN(char *buffer, int n)
-{
-  int nOriginalSize = n;
-  memset(buffer, 0, n);
-  char *ptr = buffer;
-  while (n > 0)
-  {
-    int nBytes = 0;
-    nBytes = recv(m_socket, ptr, n, 0);
-
-    if (WSAGetLastError() == WSAEWOULDBLOCK)
-    {
-      return nOriginalSize - n;
-    }
-    if (nBytes < 0)
-    {
-      CLog::Log(LOGERROR, "%s, IRServerSuite recv error %d", __FUNCTION__, GetLastError());
-      Close();
-      return -1;
-    }
-    
-    if (nBytes == 0)
-    {
-      CLog::Log(LOGDEBUG,"%s, IRServerSuite socket closed by server", __FUNCTION__);
-      Close();
-      break;
-    }
-    
-    n -= nBytes;
-    ptr += nBytes;
-  }
-
-  return nOriginalSize - n;
-}
-
-bool CRemoteControl::WriteN(const char *buffer, int n)
-{
-  const char *ptr = buffer;
-  while (n > 0)
-  {
-    int nBytes = send(m_socket, ptr, n, 0);
-    if (nBytes < 0)
-    {
-      CLog::Log(LOGERROR, "%s, IRServerSuite send error %d (%d bytes)", __FUNCTION__, GetLastError(), n);
-      Close();
-      return false;
-    }
-    
-    if (nBytes == 0)
-      break;
-    
-    n -= nBytes;
-    ptr += nBytes;
-  }
-
-  return n == 0;
-}
-
-bool CRemoteControl::ReadPacket(CIrssMessage &message)
-{
-  try
-  {
-    char sizebuf[4];
-    int iRead = ReadN(&sizebuf[0], 4);
-    if (iRead == 0) return false; //nothing to read
-    if (iRead != 4)
-    {
-      CLog::Log(LOGERROR, "IRServerSuite: failed to read packetsize.");
-      return false;
-    }
-    uint32_t size = 0;
-    memcpy(&size, &sizebuf[0], 4);
-    size = ntohl(size);
-    char* messagebytes = new char[size];
-    if (ReadN(messagebytes, size) != size)
-    {
-      CLog::Log(LOGERROR, "IRServerSuite: failed to read packet.");
-      return false;
-    }
-    if (!CIrssMessage::FromBytes(messagebytes, size, message))
-    {
-      CLog::Log(LOGERROR, "IRServerSuite: invalid packet received (size: %u).", size);
-      return false;
-    }
-    delete[] messagebytes;
-    return true;
-  }
-  catch(...)
-  {
-    CLog::Log(LOGERROR, "IRServerSuite: exception while processing packet.");
-    return false;
-  }
-}
-
-WORD CRemoteControl::GetButton()
-{
-  return m_button;
-}
-
-bool CRemoteControl::IsHolding()
-{
-  return m_isHolding;
-}
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "include.h"
+#include "IRServerSuite.h"
+#include "IrssMessage.h"
+#include "ButtonTranslator.h"
+#include "log.h"
+#include "Settings.h"
+
+#define IRSS_PORT 24000
+
+CRemoteControl g_RemoteControl;
+
+CRemoteControl::CRemoteControl()
+{
+  m_bInitialized = false;
+  m_isConnecting = false;
+  Reset();
+}
+
+CRemoteControl::~CRemoteControl()
+{
+  Close();
+}
+
+void CRemoteControl::Close()
+{
+  if (m_socket)
+  {
+    if (m_bInitialized)
+    {
+      m_bInitialized = false;
+      CIrssMessage message(IRSSMT_UnregisterClient, IRSSMF_Request | IRSSMF_ForceNotRespond);
+      SendPacket(message);
+    }
+    shutdown(m_socket, SD_BOTH);
+    closesocket(m_socket);
+  }
+}
+
+void CRemoteControl::Reset()
+{
+  m_isHolding = false;
+  m_button = 0;
+}
+
+bool CRemoteControl::Initialize()
+{
+  //trying to connect when there is nothing to connect to is kinda slow so kick it off in a thread.
+  Create();
+  return true;
+}
+
+void CRemoteControl::Process()
+{
+  Connect();
+}
+
+bool CRemoteControl::Connect()
+{
+  m_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  if (m_socket == INVALID_SOCKET)
+  {
+    return false; //Couldn't create the socket
+  }  
+  // Get the local host information
+  hostent* localHost = gethostbyname("");
+  char* localIP = inet_ntoa (*(struct in_addr *)*localHost->h_addr_list);
+
+  SOCKADDR_IN target;
+  memset(&target, 0, sizeof(SOCKADDR_IN));
+
+  target.sin_family = AF_INET;
+  target.sin_addr.s_addr = inet_addr(localIP);
+  target.sin_port = htons (IRSS_PORT);
+
+  if (connect(m_socket, (SOCKADDR *)&target, sizeof(target)) == SOCKET_ERROR)
+  {
+    return false; //Couldn't connect, irss not available
+  }
+
+  u_long iMode = 1; //non-blocking
+  ioctlsocket(m_socket, FIONBIO, &iMode);
+
+  //register
+  CIrssMessage mess(IRSSMT_RegisterClient, IRSSMF_Request);
+  if (!SendPacket(mess))
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: failed to send RegisterClient packet.");
+    return false;
+  }
+  m_isConnecting = true;
+  return true;
+}
+
+bool CRemoteControl::SendPacket(CIrssMessage& message)
+{
+  int iSize = 0;
+  char* bytes = message.ToBytes(iSize);
+  char buffer[4];
+  uint32_t len = htonl(iSize);
+  memcpy(&buffer[0], &len, 4);
+  bool bResult = WriteN(&buffer[0], 4);
+  if (bResult)
+  {
+    bResult = WriteN(bytes, iSize);
+  }
+  delete[] bytes;
+  if (!bResult)
+  {
+    Close();
+    return false;
+  }
+  return true;
+}
+
+
+void CRemoteControl::Update()
+{
+  if (!m_bInitialized && !m_isConnecting)
+  {
+    return;
+  }
+
+  CIrssMessage mess;
+  if (!ReadPacket(mess))
+  {
+    return;
+  }
+  switch (mess.GetType())
+  {
+  case IRSSMT_RegisterClient:
+    m_isConnecting = false;
+    if ((mess.GetFlags() & IRSSMF_Success) != IRSSMF_Success)
+    {
+      //uh oh, it failed to register
+      Close();
+      CLog::Log(LOGERROR, "IRServerSuite: failed to register XBMC as a client.");
+    }
+    else
+    {
+      m_bInitialized = true;
+      //request info about receivers
+      CIrssMessage mess(IRSSMT_DetectedReceivers, IRSSMF_Request);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+      mess.SetType(IRSSMT_AvailableReceivers);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+      mess.SetType(IRSSMT_ActiveReceivers);
+      if (!SendPacket(mess))
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+      }
+    }
+    break;
+  case IRSSMT_RemoteEvent:
+    HandleRemoteEvent(mess);
+    break;
+  case IRSSMT_Error:
+    //I suppose the errormessage is in the packet somewhere...
+    CLog::Log(LOGERROR, "IRServerSuite: we got an error message.");
+    break;
+  case IRSSMT_ServerShutdown:
+    Close();
+    break;
+  case IRSSMT_ServerSuspend:
+    //should we do something?
+    break;
+  case IRSSMT_ServerResume:
+    //should we do something?
+    break;
+  case IRSSMT_AvailableReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* availablereceivers = new char[size + 1];
+        memcpy(availablereceivers, data, size);
+        availablereceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Available receivers: %s", availablereceivers);
+        delete[] availablereceivers;
+      }
+    }
+    break;
+  case IRSSMT_DetectedReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* detectedreceivers = new char[size + 1];
+        memcpy(detectedreceivers, data, size);
+        detectedreceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Detected receivers: %s", detectedreceivers);
+        delete[] detectedreceivers;
+      }
+    }
+    break;
+  case IRSSMT_ActiveReceivers:
+    {
+      uint32_t size = mess.GetDataSize();
+      if (size > 0)
+      {
+        char* data = mess.GetData();
+        char* activereceivers = new char[size + 1];
+        memcpy(activereceivers, data, size);
+        activereceivers[size] = '\0';
+        CLog::Log(LOGINFO, "IRServerSuite: Active receivers: %s", activereceivers);
+        delete[] activereceivers;
+      }
+    }
+    break;
+  }
+}
+
+bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
+{
+  try
+  {
+    //flag should be notify, maybe check it?
+    char* data = message.GetData();
+    uint32_t datalen = message.GetDataSize();
+    char* deviceName;
+    char* keycode;
+    uint32_t devicenamelength;
+    uint32_t keycodelength;
+    if (datalen == 0)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: no data in remote message.");
+      return false;
+    }
+    if (datalen <= 8)
+    {
+      //seems to be version 1.0.4.1, only keycode is sent, use Microsoft MCE mapping??
+      devicenamelength = 13;
+      deviceName = new char[devicenamelength + 1];
+      sprintf(deviceName, "Microsoft MCE"); 
+      keycodelength = datalen;
+      keycode = new char[keycodelength + 1];
+      memcpy(keycode, data, keycodelength);
+    }
+    else
+    {
+      //first 4 bytes is devicename length
+      memcpy(&devicenamelength, data, 4);
+      //devicename itself
+      if (datalen < 4 + devicenamelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        return false;
+      }
+      deviceName = new char[devicenamelength + 1];
+      memcpy(deviceName, data + 4, devicenamelength);
+      if (datalen < 8 + devicenamelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        return false;
+      }
+      //next 4 bytes is keycode length
+      memcpy(&keycodelength, data + 4 + devicenamelength, 4);
+      //keycode itself
+      if (datalen < 8 + devicenamelength + keycodelength)
+      {
+        CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+        delete[] deviceName;
+        return false;
+      }
+      keycode = new char[keycodelength + 1];
+      memcpy(keycode, data + 8 + devicenamelength, keycodelength);
+    }
+    deviceName[devicenamelength] = '\0';
+    keycode[keycodelength] = '\0';
+    //translate to a buttoncode xbmc understands
+    m_button = g_buttonTranslator.TranslateLircRemoteString(deviceName, keycode);
+    if (g_advancedSettings.m_logLevel == LOG_LEVEL_DEBUG_FREEMEM)
+    {
+      CLog::Log(LOGINFO, "IRServerSuite, RemoteEvent: %s %s", deviceName, keycode);
+    }
+    delete[] deviceName;
+    delete[] keycode;
+    return true;
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: exception while processing RemoteEvent.");
+    return false;
+  }
+}
+
+int CRemoteControl::ReadN(char *buffer, int n)
+{
+  int nOriginalSize = n;
+  memset(buffer, 0, n);
+  char *ptr = buffer;
+  while (n > 0)
+  {
+    int nBytes = 0;
+    nBytes = recv(m_socket, ptr, n, 0);
+
+    if (WSAGetLastError() == WSAEWOULDBLOCK)
+    {
+      return nOriginalSize - n;
+    }
+    if (nBytes < 0)
+    {
+      CLog::Log(LOGERROR, "%s, IRServerSuite recv error %d", __FUNCTION__, GetLastError());
+      Close();
+      return -1;
+    }
+    
+    if (nBytes == 0)
+    {
+      CLog::Log(LOGDEBUG,"%s, IRServerSuite socket closed by server", __FUNCTION__);
+      Close();
+      break;
+    }
+    
+    n -= nBytes;
+    ptr += nBytes;
+  }
+
+  return nOriginalSize - n;
+}
+
+bool CRemoteControl::WriteN(const char *buffer, int n)
+{
+  const char *ptr = buffer;
+  while (n > 0)
+  {
+    int nBytes = send(m_socket, ptr, n, 0);
+    if (nBytes < 0)
+    {
+      CLog::Log(LOGERROR, "%s, IRServerSuite send error %d (%d bytes)", __FUNCTION__, GetLastError(), n);
+      Close();
+      return false;
+    }
+    
+    if (nBytes == 0)
+      break;
+    
+    n -= nBytes;
+    ptr += nBytes;
+  }
+
+  return n == 0;
+}
+
+bool CRemoteControl::ReadPacket(CIrssMessage &message)
+{
+  try
+  {
+    char sizebuf[4];
+    int iRead = ReadN(&sizebuf[0], 4);
+    if (iRead == 0) return false; //nothing to read
+    if (iRead != 4)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: failed to read packetsize.");
+      return false;
+    }
+    uint32_t size = 0;
+    memcpy(&size, &sizebuf[0], 4);
+    size = ntohl(size);
+    char* messagebytes = new char[size];
+    if (ReadN(messagebytes, size) != size)
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: failed to read packet.");
+      return false;
+    }
+    if (!CIrssMessage::FromBytes(messagebytes, size, message))
+    {
+      CLog::Log(LOGERROR, "IRServerSuite: invalid packet received (size: %u).", size);
+      return false;
+    }
+    delete[] messagebytes;
+    return true;
+  }
+  catch(...)
+  {
+    CLog::Log(LOGERROR, "IRServerSuite: exception while processing packet.");
+    return false;
+  }
+}
+
+WORD CRemoteControl::GetButton()
+{
+  return m_button;
+}
+
+bool CRemoteControl::IsHolding()
+{
+  return m_isHolding;
+}


Property changes on: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,60 +1,60 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include <winsock2.h>
-#include "IrssMessage.h"
-#include "Thread.h"
-
-class CRemoteControl : CThread
-{
-public:
-  CRemoteControl();
-  ~CRemoteControl();
-  bool Initialize();
-  void Reset();
-  void Update();
-  WORD GetButton();
-  bool IsHolding();
-
-protected:
-  virtual void Process();
-
-private:
-  WORD  m_button;
-  bool  m_isHolding;
-  bool  m_bInitialized;
-  SOCKET m_socket;
-  bool m_isConnecting;
-  CStdString m_deviceName;
-  CStdString m_keyCode;
-
-  bool SendPacket(CIrssMessage& message);
-  bool ReadPacket(CIrssMessage& message);
-  int  ReadN(char *buffer, int n);
-  bool WriteN(const char *buffer, int n);
-  bool Connect();
-  void Close();
-
-  bool HandleRemoteEvent(CIrssMessage& message);
-};
-
-extern CRemoteControl g_RemoteControl;
+#pragma once
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <winsock2.h>
+#include "IrssMessage.h"
+#include "Thread.h"
+
+class CRemoteControl : CThread
+{
+public:
+  CRemoteControl();
+  ~CRemoteControl();
+  bool Initialize();
+  void Reset();
+  void Update();
+  WORD GetButton();
+  bool IsHolding();
+
+protected:
+  virtual void Process();
+
+private:
+  WORD  m_button;
+  bool  m_isHolding;
+  bool  m_bInitialized;
+  SOCKET m_socket;
+  bool m_isConnecting;
+  CStdString m_deviceName;
+  CStdString m_keyCode;
+
+  bool SendPacket(CIrssMessage& message);
+  bool ReadPacket(CIrssMessage& message);
+  int  ReadN(char *buffer, int n);
+  bool WriteN(const char *buffer, int n);
+  bool Connect();
+  void Close();
+
+  bool HandleRemoteEvent(CIrssMessage& message);
+};
+
+extern CRemoteControl g_RemoteControl;


Property changes on: branches/linuxport/XBMC/guilib/common/IRServerSuite/IRServerSuite.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,149 +1,149 @@
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "include.h"
-#include "IrssMessage.h"
-
-CIrssMessage::CIrssMessage()
-{
-  m_type = IRSSMT_Unknown;
-  m_flags = 0;
-  m_data = NULL;
-  m_dataSize = 0;
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags)
-{
-  m_type     = type;
-  m_flags    = flags;
-  m_data     = NULL;
-  m_dataSize = 0;
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size)
-{
-  CIrssMessage::CIrssMessage(type, flags);
-  SetDataAsBytes(data, size);
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data)
-{
-  CIrssMessage::CIrssMessage(type, flags);
-  SetDataAsString(data);
-}
-
-CIrssMessage::~CIrssMessage()
-{
-  FreeData();
-}
-
-void CIrssMessage::SetDataAsBytes(char* data, int size)
-{
-  if (!data)
-  {
-    FreeData();
-  }
-  else
-  {
-    m_data = new char[size];
-    memcpy(m_data, data, size);
-    m_dataSize = size;
-  }
-}
-
-void CIrssMessage::SetDataAsString(const CStdString& data)
-{
-  if (!data || data.IsEmpty())
-  {
-    FreeData();
-  }
-  else
-  {
-    m_data = strdup(data.c_str());
-    m_dataSize = strlen(data.c_str());
-  }
-}
-
-void CIrssMessage::FreeData()
-{
-  if (m_data)
-  {
-    delete[] m_data;
-  }
-  m_data = NULL;
-  m_dataSize = 0;
-}
-
-
-char* CIrssMessage::ToBytes(int& size)
-{
-  int dataLength = 0;
-  if (m_data)
-  {
-    dataLength = m_dataSize;
-  }
-
-  size = 8 + dataLength;
-  char* byteArray = new char[size];
-
-  memcpy(&byteArray[0], &m_type, 4);
-  memcpy(&byteArray[4], &m_flags, 4);
-
-  if (m_data)
-  {
-    memcpy(&byteArray[8], &m_data, m_dataSize);
-  }
-
-  return byteArray;
-}
-
-bool CIrssMessage::FromBytes(char* from, int size, CIrssMessage& message)
-{
-  if (!from)
-    return false;
-
-  if (size < 8)
-    return false;
-
-  //IRSS_MessageType type    = (MessageType)BitConverter.ToInt32(from, 0);
-  //IRSS_MessageFlags flags  = (MessageFlags)BitConverter.ToInt32(from, 4);
-  uint32_t type;
-  memcpy(&type, from, 4);
-  uint32_t flags;
-  memcpy(&flags, from + 4, 4);
-
-  message.SetType((IRSS_MessageType)type);
-  message.SetFlags(flags);
-  if (size > 8)
-  {
-    message.SetDataAsBytes(from + 8, size - 8);
-  }
-  return true;
-}
-
-void CIrssMessage::SetType(IRSS_MessageType type)
-{
-  m_type = type;
-}
-void CIrssMessage::SetFlags(uint32_t flags)
-{
-  m_flags = flags;
-}
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "include.h"
+#include "IrssMessage.h"
+
+CIrssMessage::CIrssMessage()
+{
+  m_type = IRSSMT_Unknown;
+  m_flags = 0;
+  m_data = NULL;
+  m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags)
+{
+  m_type     = type;
+  m_flags    = flags;
+  m_data     = NULL;
+  m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size)
+{
+  CIrssMessage::CIrssMessage(type, flags);
+  SetDataAsBytes(data, size);
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data)
+{
+  CIrssMessage::CIrssMessage(type, flags);
+  SetDataAsString(data);
+}
+
+CIrssMessage::~CIrssMessage()
+{
+  FreeData();
+}
+
+void CIrssMessage::SetDataAsBytes(char* data, int size)
+{
+  if (!data)
+  {
+    FreeData();
+  }
+  else
+  {
+    m_data = new char[size];
+    memcpy(m_data, data, size);
+    m_dataSize = size;
+  }
+}
+
+void CIrssMessage::SetDataAsString(const CStdString& data)
+{
+  if (!data || data.IsEmpty())
+  {
+    FreeData();
+  }
+  else
+  {
+    m_data = strdup(data.c_str());
+    m_dataSize = strlen(data.c_str());
+  }
+}
+
+void CIrssMessage::FreeData()
+{
+  if (m_data)
+  {
+    delete[] m_data;
+  }
+  m_data = NULL;
+  m_dataSize = 0;
+}
+
+
+char* CIrssMessage::ToBytes(int& size)
+{
+  int dataLength = 0;
+  if (m_data)
+  {
+    dataLength = m_dataSize;
+  }
+
+  size = 8 + dataLength;
+  char* byteArray = new char[size];
+
+  memcpy(&byteArray[0], &m_type, 4);
+  memcpy(&byteArray[4], &m_flags, 4);
+
+  if (m_data)
+  {
+    memcpy(&byteArray[8], &m_data, m_dataSize);
+  }
+
+  return byteArray;
+}
+
+bool CIrssMessage::FromBytes(char* from, int size, CIrssMessage& message)
+{
+  if (!from)
+    return false;
+
+  if (size < 8)
+    return false;
+
+  //IRSS_MessageType type    = (MessageType)BitConverter.ToInt32(from, 0);
+  //IRSS_MessageFlags flags  = (MessageFlags)BitConverter.ToInt32(from, 4);
+  uint32_t type;
+  memcpy(&type, from, 4);
+  uint32_t flags;
+  memcpy(&flags, from + 4, 4);
+
+  message.SetType((IRSS_MessageType)type);
+  message.SetFlags(flags);
+  if (size > 8)
+  {
+    message.SetDataAsBytes(from + 8, size - 8);
+  }
+  return true;
+}
+
+void CIrssMessage::SetType(IRSS_MessageType type)
+{
+  m_type = type;
+}
+void CIrssMessage::SetFlags(uint32_t flags)
+{
+  m_flags = flags;
+}


Property changes on: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,207 +1,207 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-  /// <summary>
-  /// Type of message.
-  /// </summary>
-  enum IRSS_MessageType
-  {
-    /// <summary>
-    /// Unknown message type.
-    /// </summary>
-    IRSSMT_Unknown = 0,
-
-    /// <summary>
-    /// Register Client.
-    /// </summary>
-    IRSSMT_RegisterClient = 1,
-    /// <summary>
-    /// Unregister Client.
-    /// </summary>
-    IRSSMT_UnregisterClient = 2,
-
-    /// <summary>
-    /// Register Repeater.
-    /// </summary>
-    IRSSMT_RegisterRepeater = 3,
-    /// <summary>
-    /// Unregister Repeater.
-    /// </summary>
-    IRSSMT_UnregisterRepeater = 4,
-
-    /// <summary>
-    /// Learn IR Command.
-    /// </summary>
-    IRSSMT_LearnIR = 5,
-    /// <summary>
-    /// Blast IR Command.
-    /// </summary>
-    IRSSMT_BlastIR = 6,
-
-    /// <summary>
-    /// Error.
-    /// </summary>
-    IRSSMT_Error = 7,
-
-    /// <summary>
-    /// Server Shutdown.
-    /// </summary>
-    IRSSMT_ServerShutdown = 8,
-    /// <summary>
-    /// Server Suspend.
-    /// </summary>
-    IRSSMT_ServerSuspend = 9,
-    /// <summary>
-    /// Server Resume
-    /// </summary>
-    IRSSMT_ServerResume = 10,
-
-    /// <summary>
-    /// Remote Event.
-    /// </summary>
-    IRSSMT_RemoteEvent = 11,
-    /// <summary>
-    /// Keyboard Event.
-    /// </summary>
-    IRSSMT_KeyboardEvent = 12,
-    /// <summary>
-    /// Mouse Event.
-    /// </summary>
-    IRSSMT_MouseEvent = 13,
-
-    /// <summary>
-    /// Forward a Remote Event.
-    /// </summary>
-    IRSSMT_ForwardRemoteEvent = 14,
-    /// <summary>
-    /// Forward a Keyboard Event.
-    /// </summary>
-    IRSSMT_ForwardKeyboardEvent = 15,
-    /// <summary>
-    /// Forward a Mouse Event.
-    /// </summary>
-    IRSSMT_ForwardMouseEvent = 16,
-
-    /// <summary>
-    /// Available Receivers.
-    /// </summary>
-    IRSSMT_AvailableReceivers = 17,
-    /// <summary>
-    /// Available Blasters.
-    /// </summary>
-    IRSSMT_AvailableBlasters = 18,
-    /// <summary>
-    /// Active Receivers.
-    /// </summary>
-    IRSSMT_ActiveReceivers = 19,
-    /// <summary>
-    /// Active Blasters.
-    /// </summary>
-    IRSSMT_ActiveBlasters = 20,
-    /// <summary>
-    /// Detected Receivers.
-    /// </summary>
-    IRSSMT_DetectedReceivers = 21,
-    /// <summary>
-    /// Detected Blasters.
-    /// </summary>
-    IRSSMT_DetectedBlasters = 22,
-  };
-
-  /// <summary>
-  /// Flags to determine more information about the message.
-  /// </summary>
-  enum IRSS_MessageFlags
-  {
-    /// <summary>
-    /// No Flags.
-    /// </summary>
-    IRSSMF_None            = 0x0000,
-
-    /// <summary>
-    /// Message is a Request.
-    /// </summary>
-    IRSSMF_Request         = 0x0001,
-    /// <summary>
-    /// Message is a Response to a received Message.
-    /// </summary>
-    IRSSMF_Response        = 0x0002,
-    /// <summary>
-    /// Message is a Notification.
-    /// </summary>
-    IRSSMF_Notify          = 0x0004,
-
-    /// <summary>
-    /// Operation Success.
-    /// </summary>
-    IRSSMF_Success         = 0x0008,
-    /// <summary>
-    /// Operation Failure.
-    /// </summary>
-    IRSSMF_Failure         = 0x0010,
-    /// <summary>
-    /// Operation Time-Out.
-    /// </summary>
-    IRSSMF_Timeout         = 0x0020,
-    
-    //IRSSMF_Error           = 0x0040,
-
-    //IRSSMF_DataString      = 0x0080,
-    //IRSSMF_DataBytes       = 0x0100,
-
-    //IRSSMF_ForceRespond    = 0x0200,
-    
-    /// <summary>
-    /// Force the recipient not to respond.
-    /// </summary>
-    IRSSMF_ForceNotRespond = 0x0400,
-  };
-
-class CIrssMessage
-{
-public:
-  CIrssMessage();
-  CIrssMessage(IRSS_MessageType type, uint32_t flags);
-  CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size);
-  CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data);
-  ~CIrssMessage();
-
-  void SetDataAsBytes(char* data, int size);
-  void SetDataAsString(const CStdString& data);
-  char* ToBytes(int& size);
-  void SetType(IRSS_MessageType type);
-  void SetFlags(uint32_t flags);
-  IRSS_MessageType GetType() {return m_type;}
-  uint32_t GetFlags() {return m_flags;}
-  char* GetData() {return m_data;}
-  uint32_t GetDataSize() {return m_dataSize;}
-  static bool FromBytes(char* from, int size, CIrssMessage& message);
-
-private:
-  IRSS_MessageType m_type;
-  uint32_t m_flags;
-  
-  char* m_data;
-  int m_dataSize;
-
-  void FreeData();
-};
+#pragma once
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://xbmc.org
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+  /// <summary>
+  /// Type of message.
+  /// </summary>
+  enum IRSS_MessageType
+  {
+    /// <summary>
+    /// Unknown message type.
+    /// </summary>
+    IRSSMT_Unknown = 0,
+
+    /// <summary>
+    /// Register Client.
+    /// </summary>
+    IRSSMT_RegisterClient = 1,
+    /// <summary>
+    /// Unregister Client.
+    /// </summary>
+    IRSSMT_UnregisterClient = 2,
+
+    /// <summary>
+    /// Register Repeater.
+    /// </summary>
+    IRSSMT_RegisterRepeater = 3,
+    /// <summary>
+    /// Unregister Repeater.
+    /// </summary>
+    IRSSMT_UnregisterRepeater = 4,
+
+    /// <summary>
+    /// Learn IR Command.
+    /// </summary>
+    IRSSMT_LearnIR = 5,
+    /// <summary>
+    /// Blast IR Command.
+    /// </summary>
+    IRSSMT_BlastIR = 6,
+
+    /// <summary>
+    /// Error.
+    /// </summary>
+    IRSSMT_Error = 7,
+
+    /// <summary>
+    /// Server Shutdown.
+    /// </summary>
+    IRSSMT_ServerShutdown = 8,
+    /// <summary>
+    /// Server Suspend.
+    /// </summary>
+    IRSSMT_ServerSuspend = 9,
+    /// <summary>
+    /// Server Resume
+    /// </summary>
+    IRSSMT_ServerResume = 10,
+
+    /// <summary>
+    /// Remote Event.
+    /// </summary>
+    IRSSMT_RemoteEvent = 11,
+    /// <summary>
+    /// Keyboard Event.
+    /// </summary>
+    IRSSMT_KeyboardEvent = 12,
+    /// <summary>
+    /// Mouse Event.
+    /// </summary>
+    IRSSMT_MouseEvent = 13,
+
+    /// <summary>
+    /// Forward a Remote Event.
+    /// </summary>
+    IRSSMT_ForwardRemoteEvent = 14,
+    /// <summary>
+    /// Forward a Keyboard Event.
+    /// </summary>
+    IRSSMT_ForwardKeyboardEvent = 15,
+    /// <summary>
+    /// Forward a Mouse Event.
+    /// </summary>
+    IRSSMT_ForwardMouseEvent = 16,
+
+    /// <summary>
+    /// Available Receivers.
+    /// </summary>
+    IRSSMT_AvailableReceivers = 17,
+    /// <summary>
+    /// Available Blasters.
+    /// </summary>
+    IRSSMT_AvailableBlasters = 18,
+    /// <summary>
+    /// Active Receivers.
+    /// </summary>
+    IRSSMT_ActiveReceivers = 19,
+    /// <summary>
+    /// Active Blasters.
+    /// </summary>
+    IRSSMT_ActiveBlasters = 20,
+    /// <summary>
+    /// Detected Receivers.
+    /// </summary>
+    IRSSMT_DetectedReceivers = 21,
+    /// <summary>
+    /// Detected Blasters.
+    /// </summary>
+    IRSSMT_DetectedBlasters = 22,
+  };
+
+  /// <summary>
+  /// Flags to determine more information about the message.
+  /// </summary>
+  enum IRSS_MessageFlags
+  {
+    /// <summary>
+    /// No Flags.
+    /// </summary>
+    IRSSMF_None            = 0x0000,
+
+    /// <summary>
+    /// Message is a Request.
+    /// </summary>
+    IRSSMF_Request         = 0x0001,
+    /// <summary>
+    /// Message is a Response to a received Message.
+    /// </summary>
+    IRSSMF_Response        = 0x0002,
+    /// <summary>
+    /// Message is a Notification.
+    /// </summary>
+    IRSSMF_Notify          = 0x0004,
+
+    /// <summary>
+    /// Operation Success.
+    /// </summary>
+    IRSSMF_Success         = 0x0008,
+    /// <summary>
+    /// Operation Failure.
+    /// </summary>
+    IRSSMF_Failure         = 0x0010,
+    /// <summary>
+    /// Operation Time-Out.
+    /// </summary>
+    IRSSMF_Timeout         = 0x0020,
+    
+    //IRSSMF_Error           = 0x0040,
+
+    //IRSSMF_DataString      = 0x0080,
+    //IRSSMF_DataBytes       = 0x0100,
+
+    //IRSSMF_ForceRespond    = 0x0200,
+    
+    /// <summary>
+    /// Force the recipient not to respond.
+    /// </summary>
+    IRSSMF_ForceNotRespond = 0x0400,
+  };
+
+class CIrssMessage
+{
+public:
+  CIrssMessage();
+  CIrssMessage(IRSS_MessageType type, uint32_t flags);
+  CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size);
+  CIrssMessage(IRSS_MessageType type, uint32_t flags, const CStdString& data);
+  ~CIrssMessage();
+
+  void SetDataAsBytes(char* data, int size);
+  void SetDataAsString(const CStdString& data);
+  char* ToBytes(int& size);
+  void SetType(IRSS_MessageType type);
+  void SetFlags(uint32_t flags);
+  IRSS_MessageType GetType() {return m_type;}
+  uint32_t GetFlags() {return m_flags;}
+  char* GetData() {return m_data;}
+  uint32_t GetDataSize() {return m_dataSize;}
+  static bool FromBytes(char* from, int size, CIrssMessage& message);
+
+private:
+  IRSS_MessageType m_type;
+  uint32_t m_flags;
+  
+  char* m_data;
+  int m_dataSize;
+
+  void FreeData();
+};


Property changes on: branches/linuxport/XBMC/guilib/common/IRServerSuite/IrssMessage.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/Keyboard.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/LIRC.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/LIRC.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/SDLJoystick.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/SDLJoystick.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/SDLJoystick.h	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/SDLJoystick.h	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,66 +1,66 @@
-#ifndef SDL_JOYSTICK_H
-#define SDL_JOYSTICK_H
-
-#include "../system.h"
-
-#ifdef HAS_SDL_JOYSTICK
-
-#define MAX_AXES 64
-
-#define JACTIVE_BUTTON 0x00000001
-#define JACTIVE_AXIS   0x00000002
-#define JACTIVE_NONE   0x00000000
-
-// Class to manage all connected joysticks
-
-class CJoystick
-{
-public:
-  CJoystick();
-
-  void Initialize(HWND hwnd);
-  void Reset(bool axis=false);
-  void CalibrateAxis(SDL_Joystick *joy);
-  void ResetAxis(int axisId) { m_Amount[axisId] = 0; }
-  void Update();
-  void Update(SDL_Event& event);
-  float GetAmount(int axis)
-  {
-    if (m_Amount[axis]>0)
-      return (float)(m_Amount[axis]-m_SafeRange)/(32768.0f-(float)m_SafeRange); 
-    return (float)(m_Amount[axis]+m_SafeRange)/(32768.0f-(float)m_SafeRange); 
-  }
-  float GetAmount()
-  {
-    return GetAmount(m_AxisId);
-  }
-  bool GetButton (int& id, bool consider_repeat=true);
-  bool GetAxis (int &id) { if (!IsAxisActive()) return false; id=m_AxisId; return true; }
-  std::string GetJoystick() { return (m_JoyId>-1)?m_JoystickNames[m_JoyId]:""; }
-  int GetAxisWithMaxAmount();
-  void SetSafeRange(int val) { m_SafeRange=(val>32767)?32767:val; }
-
-private:
-  void SetAxisActive(bool active=true) { m_ActiveFlags = active?(m_ActiveFlags|JACTIVE_AXIS):(m_ActiveFlags&(~JACTIVE_AXIS)); }
-  void SetButtonActive(bool active=true) { m_ActiveFlags = active?(m_ActiveFlags|JACTIVE_BUTTON):(m_ActiveFlags&(~JACTIVE_BUTTON)); }
-  bool IsButtonActive() { return (bool)(m_ActiveFlags&JACTIVE_BUTTON); }
-  bool IsAxisActive() { return (bool)(m_ActiveFlags&JACTIVE_AXIS); }
-
-  int m_Amount[MAX_AXES];
-  int m_DefaultAmount[MAX_AXES];
-  int m_AxisId;
-  int m_ButtonId;
-  int m_JoyId;
-  int m_NumAxes;
-  int m_SafeRange; // dead zone
-  Uint32 m_pressTicks;
-  WORD m_ActiveFlags;
-  std::vector<SDL_Joystick*> m_Joysticks;
-  std::vector<std::string> m_JoystickNames;
-};
-
-extern CJoystick g_Joystick;
-
-#endif
-
-#endif
+#ifndef SDL_JOYSTICK_H
+#define SDL_JOYSTICK_H
+
+#include "../system.h"
+
+#ifdef HAS_SDL_JOYSTICK
+
+#define MAX_AXES 64
+
+#define JACTIVE_BUTTON 0x00000001
+#define JACTIVE_AXIS   0x00000002
+#define JACTIVE_NONE   0x00000000
+
+// Class to manage all connected joysticks
+
+class CJoystick
+{
+public:
+  CJoystick();
+
+  void Initialize(HWND hwnd);
+  void Reset(bool axis=false);
+  void CalibrateAxis(SDL_Joystick *joy);
+  void ResetAxis(int axisId) { m_Amount[axisId] = 0; }
+  void Update();
+  void Update(SDL_Event& event);
+  float GetAmount(int axis)
+  {
+    if (m_Amount[axis]>0)
+      return (float)(m_Amount[axis]-m_SafeRange)/(32768.0f-(float)m_SafeRange); 
+    return (float)(m_Amount[axis]+m_SafeRange)/(32768.0f-(float)m_SafeRange); 
+  }
+  float GetAmount()
+  {
+    return GetAmount(m_AxisId);
+  }
+  bool GetButton (int& id, bool consider_repeat=true);
+  bool GetAxis (int &id) { if (!IsAxisActive()) return false; id=m_AxisId; return true; }
+  std::string GetJoystick() { return (m_JoyId>-1)?m_JoystickNames[m_JoyId]:""; }
+  int GetAxisWithMaxAmount();
+  void SetSafeRange(int val) { m_SafeRange=(val>32767)?32767:val; }
+
+private:
+  void SetAxisActive(bool active=true) { m_ActiveFlags = active?(m_ActiveFlags|JACTIVE_AXIS):(m_ActiveFlags&(~JACTIVE_AXIS)); }
+  void SetButtonActive(bool active=true) { m_ActiveFlags = active?(m_ActiveFlags|JACTIVE_BUTTON):(m_ActiveFlags&(~JACTIVE_BUTTON)); }
+  bool IsButtonActive() { return (bool)(m_ActiveFlags&JACTIVE_BUTTON); }
+  bool IsAxisActive() { return (bool)(m_ActiveFlags&JACTIVE_AXIS); }
+
+  int m_Amount[MAX_AXES];
+  int m_DefaultAmount[MAX_AXES];
+  int m_AxisId;
+  int m_ButtonId;
+  int m_JoyId;
+  int m_NumAxes;
+  int m_SafeRange; // dead zone
+  Uint32 m_pressTicks;
+  WORD m_ActiveFlags;
+  std::vector<SDL_Joystick*> m_Joysticks;
+  std::vector<std::string> m_JoystickNames;
+};
+
+extern CJoystick g_Joystick;
+
+#endif
+
+#endif


Property changes on: branches/linuxport/XBMC/guilib/common/SDLJoystick.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/SDLKeyboard.cpp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/common/SDLKeyboard.h
===================================================================
--- branches/linuxport/XBMC/guilib/common/SDLKeyboard.h	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/common/SDLKeyboard.h	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,40 +1,40 @@
-#ifndef SDL_KEYBOARD_H
-#define SDL_KEYBOARD_H
-
-#include "../system.h"
-
-#ifdef HAS_SDL
-#include <SDL/SDL.h>
-
-class CLowLevelKeyboard
-{
-public:
-  CLowLevelKeyboard();
-
-  void Initialize(HWND hwnd);
-  void Reset();
-  void Update(SDL_Event& event);
-  bool GetShift() { return m_bShift;};
-  bool GetCtrl() { return m_bCtrl;};
-  bool GetAlt() { return m_bAlt;};
-  bool GetRAlt() { return m_bRAlt;};
-  char GetAscii() { return m_cAscii;}; // FIXME should be replaced completly by GetUnicode() 
-  WCHAR GetUnicode() { return m_wUnicode;};
-  BYTE GetKey() { return m_VKey;};
-
-private:
-  bool m_bShift;
-  bool m_bCtrl;
-  bool m_bAlt;
-  bool m_bRAlt;
-  char m_cAscii;
-  WCHAR m_wUnicode;
-  BYTE m_VKey;
-#ifdef HAS_SDL_JOYSTICK
-  SDL_Joystick* m_pJoy;
-#endif
-};
-
-#endif
-
-#endif
+#ifndef SDL_KEYBOARD_H
+#define SDL_KEYBOARD_H
+
+#include "../system.h"
+
+#ifdef HAS_SDL
+#include <SDL/SDL.h>
+
+class CLowLevelKeyboard
+{
+public:
+  CLowLevelKeyboard();
+
+  void Initialize(HWND hwnd);
+  void Reset();
+  void Update(SDL_Event& event);
+  bool GetShift() { return m_bShift;};
+  bool GetCtrl() { return m_bCtrl;};
+  bool GetAlt() { return m_bAlt;};
+  bool GetRAlt() { return m_bRAlt;};
+  char GetAscii() { return m_cAscii;}; // FIXME should be replaced completly by GetUnicode() 
+  WCHAR GetUnicode() { return m_wUnicode;};
+  BYTE GetKey() { return m_VKey;};
+
+private:
+  bool m_bShift;
+  bool m_bCtrl;
+  bool m_bAlt;
+  bool m_bRAlt;
+  char m_cAscii;
+  WCHAR m_wUnicode;
+  BYTE m_VKey;
+#ifdef HAS_SDL_JOYSTICK
+  SDL_Joystick* m_pJoy;
+#endif
+};
+
+#endif
+
+#endif


Property changes on: branches/linuxport/XBMC/guilib/common/SDLKeyboard.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/SDLMouse.cpp
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/common/SDLMouse.h
___________________________________________________________________
Name: svn:eol-style
   + native


Property changes on: branches/linuxport/XBMC/guilib/freetype2/include/freetype/ftoutln.h
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: branches/linuxport/XBMC/guilib/system.h
===================================================================
--- branches/linuxport/XBMC/guilib/system.h	2008-07-15 18:33:17 UTC (rev 14119)
+++ branches/linuxport/XBMC/guilib/system.h	2008-07-15 18:34:24 UTC (rev 14120)
@@ -1,182 +1,182 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http:/