diff src/slideshow.c @ 885:ad420f2eb789

Use a specific enum for image.zoom_mode values (ZoomMode) and simplify calls to image_zoom_get_default(), dropping last parameter which was always options->image.zoom_mode.
author zas_
date Tue, 15 Jul 2008 12:52:02 +0000
parents d6a7fb4b8e7c
children 4fe8f9656107
line wrap: on
line diff
--- a/src/slideshow.c	Sun Jul 13 14:50:07 2008 +0000
+++ b/src/slideshow.c	Tue Jul 15 12:52:02 2008 +0000
@@ -183,7 +183,7 @@
 	if (ss->filelist)
 		{
 		ss->slide_fd = file_data_ref((FileData *)g_list_nth_data(ss->filelist, row));
-		image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+		image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
 		}
 	else if (ss->cd)
 		{
@@ -192,7 +192,7 @@
 		info = g_list_nth_data(ss->cd->list, row);
 		ss->slide_fd = file_data_ref(info->fd);
 
-		image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+		image_change_from_collection(ss->imd, ss->cd, info, image_zoom_get_default(ss->imd));
 		}
 	else
 		{
@@ -200,7 +200,7 @@
 
 		if (ss->from_selection)
 			{
-			image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd, options->image.zoom_mode));
+			image_change_fd(ss->imd, ss->slide_fd, image_zoom_get_default(ss->imd));
 			layout_status_update_info(ss->layout, NULL);
 			}
 		else