diff options
author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-04-06 11:36:03 +0000 |
---|---|---|
committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-04-06 11:36:03 +0000 |
commit | b2a824d8f4fcf4d9038e2a360ac586fb0279e739 (patch) | |
tree | 79c473600e6ada136c7b2e63c8725565f8c4c521 /Game/Code/lib/midi | |
parent | da94f9cb1798038b5bbf898b1a92ab03c3a1628e (diff) | |
download | usdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.tar.gz usdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.tar.xz usdx-b2a824d8f4fcf4d9038e2a360ac586fb0279e739.zip |
removed lazarus dependencies
- added an implementation of AllocateHWnd/DeallocateHWnd to UCommon for
the Win32 only units DirWatch and Midi... (do not use AllocateHWnd somewhere else)
- added an own implementation of ShowMessage to UCommon (uses MessageBox in Windows, console-output otherwise)
- linux still needs lresources for the lrs-file (will be removed soon)
- the FPC windows version uses windows resources now (instead of lrs ones).
compile them with windres (in FPC's "bin" dir) or delphi (a batch-file for windres will follow soon)
- changed path-separator from '\' to '/' in RC-file for windres compatibility
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1006 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | Game/Code/lib/midi/MidiFile.pas | 15 | ||||
-rw-r--r-- | Game/Code/lib/midi/Midiin.pas | 4 | ||||
-rw-r--r-- | Game/Code/lib/midi/Midiout.pas | 5 |
3 files changed, 9 insertions, 15 deletions
diff --git a/Game/Code/lib/midi/MidiFile.pas b/Game/Code/lib/midi/MidiFile.pas index e6306bec..0c150a8b 100644 --- a/Game/Code/lib/midi/MidiFile.pas +++ b/Game/Code/lib/midi/MidiFile.pas @@ -96,12 +96,10 @@ interface uses
Windows,
- Forms,
+ //Forms,
Messages,
SysUtils,
- {$IFDEF LCL}
- LCLIntf, // used for AllocateHWnd
- {$ENDIF}
+ UCommon,
Classes;
type
@@ -941,11 +939,12 @@ begin case Msg of
WM_MULTIMEDIA_TIMER:
begin
- try
+ //try
MidiTimer(self);
- except
- Application.HandleException(Self);
- end;
+ //except
+ // Note: HandleException() is called by default if exception is not handled
+ // Application.HandleException(Self);
+ //end;
end;
else
begin
diff --git a/Game/Code/lib/midi/Midiin.pas b/Game/Code/lib/midi/Midiin.pas index 6820a740..8cb7beb7 100644 --- a/Game/Code/lib/midi/Midiin.pas +++ b/Game/Code/lib/midi/Midiin.pas @@ -111,9 +111,7 @@ uses Messages,
Windows,
MMSystem,
- {$IFDEF LCL}
- LCLIntf, // used for AllocateHWnd
- {$ENDIF}
+ UCommon,
MidiDefs,
MidiType,
MidiCons,
diff --git a/Game/Code/lib/midi/Midiout.pas b/Game/Code/lib/midi/Midiout.pas index 0ad93591..cdbc762d 100644 --- a/Game/Code/lib/midi/Midiout.pas +++ b/Game/Code/lib/midi/Midiout.pas @@ -105,11 +105,8 @@ uses Windows,
Messages,
Classes,
- //Controls,
MMSystem,
- {$IFDEF LCL}
- LCLIntf, // used for AllocateHWnd
- {$ENDIF}
+ UCommon,
Circbuf,
MidiType,
MidiDefs,
|