1 files changed, 35 insertions, 35 deletions

diff --git a/command/global.h b/command/global.h
index 7ac42b6..af2d3a1 100644
--- a/command/global.h
+++ b/command/global.h
@@ -22,38 +22,35 @@ typedef unsigned char uchar;
 #define MA_SP_TYPE 6
 #define MA_BI_TYPE 7
 
-#define MT_UNCERTAIN	 0
-#define MT_START         1
-#define MT_STOP          2
+#define MT_START          1
+#define MT_STOP           2
 
-#define MT_COMMON        0x10
-#define MT_COMMONSTART   0x11
-#define MT_COMMONSTOP    0x12
+#define MT_ASSUMED        0x10
+#define MT_ASSUMEDSTART   0x11
+#define MT_ASSUMEDSTOP    0x12
 
-#define MT_ASSUMED       0x20
-#define MT_ASSUMEDSTART  0x21
-#define MT_ASSUMEDSTOP   0x22
+#define MT_LOGOCHANGE     0x20
+#define MT_LOGOSTART      0x21
+#define MT_LOGOSTOP       0x22
 
-#define MT_ASPECTCHANGE  0x30
-#define MT_ASPECTSTART   0x31
-#define MT_ASPECTSTOP    0x32
+#define MT_HBORDERCHANGE  0x30
+#define MT_HBORDERSTART   0x31
+#define MT_HBORDERSTOP    0x32
 
-#define MT_CHANNELCHANGE 0x40
-#define MT_CHANNELSTART  0x41
-#define MT_CHANNELSTOP   0x42
+#define MT_VBORDERCHANGE  0x40
+#define MT_VBORDERSTART   0x41
+#define MT_VBORDERSTOP    0x42
 
-#define MT_LOGOCHANGE    0x50
-#define MT_LOGOSTART     0x51
-#define MT_LOGOSTOP      0x52
+#define MT_ASPECTCHANGE   0x50
+#define MT_ASPECTSTART    0x51
+#define MT_ASPECTSTOP     0x52
 
-#define MT_BORDERCHANGE  0x60
-#define MT_BORDERSTART   0x61
-#define MT_BORDERSTOP    0x62
+#define MT_CHANNELCHANGE  0x60
+#define MT_CHANNELSTART   0x61
+#define MT_CHANNELSTOP    0x62
 
-#define MT_SILENCECHANGE 0x90
-
-#define MT_MOVED         0xE0
-#define MT_ALL           0xFF
+#define MT_MOVED          0xE0
+#define MT_ALL            0xFF
 
 typedef struct config
 {
@@ -84,15 +81,22 @@ typedef struct MarkAdPos
 {
     int FrameNumberBefore;
     int FrameNumberAfter;
-    char *CommentBefore;
-    char *CommentAfter;
 } MarkAdPos;
 
+typedef struct MarkAdAspectRatio
+{
+    int Num;
+    int Den;
+} MarkAdAspectRatio;
+
 typedef struct MarkAdMark
 {
     char Type;
     int Position;
-    char *Comment;
+    int ChannelsBefore;
+    int ChannelsAfter;
+    MarkAdAspectRatio AspectRatioBefore;
+    MarkAdAspectRatio AspectRatioAfter;
 } MarkAdMark;
 
 typedef struct MarkAdMarks
@@ -102,12 +106,6 @@ typedef struct MarkAdMarks
     int Count;
 } MarkAdMarks;
 
-typedef struct MarkAdAspectRatio
-{
-    int Num;
-    int Den;
-} MarkAdAspectRatio;
-
 #define MARKAD_PIDTYPE_VIDEO_H262 0x10
 #define MARKAD_PIDTYPE_VIDEO_H264 0x11
 #define MARKAD_PIDTYPE_AUDIO_AC3  0x20
@@ -125,9 +123,11 @@ typedef struct MarkAdContext
 
     struct Info
     {
+
+        MarkAdAspectRatio AspectRatio;
         int Channels;
+
         char *ChannelName;
-        MarkAdAspectRatio AspectRatio;
         MarkAdPid VPid;
         MarkAdPid APid;
         MarkAdPid DPid;