aboutsummaryrefslogtreecommitdiff
path: root/backends/epoc/S80
diff options
context:
space:
mode:
Diffstat (limited to 'backends/epoc/S80')
-rw-r--r--backends/epoc/S80/ScummVMApp.cpp168
-rw-r--r--backends/epoc/S80/ScummVMApp.h84
-rw-r--r--backends/epoc/S80/ScummVM_S80_App.mmp12
-rw-r--r--backends/epoc/S80/ScummvmS80.rss62
-rw-r--r--backends/epoc/S80/scummvm-CVS-SymbianS80.pkg4
5 files changed, 9 insertions, 321 deletions
diff --git a/backends/epoc/S80/ScummVMApp.cpp b/backends/epoc/S80/ScummVMApp.cpp
deleted file mode 100644
index f835de5d0c..0000000000
--- a/backends/epoc/S80/ScummVMApp.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
- * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "ScummVMapp.h"
-#include <scummvms80.rsg>
-#include <apgcli.h>
-#include <eikdll.h>
-#include <apgtask.h>
-
-EXPORT_C CApaApplication *NewApplication() {
- return (new CScummVM);
-}
-
-CScummVM::CScummVM() {
-}
-
-CScummVM::~CScummVM() {
-}
-
-CApaDocument *CScummVM::CreateDocumentL() {
- return new (ELeave)CScummVMDoc(*this);
-}
-
-TUid CScummVM::AppDllUid() const {
- return TUid::Uid(0x101f9b57);
-}
-
-CScummVMDoc::CScummVMDoc(CEikApplication &aApp) : CEikDocument(aApp) {
-}
-
-CScummVMDoc::~CScummVMDoc() {
-}
-
-CEikAppUi *CScummVMDoc::CreateAppUiL() {
- return new (ELeave)CScummVMUi;
-}
-
-void CScummVMUi::HandleForegroundEventL(TBool aForeground) {
- if(aForeground) {
- BringUpEmulatorL();
- }
-}
-
-CScummVMUi::CScummVMUi() {
-}
-
-CScummVMUi::~CScummVMUi() {
- if(iWatcher) {
- iThreadWatch.LogonCancel(iWatcher->iStatus);
- iWatcher->Cancel();
- }
- delete iWatcher;
-
- iThreadWatch.Close();
-}
-
-void CScummVMUi::ConstructL() {
- BaseConstructL();
- TBuf<128> startFile;
- startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
- TParse parser;
- parser.Set(startFile,NULL,NULL);
-
- startFile = parser.DriveAndPath();
-#ifndef __WINS__
- startFile.Append( _L("ScummVM.exe"));
-#else
- startFile.Append( _L("ScummVM.dll"));
-#endif
- CApaCommandLine *cmdLine = CApaCommandLine::NewLC(startFile);
- RApaLsSession lsSession;
-
- lsSession.Connect();
- CleanupClosePushL(lsSession);
- lsSession.StartApp(*cmdLine, iThreadId);
-
- CleanupStack::PopAndDestroy(); // close lsSession
- CleanupStack::PopAndDestroy(cmdLine);
-
- User::After(500000); // Let the application start
-
- TApaTaskList taskList(iEikonEnv->WsSession());
-
- TApaTask myTask = taskList.FindApp(TUid::Uid(0x101f9b57));
- myTask.SendToBackground();
-
- TApaTask exeTask = taskList.FindByPos(0);
-
- iExeWgId = exeTask.WgId();
- exeTask.BringToForeground();
-
- if(iExeWgId == myTask.WgId()) { // Should n't be the same
- Exit();
- }
- if(iThreadWatch.Open(iThreadId) == KErrNone) {
- iWatcher = new (ELeave)CScummWatcher;
- iWatcher->iAppUi = this;
- iThreadWatch.Logon(iWatcher->iStatus);
- }
-}
-
-CScummWatcher::CScummWatcher() : CActive(EPriorityStandard) {
- CActiveScheduler::Add(this);
- iStatus = KRequestPending;
- SetActive();
-}
-
-CScummWatcher::~CScummWatcher() {
-}
-
-void CScummWatcher::DoCancel() {
-}
-
-void CScummWatcher::RunL() {
- iAppUi->HandleCommandL(EEikCmdExit);
-}
-
-void CScummVMUi::BringUpEmulatorL() {
- RThread thread;
- if(thread.Open(iThreadId) == KErrNone) {
- thread.Close();
- TApaTask apaTask(iEikonEnv->WsSession());
- apaTask.SetWgId(iExeWgId);
- apaTask.BringToForeground();
- } else {
- iExeWgId = -1;
- }
-}
-
-void CScummVMUi::HandleCommandL(TInt aCommand) {
- switch(aCommand) {
- case EEikCmdExit:
- {
- RThread thread;
- if(thread.Open(iThreadId) == KErrNone) {
- thread.Terminate(0);
- thread.Close();
- }
- Exit();
- }
- break;
- }
-}
-
-GLDEF_C TInt E32Dll(TDllReason) {
- return KErrNone;
-}
diff --git a/backends/epoc/S80/ScummVMApp.h b/backends/epoc/S80/ScummVMApp.h
deleted file mode 100644
index 096cbc6f1d..0000000000
--- a/backends/epoc/S80/ScummVMApp.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
- * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#ifndef ScummVMapps60h
-#define ScummVMapps60h
-
-#include <eikapp.h>
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eikenv.h>
-#include <coeview.h>
-#include <eikappui.h>
-
-class CScummVM : public CEikApplication {
-public:
- CScummVM();
- ~CScummVM();
-
- CApaDocument *CreateDocumentL();
- TUid AppDllUid() const;
-};
-
-
-#include <eikdoc.h>
-
-class CScummVMDoc : public CEikDocument {
-public:
- CScummVMDoc(CEikApplication &aApplicaiton);
- ~CScummVMDoc();
-
- CEikAppUi *CreateAppUiL();
- void ConstructL();
-};
-
-#include <eikappui.h>
-class CScummVMUi;
-class CScummWatcher : public CActive {
-public:
- CScummWatcher();
- ~CScummWatcher();
-
- void DoCancel();
- void RunL();
- CScummVMUi *iAppUi;
-};
-
-class CScummVMUi : public CEikAppUi {
-public:
- CScummVMUi();
- ~CScummVMUi();
-
- void ConstructL();
- void HandleCommandL(TInt aCommand);
- void HandleForegroundEventL(TBool aForeground);
- void BringUpEmulatorL();
-
-private:
- TThreadId iThreadId;
- TInt iExeWgId;
- RThread iThreadWatch;
- CScummWatcher *iWatcher;
-};
-#endif
diff --git a/backends/epoc/S80/ScummVM_S80_App.mmp b/backends/epoc/S80/ScummVM_S80_App.mmp
index 268fd18a40..6cc6d044c4 100644
--- a/backends/epoc/S80/ScummVM_S80_App.mmp
+++ b/backends/epoc/S80/ScummVM_S80_App.mmp
@@ -25,22 +25,24 @@
// MAKEFILE.MMP S80 ScummVM Launcher
//
-TARGET ScummVMS80.app
-TARGETPATH system\apps\ScummVMS80
+TARGET ScummVM.app
+TARGETPATH system\apps\ScummVM
TARGETTYPE app
UID 0x100039ce 0x101f9b57
-RESOURCE SCUMMVMS80.rss
+sourcepath ..\res
+RESOURCE SCUMMVM.rss
SOURCEPATH .
-USERINCLUDE .
+USERINCLUDE ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc
// app source
+sourcepath ..\src
SOURCE ScummVMApp.cpp
sourcepath ..
-AIF ScummVmS80.Aif ..\res\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp
+AIF ScummVm.Aif ..\res\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp
// libraries
LIBRARY cone.lib EIKCORE.lib
diff --git a/backends/epoc/S80/ScummvmS80.rss b/backends/epoc/S80/ScummvmS80.rss
deleted file mode 100644
index 73988dab42..0000000000
--- a/backends/epoc/S80/ScummvmS80.rss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
- * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
- * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
- * Copyright (C) 2005 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $Header:
- */
-
-// ScummVM.RSS
-
-NAME SCUM
-
-// Include definitions of resource STRUCTS used by this
-// resource script
-#include <eikon.rh>
-#include "..\src\Scummvm.hrh"
-// Include the standard Eikon resource ids
-#include <eikon.rsg>
-
-
-RESOURCE RSS_SIGNATURE
- {
- }
-
-RESOURCE TBUF16 { buf=""; }
-
-RESOURCE EIK_APP_INFO
- {
- menubar = r_scum_menubar;
- }
-
-RESOURCE MENU_BAR r_scum_menubar // *** Menu bar
-{
- titles =
- {
- MENU_TITLE { menu_pane = r_scum_menu; txt = "ScummVM"; }
- };
-}
-
-RESOURCE MENU_PANE r_scum_menu // *** Submenu
-{
- items =
- {
-
- MENU_ITEM{command = EEikCmdExit;txt = "Exit";}
- };
-}
diff --git a/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg b/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
index 5f72d6d905..e48d37b08e 100644
--- a/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
+++ b/backends/epoc/S80/scummvm-CVS-SymbianS80.pkg
@@ -8,8 +8,8 @@
; UID is the app's UID
#{"ScummVM S80"},(0x101f9b57),0,80,3
-; Platform type
-(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
+; Platform type -- disabled: seems to be causing trouble
+;(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
; Launcher, Application, AIF & Resource file
"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 20:28:41 +0000