Delete unused Thumbnail handling code

src/Config.h

@@ -101,9 +101,6 @@
 #define M_GRAV 6.67300e-1
 #endif
 
-//Number of asynchronous connections used to retrieve thumbnails
-#define IMGCONNS 5
-
 #ifdef RENDERER
 #define MENUSIZE 0
 #define BARSIZE 0

src/client/Client.cpp

@@ -42,7 +42,6 @@
 #include "client/SaveFile.h"
 #include "client/GameSave.h"
 #include "client/UserInfo.h"
-#include "gui/search/Thumbnail.h"
 #include "gui/preview/Comment.h"
 #include "ClientListener.h"
 #include "requestbroker/RequestBroker.h"
@@ -70,18 +69,6 @@ Client::Client():
 	updateAvailable(false),
 	authUser(0, "")
 {
-	int i = 0;
-	for(i = 0; i < THUMB_CACHE_SIZE; i++)
-	{
-		thumbnailCache[i] = NULL;
-	}
-	for(i = 0; i < IMGCONNS; i++)
-	{
-		activeThumbRequests[i] = NULL;
-		activeThumbRequestTimes[i] = 0;
-		activeThumbRequestCompleteTimes[i] = 0;
-	}
-
 	//Read config
 	std::ifstream configFile;
 	configFile.open("powder.pref", std::ios::binary);
@@ -952,7 +939,6 @@ void Client::WritePrefs()
 void Client::Shutdown()
 {
 	RequestBroker::Ref().Shutdown();
-	ClearThumbnailRequests();
 	http_done();
 
 	//Save config
@@ -1874,20 +1860,6 @@ std::vector<SaveInfo*> * Client::SearchSaves(int start, int count, String query,
 	return saveArray;
 }
 
-void Client::ClearThumbnailRequests()
-{
-	for(int i = 0; i < IMGCONNS; i++)
-	{
-		if(activeThumbRequests[i])
-		{
-			http_async_req_close(activeThumbRequests[i]);
-			activeThumbRequests[i] = NULL;
-			activeThumbRequestTimes[i] = 0;
-			activeThumbRequestCompleteTimes[i] = 0;
-		}
-	}
-}
-
 std::list<ByteString> * Client::RemoveTag(int saveID, ByteString tag)
 {
 	lastError = "";

src/client/Client.h

@@ -16,7 +16,6 @@
 
 #include "requestbroker/RequestBroker.h"
 
-class Thumbnail;
 class SaveInfo;
 class SaveFile;
 class SaveComment;
@@ -70,13 +69,6 @@ private:
 	//Auth session
 	User authUser;
 
-	//Thumbnail retreival
-	int thumbnailCacheNextID;
-	Thumbnail * thumbnailCache[THUMB_CACHE_SIZE];
-	void * activeThumbRequests[IMGCONNS];
-	int activeThumbRequestTimes[IMGCONNS];
-	int activeThumbRequestCompleteTimes[IMGCONNS];
-	ByteString activeThumbRequestIDs[IMGCONNS];
 	void notifyUpdateAvailable();
 	void notifyAuthUserChanged();
 	void notifyMessageOfTheDay();
@@ -160,7 +152,6 @@ public:
 	std::vector<unsigned char> GetSaveData(int saveID, int saveDate);
 
 	LoginStatus Login(ByteString username, ByteString password, User & user);
-	void ClearThumbnailRequests();
 	std::vector<SaveInfo*> * SearchSaves(int start, int count, String query, ByteString sort, ByteString category, int & resultCount);
 	std::vector<std::pair<ByteString, int> > * GetTags(int start, int count, String query, int & resultCount);
 

src/client/SaveFile.cpp

@@ -1,10 +1,8 @@
 #include "SaveFile.h"
 #include "GameSave.h"
 #include "Client.h"
-#include "gui/search/Thumbnail.h"
 
 SaveFile::SaveFile(SaveFile & save):
-	thumbnail(NULL),
 	gameSave(NULL),
 	filename(save.filename),
 	displayName(save.displayName),
@@ -12,22 +10,9 @@ SaveFile::SaveFile(SaveFile & save):
 {
 	if (save.gameSave)
 		gameSave = new GameSave(*save.gameSave);
-	if (save.thumbnail)
-		thumbnail = new Thumbnail(*save.thumbnail);
-}
-
-Thumbnail * SaveFile::GetThumbnail()
-{
-	return thumbnail;
-}
-
-void SaveFile::SetThumbnail(Thumbnail * thumb)
-{
-	thumbnail = thumb;
 }
 
 SaveFile::SaveFile(ByteString filename):
-	thumbnail(NULL),
 	gameSave(NULL),
 	filename(filename),
 	displayName(filename.FromUtf8()),
@@ -78,6 +63,5 @@ void SaveFile::SetLoadingError(String error)
 
 SaveFile::~SaveFile() {
 	delete gameSave;
-	delete thumbnail;
 }
 

src/client/SaveFile.h

@@ -4,16 +4,13 @@
 #include "common/String.h"
 
 class GameSave;
-class Thumbnail;
 
 class SaveFile {
 public:
 	SaveFile(SaveFile & save);
 	SaveFile(ByteString filename);
 
-	Thumbnail * GetThumbnail();
 	GameSave * GetGameSave();
-	void SetThumbnail(Thumbnail * thumb);
 	void SetGameSave(GameSave * save);
 	String GetDisplayName();
 	void SetDisplayName(String displayName);
@@ -24,7 +21,6 @@ public:
 
 	virtual ~SaveFile();
 private:
-	Thumbnail * thumbnail;
 	GameSave * gameSave;
 	ByteString filename;
 	String displayName;

src/gui/filebrowser/FileBrowserActivity.cpp

@@ -16,9 +16,6 @@
 #include "gui/dialogues/ConfirmPrompt.h"
 #include "gui/dialogues/ErrorMessage.h"
 
-class Thumbnail;
-
-
 class SaveSelectedAction: public ui::SaveButtonAction
 {
 	FileBrowserActivity * a;

src/gui/game/GameView.cpp

@@ -19,7 +19,6 @@
 #include "gui/interface/Mouse.h"
 #include "gui/interface/Slider.h"
 #include "gui/interface/Window.h"
-#include "gui/search/Thumbnail.h"
 #include "simulation/SaveRenderer.h"
 #include "simulation/SimulationData.h"
 

src/gui/preview/PreviewModel.h

@@ -6,7 +6,6 @@
 #include "PreviewView.h"
 #include "client/SaveInfo.h"
 #include "gui/preview/Comment.h"
-#include "gui/search/Thumbnail.h"
 #include "client/Download.h"
 
 using namespace std;

src/gui/preview/PreviewView.cpp

@@ -9,7 +9,6 @@
 #include "gui/interface/Textbox.h"
 #include "gui/Style.h"
 #include "Format.h"
-#include "gui/search/Thumbnail.h"
 #include "gui/profile/ProfileActivity.h"
 #include "client/Client.h"
 #include "gui/interface/ScrollPanel.h"

src/gui/save/LocalSaveActivity.cpp

@@ -1,15 +1,18 @@
 #include "LocalSaveActivity.h"
-#include "gui/interface/Label.h"
+#include "images.h"
-#include "gui/interface/Textbox.h"
+
-#include "gui/interface/Button.h"
-#include "gui/search/Thumbnail.h"
-#include "client/requestbroker/RequestBroker.h"
-#include "gui/dialogues/ErrorMessage.h"
-#include "gui/dialogues/ConfirmPrompt.h"
 #include "client/Client.h"
 #include "client/GameSave.h"
+#include "graphics/Graphics.h"
 #include "gui/Style.h"
-#include "images.h"
+
+#include "client/requestbroker/RequestBroker.h"
+#include "gui/dialogues/ConfirmPrompt.h"
+#include "gui/dialogues/ErrorMessage.h"
+#include "gui/interface/Button.h"
+#include "gui/interface/Label.h"
+#include "gui/interface/Textbox.h"
+
 
 class LocalSaveActivity::CancelAction: public ui::ButtonAction
 {

src/gui/save/ServerSaveActivity.h

@@ -13,7 +13,6 @@ namespace ui
 }
 
 class Task;
-class Thumbnail;
 class VideoBuffer;
 class ServerSaveActivity: public WindowActivity, public RequestListener, public TaskListener
 {

src/gui/search/SearchController.cpp

@@ -2,6 +2,7 @@
 #include "SearchController.h"
 #include "SearchModel.h"
 #include "SearchView.h"
+#include "graphics/Graphics.h"
 #include "gui/interface/Panel.h"
 #include "gui/dialogues/ConfirmPrompt.h"
 #include "gui/dialogues/ErrorMessage.h"

src/gui/search/SearchView.cpp

@@ -582,7 +582,6 @@ void SearchView::NotifySaveListChanged(SearchModel * sender)
 	else
 		favouriteSelected->SetText("Favourite");
 
-	Client::Ref().ClearThumbnailRequests();
 	for (size_t i = 0; i < saveButtons.size(); i++)
 	{
 		RemoveComponent(saveButtons[i]);

src/gui/search/Thumbnail.cpp

@@ -1,72 +0,0 @@
-#include "Thumbnail.h"
-
-Thumbnail::Thumbnail(const Thumbnail & thumb):
-	ID(thumb.ID),
-	Datestamp(thumb.Datestamp),
-	Data(thumb.Data),
-	Size(thumb.Size)
-{
-	//Ensure the actual thumbnail data is copied
-	if(thumb.Data)
-	{
-		Data = new pixel[thumb.Size.X*thumb.Size.Y];
-		memcpy(Data, thumb.Data, (thumb.Size.X*thumb.Size.Y) * PIXELSIZE);
-	}
-	else
-	{
-		Data = NULL;
-	}
-}
-
-Thumbnail::Thumbnail(int _id, int _datestamp, pixel * _data, ui::Point _size):
-	ID(_id),
-	Datestamp(_datestamp),
-	Data(_data),
-	Size(_size)
-{
-	if(_data)
-	{
-		Data = new pixel[_size.X*_size.Y];
-		memcpy(Data, _data, (_size.X*_size.Y) * PIXELSIZE);
-	}
-	else
-	{
-		Data = NULL;
-	}
-}
-
-void Thumbnail::Resize(int width, int height)
-{
-	Resize(ui::Point(width, height));
-}
-
-void Thumbnail::Resize(ui::Point newSize)
-{
-	float scaleFactorX = 1.0f, scaleFactorY = 1.0f;
-	if(Size.Y >  newSize.Y)
-	{
-		scaleFactorY = float(newSize.Y)/((float)Size.Y);
-	}
-	if(Size.X > newSize.X)
-	{
-		scaleFactorX = float(newSize.X)/((float)Size.X);
-	}
-	if(newSize.X == -1)
-		scaleFactorX = scaleFactorY;
-	if(newSize.Y == -1)
-		scaleFactorY = scaleFactorX;
-	if(scaleFactorY < 1.0f || scaleFactorX < 1.0f)
-	{
-		float scaleFactor = scaleFactorY < scaleFactorX ? scaleFactorY : scaleFactorX;
-		pixel * thumbData = Data;
-		Data = Graphics::resample_img(thumbData, Size.X, Size.Y, Size.X * scaleFactor, Size.Y * scaleFactor);
-		Size.X *= scaleFactor;
-		Size.Y *= scaleFactor;
-		delete[] thumbData;
-	}
-}
-
-Thumbnail::~Thumbnail()
-{
-	delete[] Data;
-}

src/gui/search/Thumbnail.h

@@ -1,25 +0,0 @@
-#ifndef THUMBNAIL_H
-#define THUMBNAIL_H
-
-#include <iostream>
-#include "graphics/Graphics.h"
-#include "gui/interface/Point.h"
-
-class Thumbnail
-{
-public:
-	Thumbnail(const Thumbnail & thumb);
-
-	Thumbnail(int _id, int _datestamp, pixel * _data, ui::Point _size);
-
-	~Thumbnail();
-
-	void Resize(int Width, int Height);
-	void Resize(ui::Point newSize);
-
-	int ID, Datestamp;
-	pixel * Data;
-	ui::Point Size;
-};
-
-#endif // THUMBNAIL_H

src/simulation/SaveRenderer.cpp

@@ -3,7 +3,6 @@
 #include "graphics/Graphics.h"
 #include "Simulation.h"
 #include "graphics/Renderer.h"
-#include "gui/search/Thumbnail.h"
 
 
 SaveRenderer::SaveRenderer(){