Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Prev/Next Segment UID classes standalone #124

Merged
merged 1 commit into from
Dec 19, 2023
Merged

Make Prev/Next Segment UID classes standalone #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions matroska/KaxInfoData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,15 @@ using namespace libebml;
namespace libmatroska {

DECLARE_MKX_CONTEXT(KaxPrevUID)
class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
DECLARE_MKX_BINARY (KaxPrevUID)
public:
KaxPrevUID() = default;
KaxPrevUID(const KaxPrevUID & ElementToClone) = default;
bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);}

EBML_CONCRETE_CLASS(KaxPrevUID)
};

DECLARE_MKX_CONTEXT(KaxNextUID)
class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
DECLARE_MKX_BINARY (KaxNextUID)
public:
KaxNextUID() = default;
KaxNextUID(const KaxNextUID & ElementToClone) = default;
bool ValidateSize() const override { return IsFiniteSize() && (GetSize() == 16);}

EBML_CONCRETE_CLASS(KaxNextUID)
};

} // namespace libmatroska
Expand Down
4 changes: 2 additions & 2 deletions src/KaxSemantic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ DEFINE_END_SEMANTIC(KaxInfo)
DEFINE_MKX_MASTER(KaxInfo, 0x1549A966, 4, KaxSegment, "Info")
DEFINE_MKX_BINARY (KaxSegmentUID, 0x73A4, 2, KaxInfo, "SegmentUID")
DEFINE_MKX_UNISTRING(KaxSegmentFilename, 0x7384, 2, KaxInfo, "SegmentFilename")
DEFINE_MKX_BINARY_CONS(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
DEFINE_MKX_BINARY(KaxPrevUID, 0x3CB923, 3, KaxInfo, "PrevUID")
DEFINE_MKX_UNISTRING(KaxPrevFilename, 0x3C83AB, 3, KaxInfo, "PrevFilename")
DEFINE_MKX_BINARY_CONS(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
DEFINE_MKX_BINARY(KaxNextUID, 0x3EB923, 3, KaxInfo, "NextUID")
DEFINE_MKX_UNISTRING(KaxNextFilename, 0x3E83BB, 3, KaxInfo, "NextFilename")
DEFINE_MKX_BINARY (KaxSegmentFamily, 0x4444, 2, KaxInfo, "SegmentFamily")

Expand Down