diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 14:08:15 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-22 14:08:15 +0000 |
| commit | df43c0e18b852fb1490cf9199b7766239cd2801c (patch) | |
| tree | 5f3f1b0182149d9ba09bc6bd8c05f256b5c5ca32 /indra/media_plugins/webkit/linux_volume_catcher.cpp | |
| parent | 551771fd90e2caf58856b746d4dfc108679cc05f (diff) | |
Wire the linux volume catcher into the webkit plugin.
Diffstat (limited to 'indra/media_plugins/webkit/linux_volume_catcher.cpp')
| -rw-r--r-- | indra/media_plugins/webkit/linux_volume_catcher.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/media_plugins/webkit/linux_volume_catcher.cpp b/indra/media_plugins/webkit/linux_volume_catcher.cpp index 1439f1c5a5..89cababdd8 100644 --- a/indra/media_plugins/webkit/linux_volume_catcher.cpp +++ b/indra/media_plugins/webkit/linux_volume_catcher.cpp @@ -58,7 +58,7 @@ public: LinuxVolumeCatcherImpl(); ~LinuxVolumeCatcherImpl(); - void setVol(F32 volume); + void setVolume(F32 volume); void pump(void); // for internal use - can't be private because used from our C callbacks @@ -144,7 +144,7 @@ void LinuxVolumeCatcherImpl::cleanup() mConnected = false; } -void LinuxVolumeCatcherImpl::setVol(F32 volume) +void LinuxVolumeCatcherImpl::setVolume(F32 volume) { mDesiredVolume = volume; @@ -311,10 +311,10 @@ LinuxVolumeCatcher::~LinuxVolumeCatcher() pimpl = NULL; } -void LinuxVolumeCatcher::setVol(F32 volume) +void LinuxVolumeCatcher::setVolume(F32 volume) { llassert(pimpl); - pimpl->setVol(volume); + pimpl->setVolume(volume); } void LinuxVolumeCatcher::pump() |