Max Horn
|
018d19e020
|
SCI: Some cleanup to the SongIteratorMessage code
svn-id: r39151
|
2009-03-06 07:25:37 +00:00 |
|
Max Horn
|
24dac898fe
|
SCI: Converted SongIterator::get_pcm_feed into a virtual method
svn-id: r39150
|
2009-03-06 07:25:25 +00:00 |
|
Max Horn
|
f8d9e4fdcc
|
SCI: Restructured PolledPlayerAudioStream::readBuffer a bit
svn-id: r39149
|
2009-03-06 07:25:15 +00:00 |
|
Max Horn
|
5e2ee01b39
|
SCI: Renamed lots of classes related to song iterators; allocate song iterators via new/delete instead of malloc/free
svn-id: r39148
|
2009-03-06 07:25:06 +00:00 |
|
Andre Heider
|
7ef3a59a2c
|
don't crash if sound has been disabled or the backend driver failed to initialize.
svn-id: r39137
|
2009-03-05 21:50:01 +00:00 |
|
Max Horn
|
2a7eef19c0
|
SCI: Removed unused FEED_MODE_DEAD, extended FIXME comment for FEED_MODE_RESTART
svn-id: r39119
|
2009-03-04 08:04:28 +00:00 |
|
Max Horn
|
dbb59ce3a1
|
SCI: Merged polled player & PCMFeedAudioStream -> PolledPlayerAudioStream
svn-id: r39118
|
2009-03-04 07:59:33 +00:00 |
|
Max Horn
|
ce5c6f3a95
|
SCI: Added FIXME about Opl2 driver hardcoding sample rate. well, we probably should ditch that one and use our fmopl...
svn-id: r39117
|
2009-03-04 07:46:27 +00:00 |
|
Max Horn
|
ac2d012ae5
|
SCI: Merged sfx/mixer.cpp into sfx/player/polled.cpp
svn-id: r39116
|
2009-03-04 07:38:49 +00:00 |
|
Max Horn
|
e783859d5c
|
SCI: Replaced sfx_iterator_make_feed and associated code by Audio::makeLinearInputStream
svn-id: r39115
|
2009-03-04 07:31:31 +00:00 |
|
Max Horn
|
0a206fb031
|
SCI: Use Audio::Timestamp instead of sfx_timestamp_t
svn-id: r39113
|
2009-03-04 06:58:51 +00:00 |
|
Max Horn
|
92eceb741a
|
SCI: mixer cleanup
svn-id: r39111
|
2009-03-04 06:23:14 +00:00 |
|
Filippos Karapetis
|
a4e4de9ecd
|
Fixed crash in SQ4
svn-id: r39091
|
2009-03-03 17:20:02 +00:00 |
|
Max Horn
|
00db87563a
|
SCI: Reimplemented the SCI mixer based on the old SCI DC mixer by walter, and by taking advantage of ScummVM's mixers capabilities. Got rid of sfx_pcm_mixer_t
svn-id: r39053
|
2009-03-01 21:23:44 +00:00 |
|
Willem Jan Palenstijn
|
82e4168d47
|
Don't free a sfx_pcm_feed_t that's still in use.
It's a rather hackish fix, but this feed-wrapping code should only be
temporary anyway.
svn-id: r39033
|
2009-03-01 12:08:44 +00:00 |
|
Max Horn
|
7ee049ab8f
|
SCI: Forgot to commit a couple files after renaming sfx headers
svn-id: r39010
|
2009-03-01 06:17:52 +00:00 |
|
Max Horn
|
d0c477e930
|
SCI: Removed unused pause/resume methods from the mixer, and rewrote the feeds handling to use Common::List
svn-id: r39009
|
2009-03-01 06:02:42 +00:00 |
|
Max Horn
|
4e0ee7abea
|
SCI: cleanup
svn-id: r39008
|
2009-03-01 06:02:34 +00:00 |
|
Max Horn
|
6f290b7cd6
|
SCI: Removed some unused code from the SCI mixer
svn-id: r39007
|
2009-03-01 06:02:26 +00:00 |
|
Max Horn
|
25e7d3a08d
|
SCI: Renamed some sfx header files
svn-id: r39006
|
2009-03-01 06:02:17 +00:00 |
|
Max Horn
|
6454a3dee1
|
SCI: Replaced fake struct 'inheritance' (using #defines) with regular C++ subclassing
svn-id: r39005
|
2009-03-01 06:01:48 +00:00 |
|
Jordi Vilalta Prat
|
7050c7b03f
|
SCI: Use the ResourceType enum instead of integers where it makes sense
svn-id: r38988
|
2009-02-28 23:46:50 +00:00 |
|
Greg Frieger
|
61ab59138a
|
resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
|
2009-02-28 21:59:49 +00:00 |
|
Greg Frieger
|
4dd1b7dad5
|
Turned ResourceManager into a class, along with all related functions
svn-id: r38978
|
2009-02-28 20:45:36 +00:00 |
|
Andre Heider
|
b2cd5beb9e
|
clean up some warnings
svn-id: r38965
|
2009-02-28 13:41:43 +00:00 |
|
Andre Heider
|
aff4aeae14
|
set the correct OPL2 frequency for Wii
svn-id: r38964
|
2009-02-28 13:39:56 +00:00 |
|
Willem Jan Palenstijn
|
c76dc0b71c
|
Initialize mixer feed variables
svn-id: r38951
|
2009-02-28 10:04:40 +00:00 |
|
Max Horn
|
6f72cc45a3
|
cleanup
svn-id: r38950
|
2009-02-28 07:23:31 +00:00 |
|
Max Horn
|
413ded4ce4
|
SCI: Get rid around the first layer around the ScummVM audio mixer. Also resolve the FIXME about releasing the mixer channel we allocated
svn-id: r38949
|
2009-02-28 06:48:53 +00:00 |
|
Max Horn
|
a26b3bfde6
|
SCI: Get rid of extra layer around our timer manager
svn-id: r38947
|
2009-02-28 06:14:42 +00:00 |
|
Willem Jan Palenstijn
|
6eeec1d295
|
Add FIXME: We need a pcm_device->exit() function,
to release the mixer channel allocated for pcm_device in ScummVM's mixer.
svn-id: r38941
|
2009-02-27 23:53:52 +00:00 |
|
Willem Jan Palenstijn
|
d3e60f2ae3
|
Depend on backend timer API instead of a new mutex
This fixes a deadlock between the backend's timer mutex and
the sound callbackMutex that would occur while restoring a game.
svn-id: r38939
|
2009-02-27 22:20:11 +00:00 |
|
Eugene Sandulenko
|
d53c75fc8f
|
Fix code formatting
svn-id: r38930
|
2009-02-27 12:59:02 +00:00 |
|
Max Horn
|
479751104f
|
SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
svn-id: r38921
|
2009-02-27 02:23:40 +00:00 |
|
Max Horn
|
170916201c
|
SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
|
2009-02-27 02:23:00 +00:00 |
|
Andre Heider
|
dbe632e8ed
|
protect the sfx timer with the callbackMutex to fix the race the condition when restarting or restoring a game.
svn-id: r38913
|
2009-02-26 19:32:22 +00:00 |
|
Max Horn
|
fde001ce81
|
SCI: Changed 'typedef enum { } NAME' into C++-style 'enum NAME { }'
svn-id: r38908
|
2009-02-26 16:16:46 +00:00 |
|
Paweł Kołodziejski
|
91ee9a3eb8
|
not needed this includes anymore
svn-id: r38857
|
2009-02-24 21:13:32 +00:00 |
|
Andre Heider
|
357299c570
|
substitute all time related functions, removing sci_gettime sci_get_current_time altogether.
svn-id: r38845
|
2009-02-24 18:31:05 +00:00 |
|
Eugene Sandulenko
|
a27285f117
|
Normalized guard #defines
svn-id: r38842
|
2009-02-24 15:33:40 +00:00 |
|
Max Horn
|
1e4db221e5
|
SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
svn-id: r38832
|
2009-02-24 05:39:10 +00:00 |
|
Max Horn
|
8997a45773
|
SCI: Replaced two uses of sci_fopen by Common::File; moved is_print_str() to the only spot it is used
svn-id: r38791
|
2009-02-22 19:45:53 +00:00 |
|
Jordi Vilalta Prat
|
b5ce8d9320
|
Whitespace cleanup
svn-id: r38783
|
2009-02-22 13:11:43 +00:00 |
|
Max Horn
|
d6e397233f
|
SCI: More cleanup
svn-id: r38758
|
2009-02-21 22:40:58 +00:00 |
|
Max Horn
|
b18c96ca87
|
SCI: Replaced evil MIDI_WRITER_BODY with C++ subclassing; some compile fixes to currently unused files
svn-id: r38755
|
2009-02-21 22:14:26 +00:00 |
|
Max Horn
|
8430b662a9
|
SCI: Changed typedef struct -> struct
svn-id: r38752
|
2009-02-21 22:06:42 +00:00 |
|
Max Horn
|
ff17899d8e
|
SCI: Got rid of include/scitypes.h
svn-id: r38746
|
2009-02-21 21:16:41 +00:00 |
|
Max Horn
|
041869ed36
|
SCI: Untangling #include dependencies a bit
svn-id: r38740
|
2009-02-21 19:54:15 +00:00 |
|
Max Horn
|
eb37789f6f
|
SCI: Renamed include/gfx_*.h to gfx/gfx_*.h and likewise for sfx header files
svn-id: r38735
|
2009-02-21 19:33:01 +00:00 |
|
Max Horn
|
f00f020d08
|
SCI: Moved sci_dir_t and GTimeVal to tools.h
svn-id: r38728
|
2009-02-21 19:04:27 +00:00 |
|
Max Horn
|
c5e00f3de2
|
SCI: More cleanup
svn-id: r38725
|
2009-02-21 19:01:32 +00:00 |
|
Max Horn
|
0d41ca8d38
|
SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h
svn-id: r38720
|
2009-02-21 18:28:38 +00:00 |
|
Max Horn
|
273271767b
|
When using error, no need to add a trailing newline
svn-id: r38718
|
2009-02-21 18:20:40 +00:00 |
|
Filippos Karapetis
|
426def4f44
|
Turned back all fprintf/exit(1) bits into error()
svn-id: r38716
|
2009-02-21 18:16:17 +00:00 |
|
Max Horn
|
11b2ddfc54
|
SCI: Simplified gcd (and fixed crash when a = 0, not that it would be relevant ;)
svn-id: r38715
|
2009-02-21 18:13:03 +00:00 |
|
Max Horn
|
199121a04e
|
SCI: Replaced sci_sched_yield based 'mutex' in SCI mixer by a regular ScummVM mutex
svn-id: r38713
|
2009-02-21 18:06:00 +00:00 |
|
Paweł Kołodziejski
|
a5cf6bfd85
|
cleanup
svn-id: r38712
|
2009-02-21 17:29:03 +00:00 |
|
Paweł Kołodziejski
|
f18d5500b1
|
formating
svn-id: r38709
|
2009-02-21 17:23:28 +00:00 |
|
Paweł Kołodziejski
|
d23166c2a1
|
formating
svn-id: r38706
|
2009-02-21 16:20:53 +00:00 |
|
Willem Jan Palenstijn
|
34f90ac043
|
revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
svn-id: r38696
|
2009-02-21 14:11:41 +00:00 |
|
Willem Jan Palenstijn
|
baa7c7b997
|
remove some endlines from warning() calls
svn-id: r38683
|
2009-02-21 11:26:54 +00:00 |
|
Oystein Eftevaag
|
25f7c37171
|
Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
|
2009-02-21 10:23:36 +00:00 |
|
Max Horn
|
bcb1a71052
|
SCI: Fixed more warnings
svn-id: r38658
|
2009-02-21 04:10:21 +00:00 |
|
Travis Howell
|
c5abad4dea
|
Switch error back to warning, to fix SCI 1.1 regression.
svn-id: r38648
|
2009-02-20 23:31:00 +00:00 |
|
Filippos Karapetis
|
80868065e6
|
Downgraded some errors to warnings and printf's
svn-id: r38642
|
2009-02-20 23:19:47 +00:00 |
|
Filippos Karapetis
|
2ddce51a56
|
Changed more messages to warnings/errors
svn-id: r38621
|
2009-02-20 20:39:02 +00:00 |
|
Max Horn
|
a2aba2f18e
|
SCI: Renamed resource_mgr_t -> ResourceManager; added remark to 'the other resource manager' that it should be renamed to GraphicsManager or so
svn-id: r38592
|
2009-02-20 15:24:22 +00:00 |
|
Max Horn
|
c3ffac5e62
|
SCI: Removed unused file
svn-id: r38591
|
2009-02-20 15:20:48 +00:00 |
|
Travis Howell
|
422ebda3ba
|
Add change from Quietust, to fix MSVC 7.1 compile.
svn-id: r38574
|
2009-02-20 03:46:00 +00:00 |
|
Filippos Karapetis
|
45d3382c9a
|
We only got 1 mixer - removed the unneeded file mixers.cpp
svn-id: r38569
|
2009-02-20 00:31:22 +00:00 |
|
Paweł Kołodziejski
|
dd30cc6382
|
remove dreamcast mixer platform code - no use for scummvm
svn-id: r38499
|
2009-02-18 19:35:35 +00:00 |
|
Max Horn
|
766783b493
|
SCI: Some random cleanup
svn-id: r38497
|
2009-02-18 19:14:40 +00:00 |
|
Max Horn
|
88bb21f9e1
|
Removed unused file
svn-id: r38482
|
2009-02-18 14:49:24 +00:00 |
|
Max Horn
|
471f630c2e
|
SCI: Moved sfx_pcm_urat_t from include/sfx_pcm.h to sfx/mixer.h
svn-id: r38434
|
2009-02-17 18:17:01 +00:00 |
|
Sven Hesse
|
2ef866690d
|
Fixing compilation for me
svn-id: r38421
|
2009-02-17 15:54:15 +00:00 |
|
Eugene Sandulenko
|
2a68f8c1cb
|
Remove unneeded files
svn-id: r38414
|
2009-02-17 15:21:38 +00:00 |
|
Eugene Sandulenko
|
b0abacf7cd
|
Update headers. sfx/
svn-id: r38410
|
2009-02-17 15:07:44 +00:00 |
|
Filippos Karapetis
|
d39d83e525
|
Replaced sci_free() with free() - it's OK to free a NULL pointer, so the checking that sci_free() performed is not necessary
svn-id: r38406
|
2009-02-17 13:51:52 +00:00 |
|
Filippos Karapetis
|
d6b5855800
|
Removed more directories which are not part of the SCI engine - again, the code and documentation can be referenced from /vendor/freesci/glutton/src/sfx
svn-id: r38404
|
2009-02-17 10:33:16 +00:00 |
|
Filippos Karapetis
|
7f8f0e96f7
|
Removed directory which is not part of the SCI engine - the code can be referenced from /vendor/freesci/glutton/src/sfx/mt32_GM_mapping
svn-id: r38403
|
2009-02-17 10:25:26 +00:00 |
|
Filippos Karapetis
|
ffc07febeb
|
Removed unused SFX code
svn-id: r38396
|
2009-02-17 09:15:17 +00:00 |
|
Jordi Vilalta Prat
|
c8a3a05a5d
|
SCI: Changed pcm_device and timer "driver" functionality to use directly the ScummVM modules
svn-id: r38373
|
2009-02-16 16:23:48 +00:00 |
|
Max Horn
|
a272626210
|
Replace strncasecmp by scumm_strnicmp
svn-id: r38362
|
2009-02-16 09:53:34 +00:00 |
|
Travis Howell
|
954aa46b8a
|
SCUMMVM define no longer required.
svn-id: r38361
|
2009-02-16 09:44:00 +00:00 |
|
Travis Howell
|
42cb3a55d9
|
Replace strcasecmp with scumm_stricmp.
svn-id: r38359
|
2009-02-16 09:29:07 +00:00 |
|
Travis Howell
|
2d0a897d16
|
Replace strcasecmp with scumm_stricmp.
svn-id: r38356
|
2009-02-16 09:17:49 +00:00 |
|
Max Horn
|
296686e812
|
SCI: Header cleanup (avoid #include <> where possible)
svn-id: r38330
|
2009-02-15 23:39:31 +00:00 |
|
Max Horn
|
29611bc7ea
|
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: sfx dir
svn-id: r38322
|
2009-02-15 22:34:41 +00:00 |
|
Max Horn
|
e90eed4ff3
|
SCI: Changed _WIN32 -> WIN32; _DREAMCAST -> __DC__; removed _DOS stuff
svn-id: r38305
|
2009-02-15 21:27:42 +00:00 |
|
Willem Jan Palenstijn
|
b484e82821
|
retreive->retrieve
svn-id: r38296
|
2009-02-15 20:40:49 +00:00 |
|
Paweł Kołodziejski
|
7d0d96ecc1
|
fixed compilation with msvc
svn-id: r38285
|
2009-02-15 20:02:43 +00:00 |
|
Max Horn
|
a49d29cf6f
|
cleanup, fixed warnings
svn-id: r38282
|
2009-02-15 19:15:43 +00:00 |
|
Filippos Karapetis
|
b27053c71e
|
Silenced some more warnings
svn-id: r38270
|
2009-02-15 16:59:48 +00:00 |
|
Filippos Karapetis
|
06186502b2
|
Silenced more warnings
svn-id: r38267
|
2009-02-15 16:45:39 +00:00 |
|
Willem Jan Palenstijn
|
f046858d5d
|
fix race condition: sfx_exit could stop and delete the mixer while the mixing callback was being executed
svn-id: r38263
|
2009-02-15 16:09:55 +00:00 |
|
Max Horn
|
3ea3141e90
|
Some more warning fixes
svn-id: r38248
|
2009-02-15 14:52:52 +00:00 |
|
Max Horn
|
9daed50e01
|
Fixed lots of warnings and errors (on my system) by backporting a patch I had sent the FreeSCI folks some time ago (but apparently it never made it, or only made it to a branch not imported?)
svn-id: r38245
|
2009-02-15 14:46:42 +00:00 |
|
Filippos Karapetis
|
24dc986944
|
Silenced a ton of warnings, and disabled several unreferenced functions (dead code) - hopefully, compilation hasn't been broken...
svn-id: r38243
|
2009-02-15 14:26:33 +00:00 |
|
Eugene Sandulenko
|
8b34730107
|
Make MSVC happy and rename timer/scummvm.cpp to timer/timer_scummvm.cpp
svn-id: r38231
|
2009-02-15 12:23:54 +00:00 |
|
Eugene Sandulenko
|
e241843bec
|
- Remove some unneeded files
- Mass rename .c to .cpp
svn-id: r38227
|
2009-02-15 11:39:07 +00:00 |
|