Skip to content

Commit

Permalink
Fixed colored noises page, added white and red noise.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacqquot committed Dec 8, 2016
1 parent f91a0a7 commit d20dc5f
Show file tree
Hide file tree
Showing 11 changed files with 280 additions and 90 deletions.
32 changes: 8 additions & 24 deletions Noise Manipulation.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
/* Begin PBXBuildFile section */
320C8E171DF7D6BC00FB9B19 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320C8E161DF7D6BC00FB9B19 /* AVKit.framework */; };
320C8E191DF7D73A00FB9B19 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320C8E181DF7D73A00FB9B19 /* AVFoundation.framework */; };
327591A11DF7E82A00DC9190 /* thunder.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327591A01DF7E82A00DC9190 /* thunder.mp3 */; };
327591A31DF7ED3C00DC9190 /* rain.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327591A21DF7ED3C00DC9190 /* rain.mp3 */; };
327D992C1DF6A15F00236428 /* AcknowledgementsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 327D992B1DF6A15F00236428 /* AcknowledgementsViewController.m */; };
32FBE0001DF49E3A00406E39 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBDFFF1DF49E3A00406E39 /* main.m */; };
32FBE0031DF49E3A00406E39 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0021DF49E3A00406E39 /* AppDelegate.m */; };
Expand All @@ -24,10 +22,8 @@
32FBE0391DF4B83600406E39 /* ColoredNoiseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0381DF4B83600406E39 /* ColoredNoiseViewController.m */; };
32FBE03C1DF4B85A00406E39 /* BinauralBeatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE03B1DF4B85A00406E39 /* BinauralBeatViewController.m */; };
32FBE03F1DF4B87500406E39 /* NoiseCancellationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE03E1DF4B87500406E39 /* NoiseCancellationViewController.m */; };
32FD5AB01DF8971200263EC6 /* space.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 32FD5AAF1DF8971100263EC6 /* space.mp3 */; };
32FD5AB21DF8971F00263EC6 /* wind.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 32FD5AB11DF8971F00263EC6 /* wind.mp3 */; };
32FD5AB41DF8972E00263EC6 /* ocean.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 32FD5AB31DF8972E00263EC6 /* ocean.mp3 */; };
32FD5AB61DF8A46800263EC6 /* pink.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 32FD5AB51DF8A46800263EC6 /* pink.mp3 */; };
8477C4C31DF9028500704445 /* red.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8477C4C11DF9028500704445 /* red.mp3 */; };
8477C4C41DF9028500704445 /* white.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8477C4C21DF9028500704445 /* white.mp3 */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -50,8 +46,6 @@
/* Begin PBXFileReference section */
320C8E161DF7D6BC00FB9B19 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; };
320C8E181DF7D73A00FB9B19 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
327591A01DF7E82A00DC9190 /* thunder.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = thunder.mp3; path = "../../cs50 project files/thunder.mp3"; sourceTree = "<group>"; };
327591A21DF7ED3C00DC9190 /* rain.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = rain.mp3; path = "../../cs50 project files/rain.mp3"; sourceTree = "<group>"; };
327D992A1DF6A15F00236428 /* AcknowledgementsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AcknowledgementsViewController.h; sourceTree = "<group>"; };
327D992B1DF6A15F00236428 /* AcknowledgementsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AcknowledgementsViewController.m; sourceTree = "<group>"; };
32FBDFFB1DF49E3A00406E39 /* Noise Manipulation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Noise Manipulation.app"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -78,10 +72,8 @@
32FBE03B1DF4B85A00406E39 /* BinauralBeatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BinauralBeatViewController.m; sourceTree = "<group>"; };
32FBE03D1DF4B87500406E39 /* NoiseCancellationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoiseCancellationViewController.h; sourceTree = "<group>"; };
32FBE03E1DF4B87500406E39 /* NoiseCancellationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoiseCancellationViewController.m; sourceTree = "<group>"; };
32FD5AAF1DF8971100263EC6 /* space.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = space.mp3; path = "../../cs50 project files/space.mp3"; sourceTree = "<group>"; };
32FD5AB11DF8971F00263EC6 /* wind.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = wind.mp3; path = "../../cs50 project files/wind.mp3"; sourceTree = "<group>"; };
32FD5AB31DF8972E00263EC6 /* ocean.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ocean.mp3; path = "../../cs50 project files/ocean.mp3"; sourceTree = "<group>"; };
32FD5AB51DF8A46800263EC6 /* pink.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = pink.mp3; path = "../../cs50 project files/pink.mp3"; sourceTree = "<group>"; };
8477C4C11DF9028500704445 /* red.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = red.mp3; path = Audio/red.mp3; sourceTree = "<group>"; };
8477C4C21DF9028500704445 /* white.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = white.mp3; path = Audio/white.mp3; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -161,12 +153,8 @@
32FBDFFE1DF49E3A00406E39 /* Supporting Files */ = {
isa = PBXGroup;
children = (
32FD5AB51DF8A46800263EC6 /* pink.mp3 */,
32FD5AB31DF8972E00263EC6 /* ocean.mp3 */,
32FD5AB11DF8971F00263EC6 /* wind.mp3 */,
32FD5AAF1DF8971100263EC6 /* space.mp3 */,
327591A21DF7ED3C00DC9190 /* rain.mp3 */,
327591A01DF7E82A00DC9190 /* thunder.mp3 */,
8477C4C11DF9028500704445 /* red.mp3 */,
8477C4C21DF9028500704445 /* white.mp3 */,
32FBDFFF1DF49E3A00406E39 /* main.m */,
);
name = "Supporting Files";
Expand Down Expand Up @@ -314,14 +302,10 @@
buildActionMask = 2147483647;
files = (
32FBE00E1DF49E3A00406E39 /* LaunchScreen.storyboard in Resources */,
32FD5AB01DF8971200263EC6 /* space.mp3 in Resources */,
32FD5AB61DF8A46800263EC6 /* pink.mp3 in Resources */,
327591A31DF7ED3C00DC9190 /* rain.mp3 in Resources */,
8477C4C41DF9028500704445 /* white.mp3 in Resources */,
32FBE00B1DF49E3A00406E39 /* Assets.xcassets in Resources */,
8477C4C31DF9028500704445 /* red.mp3 in Resources */,
32FBE0091DF49E3A00406E39 /* Main.storyboard in Resources */,
32FD5AB41DF8972E00263EC6 /* ocean.mp3 in Resources */,
32FD5AB21DF8971F00263EC6 /* wind.mp3 in Resources */,
327591A11DF7E82A00DC9190 /* thunder.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Noise Manipulation/ColoredNoiseViewController.m"
timestampString = "502858391.963354"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "50"
endingLineNumber = "50"
landmarkName = "-makeNoisePlayerWithFileName:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
BuildableName = "Noise Manipulation.app"
BlueprintName = "Noise Manipulation"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBE0131DF49E3A00406E39"
BuildableName = "Noise ManipulationTests.xctest"
BlueprintName = "Noise ManipulationTests"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBE01E1DF49E3A00406E39"
BuildableName = "Noise ManipulationUITests.xctest"
BlueprintName = "Noise ManipulationUITests"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
BuildableName = "Noise Manipulation.app"
BlueprintName = "Noise Manipulation"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
BuildableName = "Noise Manipulation.app"
BlueprintName = "Noise Manipulation"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
BuildableName = "Noise Manipulation.app"
BlueprintName = "Noise Manipulation"
ReferencedContainer = "container:Noise Manipulation.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>Noise Manipulation.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>32FBDFFA1DF49E3A00406E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32FBE0131DF49E3A00406E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32FBE01E1DF49E3A00406E39</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Binary file added Noise Manipulation/Audio/red.mp3
Binary file not shown.
Binary file added Noise Manipulation/Audio/white.mp3
Binary file not shown.
11 changes: 6 additions & 5 deletions Noise Manipulation/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
Expand Down Expand Up @@ -105,6 +105,7 @@
<color key="titleColor" white="0.022279094827586207" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="backButton:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="8BM-47-RGo"/>
<segue destination="BYZ-38-t0r" kind="show" id="n9e-ou-aVb"/>
</connections>
</button>
Expand All @@ -120,7 +121,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QCj-hX-r7q">
<rect key="frame" x="127" y="217" width="66" height="30"/>
<rect key="frame" x="122" y="217" width="77" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="34"/>
<state key="normal" title="Pink">
Expand All @@ -131,7 +132,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lx7-Pn-rgG">
<rect key="frame" x="127" y="323" width="66" height="30"/>
<rect key="frame" x="94" y="323" width="131" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="34"/>
<state key="normal" title="Red">
Expand All @@ -142,7 +143,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vf5-dO-Mim">
<rect key="frame" x="122" y="439" width="77" height="30"/>
<rect key="frame" x="94" y="439" width="131" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="34"/>
<state key="normal" title="Grey">
Expand Down
2 changes: 2 additions & 0 deletions Noise Manipulation/ColoredNoiseViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

#import <UIKit/UIKit.h>


@interface ColoredNoiseViewController : UIViewController

@property (weak, nonatomic) IBOutlet UIImageView *coloredNoisesView;

@end
Loading

0 comments on commit d20dc5f

Please sign in to comment.