diff options
| author | Torbjörn Andersson | 2003-10-03 06:54:44 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-03 06:54:44 +0000 |
| commit | 10fee205e1d7d064c74040192022440711f3a4ca (patch) | |
| tree | 8e078413dfa5553f307f3c15de6910028424da46 /sword2/driver/d_sound.cpp | |
| parent | 2c726548969a33c37b4dd79ac9f72ee5b6f80a7c (diff) | |
| download | scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.tar.gz scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.tar.bz2 scummvm-rg350-10fee205e1d7d064c74040192022440711f3a4ca.zip | |
Some renaming (ironic in the light of Fingolfin's recent namespace
suggestion, but I prepared the patch long before reading the mail :-).
Also, the remaining parts of the control panel etc. have been moved into a
class of their own.
This is still work in progress. I'm well aware that some of the classes
aren't as well separated as they ought to be, and that using global
variables to keep track of the different classes probably isn't pretty.
svn-id: r10561
Diffstat (limited to 'sword2/driver/d_sound.cpp')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 6f2dca6851..057c3b2bb9 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -63,7 +63,7 @@ static int32 musicVolTable[17] = { 143, 159, 175, 191, 207, 223, 239, 255 }; -int16 MusicHandle::read() { +int16 Sword2MusicHandle::read() { uint8 in; uint16 delta; int16 out; @@ -115,7 +115,7 @@ int16 MusicHandle::read() { return out; } -bool MusicHandle::eos() const { +bool Sword2MusicHandle::eos() const { if (!_streaming || _filePos >= _fileEnd) return true; return false; |