X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flistimporter.cpp;h=01ef02f4963f6ebb2a53f3a9c98f6bdfc5ef4ba7;hb=70dccb34d96712a0d2eb26332ee4d32ed2678c25;hp=aec3fd9ebeb429cb76d869b2ad39fcf4b11f2290;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/listimporter.cpp b/synfig-core/trunk/src/synfig/listimporter.cpp
index aec3fd9..01ef02f 100644
--- a/synfig-core/trunk/src/synfig/listimporter.cpp
+++ b/synfig-core/trunk/src/synfig/listimporter.cpp
@@ -2,7 +2,7 @@
 /*!	\file listimporter.cpp
 **	\brief Template File
 **
-**	$Id: listimporter.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -63,7 +63,7 @@ ListImporter::ListImporter(const String &filename)
 		return;
 	}
 	String line;
-	String prefix=etl::dirname(filename)+ETL_DIRECTORY_SEPERATOR;
+	String prefix=etl::dirname(filename)+ETL_DIRECTORY_SEPARATOR;
 	while(!stream.eof())
 	{
 		getline(stream,line);
@@ -96,7 +96,7 @@ bool
 ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb)
 {
 //			DEBUGPOINT();
-	int frame=static_cast<int>(time*fps);
+	int frame=round_to_int(time*fps);
 //			DEBUGPOINT();
 
 	if(!filename_list.size())
@@ -112,10 +112,10 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb)
 
 //			DEBUGPOINT();
 	// See if that frame is cached
-	std::list<std::pair<int,Surface> >::iterator iter;
+	std::list<std::pair<String,Surface> >::iterator iter;
 	for(iter=frame_cache.begin();iter!=frame_cache.end();++iter)
 	{
-		if(iter->first==frame)
+		if(iter->first==filename_list[frame])
 		{
 //			DEBUGPOINT();
 			surface.mirror(iter->second);
@@ -150,7 +150,7 @@ ListImporter::get_frame(Surface &surface,Time time, ProgressCallback *cb)
 
 //	DEBUGPOINT();
 
-	frame_cache.push_back(std::pair<int,Surface>(frame,surface));
+	frame_cache.push_back(std::pair<String,Surface>(filename_list[frame],surface));
 
 //	DEBUGPOINT();