From 0e68ac8a6aab293a9ad853788c92506b13c866d6 Mon Sep 17 00:00:00 2001 From: PacketVideo CM Date: Fri, 19 Mar 2010 17:52:51 -0700 Subject: [PATCH] RIO-7826: Prevent redundant oscl file cache writeupdate calls when closing file Change-Id: I6e11acb34c2dc533c98acd3ed0ffa0e7666c713f --- engines/2way/src/pv_2way_sdkinfo.h | 2 +- engines/author/src/pv_author_sdkinfo.h | 2 +- engines/player/src/pv_player_sdkinfo.h | 2 +- oscl/oscl/osclio/src/oscl_file_cache.cpp | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index cba6dc92..a184f013 100644 --- 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 "1304870" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1306189" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100308 #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 0ed4642b..aa3b9258 100644 --- 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 "1304870" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1306189" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100308 #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 132edb61..79f77345 100644 --- 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 "1304870" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1306189" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100308 #endif //PV_PLAYER_SDKINFO_H_INCLUDED diff --git a/oscl/oscl/osclio/src/oscl_file_cache.cpp b/oscl/oscl/osclio/src/oscl_file_cache.cpp index c5021179..d4b5cada 100644 --- a/oscl/oscl/osclio/src/oscl_file_cache.cpp +++ b/oscl/oscl/osclio/src/oscl_file_cache.cpp @@ -264,10 +264,9 @@ OSCL_EXPORT_REF OsclFileCacheBuffer* OsclFileCache::AddFixedCache(const Oscl_Fil void OsclFileCache::Close() { //flush any cache updates & free the buffers - - _movableCache.WriteUpdatesToFile(); if (_movableCache.pBuffer) { + _movableCache.WriteUpdatesToFile(); OSCL_FREE(_movableCache.pBuffer); _movableCache.pBuffer = NULL; _movableCache.capacity = _movableCache.usableSize = 0; -- 2.11.0