From 07d6794bea3dadc612b70d5f16cf52da2d1d1081 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 25 Mar 2007 22:07:40 +0000 Subject: All private data for a capture in a Wiretap module must be per-file, not static to the module. Add the older(?) ID tag for MPEG audio. Just use the ID at the beginning to identify MPEG audio files; don't check the file any further. If the read of the magic number doesn't work, get the error, and, if there is no error (i.e., it's a short read), just return 0 (meaning "no error, but this isn't that type of file). Similarly, if the magic number doesn't match, just return 0, so other types of file are tried. svn path=/trunk/; revision=21192 --- wiretap/wtap-int.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'wiretap/wtap-int.h') diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 0e88c6d99e..f8ab6583fa 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -149,6 +149,11 @@ typedef struct { guint32 start_usecs; } catapult_dct2000_t; +typedef struct { + struct wtap_nstime now; + double t0; +} mpeg_t; + typedef gboolean (*subtype_read_func)(struct wtap*, int*, char**, gint64*); typedef gboolean (*subtype_seek_read_func)(struct wtap*, gint64, union wtap_pseudo_header*, guint8*, int, int *, char **); @@ -179,7 +184,8 @@ struct wtap { airopeek9_t *airopeek9; erf_t *erf; k12_t *k12; - catapult_dct2000_t* catapult_dct2000; + catapult_dct2000_t *catapult_dct2000; + mpeg_t *mpeg; void *generic; } capture; -- cgit v1.2.3