From 755aeec226e55aefccd32f479261ef59197b719f Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 9 Apr 2012 14:32:56 +0200 Subject: [PATCH] Revert "(PS3) Initial implementation of new message queue" Get rid of 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. --- ps3/main.c | 1 - ps3/menu.c | 30 ++++++++++-------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/ps3/main.c b/ps3/main.c index 73ffe52184..694456591b 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -573,7 +573,6 @@ int main(int argc, char *argv[]) bool load_libsnes_path = manage_libsnes_core(); set_default_settings(); - ssnes_init_msg_queue(); init_settings(load_libsnes_path); init_libsnes_sym(); diff --git a/ps3/menu.c b/ps3/menu.c index 7efa86d270..a694514085 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -2006,24 +2006,19 @@ static void select_rom(void) } } - const char * msg = msg_queue_pull_simple(g_extern.stderr_queue); - - if(!msg) + if (FILEBROWSER_IS_CURRENT_A_DIRECTORY(browser)) { - 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."); - else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"..")) - cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous 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(!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."); + else if(!strcmp(FILEBROWSER_GET_CURRENT_FILENAME(browser),"..")) + cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "INFO - Press X to go back to the previous 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. "); + 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.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); } - 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); glDisable(GL_BLEND); }while (g_console.menu_enable);