switch Cyclone to submodule on it's own git repo

[picodrive.git] / platform / uiq3 / App.cpp

diff --git a/platform/uiq3/App.cpp b/platform/uiq3/App.cpp
index 68a802c..d1be510 100644 (file)
--- a/platform/uiq3/App.cpp
+++ b/platform/uiq3/App.cpp
@@ -35,6 +35,7 @@
 #include "../common/emu.h"\r
 #include "emu.h"\r
 \r
+extern "C" char menuErrorMsg[];\r
 \r
 ////////////////////////////////////////////////////////////////\r
 //\r
@@ -163,32 +164,32 @@ void CPicolAppView::HandleCommandL(CQikCommand& aCommand)
 \r
                case EEikCmdPicoFrameskipAuto:\r
                        currentConfig.Frameskip = -1;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip0:\r
                        currentConfig.Frameskip = 0;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip1:\r
                        currentConfig.Frameskip = 1;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip2:\r
                        currentConfig.Frameskip = 2;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip4:\r
                        currentConfig.Frameskip = 4;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdPicoFrameskip8:\r
                        currentConfig.Frameskip = 8;\r
-                       emu_WriteConfig(0);\r
+                       emu_write_config(0);\r
                        break;\r
 \r
                case EEikCmdExit:\r
@@ -215,7 +216,7 @@ void CPicolAppView::DisplayOpenROMDialogL()
        CleanupStack::PushL(fileArray);\r
        _LIT16(KDlgTitle, "Select a ROM file");\r
 \r
-       TPtrC8 text8((TUint8*) loadedRomFName);\r
+       TPtrC8 text8((TUint8*) rom_fname_loaded);\r
        iCurrentConfig.iLastROMFile.Copy(text8);\r
 \r
        if( CQikSelectFileDlg::RunDlgLD( *mimeArray, *fileArray, &KDlgTitle, &iCurrentConfig.iLastROMFile) )\r
@@ -235,26 +236,18 @@ void CPicolAppView::DisplayOpenROMDialogL()
                iROMLoaded = EFalse;\r
                switch (res)\r
                {\r
-                       case PicoErrRomOpenFailed:\r
-                               CEikonEnv::Static()->InfoWinL(_L("Error"), _L("Failed to open file."));\r
+                       case PicoErrRomOpenFailed: {\r
+                               TBuf<64> mErrorBuff;\r
+                               TPtrC8 buff8((TUint8*) menuErrorMsg);\r
+                               mErrorBuff.Copy(buff8);\r
+                               CEikonEnv::Static()->InfoWinL(_L("Error"), mErrorBuff);\r
                                break;\r
+                       }\r
 \r
                        case PicoErrOutOfMem:\r
                                CEikonEnv::Static()->InfoWinL(_L("Error"), _L("Failed to allocate memory."));\r
                                break;\r
 \r
-                       case PicoErrNotRom:\r
-                               CEikonEnv::Static()->InfoWinL(_L("Error"), _L("The file you selected is not a game ROM."));\r
-                               break;\r
-\r
-                       case PicoErrNoRomsInArchive:\r
-                               CEikonEnv::Static()->InfoWinL(_L("Error"), _L("No game ROMs found in zipfile."));\r
-                               break;\r
-\r
-                       case PicoErrUncomp:\r
-                               CEikonEnv::Static()->InfoWinL(_L("Error"), _L("Failed while unzipping ROM."));\r
-                               break;\r
-\r
                        case PicoErrEmuThread:\r
                                CEikonEnv::Static()->InfoWinL(_L("Error"), _L("Failed to create emulation thread. Try to restart this application."));\r
                                break;\r
@@ -292,10 +285,10 @@ void CPicolAppView::DisplayOpenROMDialogL()
 void CPicolAppView::DisplayConfigDialogL()\r
 {\r
        CPicoConfigDialog* configDialog = new(ELeave)CPicoConfigDialog(currentConfig);\r
-       emu_packConfig();\r
+       emu_pack_config();\r
        configDialog->ExecuteLD(R_PICO_CONFIG);\r
-       emu_unpackConfig();\r
-       emu_WriteConfig(0);\r
+       emu_unpack_config();\r
+       emu_write_config(0);\r
 \r
        CPicoGameSession::Do(PicoMsgConfigChange, &currentConfig);\r
 }\r