diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-15 14:35:09 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-08-15 14:35:09 +0000 |
| commit | a2f063e2bde647a9f6f79e7f3be7b3c9d82eec64 (patch) | |
| tree | b43c17e06082ab3535eef4b4217f2c477d7f9f99 /src/xine-engine/video_out.c | |
| parent | 6b9fa3fbe1ceee6f4a7215cb70d5f3fbee33a1c7 (diff) | |
| download | xine-lib-a2f063e2bde647a9f6f79e7f3be7b3c9d82eec64.tar.gz xine-lib-a2f063e2bde647a9f6f79e7f3be7b3c9d82eec64.tar.bz2 | |
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
Diffstat (limited to 'src/xine-engine/video_out.c')
| -rw-r--r-- | src/xine-engine/video_out.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index d8657af98..2b3af4a9a 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -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.c,v 1.168 2003/08/12 13:53:30 mroi Exp $ + * $Id: video_out.c,v 1.169 2003/08/15 14:35:09 mroi Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -86,7 +86,7 @@ typedef struct { int64_t last_delivery_pts; - video_overlay_instance_t *overlay_source; + video_overlay_manager_t *overlay_source; int overlay_enabled; /* do we true real-time output or is this a grab only instance ? */ @@ -1398,7 +1398,7 @@ static vo_frame_t *vo_get_last_frame (xine_video_port_t *this_gen) { * overlay stuff */ -static video_overlay_instance_t *vo_get_overlay_instance (xine_video_port_t *this_gen) { +static video_overlay_manager_t *vo_get_overlay_manager (xine_video_port_t *this_gen) { vos_t *this = (vos_t *) this_gen; return this->overlay_source; } @@ -1480,7 +1480,7 @@ xine_video_port_t *vo_new_port (xine_t *xine, vo_driver_t *driver, this->vo.exit = vo_exit; this->vo.get_capabilities = vo_get_capabilities; this->vo.enable_ovl = vo_enable_overlay; - this->vo.get_overlay_instance = vo_get_overlay_instance; + this->vo.get_overlay_manager = vo_get_overlay_manager; this->vo.flush = vo_flush; this->vo.get_property = vo_get_property; this->vo.set_property = vo_set_property; @@ -1497,7 +1497,7 @@ xine_video_port_t *vo_new_port (xine_t *xine, vo_driver_t *driver, this->last_frame = NULL; this->img_backup = NULL; - this->overlay_source = video_overlay_new_instance(); + this->overlay_source = video_overlay_new_manager(); this->overlay_source->init (this->overlay_source); this->overlay_enabled = 1; |