--- hatari/src/includes/screenConvert.h	2019/04/01 07:10:38	1.1.1.4
+++ hatari/src/includes/screenConvert.h	2019/04/09 08:56:57	1.1.1.6
@@ -1,30 +1,18 @@
 /*
   Hatari - screenConvert.h
 
-  This file is distributed under the GNU Public License, version 2 or at your
-  option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
+void Screen_RemapPalette(void);
+void Screen_SetPaletteColor(Uint8 idx, Uint8 red, Uint8 green, Uint8 blue);
+void ScreenConv_MemorySnapShot_Capture(bool bSave);
 
-extern int ScrUpdateFlag;
-extern BOOL bScrDoubleY;
+void Screen_GenConvert(void *fvram, int vw, int vh, int vbpp, int nextline,
+                       int hscroll, int leftBorderSize, int rightBorderSize,
+                       int upperBorderSize, int lowerBorderSize);
 
-extern void ConvertLowRes_320x16Bit(void);
-extern void ConvertLowRes_640x16Bit(void);
-extern void Line_ConvertLowRes_640x16Bit(Uint32 *edi, Uint32 *ebp, Uint32 *esi, Uint32 eax);
-extern void ConvertMediumRes_640x16Bit(void);
-extern void Line_ConvertMediumRes_640x16Bit(Uint32 *edi, Uint32 *ebp, Uint16 *esi, Uint32 eax);
-extern void ConvertLowRes_320x8Bit(void);
-extern void ConvertLowRes_640x8Bit(void);
-extern void Line_ConvertLowRes_640x8Bit(Uint32 *edi, Uint32 *ebp, Uint32 *esi, Uint32 eax);
-extern void ConvertMediumRes_640x8Bit(void);
-extern void Line_ConvertMediumRes_640x8Bit(Uint32 *edi, Uint32 *ebp, Uint32 *esi, Uint32 eax);
-extern void ConvertHighRes_640x8Bit(void);
-extern void ConvertHighRes_640x1Bit(void);
-extern void ConvertSpec512_320x16Bit(void);
-extern void ConvertSpec512_640x16Bit(void);
-
-extern void ConvertVDIRes_16Colour(void);
-extern void ConvertVDIRes_4Colour(void);
-extern void ConvertVDIRes_2Colour_1Bit(void);
-extern void ConvertVDIRes_2Colour(void);
+bool Screen_GenDraw(uint32_t vaddr, int vw, int vh, int vbpp, int nextline,
+                    int leftBorderSize, int rightBorderSize,
+                    int upperBorderSize, int lowerBorderSize);