Procházet zdrojové kódy

Last updates from irixxxx + submodule update

root před 2 roky
rodič
revize
a16b0ab939

+ 1 - 1
.gitmodules

@@ -9,7 +9,7 @@
 	url = https://github.com/digital-sound-antiques/emu2413.git
 [submodule "pico/cd/libchdr"]
 	path = pico/cd/libchdr
-	url = https://github.com/irixxxx/libchdr-picodrive.git
+	url = https://github.com/rtissera/libchdr.git
 [submodule "platform/common/minimp3"]
 	path = platform/common/minimp3
 	url = https://github.com/lieff/minimp3

+ 1 - 1
pico/cd/libchdr

@@ -1 +1 @@
-Subproject commit ff3175ddb040b1a967c665a28868b16bf5aa97dd
+Subproject commit 00319cf31f034e4d468a49a60265c7c5b8305b70

+ 5 - 5
pico/cd/pcm.c

@@ -89,10 +89,10 @@ void pcd_pcm_sync(unsigned int to)
 
     addr = ch->addr;
     inc = ch->regs[2] + (ch->regs[3]<<8);
-    mul_l = ((int)ch->regs[0] * (ch->regs[1] & 0xf)) >> (5+1); 
-    mul_r = ((int)ch->regs[0] * (ch->regs[1] >>  4)) >> (5+1);
+    mul_l = (int)ch->regs[0] * (ch->regs[1] & 0xf); 
+    mul_r = (int)ch->regs[0] * (ch->regs[1] >>  4);
 
-    for (s = 0; s < steps; s++, addr = (addr + inc) & 0x7FFFFFF)
+    for (s = 0; s < steps; s++, addr = (addr + inc) & 0x07FFFFFF)
     {
       smp = Pico_mcd->pcm_ram[addr >> PCM_STEP_SHIFT];
 
@@ -109,8 +109,8 @@ void pcd_pcm_sync(unsigned int to)
       if (smp & 0x80)
         smp = -(smp & 0x7f);
 
-      out[s*2  ] += smp * mul_l; // max 128 * 119 = 15232
-      out[s*2+1] += smp * mul_r;
+      out[s*2  ] += (smp * mul_l) >> 5; // max 127 * 255 * 15 / 32 = 15180
+      out[s*2+1] += (smp * mul_r) >> 5;
     }
     ch->addr = addr;
   }

+ 1 - 1
platform/common/emu.c

@@ -1533,7 +1533,7 @@ void quick_save_and_poweroff()
     printf("Save Instant Play file\n");
 
     /* Send command to cancel any previously scheduled powerdown */
-    fp = popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r");
+    fp = popen(SHELL_CMD_POWERDOWN_HANDLE, "r");
     if (fp == NULL)
     {
         /* Countdown is still ticking, so better do nothing

+ 4 - 3
platform/common/menu_pico.c

@@ -84,7 +84,8 @@ static const char *men_dummy[] = { NULL };
 #elif defined(PANDORA)
 #include <platform/pandora/menu.c>
 #else
-#include <platform/linux/menu.c>
+#define MENU_OPTIONS_GFX
+#define MENU_OPTIONS_ADV
 #endif
 
 
@@ -1020,8 +1021,8 @@ void run_menu_loop()
                             if(menu_confirmation){
                                 MENU_DEBUG_PRINTF("Powerdown - confirmed\n");
                                 /// ----- Shell cmd ----
-                                execlp(SHELL_CMD_SHUTDOWN_FUNKEY, SHELL_CMD_SHUTDOWN_FUNKEY, NULL);
-                                MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_SHUTDOWN_FUNKEY);
+                                execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN, NULL);
+                                MENU_ERROR_PRINTF("Failed to run command %s\n", SHELL_CMD_POWERDOWN);
                                 exit(0);
                             }
                             else{

+ 2 - 2
platform/common/menu_pico.h

@@ -40,9 +40,9 @@ typedef enum {RESUME_OPTIONS} ENUM_RESUME_OPTIONS;
 #define SHELL_CMD_NOTIF_CLEAR               "notif clear"
 #define SHELL_CMD_AUDIO_AMP_ON              "audio_amp on"
 #define SHELL_CMD_AUDIO_AMP_OFF             "audio_amp off"
-#define SHELL_CMD_CANCEL_SCHED_POWERDOWN    "cancel_sched_powerdown"
+#define SHELL_CMD_POWERDOWN                 "powerdown"
+#define SHELL_CMD_POWERDOWN_HANDLE          "powerdown handle"
 #define SHELL_CMD_INSTANT_PLAY              "instant_play"
-#define SHELL_CMD_SHUTDOWN_FUNKEY           "shutdown_funkey"
 #define SHELL_CMD_KEYMAP_DEFAULT            "keymap default"
 #define SHELL_CMD_KEYMAP_RESUME             "keymap resume"