From: Peter Harris <pharris@opentext.com>
Date: Tue, 31 Mar 2009 19:54:59 +0000 (-0400)
Subject: Add enum references to fields in XVideo
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b2b6acffaeca4a3f2b8ecf2877614fdb3d6ae46;p=free-sw%2Fxcb%2Fproto

Add enum references to fields in XVideo

Signed-off-by: Peter Harris <pharris@opentext.com>
---

diff --git a/src/xv.xml b/src/xv.xml
index 26047a6..d2bfc29 100644
--- a/src/xv.xml
+++ b/src/xv.xml
@@ -58,6 +58,28 @@ authorization from the authors.
         <item name="Settable"><bit>1</bit></item>
     </enum>
     
+    <enum name="VideoNotifyReason">
+	<item name="Started" />
+	<item name="Stopped" />
+	<item name="Busy" />
+	<item name="Preempted" />
+	<item name="HardError" />
+    </enum>
+
+    <enum name="ScanlineOrder">
+        <item name="TopToBottom" />
+        <item name="BottomToTop" />
+    </enum>
+
+    <enum name="GrabPortStatus">
+        <item name="Success" />
+        <item name="BadExtension" />
+        <item name="AlreadyGrabbed" />
+        <item name="InvalidTime" />
+        <item name="BadReply" />
+        <item name="BadAlloc" />
+    </enum>
+
     <struct name="Rational">
         <field type="INT32" name="numerator" />
         <field type="INT32" name="denominator" />
@@ -74,7 +96,7 @@ authorization from the authors.
         <field type="CARD16" name="name_size" />
         <field type="CARD16" name="num_ports" />
         <field type="CARD16" name="num_formats" />
-        <field type="CARD8" name="type" />
+        <field type="CARD8" name="type" mask="Type" />
         <pad bytes="1" />
         <list type="char" name="name">
             <fieldref>name_size</fieldref>
@@ -120,7 +142,7 @@ authorization from the authors.
     </struct>
     
     <struct name="AttributeInfo">
-        <field type="CARD32" name="flags" />
+        <field type="CARD32" name="flags" mask="AttributeFlag" />
         <field type="INT32" name="min" />
         <field type="INT32" name="max" />
         <field type="CARD32" name="size" />
@@ -131,8 +153,8 @@ authorization from the authors.
 
     <struct name="ImageFormatInfo">
         <field type="CARD32" name="id" />
-        <field type="CARD8" name="type" />
-        <field type="CARD8" name="byte_order" />
+        <field type="CARD8" name="type" enum="ImageFormatInfoType" />
+        <field type="CARD8" name="byte_order" enum="ImageOrder" />
         <pad bytes="2" />
         <list type="CARD8" name="guid">
             <value>16</value>
@@ -145,7 +167,7 @@ authorization from the authors.
         <field type="CARD32" name="red_mask" />
         <field type="CARD32" name="green_mask" />
         <field type="CARD32" name="blue_mask" />
-        <field type="CARD8" name="format" />
+        <field type="CARD8" name="format" enum="ImageFormatInfoFormat" />
         <pad bytes="3" />
         <field type="CARD32" name="y_sample_bits" />
         <field type="CARD32" name="u_sample_bits" />
@@ -159,7 +181,7 @@ authorization from the authors.
         <list type="CARD8" name="vcomp_order">
             <value>32</value>
         </list>
-        <field type="CARD8" name="vscanline_order" />
+        <field type="CARD8" name="vscanline_order" enum="ScanlineOrder" />
         <pad bytes="11" />
     </struct>
 
@@ -171,7 +193,7 @@ authorization from the authors.
 
     <!-- Events -->
     <event name="VideoNotify" number="0">
-        <field type="BYTE" name="reason" />
+        <field type="BYTE" name="reason" enum="VideoNotifyReason" />
         <field type="TIMESTAMP" name="time" />
         <field type="DRAWABLE" name="drawable" />
         <field type="PORT" name="port" />
@@ -225,15 +247,15 @@ authorization from the authors.
 
     <request name="GrabPort" opcode="3">
         <field type="PORT" name="port" />
-        <field type="TIMESTAMP" name="time" />
+        <field type="TIMESTAMP" name="time" altenum="Time" />
         <reply>
-            <field type="BYTE" name="result" />
+            <field type="BYTE" name="result" enum="GrabPortStatus" />
         </reply>
     </request>
 
     <request name="UngrabPort" opcode="4">
         <field type="PORT" name="port" />
-        <field type="TIMESTAMP" name="time" />
+        <field type="TIMESTAMP" name="time" altenum="Time" />
     </request>
 
     <request name="PutVideo" opcode="5">