as a first step, all appearently unused calls are commented outfrom DisplayDriver and derived classes, I moved many implementations arround to match the order of the declaration in the header, makes it easier to find stuff

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11980 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/servers/app/BitmapDriver.cpp

@@ -529,9 +529,9 @@ void BitmapDriver::VLinePatternThick(int32 x, int32 y1, int32 y2)
 	}
 }
 
-
+/*
 void BitmapDriver::DrawBitmap(ServerBitmap *sourcebmp, const BRect &source, 
-	const BRect &dest, DrawData *d)
+	const BRect &dest, const DrawData *d)
 {
 	// Another internal function called from other functions.
 	
@@ -656,7 +656,7 @@ void BitmapDriver::DrawBitmap(ServerBitmap *sourcebmp, const BRect &source,
 			break;
 		}
 	}
-}
+}*/
 
 
 bool BitmapDriver::AcquireBuffer(FBBitmap *fbmp)

src/servers/app/BitmapDriver.h

@@ -73,7 +73,7 @@ public:
 	ServerBitmap *GetTarget(void) const { return fTarget; }
 	
 	// Settings functions
-	virtual void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, DrawData *d);
+//	virtual void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
 
 	virtual void SetMode(const int32 &mode);
 	virtual void SetMode(const display_mode &mode);

src/servers/app/DirectDriver.cpp

@@ -163,7 +163,7 @@ void DirectDriver::Shutdown(void)
 	if(fSavedScreenMode.space!=fCurrentScreenMode.space)
 		BScreen().SetMode(&fSavedScreenMode);
 }
-
+/*
 void DirectDriver::DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d)
 {
 	STRACE(("DirectDriver::DrawBitmap\n"));
@@ -190,7 +190,7 @@ void DirectDriver::DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &
 	screenwin->rectpipe.PutRect(dest);
 	Unlock();
 	delete mediator;
-}
+}*/
 
 void DirectDriver::InvertRect(const BRect &r)
 {

src/servers/app/DirectDriver.h

@@ -123,7 +123,7 @@ public:
 	virtual	bool Initialize(void);
 	virtual	void Shutdown(void);
 	
-	void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
+//	void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
 
 	virtual	void InvertRect(const BRect &r);
 

src/servers/app/PicturePlayer.cpp

@@ -43,8 +43,7 @@ PicturePlayer::PicturePlayer(DisplayDriver *d,void *data, int32 size)
 
 PicturePlayer::~PicturePlayer()
 {
-	if(clipreg)
-		delete clipreg;
+	delete clipreg;
 }
 
 int16 PicturePlayer::GetOp()
@@ -255,7 +254,13 @@ status_t PicturePlayer::Play(int32 tableEntries,void *userData, LayerData *d)
 				ServerBitmap sbmp(BRect(0,0,width-1,height-1), (color_space)pixelFormat, flags, bytesPerRow);
 				sbmp._AllocateBuffer();
 				GetData(sbmp.Bits(), size - (fData.Position() - pos));
-				fdriver->DrawBitmap(&sbmp,src,dest,&fldata);
+				// TODO: what clipping region is DrawBitmap expecting?
+				// It appears to be in screen space. What space is clipreg in?
+				// We might pass a NULL pointer here, which would crash
+				// in DrawBitmap(), but I think this whole thing needs
+				// fixing...
+				fdriver->DrawBitmap(clipreg,
+									&sbmp,src,dest,&fldata);
 				sbmp._FreeBuffer();
 				break;
 			}

src/servers/app/ViewDriver.cpp

@@ -1,5 +1,5 @@
 //------------------------------------------------------------------------------
-//	Copyright (c) 2001-2002, Haiku, Inc.
+//	Copyright (c) 2001-2005, Haiku, Inc.
 //
 //	Permission is hereby granted, free of charge, to any person obtaining a
 //	copy of this software and associated documentation files (the "Software"),
@@ -39,7 +39,6 @@
 #include <Screen.h>
 #include <TranslatorRoster.h>
 
-#include "Angle.h"
 #include "PortLink.h"
 #include "RectUtils.h"
 #include "ServerProtocol.h"
@@ -595,14 +594,14 @@ void ViewDriver::SetMode(const display_mode &mode)
 	screenwin->Unlock();
 }
 
-
+/*
 void ViewDriver::DrawBitmap(ServerBitmap *bitmap, const BRect &src, const BRect &dest, const DrawData *d)
 {
 	if(!is_initialized)
 		return;
 		
 STRACE(("ViewDriver:: DrawBitmap unimplemented()\n"));
-}
+}*/
 
 bool ViewDriver::DumpToFile(const char *path)
 {

src/servers/app/ViewDriver.h

@@ -106,7 +106,7 @@ public:
 	virtual	void				Shutdown(void); // You never know when you'll need this
 	
 	// Drawing functions
-	void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
+//	void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
 
 	virtual	void				InvertRect(const BRect &r);