OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed spurious warnings on 32-bit VC++ debug builds.

Browse source 
- Made the subsong (order) number a proper parameter to MusInfo::Play()
  instead of requiring a separate SetPosition() call to do it.



SVN r1104 (trunk)
This commit is contained in:
Randy Heit 2008-08-03 03:54:48 +00:00
commit 9f21b22cc5
16 changed files with 133 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/sound/fmodsound.cpp
View file

@ -454,21 +454,16 @@ public:
Volume = volume;
}
// Sets the current order number for a MOD-type song, or the position in ms
// for anything else.
bool SetPosition(int pos)
// Sets the position in ms.
bool SetPosition(unsigned int ms_pos)
{
FMOD_SOUND_TYPE type;
return FMOD_OK == Channel->setPosition(ms_pos, FMOD_TIMEUNIT_MS);
}
if (FMOD_OK == Stream->getFormat(&type, NULL, NULL, NULL) &&
(type == FMOD_SOUND_TYPE_IT ||
type == FMOD_SOUND_TYPE_MOD ||
type == FMOD_SOUND_TYPE_S3M ||
type == FMOD_SOUND_TYPE_XM))
{
return FMOD_OK == Channel->setPosition(pos, FMOD_TIMEUNIT_MODORDER);
}
return FMOD_OK == Channel->setPosition(pos, FMOD_TIMEUNIT_MS);
// Sets the order number for MOD formats.
bool SetOrder(int order_pos)
{
return FMOD_OK == Channel->setPosition(order_pos, FMOD_TIMEUNIT_MODORDER);
}
FString GetStats()