From 5974c2bbbcc45fa0ae56f81b97193be67d4df46e Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Mon, 21 Apr 2008 19:56:41 -0600 Subject: [PATCH] Use an enum for lacing types. --- include/libmkv.h | 12 +++++++----- src/matroska.c | 4 +++- src/matroska.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/libmkv.h b/include/libmkv.h index 173cab7..085dbe3 100644 --- a/include/libmkv.h +++ b/include/libmkv.h @@ -72,10 +72,12 @@ #define MK_TRACK_BUTTONS 0x12 #define MK_TRACK_CONTROL 0x20 -#define MK_LACING_NONE 0x00 -#define MK_LACING_XIPH 0x01 -#define MK_LACING_FIXED 0x02 -#define MK_LACING_EBML 0x03 +typedef enum mk_LacingTypesEnum { + MK_LACING_NONE = 0x00, + MK_LACING_XIPH, + MK_LACING_FIXED, + MK_LACING_EBML +} mk_LacingTypes; #ifdef __cplusplus extern "C" { @@ -127,7 +129,7 @@ int mk_writeHeader(mk_Writer *w, const char *writingApp); int mk_startFrame( mk_Writer *w, mk_Track *track ); int mk_addFrameData(mk_Writer *w, mk_Track *track, const void *data, unsigned size); int mk_setFrameFlags(mk_Writer *w, mk_Track *track, int64_t timestamp, unsigned keyframe); -int mk_setFrameLacing(mk_Writer *w, mk_Track *track, uint8_t lacing, uint8_t num_frames, uint64_t sizes[]); +int mk_setFrameLacing(mk_Writer *w, mk_Track *track, mk_LacingTypes lacing, uint8_t num_frames, uint64_t sizes[]); int mk_createChapterSimple(mk_Writer *w, uint64_t start, uint64_t end, char *name); int mk_close( mk_Writer *w ); diff --git a/src/matroska.c b/src/matroska.c index 9e08a21..5224c1b 100644 --- a/src/matroska.c +++ b/src/matroska.c @@ -231,6 +231,8 @@ int mk_flushFrame(mk_Writer *w, mk_Track *track) { ++length; break; } + default: + break; } fsize = track->frame.data ? track->frame.data->d_cur : 0; @@ -329,7 +331,7 @@ int mk_setFrameFlags(mk_Writer *w, mk_Track *track, int64_t timestamp, unsigne return 0; } -int mk_setFrameLacing(mk_Writer *w, mk_Track *track, uint8_t lacing, uint8_t num_frames, uint64_t sizes[]) { +int mk_setFrameLacing(mk_Writer *w, mk_Track *track, mk_LacingTypes lacing, uint8_t num_frames, uint64_t sizes[]) { if (!track->in_frame) return -1; track->frame.lacing_sizes = calloc(num_frames, sizeof(uint64_t)); diff --git a/src/matroska.h b/src/matroska.h index 77ad87b..c4e61ff 100644 --- a/src/matroska.h +++ b/src/matroska.h @@ -252,7 +252,7 @@ struct mk_Track_s { mk_Context *data; int64_t timecode; uint8_t keyframe; - uint8_t lacing; + mk_LacingTypes lacing; uint8_t lacing_num_frames; uint64_t *lacing_sizes; } frame; -- 2.11.4.GIT