X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=mixer.h;h=d8a9c8badf527e0e6dfcf2867156a10ad4677c9c;hp=adfb7cf361f24ea22554c3deab545cbd9de87ad5;hb=80a2892bbe07a4e065704830e9e7244d2b1139fa;hpb=11a83c8d137baee4852ba23b2db77ab4132fee85

diff --git a/mixer.h b/mixer.h
index adfb7cf..d8a9c8b 100644
--- a/mixer.h
+++ b/mixer.h
@@ -288,8 +288,8 @@ public:
 	}
 
 	// Note: You can also get this through the global variable global_audio_mixer.
-	AudioMixer *get_audio_mixer() { return &audio_mixer; }
-	const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
+	AudioMixer *get_audio_mixer() { return audio_mixer.get(); }
+	const AudioMixer *get_audio_mixer() const { return audio_mixer.get(); }
 
 	void schedule_cut()
 	{
@@ -548,7 +548,7 @@ private:
 	JitterHistory output_jitter_history;
 	CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
 	YCbCrInterpretation ycbcr_interpretation[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
-	AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
+	std::unique_ptr<AudioMixer> audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
 	bool input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const;
 	struct OutputFrameInfo {
 		int dropped_frames;  // Since last frame.