X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Ffilethread.cpp;h=112e848afccac791b8237dd73c590f975e1b4ebc;hb=f0e50fb1d23805881b72d51ea603be78b645ec97;hp=dec070ffd4efcfeeb81207a06de89df66d0b2d62;hpb=68e8886a9aaf48fcc130334d8cf4fe35a4534a02;p=virtualjaguar

diff --git a/src/gui/filethread.cpp b/src/gui/filethread.cpp
index dec070f..112e848 100644
--- a/src/gui/filethread.cpp
+++ b/src/gui/filethread.cpp
@@ -10,6 +10,7 @@
 // ---  ----------  -------------------------------------------------------------
 // JLH  01/28/2010  Created this file
 // JLH  02/16/2010  Moved RomIdentifier stuff to its own file
+// JLH  03/02/2010  Added .ZIP file fishing
 //
 
 #include "filethread.h"
@@ -83,6 +84,9 @@ printf("FileThread: Aborting!!!\n");
 
 		QFileInfo fileInfo = list.at(i);
 
+		// ZIP files are special: They contain more than just the software now... ;-)
+		// So now we fish around inside them to pull out the stuff we want.
+		// Probably also need more stringent error checking as well... :-O
 		if (fileInfo.suffix().compare("zip", Qt::CaseInsensitive) == 0)
 		{
 			uint8 * buffer = NULL;
@@ -90,25 +94,58 @@ printf("FileThread: Aborting!!!\n");
 
 			if (size > 0)
 			{
+				uint32_t fileSize = size;
 //printf("FileThread: About to calc checksum on file with size %u... (buffer=%08X)\n", size, buffer);
 				uint32 crc = crc32_calcCheckSum(buffer, size);
 				uint32 index = FindCRCIndexInFileList(crc);
-				delete[] buffer;
+// These two are NOT interchangeable!
+//Hm, confusing. It looks like in file.cpp it uses operater new() to create the buffer...
+//				delete[] buffer;
+				free(buffer);
 
 // Mebbe we should pass a index AND a QImage here???
+/*
+Let's think about this... What *do* we need to send out?
+we need the filename for sure. image file if it exists.
+do we need the index? I think we're only using it to pull the label from the subdir...
+we might need it if we want to pull ROM flags from the fileDB...
+*/
 				if (index != 0xFFFFFFFF && !(romList[index].flags & FF_BIOS))
 				{
-					QImage img;
+//Here's a little problem. When we create the image here and pass it off to FilePicker,
+//we can clobber this image before we have a chance to copy it out in the FilePicker function
+//because we can be back here before FilePicker can respond.
+//So we need to fix this so that this does not happen. :-/
+//And now it is. :-)
+/*
+So I guess we can create an image on the heap and pass *that* to FilePicker. But then, would
+it be worthwhile to just pass the pointer into the FileListModel instead of a copy of an object?
+Maybe. We'd do like so:
+QImage * imageCopy = new QImage();
+*/
+					QImage * img = NULL;
 					size = GetFileFromZIP(fileInfo.canonicalFilePath().toAscii(), FT_LABEL, buffer);
+//printf("FT: Label size = %u bytes.\n", size);
 
 					if (size > 0)
 					{
-						img.loadFromData(buffer, size);
-						delete[] buffer;
+//#warning "!!!"
+//Not sure if this will work properly... Seems to.
+						QImage label;
+						bool success = label.loadFromData(buffer, size);
+						img = new QImage();
+//						*img = label.scaled(373, 172, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+						*img = label.scaled(365, 168, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+//printf("FT: Label %s: %ux%u.\n", (success ? "succeeded" : "did not succeed"), img->width(), img->height());
+// These two are NOT interchangeable!
+//Hm, confusing. It looks like in file.cpp it uses operater new() to create the buffer...
+//						delete[] buffer;
+						free(buffer);
 					}
 //printf("FileThread: Attempted to load image. Size: %u x %u...\n", img.width(), img.height());
 
-					emit FoundAFile(index);
+//					emit FoundAFile(index);
+					emit FoundAFile2(index, fileInfo.canonicalFilePath(), img, fileSize);
 				}
 			}
 		}
@@ -127,7 +164,8 @@ printf("FileThread: Aborting!!!\n");
 
 // Mebbe we should pass a index AND a QImage here???
 				if (index != 0xFFFFFFFF && !(romList[index].flags & FF_BIOS))
-					emit FoundAFile(index);
+//					emit FoundAFile(index);
+					emit FoundAFile2(index, fileInfo.canonicalFilePath(), 0, fileInfo.size());
 			}
 		}
 	}