mediaportal pvr addon: cosmetic changes and cleanup

margro · May 22, 2011 · 284cb94 · 284cb94
1 parent 46e02c5
commit 284cb94
Show file tree

Hide file tree

Showing 18 changed files with 151 additions and 152 deletions.
diff --git a/xbmc/pvrclients/MediaPortal/Socket.cpp b/xbmc/pvrclients/MediaPortal/Socket.cpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This program is free software: you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/Socket.h b/xbmc/pvrclients/MediaPortal/Socket.h
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/channels.cpp b/xbmc/pvrclients/MediaPortal/channels.cpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -66,7 +66,9 @@ bool cChannel::Parse(const std::string& data)
     }
 
     return true;
-  } else {
+  }
+  else
+  {
     return false;
   }
 }
diff --git a/xbmc/pvrclients/MediaPortal/channels.h b/xbmc/pvrclients/MediaPortal/channels.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/client.cpp b/xbmc/pvrclients/MediaPortal/client.cpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -253,6 +253,7 @@ ADDON_STATUS ADDON_GetStatus()
 {
   return m_CurStatus;
 }
+
 //-- HasSettings --------------------------------------------------------------
 // Report "true", yes this AddOn have settings
 //-----------------------------------------------------------------------------

diff --git a/xbmc/pvrclients/MediaPortal/client.h b/xbmc/pvrclients/MediaPortal/client.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/epg.cpp b/xbmc/pvrclients/MediaPortal/epg.cpp
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2005-2010 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,16 @@
 
 using namespace std;
 
+#include "xbmc_pvr_types.h"
 #include "epg.h"
 #include "utils.h"
 #include "client.h"
 
-//Copied from PVREpg.h:
+// For the main EPG event types, see xbmc_pvr_types.h
-//subtypes derived from English strings.xml and CPVREpgInfoTag::ConvertGenreIdToString
+// Subtypes below are derived from English strings.xml and CEpg::ConvertGenreIdToString()
-//TODO: Finish me... This list is not yet complete
+// TODO: Finish me... This list is not yet complete
-#define EPG_EVENT_CONTENTMASK_MOVIEDRAMA                     0x10
+// EPG_EVENT_CONTENTMASK_MOVIEDRAMA                  0x10
-//Subtypes MOVIE/DRAMA
+// Subtypes MOVIE/DRAMA
 #define DETECTIVE_THRILLER                           0x01
 #define ADVENTURE_WESTERN_WAR                        0x02
 #define SF_FANTASY_HORROR                            0x03
@@ -40,32 +41,32 @@ using namespace std;
 #define SERIOUS_CLASSICAL_RELIGIOUS_HISTORICAL_DRAMA 0x07
 #define ADULTMOVIE_DRAMA                             0x08
 
-#define EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS             0x20
+// EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS          0x20
-//subtypes:
+// subtypes:
 #define NEWS_WEATHER_REPORT                          0x01
 #define NEWS_MAGAZINE                                0x02
 #define DOCUMENTARY                                  0x03
 #define DISCUSSION_INTERVIEW_DEBATE                  0x04
 
-#define EPG_EVENT_CONTENTMASK_SHOW                           0x30
+// EPG_EVENT_CONTENTMASK_SHOW                        0x30
-//subtypes:
+// subtypes:
 #define GAMESHOW_QUIZ_CONTEST                        0x01
 #define VARIETY_SHOW                                 0x02
 #define TALK_SHOW                                    0x03
 
-#define EPG_EVENT_CONTENTMASK_SPORTS                         0x40
+// EPG_EVENT_CONTENTMASK_SPORTS                      0x40
 
-#define EPG_EVENT_CONTENTMASK_CHILDRENYOUTH                  0x50
+// EPG_EVENT_CONTENTMASK_CHILDRENYOUTH               0x50
-//subtypes
+// subtypes
 #define PRESCHOOL_CHILD_PROGRAM                      0x01
 #define ENTERTAINMENT_6TO14                          0x02
 #define ENTERTAINMENT_10TO16                         0x03
 #define INFO_EDUC_SCHOOL_PROGRAM                     0x04
 #define CARTOONS_PUPPETS                             0x05
 
-#define EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE               0x60
+// EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE            0x60
-#define EPG_EVENT_CONTENTMASK_ARTSCULTURE                    0x70
+// EPG_EVENT_CONTENTMASK_ARTSCULTURE                 0x70
-//subtypes
+// subtypes
 #define PERFORMING_ARTS                              0x01
 #define FINE_ARTS                                    0x02
 #define RELIGION                                     0x03
@@ -78,14 +79,14 @@ using namespace std;
 #define ARTS_CULTURE_MAGAZINES                       0x10
 #define FASHION                                      0x11
 
-#define EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS       0x80
+// EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS    0x80
-//subtype
+// subtype
 #define MAGAZINES_REPORTS_DOCUMENTARY                0x01
 #define ECONOMICS_SOCIAL_ADVISORY                    0x02
 #define REMARKABLE_PEOPLE                            0x03
 
-#define EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE             0x90
+// EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE          0x90
-//subtypes
+// subtypes
 #define NATURE_ANIMALS_ENVIRONMENT                   0x01
 #define TECHNOLOGY_NATURAL_SCIENCES                  0x02
 #define MEDICINE_PHYSIOLOGY_PSYCHOLOGY               0x03
@@ -94,9 +95,9 @@ using namespace std;
 #define FURTHER_EDUCATION                            0x06
 #define LANGUAGES                                    0x07
 
-#define EPG_EVENT_CONTENTMASK_LEISUREHOBBIES                 0xA0
+// EPG_EVENT_CONTENTMASK_LEISUREHOBBIES              0xA0
-#define EPG_EVENT_CONTENTMASK_SPECIAL                        0xB0
+// EPG_EVENT_CONTENTMASK_SPECIAL                     0xB0
-#define EPG_EVENT_CONTENTMASK_USERDEFINED                    0xF0
+// EPG_EVENT_CONTENTMASK_USERDEFINED                 0xF0
 
 cEpg::cEpg()
 {

diff --git a/xbmc/pvrclients/MediaPortal/epg.h b/xbmc/pvrclients/MediaPortal/epg.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *      Copyright (C) 2005-2009 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/os-dependent.h b/xbmc/pvrclients/MediaPortal/os-dependent.h
@@ -1,6 +1,6 @@
 #pragma once
 /*
- *      Copyright (C) 2005-2009 Team XBMC
+ *      Copyright (C) 2005-2011 Team XBMC
  *      http://www.xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify

diff --git a/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV_tsreader.vcxproj b/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV_tsreader.vcxproj
@@ -160,7 +160,6 @@
     <ClInclude Include="..\..\pvrclient-mediaportal.h" />
     <ClInclude Include="..\..\recordings.h" />
     <ClInclude Include="..\..\Socket.h" />
-    <ClInclude Include="..\..\StdString.h" />
     <ClInclude Include="..\..\timers.h" />
     <ClInclude Include="..\..\utils.h" />
   </ItemGroup>

diff --git a/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV_tsreader.vcxproj.filters b/xbmc/pvrclients/MediaPortal/project/VS2010Express/XBMC_MPTV_tsreader.vcxproj.filters
@@ -106,9 +106,6 @@
     <ClInclude Include="..\..\Socket.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\StdString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\timers.h">
       <Filter>Header Files</Filter>
     </ClInclude>