EPG解析処理再考中

[iptd/iPTd.git] / src / mpeg2 / ts / EIT.h

diff --git a/src/mpeg2/ts/EIT.h b/src/mpeg2/ts/EIT.h
index cc7756e..480c14a 100644 (file)
--- a/src/mpeg2/ts/EIT.h
+++ b/src/mpeg2/ts/EIT.h
@@ -130,6 +130,7 @@ public:
 
     class Event
     {
+
     public:
         uint16_t    _event_id;                  // 16
         // start_time                              40
@@ -150,13 +151,12 @@ public:
         uint8_t *   _descriptor_ptr;
         uint16_t    _descriptor_offset;
         Descriptor  _descriptor;
-
-    public:
         Descriptor *nextDescriptor();
     };
 
+    uint8_t     _event_data[MAX_SECT_LEN];
+    uint16_t    _event_offset;
     Event       _event;
-    uint16_t    _next_event_offset;
 
 public:
     EIT();
@@ -164,7 +164,7 @@ public:
     ~EIT();
     void reset();
 
-    EIT::Event *nextEvent();
+    Event *nextEvent();
 };