--- a/render.h	Sun Dec 31 10:11:16 2017 -0800
+++ b/render.h	Tue Dec 25 11:12:26 2018 -0800
@@ -40,6 +40,22 @@
 #define RENDERKEY_PLAY     SDLK_AUDIOPLAY
 #define RENDERKEY_SEARCH   SDLK_AC_SEARCH
 #define RENDERKEY_BACK     SDLK_AC_BACK
+#define RENDERKEY_NP0      SDLK_KP_0
+#define RENDERKEY_NP1      SDLK_KP_1
+#define RENDERKEY_NP2      SDLK_KP_2
+#define RENDERKEY_NP3      SDLK_KP_3
+#define RENDERKEY_NP4      SDLK_KP_4
+#define RENDERKEY_NP5      SDLK_KP_5
+#define RENDERKEY_NP6      SDLK_KP_6
+#define RENDERKEY_NP7      SDLK_KP_7
+#define RENDERKEY_NP8      SDLK_KP_8
+#define RENDERKEY_NP9      SDLK_KP_9
+#define RENDERKEY_NP_DIV   SDLK_KP_DIVIDE
+#define RENDERKEY_NP_MUL   SDLK_KP_MULTIPLY
+#define RENDERKEY_NP_MIN   SDLK_KP_MINUS
+#define RENDERKEY_NP_PLUS  SDLK_KP_PLUS
+#define RENDERKEY_NP_ENTER SDLK_KP_ENTER
+#define RENDERKEY_NP_STOP  SDLK_KP_PERIOD
 #define RENDER_DPAD_UP     SDL_HAT_UP
 #define RENDER_DPAD_DOWN   SDL_HAT_DOWN
 #define RENDER_DPAD_LEFT   SDL_HAT_LEFT
@@ -52,10 +68,9 @@
 
 #define FRAMEBUFFER_ODD 0
 #define FRAMEBUFFER_EVEN 1
+#define FRAMEBUFFER_USER_START 2
 
 #include "vdp.h"
-#include "psg.h"
-#include "ym2612.h"
 
 typedef enum {
 	VID_NTSC,
@@ -69,21 +84,22 @@
 #define RENDER_NOT_MAPPED -2
 #define RENDER_NOT_PLUGGED_IN -3
 
+typedef struct audio_source audio_source;
 typedef void (*drop_handler)(const char *filename);
 
 uint32_t render_map_color(uint8_t r, uint8_t g, uint8_t b);
 void render_save_screenshot(char *path);
+uint8_t render_create_window(char *caption, uint32_t width, uint32_t height);
+void render_destroy_window(uint8_t which);
 uint32_t *render_get_framebuffer(uint8_t which, int *pitch);
 void render_framebuffer_updated(uint8_t which, int width);
+//returns the framebuffer index associated with the Window that has focus
+uint8_t render_get_active_framebuffer(void);
 void render_init(int width, int height, char * title, uint8_t fullscreen);
 void render_set_video_standard(vid_std std);
 void render_toggle_fullscreen();
 void render_update_caption(char *title);
 void render_wait_quit(vdp_context * context);
-void render_wait_psg(psg_context * context);
-void render_wait_ym(ym2612_context * context);
-void render_disable_ym();
-void render_enable_ym();
 uint32_t render_audio_buffer();
 uint32_t render_sample_rate();
 void process_events();
@@ -96,6 +112,7 @@
 int32_t render_dpad_part(int32_t input);
 int32_t render_axis_part(int32_t input);
 uint8_t render_direction_part(int32_t input);
+char* render_joystick_type_id(int index);
 void render_errorbox(char *title, char *message);
 void render_warnbox(char *title, char *message);
 void render_infobox(char *title, char *message);
@@ -103,6 +120,17 @@
 uint32_t render_emulated_height();
 uint32_t render_overscan_top();
 uint32_t render_overscan_left();
+uint32_t render_elapsed_ms(void);
+void render_sleep_ms(uint32_t delay);
+uint8_t render_has_gl(void);
+audio_source *render_audio_source(uint64_t master_clock, uint64_t sample_divider, uint8_t channels);
+void render_audio_adjust_clock(audio_source *src, uint64_t master_clock, uint64_t sample_divider);
+void render_put_mono_sample(audio_source *src, int16_t value);
+void render_put_stereo_sample(audio_source *src, int16_t left, int16_t right);
+void render_pause_source(audio_source *src);
+void render_resume_source(audio_source *src);
+void render_free_source(audio_source *src);
+void render_config_updated(void);
 
 #endif //RENDER_H_