[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.h,1.30,1.31
Chris Apers
chrilith at users.sourceforge.net
Sun Sep 12 06:21:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6227
Modified Files:
palm.h
Log Message:
Forgot this one
Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- palm.h 4 Sep 2004 01:30:57 -0000 1.30
+++ palm.h 12 Sep 2004 13:19:58 -0000 1.31
@@ -25,7 +25,6 @@
#include <SonyClie.h>
#include "common/system.h"
-#include "ArmNative.h"
#include "cdaudio.h"
// OSD resource id
@@ -105,7 +104,7 @@
// Returns true if an event was retrieved.
bool poll_event(Event *event);
- void SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert, Boolean repeat = false);
+ void SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert);
/** @name Sound */
//@{
@@ -149,8 +148,6 @@
// Quit
void quit();
- bool _selfQuit;
- UInt8 _quitCount;
// Overlay
void showOverlay();
@@ -177,12 +174,14 @@
typedef void (OSystem_PALMOS::*RendererProc)();
RendererProc _renderer_proc;
- void updateScreen__flipping();
- void updateScreen__buffered();
- void updateScreen__direct();
- void updateScreen__wide_portrait();
- void updateScreen__wide_landscape();
- void updateScreen__wide_zodiac();
+ void updateScreen_flipping();
+ void updateScreen_buffered();
+ void updateScreen_direct();
+ void updateScreen_widePortrait();
+ void updateScreen_wideLandscape();
+ void updateScreen_wideZodiac();
+
+ void rumblePack(Boolean active);
void *ptrP[5]; // various ptr
@@ -225,7 +224,6 @@
int _new_shake_pos;
byte _mouseKeyColor;
- Boolean _vibrate;
UInt32 _exit_delay;
struct {
@@ -234,6 +232,8 @@
TimerProc callback;
} _timer;
+ // Audio
+ int _samplesPerSec;
SoundDataType _sound;
// Palette data
@@ -261,36 +261,26 @@
/* Boolean _alarmRaised;
void alarm_handler();
*/
- // ARM
- enum {
- PNO_COPY = 0,
- PNO_WIDE,
- PNO_SNDSTREAM,
- PNO_COUNT
- };
-
- struct {
- PnoDescriptor pnoDesc;
- MemPtr pnoPtr;
- } _arm[PNO_COUNT];
-
CDAudio *_cdPlayer;
// PALM spec
enum {
kLastKeyNone = 0,
- kLastKeyMouseUp = 1 << 0,
- kLastKeyMouseDown = 1 << 1,
- kLastKeyMouseLeft = 1 << 2,
- kLastKeyMouseRight = 1 << 3,
- kLastKeyMouseButLeft = 1 << 4,
- kLastKeyMouseButRight = 1 << 5,
-
+ kLastKeyMouse = 1 << 0,
+
kLastKeyCalc = 1 << 30,
kLastKeyAny = 1 << 31
};
+ UInt32 _keyMask;
+ struct {
+ UInt32 bitUp;
+ UInt32 bitDown;
+ UInt32 bitLeft;
+ UInt32 bitRight;
+ UInt32 bitButLeft;
+ } _keyMouse;
Int32 _lastKeyPressed;
UInt32 _lastKeyRepeat;
More information about the Scummvm-git-logs
mailing list