diff options
| author | Maki <maki@hotmilk.space> | 2024-04-21 20:25:31 -0400 |
|---|---|---|
| committer | Maki <maki@hotmilk.space> | 2024-04-21 20:25:31 -0400 |
| commit | cbd64336eac12f03013fd91c8068810b5239af82 (patch) | |
| tree | 5ac1195f7a1c08b36b318920b1919bb927cd68ec | |
| parent | d09ec5e87bfd892306ccdba56944583bd9213aaf (diff) | |
Remove virtual inheritence for linux volume catcher
| -rw-r--r-- | indra/media_plugins/cef/linux/volume_catcher_linux.h | 4 | ||||
| -rw-r--r-- | indra/media_plugins/cef/volume_catcher.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/cef/linux/volume_catcher_linux.h b/indra/media_plugins/cef/linux/volume_catcher_linux.h index 0f11c537b1..b7b4350ba8 100644 --- a/indra/media_plugins/cef/linux/volume_catcher_linux.h +++ b/indra/media_plugins/cef/linux/volume_catcher_linux.h @@ -49,7 +49,7 @@ extern "C" { #include "media_plugin_base.h" -class VolumeCatcherPulseAudio : public virtual VolumeCatcherImpl +class VolumeCatcherPulseAudio : public VolumeCatcherImpl { public: VolumeCatcherPulseAudio(); @@ -78,7 +78,7 @@ public: bool mGotSyms; }; -class VolumeCatcherPipeWire : public virtual VolumeCatcherImpl +class VolumeCatcherPipeWire : public VolumeCatcherImpl { public: VolumeCatcherPipeWire(); diff --git a/indra/media_plugins/cef/volume_catcher.h b/indra/media_plugins/cef/volume_catcher.h index e11ecf5881..3e53a7e961 100644 --- a/indra/media_plugins/cef/volume_catcher.h +++ b/indra/media_plugins/cef/volume_catcher.h @@ -43,7 +43,7 @@ public: virtual void pump() = 0; // call this at least a few times a second if you can - it affects how quickly we can 'catch' a new audio source and adjust its volume }; -class VolumeCatcher : public virtual VolumeCatcherImpl +class VolumeCatcher : public VolumeCatcherImpl { public: VolumeCatcher(); |