From 94740eed6070117ecd07721640ac54f9557f19cc Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 4 Sep 2013 10:11:26 -0700 Subject: [PATCH] remove the audio-mixer target --- CMakeLists.txt | 1 - audio-mixer/.gitignore | 4 ---- audio-mixer/CMakeLists.txt | 15 --------------- audio-mixer/src/main.cpp | 34 ---------------------------------- 4 files changed, 54 deletions(-) delete mode 100644 audio-mixer/.gitignore delete mode 100644 audio-mixer/CMakeLists.txt delete mode 100644 audio-mixer/src/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 921f74886e..11879038e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ add_subdirectory(animation-server) add_subdirectory(assignment-client) add_subdirectory(assignment-server) add_subdirectory(avatar-mixer) -add_subdirectory(audio-mixer) add_subdirectory(domain-server) add_subdirectory(eve) add_subdirectory(interface) diff --git a/audio-mixer/.gitignore b/audio-mixer/.gitignore deleted file mode 100644 index f69e105ae9..0000000000 --- a/audio-mixer/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -socket -sftp-config.json -.DS_Store -*.raw \ No newline at end of file diff --git a/audio-mixer/CMakeLists.txt b/audio-mixer/CMakeLists.txt deleted file mode 100644 index cd6d2850c5..0000000000 --- a/audio-mixer/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 2.8) - -set(ROOT_DIR ..) -set(MACRO_DIR ${ROOT_DIR}/cmake/macros) - -set(TARGET_NAME audio-mixer) - -include(${MACRO_DIR}/SetupHifiProject.cmake) -setup_hifi_project(${TARGET_NAME} TRUE) - -# link the shared hifi library -include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) - diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp deleted file mode 100644 index fa5a0e5086..0000000000 --- a/audio-mixer/src/main.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// -// main.cpp -// mixer -// -// Created by Stephen Birarda on 2/1/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// - -#include - -bool wantLocalDomain = false; - -int main(int argc, const char* argv[]) { - setvbuf(stdout, NULL, _IOLBF, 0); - - NodeList* nodeList = NodeList::createInstance(NODE_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT); - - // Handle Local Domain testing with the --local command line - const char* local = "--local"; - ::wantLocalDomain = cmdOptionExists(argc, argv,local); - if (::wantLocalDomain) { - printf("Local Domain MODE!\n"); - nodeList->setDomainIPToLocalhost(); - } - - const char* domainIP = getCmdOption(argc, argv, "--domain"); - if (domainIP) { - NodeList::getInstance()->setDomainHostname(domainIP); - } - - nodeList->startSilentNodeRemovalThread(); - - return 0; -}