[xiph-cvs] cvs commit: writ/include/writ writ.h

[Arc]

arc         03/12/02 02:54:13

  Modified:    include/writ writ.h
  Log:
  modified to work with current spec

Revision  Changes    Path
1.5       +41 -28    writ/include/writ/writ.h

Index: writ.h
===================================================================
RCS file: /usr/local/cvsroot/writ/include/writ/writ.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- writ.h	19 Aug 2003 06:19:17 -0000	1.4
+++ writ.h	2 Dec 2003 07:54:12 -0000	1.5
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: toplevel libwrit include
- last mod: $Id: writ.h,v 1.4 2003/08/19 06:19:17 arc Exp $
+ last mod: $Id: writ.h,v 1.5 2003/12/02 07:54:12 arc Exp $
 
  ********************************************************************/
 
@@ -30,45 +30,58 @@
 } writ_langdef;
 
 
+typedef struct writ_window {
+  ogg_uint16_t  location_x;
+  ogg_uint16_t  location_y;
+  ogg_uint16_t  location_width;
+  ogg_uint16_t  location_height;
+  int	        alignment_x; 		/* 0=left, 1=right, 2=center, 3=full */
+  int           alignment_y;		/* 0=top, 1=bottom, 2=middle, 3=full */
+} writ_window;
+
+
+typedef struct writ_wininfo {
+  ogg_uint16_t  location_scale_x;
+  ogg_uint16_t  location_scale_y;
+
+  int           num_windows;
+  writ_window  *windows;   
+} writ_wininfo;
+
+
 typedef struct writ_info {
-  int           version;
+  int            subver;
+  int            subver_bytes;
   
-  ogg_uint32_t  granulerate_numerator;
-  ogg_uint32_t  granulerate_denominator;
+  ogg_uint32_t   granulerate_numerator;
+  ogg_uint32_t   granulerate_denominator;
   
-  ogg_uint16_t  location_scale_x;
-  ogg_uint16_t  location_scale_y;
+  int            num_languages;
+  writ_langdef  *languages;
   
-  int           num_languages;
-  writ_langdef *languages;
+  writ_wininfo  *window_info; /* Used with subversion 1+ only */
+  /* Future subversion structs go here */
 } writ_info;
 
 
+typedef struct writ_phrase {
+  ogg_int64_t    start;
+  ogg_uint32_t   duration;
+  char         **text;
+
+  int            win_id;
+  /* Future subversion fields go here */
+} writ_phrase;  
+
+
 typedef struct writ_state {
-  writ_info    *wi;
+  writ_info   *wi;
   
-  int          phrases_buffed;
-  writ_phrase  *phrase_buff;
+  int          num_phrases;
+  writ_phrase *phrase_buffer;
   
   ogg_int64_t granulepos;
 } writ_state;
 
 
-typedef struct writ_phrase {
-  ogg_int64_t   granulepos;
-  ogg_uint32_t  duration;
-  
-  ogg_uint16_t  location_x;
-  ogg_uint16_t  location_y;
-  ogg_uint16_t  location_width;
-  ogg_uint16_t  location_height;
-  
-  int	        alignment_x; 		/* 0=left, 1=right, 2=center, 3=full */
-  int           alignment_y;		/* 0=top, 1=bottom, 2=middle, 3=full */
-  
-  writ_text    *phrase;
-} writ_phrase;  
-
-
 extern int ilog(unsigned int v);	/* src/format.c */
-

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.