From 8760329323ee1cf8b07fb97ae44a908f1c953420 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 21 Aug 2014 11:08:12 -0700 Subject: [PATCH] Remove deprecated Audio class Player member --- interface/src/Audio.h | 2 -- interface/src/avatar/MyAvatar.cpp | 1 - 2 files changed, 3 deletions(-) diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 59a6d942a6..ffa455908b 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -105,7 +105,6 @@ public: float getAudioOutputAverageMsecsUnplayed() const { return (float)_audioOutputMsecsUnplayedStats.getWindowAverage(); } void setRecorder(RecorderPointer recorder) { _recorder = recorder; } - void setPlayer(PlayerPointer player) { _player = player; } public slots: void start(); @@ -314,7 +313,6 @@ private: AudioOutputIODevice _audioOutputIODevice; WeakRecorderPointer _recorder; - WeakPlayerPointer _player; }; diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 1d271d5f40..ed764d7536 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -652,7 +652,6 @@ void MyAvatar::startPlaying() { _player = PlayerPointer(new Player(this)); } - Application::getInstance()->getAudio()->setPlayer(_player); _player->startPlaying(); }