From 547ce8c0908e62e264e4f4fbfb26ef2e7a3afce2 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Mon, 25 Apr 2011 19:15:54 -0700 Subject: [PATCH] Fixes to make it compile properly. --- .../Plasma/PubUtilLib/plAudioCore/plCachedFileReader.cpp | 8 ++++++++ .../Plasma/PubUtilLib/plAudioCore/plCachedFileReader.h | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.cpp b/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.cpp index 870a684f..f1c30cb3 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.cpp +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.cpp @@ -34,6 +34,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // // ////////////////////////////////////////////////////////////////////////////// +#include "hsTypes.h" #include "plCachedFileReader.h" //// Constructor/Destructor ////////////////////////////////////////////////// @@ -84,6 +85,13 @@ void plCachedFileReader::IError(const char *msg) Close(); } +plWAVHeader &plCachedFileReader::GetHeader() +{ + hsAssert(IsValid(), "GetHeader() called on an invalid cache file"); + + return fHeader; +} + void plCachedFileReader::Close() { if (fFileHandle != nil) diff --git a/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.h b/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.h index cc913c78..287437d2 100644 --- a/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.h +++ b/Sources/Plasma/PubUtilLib/plAudioCore/plCachedFileReader.h @@ -48,7 +48,7 @@ public: plAudioCore::ChannelSelect whichChan = plAudioCore::kAll); virtual ~plCachedFileReader(); - virtual plWAVHeader &GetHeader() const { return fHeader; } + virtual plWAVHeader &GetHeader(); virtual void Close(); @@ -65,6 +65,11 @@ public: virtual hsBool IsValid() { return fFileHandle != nil; } protected: + enum + { + kPCMFormatTag = 1 + }; + char fFilename[512]; FILE * fFileHandle; plWAVHeader fHeader;