diff options
author | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
commit | 1bbab8f1915eebdb18365c64ec64eec2a8770bb6 (patch) | |
tree | e7cbeca85155034e77ce1f1bbdbf645982b63182 /engines/sci/sfx/softseq | |
parent | b391f08b46c3f47e8631248fd70ee21ebe12b744 (diff) | |
download | scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.gz scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.bz2 scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.zip |
Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan
svn-id: r43908
Diffstat (limited to 'engines/sci/sfx/softseq')
-rw-r--r-- | engines/sci/sfx/softseq/adlib.cpp | 8 | ||||
-rw-r--r-- | engines/sci/sfx/softseq/adlib.h | 2 | ||||
-rw-r--r-- | engines/sci/sfx/softseq/pcjr.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sfx/softseq/adlib.cpp b/engines/sci/sfx/softseq/adlib.cpp index ba5d364cc5..c838fca00a 100644 --- a/engines/sci/sfx/softseq/adlib.cpp +++ b/engines/sci/sfx/softseq/adlib.cpp @@ -623,11 +623,11 @@ void MidiDriver_Adlib::loadResource(Resource *res) { } } -int MidiPlayer_Adlib::open(ResourceManager *resourceManager) { - assert(resourceManager != NULL); +int MidiPlayer_Adlib::open(ResourceManager *resMan) { + assert(resMan != NULL); // Load up the patch.003 file, parse out the instruments - Resource *res = resourceManager->findResource(ResourceId(kResourceTypePatch, 3), 0); + Resource *res = resMan->findResource(ResourceId(kResourceTypePatch, 3), 0); if (!res) { warning("ADLIB: Failed to load patch.003"); @@ -641,7 +641,7 @@ int MidiPlayer_Adlib::open(ResourceManager *resourceManager) { static_cast<MidiDriver_Adlib *>(_driver)->loadResource(res); - return static_cast<MidiDriver_Adlib *>(_driver)->open(resourceManager->sciVersion() <= SCI_VERSION_0_LATE); + return static_cast<MidiDriver_Adlib *>(_driver)->open(resMan->sciVersion() <= SCI_VERSION_0_LATE); } } // End of namespace Sci diff --git a/engines/sci/sfx/softseq/adlib.h b/engines/sci/sfx/softseq/adlib.h index bf72c2e15a..3432816058 100644 --- a/engines/sci/sfx/softseq/adlib.h +++ b/engines/sci/sfx/softseq/adlib.h @@ -146,7 +146,7 @@ private: class MidiPlayer_Adlib : public MidiPlayer { public: MidiPlayer_Adlib() { _driver = new MidiDriver_Adlib(g_system->getMixer()); } - int open(ResourceManager *resourceManager); + int open(ResourceManager *resMan); int getPlayMask() const { return 0x04; } int getPolyphony() const { return MidiDriver_Adlib::kVoices; } bool hasRhythmChannel() const { return false; } diff --git a/engines/sci/sfx/softseq/pcjr.h b/engines/sci/sfx/softseq/pcjr.h index 9a88812c94..d7d3469db9 100644 --- a/engines/sci/sfx/softseq/pcjr.h +++ b/engines/sci/sfx/softseq/pcjr.h @@ -67,7 +67,7 @@ private: class MidiPlayer_PCJr : public MidiPlayer { public: MidiPlayer_PCJr() { _driver = new MidiDriver_PCJr(g_system->getMixer()); } - int open(ResourceManager *resourceManager) { return static_cast<MidiDriver_PCJr *>(_driver)->open(getPolyphony()); } + int open(ResourceManager *resMan) { return static_cast<MidiDriver_PCJr *>(_driver)->open(getPolyphony()); } int getPlayMask() const { return 0x10; } int getPolyphony() const { return 3; } bool hasRhythmChannel() const { return false; } |