generic-library/ebml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more moving and cleaning

Browse Source 
git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@10 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Steve Lhomme 2010-03-15 15:58:55 +00:00
parent 377e111038
commit eeb3b1d104
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ebml/EbmlCrc32.h
View File

@ -69,7 +69,6 @@ class EBML_DLL_API EbmlCrc32 : public EbmlBinary {
} }
operator const EbmlId &() const {return ClassInfos.GlobalId;} operator const EbmlId &() const {return ClassInfos.GlobalId;}
bool IsYourId(const EbmlId & TestId) const;
void AddElementCRC32(EbmlElement &ElementToCRC); void AddElementCRC32(EbmlElement &ElementToCRC);
bool CheckElementCRC32(EbmlElement &ElementToCRC); bool CheckElementCRC32(EbmlElement &ElementToCRC);

25
ebml/EbmlElement.h
View File

@ -174,6 +174,8 @@ class EBML_DLL_API EbmlElement {
virtual EbmlElement * Clone() const = 0; virtual EbmlElement * Clone() const = 0;
virtual operator const EbmlId &() const = 0; virtual operator const EbmlId &() const = 0;
/// return the generic callback to monitor a derived class
virtual const EbmlCallbacks & Generic() const = 0;
// by default only allow to set element as finite (override when needed) // by default only allow to set element as finite (override when needed)
virtual bool SetSizeInfinite(bool bIsInfinite = true) {return !bIsInfinite;} virtual bool SetSizeInfinite(bool bIsInfinite = true) {return !bIsInfinite;}
@ -194,9 +196,6 @@ class EBML_DLL_API EbmlElement {
virtual uint64 ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) = 0; virtual uint64 ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA) = 0;
virtual void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt = false, ScopeMode ReadFully = SCOPE_ALL_DATA); virtual void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt = false, ScopeMode ReadFully = SCOPE_ALL_DATA);
/// return the generic callback to monitor a derived class
virtual const EbmlCallbacks & Generic() const = 0;
bool IsLocked() const {return bLocked;} bool IsLocked() const {return bLocked;}
void Lock(bool bLock = true) { bLocked = bLock;} void Lock(bool bLock = true) { bLocked = bLock;}
@ -245,16 +244,6 @@ class EBML_DLL_API EbmlElement {
} }
protected: protected:
uint64 Size; ///< the size of the data to write
uint64 DefaultSize; ///< Minimum data size to fill on rendering (0 = optimal)
int SizeLength; /// the minimum size on which the size will be written (0 = optimal)
bool bSizeIsFinite;
uint64 ElementPosition;
uint64 SizePosition;
bool bValueIsSet;
bool DefaultIsSet;
bool bLocked;
/*! /*!
\brief find any element in the stream \brief find any element in the stream
\return a DummyRawElement if the element is unknown or NULL if the element dummy is not allowed \return a DummyRawElement if the element is unknown or NULL if the element dummy is not allowed
@ -273,6 +262,16 @@ class EBML_DLL_API EbmlElement {
\brief special constructor for cloning \brief special constructor for cloning
*/ */
EbmlElement(const EbmlElement & ElementToClone); EbmlElement(const EbmlElement & ElementToClone);
uint64 Size; ///< the size of the data to write
uint64 DefaultSize; ///< Minimum data size to fill on rendering (0 = optimal)
int SizeLength; /// the minimum size on which the size will be written (0 = optimal)
bool bSizeIsFinite;
uint64 ElementPosition;
uint64 SizePosition;
bool bValueIsSet;
bool DefaultIsSet;
bool bLocked;
}; };
END_LIBEBML_NAMESPACE END_LIBEBML_NAMESPACE