header beautification

CVS patchset: 4675
CVS date: 2003/04/25 15:34:44

4 files changed, 74 insertions, 86 deletions

diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index f89f0d682..4905e51eb 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.h,v 1.20 2003/04/20 21:13:22 guenter Exp $
+ * $Id: configfile.h,v 1.21 2003/04/25 15:34:45 mroi Exp $
  *
  * config file management
  *
  */
-/* For the _MSC_VER (Win32) port the "this" variable
- * was removed from all prototypes.and changed to "cfg"
- */
 
 #ifndef HAVE_CONFIGFILE_H
 #define HAVE_CONFIGFILE_H
@@ -102,7 +99,7 @@ struct config_values_s {
    * from the config file otherwise
    */
 
-  char* (*register_string) (config_values_t *,
+  char* (*register_string) (config_values_t *self,
 			    const char *key,
 			    const char *def_value,
 			    const char *description,
@@ -111,7 +108,7 @@ struct config_values_s {
 			    xine_config_cb_t changed_cb,
 			    void *cb_data);
 
-  int (*register_range) (config_values_t *,
+  int (*register_range) (config_values_t *self,
 			 const char *key,
 			 int def_value,
 			 int min, int max,
@@ -121,7 +118,7 @@ struct config_values_s {
 			 xine_config_cb_t changed_cb,
 			 void *cb_data);
 
-  int (*register_enum) (config_values_t *,
+  int (*register_enum) (config_values_t *self,
 			const char *key,
 			int def_value,
 			char **values,
@@ -131,7 +128,7 @@ struct config_values_s {
 			xine_config_cb_t changed_cb,
 			void *cb_data);
 
-  int (*register_num) (config_values_t *,
+  int (*register_num) (config_values_t *self,
 		       const char *key,
 		       int def_value,
 		       const char *description,
@@ -140,7 +137,7 @@ struct config_values_s {
 		       xine_config_cb_t changed_cb,
 		       void *cb_data);
 
-  int (*register_bool) (config_values_t *,
+  int (*register_bool) (config_values_t *self,
 			const char *key,
 			int def_value,
 			const char *description,
@@ -150,10 +147,10 @@ struct config_values_s {
 			void *cb_data);
 
   /* convenience function to update range, enum, num and bool values */
-  void (*update_num) (config_values_t *, const char *key, int value);
+  void (*update_num) (config_values_t *self, const char *key, int value);
 
   /* convenience function to update string values */
-  void (*update_string) (config_values_t *, const char *key, const char *value);
+  void (*update_string) (config_values_t *self, const char *key, const char *value);
 
   /* small utility function for enum handling */
   int (*parse_enum) (const char *str, char **values);
@@ -165,17 +162,17 @@ struct config_values_s {
    * and you changed the value of this item
    */
 
-  cfg_entry_t* (*lookup_entry) (config_values_t *, const char *key);
+  cfg_entry_t* (*lookup_entry) (config_values_t *self, const char *key);
 
   /*
    * unregister callback function
    */
-  void (*unregister_callback) (config_values_t *, const char *key);
+  void (*unregister_callback) (config_values_t *self, const char *key);
 
   /*
    * dispose of all config entries in memory
    */
-  void (*dispose) (config_values_t *);
+  void (*dispose) (config_values_t *self);
 
   /*
    * config values are stored here:
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 03933ce6f..ccf6de7ec 100644
--- a/src/xine-engine/metronom.h
+++ b/src/xine-engine/metronom.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: metronom.h,v 1.46 2003/04/23 14:33:01 miguelfreitas Exp $
+ * $Id: metronom.h,v 1.47 2003/04/25 15:34:46 mroi Exp $
  *
  * metronom: general pts => virtual calculation/assoc
  *                   
@@ -39,9 +39,6 @@
  *    encoded streams.
  *
  */
-/* For the _MSC_VER (Win32) port the "this" variable
- * was removed from all prototypes.and changed to "met"
- */
 
 #ifndef HAVE_METRONOM_H
 #define HAVE_METRONOM_H
@@ -82,7 +79,7 @@ struct metronom_s {
    *
    * parameter pts_per_smpls : 1/90000 sec per 65536 samples
    */
-  void (*set_audio_rate) (metronom_t *, int64_t pts_per_smpls);
+  void (*set_audio_rate) (metronom_t *self, int64_t pts_per_smpls);
 
   /*
    * called by video output driver for *every* frame
@@ -96,7 +93,7 @@ struct metronom_s {
    * 
    */
   
-  void (*got_video_frame) (metronom_t *, vo_frame_t *frame);
+  void (*got_video_frame) (metronom_t *self, vo_frame_t *frame);
 
   /*
    * called by audio output driver whenever audio samples are delivered to it
@@ -111,7 +108,7 @@ struct metronom_s {
    *
    */
 
-  int64_t (*got_audio_samples) (metronom_t *, int64_t pts, 
+  int64_t (*got_audio_samples) (metronom_t *self, int64_t pts, 
 				int nsamples); 
 
   /*
@@ -124,7 +121,7 @@ struct metronom_s {
    * due to the lack of regularity on spu packets)
    */
 
-  int64_t (*got_spu_packet) (metronom_t *, int64_t pts);
+  int64_t (*got_spu_packet) (metronom_t *self, int64_t pts);
 
   /*
    * tell metronom about discontinuities.
@@ -154,16 +151,16 @@ struct metronom_s {
    * just switch to the new disc_offset and resume synced operation.
    *                    
    */
-  void (*handle_audio_discontinuity) (metronom_t *, int type, int64_t disc_off);
-  void (*handle_video_discontinuity) (metronom_t *, int type, int64_t disc_off);
+  void (*handle_audio_discontinuity) (metronom_t *self, int type, int64_t disc_off);
+  void (*handle_video_discontinuity) (metronom_t *self, int type, int64_t disc_off);
 
   /*
    * set/get options for metronom, constants see below
    */
-  void (*set_option) (metronom_t *, int option, int64_t value);
-  int64_t (*get_option) (metronom_t *, int option);
+  void (*set_option) (metronom_t *self, int option, int64_t value);
+  int64_t (*get_option) (metronom_t *self, int option);
   
-  void (*exit) (metronom_t *);
+  void (*exit) (metronom_t *self);
 
   /*
    * pointer to current xine stream object. 
@@ -228,8 +225,8 @@ struct metronom_clock_s {
   /*
    * set/get options for clock, constants see below
    */
-  void (*set_option) (metronom_clock_t *, int option, int64_t value);
-  int64_t (*get_option) (metronom_clock_t *, int option);
+  void (*set_option) (metronom_clock_t *self, int option, int64_t value);
+  int64_t (*get_option) (metronom_clock_t *self, int option);
 
   /*
    * system clock reference (SCR) functions
@@ -239,31 +236,31 @@ struct metronom_clock_s {
    * start clock (no clock reset)
    * at given pts
    */
-  void (*start_clock) (metronom_clock_t *, int64_t pts);
+  void (*start_clock) (metronom_clock_t *self, int64_t pts);
 
 
   /*
    * stop metronom clock
    */
-  void (*stop_clock) (metronom_clock_t *);
+  void (*stop_clock) (metronom_clock_t *self);
 
 
   /*
    * resume clock from where it was stopped
    */
-  void (*resume_clock) (metronom_clock_t *);
+  void (*resume_clock) (metronom_clock_t *self);
 
 
   /*
    * get current clock value in vpts
    */
-  int64_t (*get_current_time) (metronom_clock_t *);
+  int64_t (*get_current_time) (metronom_clock_t *self);
 
 
   /*
    * adjust master clock to external timer (e.g. audio hardware)
    */
-  void (*adjust_clock) (metronom_clock_t *, int64_t desired_pts);
+  void (*adjust_clock) (metronom_clock_t *self, int64_t desired_pts);
 
 
   /*
@@ -271,15 +268,15 @@ struct metronom_clock_s {
    * for constants see xine_internal.h
    */
 
-  int (*set_speed) (metronom_clock_t *, int speed);
+  int (*set_speed) (metronom_clock_t *self, int speed);
 
   /*
    * (un)register a System Clock Reference provider at the metronom
    */
-  int    (*register_scr) (metronom_clock_t *, scr_plugin_t *scr);
-  void (*unregister_scr) (metronom_clock_t *, scr_plugin_t *scr);
+  int    (*register_scr) (metronom_clock_t *self, scr_plugin_t *scr);
+  void (*unregister_scr) (metronom_clock_t *self, scr_plugin_t *scr);
 
-  void (*exit) (metronom_clock_t *);
+  void (*exit) (metronom_clock_t *self);
   
   scr_plugin_t*   scr_master;
   scr_plugin_t**  scr_list;
@@ -310,7 +307,7 @@ struct scr_plugin_s
 {
   int interface_version;
 
-  int (*get_priority) (scr_plugin_t *);
+  int (*get_priority) (scr_plugin_t *self);
 
   /* 
    * set/get clock speed 
@@ -319,15 +316,15 @@ struct scr_plugin_s
    * returns actual speed
    */
 
-  int (*set_speed) (scr_plugin_t *, int speed);
+  int (*set_speed) (scr_plugin_t *self, int speed);
 
-  void (*adjust) (scr_plugin_t *, int64_t vpts);
+  void (*adjust) (scr_plugin_t *self, int64_t vpts);
 
-  void (*start) (scr_plugin_t *, int64_t start_vpts);
+  void (*start) (scr_plugin_t *self, int64_t start_vpts);
 
-  int64_t (*get_current) (scr_plugin_t *);
+  int64_t (*get_current) (scr_plugin_t *self);
 
-  void (*exit) (scr_plugin_t *);
+  void (*exit) (scr_plugin_t *self);
 
   metronom_clock_t *clock;
 };
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 94b7403ed..92a8bdc77 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.85 2003/04/23 14:33:03 miguelfreitas Exp $
+ * $Id: video_out.h,v 1.86 2003/04/25 15:34:46 mroi Exp $
  *
  *
  * xine version of video_out.h 
@@ -31,9 +31,6 @@
  *               a vo_driver for output
  *
  */
-/* For the _MSC_VER (Win32) port the "this" variable
- * was removed from all prototypes.and changed to "met"
- */
 
 #ifndef HAVE_VIDEO_OUT_H
 #define HAVE_VIDEO_OUT_H
@@ -152,10 +149,10 @@ struct vo_frame_s {
  */
 struct xine_video_port_s {
 
-  uint32_t (*get_capabilities) (xine_video_port_t *); /* for constants see below */
+  uint32_t (*get_capabilities) (xine_video_port_t *self); /* for constants see below */
 
   /* open display driver for video output */
-  void (*open) (xine_video_port_t *, xine_stream_t *stream);
+  void (*open) (xine_video_port_t *self, xine_stream_t *stream);
 
   /* 
    * get_frame - allocate an image buffer from display driver 
@@ -166,36 +163,36 @@ struct xine_video_port_s {
    *          format     == FOURCC descriptor of image format
    *          flags      == field/prediction flags
    */
-  vo_frame_t* (*get_frame) (xine_video_port_t *, uint32_t width, 
+  vo_frame_t* (*get_frame) (xine_video_port_t *self, uint32_t width, 
 			    uint32_t height, int ratio_code, 
 			    int format, int flags);
 
-  vo_frame_t* (*get_last_frame) (xine_video_port_t *);
+  vo_frame_t* (*get_last_frame) (xine_video_port_t *self);
   
   /* overlay stuff */
-  void (*enable_ovl) (xine_video_port_t *, int ovl_enable);
+  void (*enable_ovl) (xine_video_port_t *self, int ovl_enable);
   
   /* video driver is no longer used by decoder => close */
-  void (*close) (xine_video_port_t *, xine_stream_t *stream);
+  void (*close) (xine_video_port_t *self, xine_stream_t *stream);
 
   /* called on xine exit */
-  void (*exit) (xine_video_port_t *);
+  void (*exit) (xine_video_port_t *self);
 
   /* get overlay instance (overlay source) */
-  video_overlay_instance_t* (*get_overlay_instance) (xine_video_port_t *);
+  video_overlay_instance_t* (*get_overlay_instance) (xine_video_port_t *self);
 
   /* flush video_out fifo */
-  void (*flush) (xine_video_port_t *);
+  void (*flush) (xine_video_port_t *self);
 
   /*   * Get/Set video property
    *
    * See VO_PROP_* bellow
    */
-  int (*get_property) (xine_video_port_t *, int property);
-  int (*set_property) (xine_video_port_t *, int property, int value);
+  int (*get_property) (xine_video_port_t *self, int property);
+  int (*set_property) (xine_video_port_t *self, int property, int value);
   
   /* return true if port is opened for this stream */
-  int (*status) (xine_video_port_t *, xine_stream_t *stream, 
+  int (*status) (xine_video_port_t *self, xine_stream_t *stream, 
                  int *width, int *height, int64_t *img_duration);
   
   /* the driver in use */
@@ -283,25 +280,25 @@ struct xine_video_port_s {
 
 struct vo_driver_s {
 
-  uint32_t (*get_capabilities) (vo_driver_t *); /* for constants see above */
+  uint32_t (*get_capabilities) (vo_driver_t *self); /* for constants see above */
 
   /*
    * allocate an vo_frame_t struct,
    * the driver must supply the copy, field and dispose functions
    */
-  vo_frame_t* (*alloc_frame) (vo_driver_t *);
+  vo_frame_t* (*alloc_frame) (vo_driver_t *self);
 
 
   /* 
    * check if the given image fullfills the format specified
    * (re-)allocate memory if necessary
    */
-  void (*update_frame_format) (vo_driver_t *, vo_frame_t *img,
+  void (*update_frame_format) (vo_driver_t *self, vo_frame_t *img,
 			       uint32_t width, uint32_t height,
 			       int ratio_code, int format, int flags);
 
   /* display a given frame */
-  void (*display_frame) (vo_driver_t *, vo_frame_t *vo_img);
+  void (*display_frame) (vo_driver_t *self, vo_frame_t *vo_img);
 
   /* overlay_begin and overlay_end are used by drivers suporting
    * persistent overlays. they can be optimized to update only when
@@ -315,18 +312,18 @@ struct vo_driver_s {
    *
    * any function pointer from this group may be set to NULL.
    */
-  void (*overlay_begin) (vo_driver_t *, vo_frame_t *vo_img, int changed);
-  void (*overlay_blend) (vo_driver_t *, vo_frame_t *vo_img, vo_overlay_t *overlay);
-  void (*overlay_end)   (vo_driver_t *, vo_frame_t *vo_img);
+  void (*overlay_begin) (vo_driver_t *self, vo_frame_t *vo_img, int changed);
+  void (*overlay_blend) (vo_driver_t *self, vo_frame_t *vo_img, vo_overlay_t *overlay);
+  void (*overlay_end)   (vo_driver_t *self, vo_frame_t *vo_img);
 
   /*
    * these can be used by the gui directly:
    */
 
-  int (*get_property) (vo_driver_t *, int property);
-  int (*set_property) (vo_driver_t *, 
+  int (*get_property) (vo_driver_t *self, int property);
+  int (*set_property) (vo_driver_t *self, 
 		       int property, int value);
-  void (*get_property_min_max) (vo_driver_t *,
+  void (*get_property_min_max) (vo_driver_t *self,
 				int property, int *min, int *max);
 
   /*
@@ -336,20 +333,20 @@ struct vo_driver_s {
    * etc. to the driver
    */
 
-  int (*gui_data_exchange) (vo_driver_t *, int data_type,
+  int (*gui_data_exchange) (vo_driver_t *self, int data_type,
 			    void *data);
 
   /* check if a redraw is needed (due to resize)
    * this is only used for still frames, normal video playback 
    * must call that inside display_frame() function.
    */
-  int (*redraw_needed) (vo_driver_t *);
+  int (*redraw_needed) (vo_driver_t *self);
 
   /*
    * free all resources, close driver
    */
 
-  void (*dispose) (vo_driver_t *);
+  void (*dispose) (vo_driver_t *self);
   
   void *node; /* needed by plugin_loader */
 };
@@ -361,24 +358,24 @@ struct video_driver_class_s {
   /*
    * open a new instance of this plugin class
    */
-  vo_driver_t* (*open_plugin) (video_driver_class_t *, const void *visual);
+  vo_driver_t* (*open_plugin) (video_driver_class_t *self, const void *visual);
   
   /*
    * return short, human readable identifier for this plugin class
    */
-  char* (*get_identifier) (video_driver_class_t *);
+  char* (*get_identifier) (video_driver_class_t *self);
 
   /*
    * return human readable (verbose = 1 line) description for 
    * this plugin class
    */
-  char* (*get_description) (video_driver_class_t *);
+  char* (*get_description) (video_driver_class_t *self);
 
   /*
    * free all class-related resources
    */
 
-  void (*dispose) (video_driver_class_t *);
+  void (*dispose) (video_driver_class_t *self);
 };
 
 
diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h
index a3f5d8d5e..546cf2ee1 100644
--- a/src/xine-engine/vo_scale.h
+++ b/src/xine-engine/vo_scale.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: vo_scale.h,v 1.6 2003/04/20 21:13:26 guenter Exp $
+ * $Id: vo_scale.h,v 1.7 2003/04/25 15:34:48 mroi Exp $
  * 
  * vo_scale.h
  *
  * keeps video scaling information
  */
-/* For the _MSC_VER (Win32) port the "this" variable
- * was removed from all prototypes.and changed to "met"
- */
 
 #ifndef HAVE_VO_SCALE_H
 #define HAVE_VO_SCALE_H
@@ -153,27 +150,27 @@ typedef struct vo_scale_s vo_scale_t;
  * taking into account aspect ratio and zoom factor
  */
 
-void vo_scale_compute_ideal_size (vo_scale_t *);
+void vo_scale_compute_ideal_size (vo_scale_t *self);
 
 
 /*
  * make ideal width/height "fit" into the gui
  */
 
-void vo_scale_compute_output_size (vo_scale_t *);
+void vo_scale_compute_output_size (vo_scale_t *self);
 
 /*
  * return true if a redraw is needed due resizing, zooming,
  * aspect ratio changing, etc.
  */
 
-int vo_scale_redraw_needed (vo_scale_t *);
+int vo_scale_redraw_needed (vo_scale_t *self);
 
 /*
  *
  */
  
-void vo_scale_translate_gui2video(vo_scale_t *,
+void vo_scale_translate_gui2video(vo_scale_t *self,
 				 int x, int y,
 				 int *vid_x, int *vid_y);
 
@@ -187,7 +184,7 @@ char *vo_scale_aspect_ratio_name(int a);
  * initialize rescaling struct
  */
  
-void vo_scale_init(vo_scale_t *, int support_zoom, int scaling_disabled, config_values_t *config );
+void vo_scale_init(vo_scale_t *self, int support_zoom, int scaling_disabled, config_values_t *config );
 
 #ifdef __cplusplus
 }