diff options
author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-09-15 11:35:08 +0000 |
---|---|---|
committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-09-15 11:35:08 +0000 |
commit | 15b88c72e2127db8a66b5f2771a3217a98f26b8c (patch) | |
tree | 0f36e02354652219e3338ba5aa7f9d3c20a1b8f8 | |
parent | c9858d165494b8aa499fca8f8d7c476c5b20a471 (diff) | |
download | xine-lib-15b88c72e2127db8a66b5f2771a3217a98f26b8c.tar.gz xine-lib-15b88c72e2127db8a66b5f2771a3217a98f26b8c.tar.bz2 |
Memory leak fixes, using a slightly modified version of the patch from
ewald@rambo.its.tudelft.nl
CVS patchset: 2666
CVS date: 2002/09/15 11:35:08
-rw-r--r-- | src/video_out/video_out_xv.c | 4 | ||||
-rw-r--r-- | src/xine-engine/configfile.c | 3 | ||||
-rw-r--r-- | src/xine-engine/configfile.h | 7 | ||||
-rw-r--r-- | src/xine-engine/vo_scale.c | 4 | ||||
-rw-r--r-- | src/xine-engine/xine.c | 4 |
5 files changed, 14 insertions, 8 deletions
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 1037609e4..5a113d5ea 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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_xv.c,v 1.132 2002/09/13 19:57:13 mroi Exp $ + * $Id: video_out_xv.c,v 1.133 2002/09/15 11:35:08 jcdutton Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -1201,7 +1201,7 @@ static void *init_video_out_plugin (xine_t *xine, void *visual_gen) { this->props[VO_PROP_INTERLACED].value = 0; this->sc.user_ratio = this->props[VO_PROP_ASPECT_RATIO].value = ASPECT_AUTO; this->props[VO_PROP_ZOOM_X].value = 100; - this->props[VO_PROP_ZOOM_Y].value = 100; + this->props[VO_PROP_ZOOM_Y].value = 128; /* * check this adaptor's capabilities diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 9d34b108b..faf8d7155 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.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: configfile.c,v 1.30 2002/09/11 17:41:08 guenter Exp $ + * $Id: configfile.c,v 1.31 2002/09/15 11:35:09 jcdutton Exp $ * * config object (was: file) management - implementation * @@ -742,6 +742,7 @@ config_values_t *xine_config_init () { this->parse_enum = xine_config_parse_enum; this->lookup_entry = _xine_config_lookup_entry; this->unregister_callback = xine_config_unregister_cb; + this->dispose = xine_config_dispose; return this; } diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 950400dae..6544a7e69 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.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: configfile.h,v 1.16 2002/09/14 20:11:52 guenter Exp $ + * $Id: configfile.h,v 1.17 2002/09/15 11:35:09 jcdutton Exp $ * * config file management * @@ -168,6 +168,11 @@ struct config_values_s { */ void (*unregister_callback) (config_values_t *this, const char *key); + /* + * dispose of all config entries in memory + */ + void (*dispose) (config_values_t *this); + /* * config values are stored here: */ diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index 253fcbfa2..dbf7ad4ab 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.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: vo_scale.c,v 1.10 2002/09/13 19:57:13 mroi Exp $ + * $Id: vo_scale.c,v 1.11 2002/09/15 11:35:09 jcdutton Exp $ * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. @@ -345,7 +345,7 @@ void vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled ) { this->scaling_disabled = scaling_disabled; this->force_redraw = 1; this->zoom_factor_x = 1.0; - this->zoom_factor_y = 1.0; + this->zoom_factor_y = 1.28; this->gui_pixel_aspect = 1.0; this->user_ratio = ASPECT_AUTO; } diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index bc873030a..f00ce7a18 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.157 2002/09/13 18:25:23 guenter Exp $ + * $Id: xine.c,v 1.158 2002/09/15 11:35:09 jcdutton Exp $ * * top-level xine functions * @@ -620,8 +620,8 @@ void xine_exit (xine_p this_ro) { this->metronom->exit (this->metronom); dispose_plugins (this); - xine_profiler_print_results (); + this->config->dispose(this->config); pthread_mutex_destroy (&this->logo_lock); pthread_mutex_destroy (&this->xine_lock); |