Make thumbnailbroker more general purpose, image requests for requestbroker, avatars in previewview

4 files changed, 17 insertions, 18 deletions

diff --git a/src/save/LocalSaveActivity.cpp b/src/save/LocalSaveActivity.cpp
index 193f0aa..58c9a63 100644
--- a/src/save/LocalSaveActivity.cpp
+++ b/src/save/LocalSaveActivity.cpp
@@ -123,14 +123,14 @@ void LocalSaveActivity::OnDraw()
 
 	if(thumbnail)
 	{
-		g->draw_image(thumbnail->Data, Position.X+(Size.X-thumbnail->Size.X)/2, Position.Y+45, thumbnail->Size.X, thumbnail->Size.Y, 255);
-		g->drawrect(Position.X+(Size.X-thumbnail->Size.X)/2, Position.Y+45, thumbnail->Size.X, thumbnail->Size.Y, 180, 180, 180, 255);
+		g->draw_image(thumbnail, Position.X+(Size.X-thumbnail->Width)/2, Position.Y+45, 255);
+		g->drawrect(Position.X+(Size.X-thumbnail->Width)/2, Position.Y+45, thumbnail->Width, thumbnail->Height, 180, 180, 180, 255);
 	}
 }
 
-void LocalSaveActivity::OnThumbnailReady(Thumbnail * thumbnail)
+void LocalSaveActivity::OnRequestReady(void * imagePtr)
 {
-	this->thumbnail = thumbnail;
+	this->thumbnail = (VideoBuffer*)imagePtr;
 }
 
 LocalSaveActivity::~LocalSaveActivity()
diff --git a/src/save/LocalSaveActivity.h b/src/save/LocalSaveActivity.h
index aacbc0b..dd33fc4 100644
--- a/src/save/LocalSaveActivity.h
+++ b/src/save/LocalSaveActivity.h
@@ -2,14 +2,14 @@
 
 #include "Activity.h"
 #include "client/SaveFile.h"
-#include "client/ThumbnailListener.h"
+#include "client/RequestListener.h"
 
 namespace ui
 {
 	class Textbox;
 }
 
-class Thumbnail;
+class VideoBuffer;
 
 class FileSavedCallback
 {
@@ -19,10 +19,10 @@ public:
 	virtual void FileSaved(SaveFile * file) {}
 };
 
-class LocalSaveActivity: public WindowActivity, public ThumbnailListener
+class LocalSaveActivity: public WindowActivity, public RequestListener
 {
 	SaveFile save;
-	Thumbnail * thumbnail;
+	VideoBuffer * thumbnail;
 	ui::Textbox * filenameField;
 	class CancelAction;
 	class SaveAction;
@@ -34,6 +34,6 @@ public:
 	void saveWrite(std::string finalFilename);
 	virtual void Save();
 	virtual void OnDraw();
-	virtual void OnThumbnailReady(Thumbnail * thumbnail);
+	virtual void OnRequestReady(void * imagePtr);
 	virtual ~LocalSaveActivity();
 };
\ No newline at end of file
diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp
index fc10814..1481b6d 100644
--- a/src/save/ServerSaveActivity.cpp
+++ b/src/save/ServerSaveActivity.cpp
@@ -3,7 +3,6 @@
 #include "interface/Textbox.h"
 #include "interface/Button.h"
 #include "interface/Checkbox.h"
-#include "search/Thumbnail.h"
 #include "client/RequestBroker.h"
 #include "dialogues/ErrorMessage.h"
 #include "dialogues/ConfirmPrompt.h"
@@ -245,14 +244,14 @@ void ServerSaveActivity::OnDraw()
 
 	if(thumbnail)
 	{
-		g->draw_image(thumbnail->Data, Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Size.X)/2, Position.Y+25, thumbnail->Size.X, thumbnail->Size.Y, 255);
-		g->drawrect(Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Size.X)/2, Position.Y+25, thumbnail->Size.X, thumbnail->Size.Y, 180, 180, 180, 255);
+		g->draw_image(thumbnail, Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Width)/2, Position.Y+25, 255);
+		g->drawrect(Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Width)/2, Position.Y+25, thumbnail->Width, thumbnail->Height, 180, 180, 180, 255);
 	}
 }
 
-void ServerSaveActivity::OnThumbnailReady(Thumbnail * thumbnail)
+void ServerSaveActivity::OnRequestReady(void * imagePtr)
 {
-	this->thumbnail = thumbnail;
+	this->thumbnail = (VideoBuffer *)imagePtr;
 }
 
 ServerSaveActivity::~ServerSaveActivity()
diff --git a/src/save/ServerSaveActivity.h b/src/save/ServerSaveActivity.h
index 5f4cdfe..9e37748 100644
--- a/src/save/ServerSaveActivity.h
+++ b/src/save/ServerSaveActivity.h
@@ -2,7 +2,7 @@
 
 #include "Activity.h"
 #include "client/SaveInfo.h"
-#include "client/ThumbnailListener.h"
+#include "client/RequestListener.h"
 #include "tasks/TaskListener.h"
 
 namespace ui
@@ -13,7 +13,7 @@ namespace ui
 
 class Task;
 class Thumbnail;
-class ServerSaveActivity: public WindowActivity, public ThumbnailListener, public TaskListener
+class ServerSaveActivity: public WindowActivity, public RequestListener, public TaskListener
 {
 public:
 	class SaveUploadedCallback
@@ -29,7 +29,7 @@ public:
 	virtual void Save();
 	virtual void Exit();
 	virtual void OnDraw();
-	virtual void OnThumbnailReady(Thumbnail * thumbnail);
+	virtual void OnRequestReady(void * imagePtr);
 	virtual void OnTick(float dt);
 	virtual ~ServerSaveActivity();
 protected:
@@ -37,7 +37,7 @@ protected:
 	Task * saveUploadTask;
 	SaveUploadedCallback * callback;
 	SaveInfo save;
-	Thumbnail * thumbnail;
+	VideoBuffer * thumbnail;
 	ui::Textbox * nameField;
 	ui::Textbox * descriptionField;
 	ui::Checkbox * publishedCheckbox;