diff --git a/Classes/MixerHostAppDelegate.m b/Classes/MixerHostAppDelegate.m index 5eb7247..721ac5d 100755 --- a/Classes/MixerHostAppDelegate.m +++ b/Classes/MixerHostAppDelegate.m @@ -61,9 +61,17 @@ - (BOOL) application: (UIApplication *) application didFinishLaunchingWithOption // in the MixerHost-Info.plist file. // [window addSubview: viewController.view]; + + // this workaround is necessary on 5th generation ipod - since we are using ancient xib screen + [window setFrame:[[UIScreen mainScreen]bounds]]; + [self.window setRootViewController:viewController]; + + [window makeKeyAndVisible]; + + return YES; } diff --git a/Classes/MixerHostViewController.m b/Classes/MixerHostViewController.m index e904ec4..3ca1f60 100755 --- a/Classes/MixerHostViewController.m +++ b/Classes/MixerHostViewController.m @@ -370,6 +370,8 @@ - (void) viewDidLoad { [self registerForAudioObjectNotifications]; [self initializeMixerSettingsToUI]; + + } diff --git a/Default-568h@2x.png b/Default-568h@2x.png index 0891b7a..c772ce1 100755 Binary files a/Default-568h@2x.png and b/Default-568h@2x.png differ diff --git a/Resources/en.lproj/MixerHostViewController.xib b/Resources/en.lproj/MixerHostViewController.xib index a462d2e..617abec 100644 --- a/Resources/en.lproj/MixerHostViewController.xib +++ b/Resources/en.lproj/MixerHostViewController.xib @@ -53,7 +53,6 @@ 266 {{0, 436}, {320, 44}} - NO NO IBCocoaTouchFramework @@ -83,7 +82,6 @@ 292 {{91, 228}, {111, 23}} - NO YES @@ -99,7 +97,6 @@ 292 {{7, 405}, {225, 23}} - NO YES @@ -114,7 +111,6 @@ 292 {{-11, 218}, {94, 27}} - NO YES @@ -129,7 +125,6 @@ 292 {{96, 212}, {49, 21}} - NO YES @@ -163,7 +158,6 @@ 292 {{12, 388}, {107, 21}} - NO YES @@ -186,7 +180,6 @@ 292 {{206, 228}, {112, 23}} - NO YES @@ -203,7 +196,6 @@ 292 {{208, 212}, {50, 21}} - NO YES @@ -226,7 +218,6 @@ 292 {{92, 60}, {140, 23}} - NO YES @@ -243,7 +234,6 @@ 292 {{-11, 50}, {94, 27}} - NO YES @@ -259,7 +249,6 @@ 292 {{94, 44}, {65, 21}} - NO YES @@ -283,7 +272,6 @@ 292 {{91, 272}, {141, 23}} - NO YES @@ -300,7 +288,6 @@ 292 {{-11, 262}, {94, 27}} - NO YES @@ -316,7 +303,6 @@ 292 {{94, 254}, {47, 21}} - NO YES @@ -339,7 +325,6 @@ 292 {{92, 316}, {140, 23}} - NO YES @@ -356,7 +341,6 @@ 292 {{-11, 306}, {94, 27}} - NO YES @@ -372,7 +356,6 @@ 292 {{94, 301}, {92, 21}} - NO YES @@ -395,7 +378,6 @@ 292 {{208, 301}, {40, 21}} - NO YES @@ -418,7 +400,6 @@ 292 {{208, 254}, {40, 21}} - NO YES @@ -441,7 +422,6 @@ 292 {{105, 81}, {74, 25}} - NO YES @@ -465,7 +445,6 @@ 292 {{9, 81}, {71, 25}} - NO YES @@ -489,7 +468,6 @@ 292 {{93, 156}, {92, 21}} - NO YES @@ -513,7 +491,6 @@ 292 {{91, 355}, {141, 23}} - NO YES @@ -530,7 +507,6 @@ 292 {{-11, 350}, {94, 27}} - NO YES @@ -546,7 +522,6 @@ 292 {{93, 341}, {92, 21}} - NO YES @@ -569,7 +544,6 @@ 292 {{92, 172}, {226, 23}} - NO IBCocoaTouchFramework @@ -582,7 +556,6 @@ 292 {{-11, 167}, {94, 27}} - NO IBCocoaTouchFramework @@ -595,7 +568,6 @@ 292 {{182, 83}, {81, 21}} - NO YES @@ -625,7 +597,6 @@ 292 {{79, 83}, {16, 21}} - NO YES @@ -645,7 +616,6 @@ 292 {{223, 395}, {94, 27}} - _NS:606 NO @@ -659,7 +629,6 @@ 292 {{223, 350}, {94, 27}} - _NS:606 NO @@ -673,7 +642,6 @@ 292 {{3, 110}, {313, 44}} - _NS:273 NO @@ -732,7 +700,6 @@ 292 {{208, 341}, {42, 21}} - _NS:328 NO @@ -753,7 +720,6 @@ 292 {{208, 388}, {42, 21}} - _NS:328 NO @@ -774,7 +740,6 @@ 292 {{238, 303}, {78, 32}} - _NS:225 NO @@ -806,7 +771,6 @@ 292 {{237, 259}, {79, 32}} - _NS:225 NO @@ -828,7 +792,6 @@ 292 {{238, 53}, {78, 9}} - _NS:677 NO @@ -840,7 +803,6 @@ 292 {{238, 68}, {78, 9}} - _NS:677 NO @@ -852,7 +814,6 @@ 290 {{-1, 0}, {320, 44}} - _NS:260 IBCocoaTouchFramework @@ -869,9 +830,8 @@ 292 - {{1, 209}, {320, 176}} + {{1, 202}, {320, 183}} - _NS:328 @@ -899,7 +859,6 @@ {320, 480} - NO @@ -1377,11 +1336,6 @@ - - 158 - - - 155 @@ -1607,6 +1561,11 @@ + + 158 + + + @@ -1738,321 +1697,7 @@ 162 - - - YES - - MixerHostViewController - UIViewController - - YES - - YES - enableMicFx: - enableMixerBus5Fx: - enableMixerFx: - enableMixerInput: - micFxFaderChanged: - micFxSelectorChanged: - mixerInputGainChanged: - mixerOutputGainChanged: - playOrStop: - samplerPlayButtonPressed: - samplerPlayButtonReleased: - synthPlayButtonPressed: - synthPlayButtonReleased: - - - YES - UISwitch - UISwitch - UISwitch - UISwitch - UISlider - UISegmentedControl - UISlider - UISlider - id - UIButton - UIButton - UIButton - UIButton - - - - YES - - YES - enableMicFx: - enableMixerBus5Fx: - enableMixerFx: - enableMixerInput: - micFxFaderChanged: - micFxSelectorChanged: - mixerInputGainChanged: - mixerOutputGainChanged: - playOrStop: - samplerPlayButtonPressed: - samplerPlayButtonReleased: - synthPlayButtonPressed: - synthPlayButtonReleased: - - - YES - - enableMicFx: - UISwitch - - - enableMixerBus5Fx: - UISwitch - - - enableMixerFx: - UISwitch - - - enableMixerInput: - UISwitch - - - micFxFaderChanged: - UISlider - - - micFxSelectorChanged: - UISegmentedControl - - - mixerInputGainChanged: - UISlider - - - mixerOutputGainChanged: - UISlider - - - playOrStop: - id - - - samplerPlayButtonPressed: - UIButton - - - samplerPlayButtonReleased: - UIButton - - - synthPlayButtonPressed: - UIButton - - - synthPlayButtonReleased: - UIButton - - - - - YES - - YES - inputLevelDisplayLeft - inputLevelDisplayRight - micFreqDisplay - micFxFader - micFxSelector - micFxSwitch - micLevelDisplay - mixerBus0LevelFader - mixerBus0Switch - mixerBus1LevelFader - mixerBus2LevelFader - mixerBus2Switch - mixerBus3LevelFader - mixerBus3Switch - mixerBus4LevelFader - mixerBus4Switch - mixerBus5FxSwitch - mixerBus5LevelFader - mixerBus5Switch - mixerFxSwitch - mixerOutputLevelFader - numberOfInputChannelsDisplay - playButton - samplerPlayButton - synthPlayButton - - - YES - UIProgressView - UIProgressView - UILabel - UISlider - UISegmentedControl - UISwitch - UILabel - UISlider - UISwitch - UISlider - UISlider - UISwitch - UISlider - UISwitch - UISlider - UISwitch - UISwitch - UISlider - UISwitch - UISwitch - UISlider - UILabel - UIBarButtonItem - UIButton - UIButton - - - - YES - - YES - inputLevelDisplayLeft - inputLevelDisplayRight - micFreqDisplay - micFxFader - micFxSelector - micFxSwitch - micLevelDisplay - mixerBus0LevelFader - mixerBus0Switch - mixerBus1LevelFader - mixerBus2LevelFader - mixerBus2Switch - mixerBus3LevelFader - mixerBus3Switch - mixerBus4LevelFader - mixerBus4Switch - mixerBus5FxSwitch - mixerBus5LevelFader - mixerBus5Switch - mixerFxSwitch - mixerOutputLevelFader - numberOfInputChannelsDisplay - playButton - samplerPlayButton - synthPlayButton - - - YES - - inputLevelDisplayLeft - UIProgressView - - - inputLevelDisplayRight - UIProgressView - - - micFreqDisplay - UILabel - - - micFxFader - UISlider - - - micFxSelector - UISegmentedControl - - - micFxSwitch - UISwitch - - - micLevelDisplay - UILabel - - - mixerBus0LevelFader - UISlider - - - mixerBus0Switch - UISwitch - - - mixerBus1LevelFader - UISlider - - - mixerBus2LevelFader - UISlider - - - mixerBus2Switch - UISwitch - - - mixerBus3LevelFader - UISlider - - - mixerBus3Switch - UISwitch - - - mixerBus4LevelFader - UISlider - - - mixerBus4Switch - UISwitch - - - mixerBus5FxSwitch - UISwitch - - - mixerBus5LevelFader - UISlider - - - mixerBus5Switch - UISwitch - - - mixerFxSwitch - UISwitch - - - mixerOutputLevelFader - UISlider - - - numberOfInputChannelsDisplay - UILabel - - - playButton - UIBarButtonItem - - - samplerPlayButton - UIButton - - - synthPlayButton - UIButton - - - - - IBProjectSource - ./Classes/MixerHostViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/audioGraph-Info.plist b/audioGraph-Info.plist index 00d44e7..ff4da26 100755 --- a/audioGraph-Info.plist +++ b/audioGraph-Info.plist @@ -16,7 +16,24 @@ Icon-Small.png Icon-Small-50.png Icon-Small@2x.png + diode144x144.png + CFBundleIcons + + CFBundlePrimaryIcon + + CFBundleIconFiles + + Icon.png + Icon@2x.png + Icon-72.png + Icon-Small.png + Icon-Small-50.png + Icon-Small@2x.png + diode144x144.png + + + CFBundleIdentifier net.megalink.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion diff --git a/audioGraph.xcodeproj/project.pbxproj b/audioGraph.xcodeproj/project.pbxproj index a2f61f9..beb4343 100755 --- a/audioGraph.xcodeproj/project.pbxproj +++ b/audioGraph.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 128D14A5148B773600A14BF4 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 128D14A3148B773600A14BF4 /* Default@2x.png */; }; 12A466BB148A6F6D0051ADA3 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 12A466B9148A6F6D0051ADA3 /* MainWindow-iPad.xib */; }; 12B1F29D146A1F1A009C0367 /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 12B1F29C146A1F1A009C0367 /* TPCircularBuffer.c */; }; + 12D3F78516E4370C0040612F /* diode144x144.png in Resources */ = {isa = PBXBuildFile; fileRef = 12D3F78416E4370C0040612F /* diode144x144.png */; }; 12DEF623148538300047696C /* congaloop.caf in Resources */ = {isa = PBXBuildFile; fileRef = 12DEF622148538300047696C /* congaloop.caf */; }; 12DEF625148539930047696C /* caitlin.caf in Resources */ = {isa = PBXBuildFile; fileRef = 12DEF624148539930047696C /* caitlin.caf */; }; 12DEF62D148602D50047696C /* lead.aupreset in Resources */ = {isa = PBXBuildFile; fileRef = 12DEF62C148602D50047696C /* lead.aupreset */; }; @@ -68,6 +69,7 @@ 128D14A3148B773600A14BF4 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; 12A466BA148A6F6D0051ADA3 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = "Resources/iPad/en.lproj/MainWindow-iPad.xib"; sourceTree = ""; }; 12B1F29C146A1F1A009C0367 /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = ""; }; + 12D3F78416E4370C0040612F /* diode144x144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = diode144x144.png; sourceTree = ""; }; 12DEF622148538300047696C /* congaloop.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = congaloop.caf; sourceTree = ""; }; 12DEF624148539930047696C /* caitlin.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = caitlin.caf; sourceTree = ""; }; 12DEF62C148602D50047696C /* lead.aupreset */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = lead.aupreset; sourceTree = ""; }; @@ -178,6 +180,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 12D3F78416E4370C0040612F /* diode144x144.png */, 12E21C7516E3CF7800BAAB3F /* Default-568h@2x.png */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -303,6 +306,7 @@ 12E21C7616E3CF7800BAAB3F /* Default-568h@2x.png in Resources */, 125F63CC16E3FF69004D1BFF /* MixerHostViewController.xib in Resources */, 125F63CF16E3FF7A004D1BFF /* MixerHostViewController~ipad.xib in Resources */, + 12D3F78516E4370C0040612F /* diode144x144.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/audioGraph.xcodeproj/project.xcworkspace/xcuserdata/tkzic.xcuserdatad/UserInterfaceState.xcuserstate b/audioGraph.xcodeproj/project.xcworkspace/xcuserdata/tkzic.xcuserdatad/UserInterfaceState.xcuserstate index b756169..06e85ce 100755 Binary files a/audioGraph.xcodeproj/project.xcworkspace/xcuserdata/tkzic.xcuserdatad/UserInterfaceState.xcuserstate and b/audioGraph.xcodeproj/project.xcworkspace/xcuserdata/tkzic.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/diode144x144.png b/diode144x144.png new file mode 100755 index 0000000..51371a0 Binary files /dev/null and b/diode144x144.png differ