X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=5807c1bbe7779118881d7046835cbf1f99e4ebd4;hb=531a8f38839713938a441f9287724e5e72c492c3;hp=1573d12818c032b5577728eb785b2f3251d766df;hpb=be7867d8756f15956447d3275382a77a71922feb;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 1573d12..5807c1b 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -455,9 +455,11 @@ int emu_reload_rom(const char *rom_fname_in)
 	// additional movie stuff
 	if (movie_data)
 	{
-		if (movie_data[0x14] == '6')
-		     PicoOpt |=  POPT_6BTN_PAD; // 6 button pad
-		else PicoOpt &= ~POPT_6BTN_PAD;
+		enum input_device indev = (movie_data[0x14] == '6') ?
+			PICO_INPUT_PAD_6BTN : PICO_INPUT_PAD_3BTN;
+		PicoSetInputDevice(0, indev);
+		PicoSetInputDevice(1, indev);
+
 		PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing
 		if (movie_data[0xF] >= 'A') {
 			if (movie_data[0x16] & 0x80) {
@@ -550,6 +552,8 @@ void emu_prep_defconfig(void)
 	defaultConfig.s_PicoCDBuffers = 0;
 	defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
 	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.input_dev0 = PICO_INPUT_PAD_3BTN;
+	defaultConfig.input_dev1 = PICO_INPUT_PAD_3BTN;
 	defaultConfig.volume = 50;
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;