RIO-8602: CPM cleanup

Change-Id: I1de219e8ac9a7beedf8bc3b467d3422e3a1fc7b4

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 76484de..d6dfc75 100644 (file)
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1338484"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1338891"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100323
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED

diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index da1f7d7..6c1c5b3 100644 (file)
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1338484"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1338891"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100323
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED

diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index a40ac76..bd2fcda 100644 (file)
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1338484"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1338891"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100323
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED

diff --git a/pvmi/content_policy_manager/plugins/common/include/pvmf_cpmplugin_metering_interface_types.h b/pvmi/content_policy_manager/plugins/common/include/pvmf_cpmplugin_metering_interface_types.h
index aeca65d..5bfb47b 100644 (file)
--- a/pvmi/content_policy_manager/plugins/common/include/pvmf_cpmplugin_metering_interface_types.h
+++ b/pvmi/content_policy_manager/plugins/common/include/pvmf_cpmplugin_metering_interface_types.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,13 +73,9 @@ class PVMFCPMMeterCertInfo
         //The URL of the metering service.
         OSCL_wHeapString<OsclMemAllocator> iURL;
 
-        //Tells if the cert is V2 (Janus).
-        bool iIsV2;
-
         void Clear()
         {
             iValid = false;
-            iIsV2 = false;
             iURL = _STRLIT_WCHAR("");
             oscl_memset(iMeterId.data, NULL, sizeof(iMeterId.data));
         }
@@ -90,7 +86,6 @@ class PVMFCPMMeterCertInfo
             {
                 iMeterId = aInfo.iMeterId;
                 iURL = aInfo.iURL;
-                iIsV2 = aInfo.iIsV2;
             }
         }
 };