mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(PS3) Initial implementation of new message queue" Get rid of

Browse Source 
this stuff and the entire FIFO-style interface for the message
queue. It's far too unstable, the ports routinely crash for no
good reason - and I can't get it to display right anyway.
So, get rid of it all and back to the drawing board with it -
because this isn't working out

This reverts commit 29b2a560c37ea5daca9c4fd355827e0dfa44417f.
This commit is contained in:
Twinaphex 2012-04-09 14:32:56 +02:00
parent 29b2a560c3
commit 755aeec226
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ps3/main.c
View File

@ -573,7 +573,6 @@ int main(int argc, char *argv[])
bool load_libsnes_path = manage_libsnes_core(); bool load_libsnes_path = manage_libsnes_core();
set_default_settings(); set_default_settings();
ssnes_init_msg_queue();
init_settings(load_libsnes_path); init_settings(load_libsnes_path);
init_libsnes_sym(); init_libsnes_sym();

30
ps3/menu.c
View File

@ -2006,24 +2006,19 @@ static void select_rom(void)
} }
} }
const char * msg = msg_queue_pull_simple(g_extern.stderr_queue); if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser))
if(!msg)
{ {
if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser)) if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"app_home") || !strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"host_root"))
{ cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart.");
if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"app_home") || !strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"host_root")) else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),".."))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, RED, "WARNING - This path only works on DEX PS3 systems. Do not attempt to open\n this directory on CEX PS3 systems, or you might have to restart."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory.");
else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"..")) else
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous directory."); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to enter the directory.");
else
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to enter the directory.");
}
if (FILEBROWSER_IS_CURRENT_A_FILE(browser))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to load the game. ");
} }
if (FILEBROWSER_IS_CURRENT_A_FILE(browser))
cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to load the game. ");
cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "FILE BROWSER"); cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, "FILE BROWSER");
cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s (v%s)", snes_library_id(), g_extern.system.version); cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s (v%s)", snes_library_id(), g_extern.system.version);
cellDbgFontPrintf (0.7f, 0.05f, 0.82f, WHITE, "%s v%s", EMULATOR_NAME, EMULATOR_VERSION); cellDbgFontPrintf (0.7f, 0.05f, 0.82f, WHITE, "%s v%s", EMULATOR_NAME, EMULATOR_VERSION);
@ -2649,11 +2644,6 @@ void menu_loop(void)
SET_TIMER_EXPIRATION(g_console.timer_expiration_frame_count, 30); SET_TIMER_EXPIRATION(g_console.timer_expiration_frame_count, 30);
} }
const char * msg = msg_queue_pull_simple(g_extern.stderr_queue);
if(msg)
cellDbgFontPrintf(g_settings.video.msg_pos_x, g_settings.video.msg_pos_y, 1.11f, LIGHTBLUE, msg);
video_gl.swap(NULL); video_gl.swap(NULL);
glDisable(GL_BLEND); glDisable(GL_BLEND);
}while (g_console.menu_enable); }while (g_console.menu_enable);