remained incompatible xine_tvmode_* functions to xine_tvmode_*2,

added backwards compatible functions
=> binary compatibility with former libxine0 0.9.11 and 0.9.12
Someone who uses nvtvd should definitely test this!
They should be renamed back when the new API is released.

CVS patchset: 2386
CVS date: 2002/08/03 17:33:06

1 files changed, 9 insertions, 5 deletions

diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index b68a0c1bf..b36a0ed50 100644
--- a/include/xine.h.tmpl.in
+++ b/include/xine.h.tmpl.in
@@ -28,7 +28,7 @@
  \endverbatim
  */
 /*
- * $Id: xine.h.tmpl.in,v 1.103 2002/07/17 21:23:57 f1rmb Exp $
+ * $Id: xine.h.tmpl.in,v 1.104 2002/08/03 17:33:06 siggi Exp $
  *
  */
 
@@ -2045,14 +2045,16 @@ char *xine_set_locale(void);
  * \brief connect to nvtvd server and save current TV and X settings
  * \param self xine object.
  */
-void xine_tvmode_init (xine_t *self);
+void xine_tvmode_init (void);
+void xine_tvmode_init2 (xine_t *self);
 
 /**
  * \fn void xine_tvmode_exit (xine_t *self);
  * \brief restore old TV and X settings and close nvtvd connection
  * \param self xine object.
  */
-void xine_tvmode_exit (xine_t *self);
+void xine_tvmode_exit (void);
+void xine_tvmode_exit2 (xine_t *self);
 
 /**
  * \fn int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps);
@@ -2065,7 +2067,8 @@ void xine_tvmode_exit (xine_t *self);
  * \return finally selected state
  * \sa xine_tvmode_init(), xine_tvmode_exit(), xine_tvmode_size()
  */
-int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps);
+int xine_tvmode_switch (int type, int width, int height, double fps);
+int xine_tvmode_switch2 (xine_t *self, int type, int width, int height, double fps);
 
 /**
  * \fn void xine_tvmode_size (xine_t *self, int *width, int *height, double *pixelaspect, double *fps);
@@ -2076,7 +2079,8 @@ int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fp
  * \param pixelaspect pixel aspect to be adapted or NULL
  * \param frame rate of current TV mode to be adapted or NULL
  */
-void xine_tvmode_size (xine_t *self, int *width, int *height, double *pixelaspect, double *fps);
+void xine_tvmode_size (int *width, int *height, double *pixelaspect, double *fps);
+void xine_tvmode_size2 (xine_t *self, int *width, int *height, double *pixelaspect, double *fps);
 
           /** @} end of xine_tvmode */