X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fuiq3%2FApp.cpp;h=d1be510d0fd43512a7f598a74bb8093bdadcb0d6;hb=f4bb5d6b2c96a94317c4edb7805eb6d6ed8589ef;hp=68a802c46ae40e508a029ef0e41775fb3157fb29;hpb=ca482e5de8bacb70db55f43afe02f93fe6fe3f16;p=picodrive.git

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