diff --git a/src/projectM-iTunes/macos/contrib/libGLEW.a b/src/projectM-iTunes/macos/contrib/libGLEW.a index f33e405a3..9f1606ca0 100644 Binary files a/src/projectM-iTunes/macos/contrib/libGLEW.a and b/src/projectM-iTunes/macos/contrib/libGLEW.a differ diff --git a/src/projectM-iTunes/macos/contrib/libfreetype.a b/src/projectM-iTunes/macos/contrib/libfreetype.a index d9f8340c8..c53398452 100644 Binary files a/src/projectM-iTunes/macos/contrib/libfreetype.a and b/src/projectM-iTunes/macos/contrib/libfreetype.a differ diff --git a/src/projectM-iTunes/macos/contrib/libftgl.a b/src/projectM-iTunes/macos/contrib/libftgl.a index b6136f06b..7012101d1 100644 Binary files a/src/projectM-iTunes/macos/contrib/libftgl.a and b/src/projectM-iTunes/macos/contrib/libftgl.a differ diff --git a/src/projectM-iTunes/projectM Visualizer/AppDelegate.m b/src/projectM-iTunes/projectM Visualizer/AppDelegate.m index 15b0fc721..2af86a7c4 100644 --- a/src/projectM-iTunes/projectM Visualizer/AppDelegate.m +++ b/src/projectM-iTunes/projectM Visualizer/AppDelegate.m @@ -12,8 +12,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { //[self installPlugin:nil]; - _prefs = [[Preferences alloc] initWithWindowNibName:@"Preferences" owner:self]; - [_prefs showWindow:self]; +// _prefs = [[Preferences alloc] initWithWindowNibName:@"Preferences" owner:self]; +// [_prefs showWindow:self]; } - (IBAction)installPlugin:(id)sender { diff --git a/src/projectM-iTunes/projectM Visualizer/AudioInputDeviceList.m b/src/projectM-iTunes/projectM Visualizer/AudioInputDeviceList.m index b010b22bc..81df5e933 100644 --- a/src/projectM-iTunes/projectM Visualizer/AudioInputDeviceList.m +++ b/src/projectM-iTunes/projectM Visualizer/AudioInputDeviceList.m @@ -35,9 +35,9 @@ return [_devices count]; } -- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index { - AVCaptureDeviceInputSource *src = [_devices objectAtIndex:index]; - return [NSString stringWithFormat:@"%@" [src localizedName]]; -} +//- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index { +// AVCaptureDeviceInputSource *src = [_devices objectAtIndex:index]; +// return [NSString stringWithFormat:@"%@" [src localizedName]]; +//} @end diff --git a/src/projectM-iTunes/projectM Visualizer/Base.lproj/MainMenu.xib b/src/projectM-iTunes/projectM Visualizer/Base.lproj/MainMenu.xib index 2b521c80a..fd34bfbf4 100644 --- a/src/projectM-iTunes/projectM Visualizer/Base.lproj/MainMenu.xib +++ b/src/projectM-iTunes/projectM Visualizer/Base.lproj/MainMenu.xib @@ -1,7 +1,8 @@ - + - + + @@ -670,19 +671,17 @@ - + - - @@ -691,7 +690,6 @@ - @@ -700,7 +698,6 @@ - diff --git a/src/projectM-iTunes/projectM Visualizer/Preferences.xib b/src/projectM-iTunes/projectM Visualizer/Preferences.xib index 2844d2b7d..d0f668f06 100644 --- a/src/projectM-iTunes/projectM Visualizer/Preferences.xib +++ b/src/projectM-iTunes/projectM Visualizer/Preferences.xib @@ -1,8 +1,8 @@ - + - + @@ -12,7 +12,7 @@ - +