From 95eb241fdd47f6f20298e6cecc6557d591644e68 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 Mar 2013 11:07:46 -0700
Subject: [PATCH] remove OS X specific menu, have voxel server point to correct
 DS

---
 interface/src/InterfaceMacOSX.h  |  8 ----
 interface/src/InterfaceMacOSX.mm | 68 --------------------------------
 interface/src/main.cpp           | 10 -----
 voxel/src/main.cpp               |  2 +-
 4 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 interface/src/InterfaceMacOSX.h
 delete mode 100644 interface/src/InterfaceMacOSX.mm

diff --git a/interface/src/InterfaceMacOSX.h b/interface/src/InterfaceMacOSX.h
deleted file mode 100644
index 2b36ff811f..0000000000
--- a/interface/src/InterfaceMacOSX.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __interface__InterfaceMacOSX
-#define __interface__InterfaceMacOSX
-
-class Oscilloscope;
-
-void initMacOSXMenu(Oscilloscope *audioScope);
-
-#endif
diff --git a/interface/src/InterfaceMacOSX.mm b/interface/src/InterfaceMacOSX.mm
deleted file mode 100644
index 466212207b..0000000000
--- a/interface/src/InterfaceMacOSX.mm
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "Oscilloscope.h"
-
-#import <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
-
-#import "InterfaceMacOSX.h"
-
-@class InterfaceMainMenuTarget;
-
-static InterfaceMainMenuTarget *sharedInterfaceMainMenuTarget = nil;
-static Oscilloscope *sharedAudioScope;
-
-
-@interface InterfaceMainMenuTarget : NSObject
-
-@property (strong, nonatomic) NSMenuItem *scopeAudioMenuItem;
-@property (strong, nonatomic) NSMenuItem *scopeNoneMenuItem;
-
-@end
-
-
-@implementation InterfaceMainMenuTarget
-
-- (void)scopeAudioAction {
-    sharedAudioScope->setState(true);
-    [self.scopeAudioMenuItem setState:NSOnState];
-    [self.scopeNoneMenuItem setState:NSOffState];
-}
-
-- (void)scopeNoneAction {
-    sharedAudioScope->setState(false);
-    [self.scopeAudioMenuItem setState:NSOffState];
-    [self.scopeNoneMenuItem setState:NSOnState];
-}
-
-@end
-
-
-void initMacOSXMenu(Oscilloscope *audioScope) {
-    @autoreleasepool {
-        if (NSApp) {
-            if (!sharedInterfaceMainMenuTarget) {
-                sharedInterfaceMainMenuTarget = [[InterfaceMainMenuTarget alloc] init];
-            }
-            sharedAudioScope = audioScope;
-            
-            NSMenu *mainMenu = [NSApp mainMenu];
-            
-            NSMenuItem *scopeMenuItem = [mainMenu insertItemWithTitle:@"Scope"
-                                                               action:nil
-                                                         keyEquivalent:@""
-                                                              atIndex:3];
-            
-            NSMenu *scopeMenu = [[[NSMenu alloc] init] initWithTitle:@"Scope"];
-            [scopeMenuItem setSubmenu:scopeMenu];
-            sharedInterfaceMainMenuTarget.scopeAudioMenuItem = [scopeMenu addItemWithTitle:@"Audio"
-                                                                                    action:@selector(scopeAudioAction)
-                                                                             keyEquivalent:@""];
-            [sharedInterfaceMainMenuTarget.scopeAudioMenuItem setTarget:sharedInterfaceMainMenuTarget];
-            [sharedInterfaceMainMenuTarget.scopeAudioMenuItem setState:NSOnState];
-            
-            sharedInterfaceMainMenuTarget.scopeNoneMenuItem = [scopeMenu addItemWithTitle:@"None"
-                                                                                   action:@selector(scopeNoneAction)
-                                                                            keyEquivalent:@""];
-            [sharedInterfaceMainMenuTarget.scopeNoneMenuItem setTarget:sharedInterfaceMainMenuTarget];
-        }
-    }
-}
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index f1e69839a0..99b356563d 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -44,11 +44,6 @@
 #include "Oscilloscope.h"
 #include "UDPSocket.h"
 
-#ifdef __APPLE__
-
-#include "InterfaceMacOSX.h"
-
-#endif
 
 using namespace std;
 
@@ -952,11 +947,6 @@ int main(int argc, char** argv)
     printf( "Init() complete.\n" );
     
     glutTimerFunc(1000, Timer, 0);
-
-#ifdef __APPLE__
-    initMacOSXMenu(&audioScope);
-#endif
-
     glutMainLoop();
 
     ::terminate();
diff --git a/voxel/src/main.cpp b/voxel/src/main.cpp
index 697accf675..35d03c9950 100644
--- a/voxel/src/main.cpp
+++ b/voxel/src/main.cpp
@@ -34,7 +34,7 @@ const float DEATH_STAR_RADIUS = 4.0;
 const float MAX_CUBE = 0.05;
 
 char DOMAIN_HOSTNAME[] = "highfidelity.below92.com";
-char DOMAIN_IP[100] = "192.168.1.47";    //  IP Address will be re-set by lookup on startup
+char DOMAIN_IP[100] = "";    //  IP Address will be re-set by lookup on startup
 const int DOMAINSERVER_PORT = 40102;
 
 AgentList agentList(VOXEL_LISTEN_PORT);