I am using the latest internal API increase to rename video_overlay_instace to

video_overlay_manager, because
a) this thing is called "overlay manager" by everyone
b) the term "instance" is misleading, since it suggests that you would not
   share the outcome of a get_instance() with others

CVS patchset: 5288
CVS date: 2003/08/15 14:35:09

1 files changed, 19 insertions, 14 deletions

diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 0ba8d9720..957b8aef7 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.h,v 1.95 2003/08/12 13:53:30 mroi Exp $
+ * $Id: video_out.h,v 1.96 2003/08/15 14:35:09 mroi Exp $
  *
  *
  * xine version of video_out.h 
@@ -55,7 +55,7 @@ extern "C" {
 typedef struct vo_frame_s vo_frame_t; 
 typedef struct img_buf_fifo_s img_buf_fifo_t;
 typedef struct vo_overlay_s vo_overlay_t;
-typedef struct video_overlay_instance_s video_overlay_instance_t;
+typedef struct video_overlay_manager_s video_overlay_manager_t;
 typedef struct vo_driver_s vo_driver_t;
 
 /* to access extra_info_t contents one have to include xine_internal.h */
@@ -191,7 +191,7 @@ struct xine_video_port_s {
   void (*exit) (xine_video_port_t *self);
 
   /* get overlay instance (overlay source) */
-  video_overlay_instance_t* (*get_overlay_instance) (xine_video_port_t *self);
+  video_overlay_manager_t* (*get_overlay_manager) (xine_video_port_t *self);
 
   /* flush video_out fifo */
   void (*flush) (xine_video_port_t *self);
@@ -412,27 +412,32 @@ struct vo_overlay_s {
 };
 
 
-/* API to video_overlay */
-struct video_overlay_instance_s {
-  void (*init) (video_overlay_instance_t *this_gen);
+/* API to video_overlay manager
+ *
+ * Remember that adding new functions to this structure requires
+ * adaption of the post plugin decoration layer. Be sure to look into
+ * src/xine-engine/post.[ch].
+ */
+struct video_overlay_manager_s {
+  void (*init) (video_overlay_manager_t *this_gen);
   
-  void (*dispose) (video_overlay_instance_t *this_gen);
+  void (*dispose) (video_overlay_manager_t *this_gen);
   
-  int32_t (*get_handle) (video_overlay_instance_t *this_gen, int object_type );
+  int32_t (*get_handle) (video_overlay_manager_t *this_gen, int object_type );
   
-  void (*free_handle) (video_overlay_instance_t *this_gen, int32_t handle);
+  void (*free_handle) (video_overlay_manager_t *this_gen, int32_t handle);
   
-  int32_t (*add_event) (video_overlay_instance_t *this_gen, void *event);
+  int32_t (*add_event) (video_overlay_manager_t *this_gen, void *event);
   
-  void (*flush_events) (video_overlay_instance_t *this_gen );
+  void (*flush_events) (video_overlay_manager_t *this_gen );
   
-  int (*redraw_needed) (video_overlay_instance_t *this_gen, int64_t vpts );
+  int (*redraw_needed) (video_overlay_manager_t *this_gen, int64_t vpts );
   
-  void (*multiple_overlay_blend) (video_overlay_instance_t *this_gen, int64_t vpts, 
+  void (*multiple_overlay_blend) (video_overlay_manager_t *this_gen, int64_t vpts, 
                                   vo_driver_t *output, vo_frame_t *vo_img, int enabled);
 };
 
-video_overlay_instance_t *video_overlay_new_instance (void);
+video_overlay_manager_t *video_overlay_new_instance (void);
 
 
 /*