From b6a0662c98e333f56d7d52841f401585838c39cb Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 29 May 2013 11:47:02 -0700 Subject: [PATCH] inline the shouldEchoAudio --- interface/src/Application.cpp | 4 ---- interface/src/Application.h | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e8419fd79b..f307efa470 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -217,10 +217,6 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : // initialization continues in initializeGL when OpenGL context is ready } -bool Application::shouldEchoAudio() { - return _echoAudioMode->isChecked(); -} - void Application::initializeGL() { printLog( "Created Display Window.\n" ); diff --git a/interface/src/Application.h b/interface/src/Application.h index 050f29895a..f611a803b9 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -13,6 +13,7 @@ #include #include +#include #include @@ -61,11 +62,10 @@ public: void wheelEvent(QWheelEvent* event); - bool shouldEchoAudio(); - Avatar* getAvatar() { return &_myAvatar; } VoxelSystem* getVoxels() { return &_voxels; } Environment* getEnvironment() { return &_environment; } + bool shouldEchoAudio() { return _echoAudioMode->isChecked(); } private slots: