Scala™

Author: Danilo Campana Fuchs

ForceTouchPlayer.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		311A7A9E252D08660072A16B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 311A7A9D252D08660072A16B /* Assets.xcassets */; };
 		311A7AA1252D08660072A16B /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 311A7AA0252D08660072A16B /* Preview Assets.xcassets */; };
 		311A7AA4252D08660072A16B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 311A7AA2252D08660072A16B /* Main.storyboard */; };
+		317A217C2541277B00A96DF2 /* CMajorScale.swift in Sources */ = {isa = PBXBuildFile; fileRef = 317A217B2541277B00A96DF2 /* CMajorScale.swift */; };
 		31A156D32530030800777E42 /* HappyBirthday.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A156D22530030800777E42 /* HappyBirthday.swift */; };
 		31A156D525300B6B00777E42 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31A156D425300B6B00777E42 /* Extensions.swift */; };
 		31ED484D252FE058002B9BAD /* Song.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31ED484C252FE058002B9BAD /* Song.swift */; };
@@ -31,6 +32,7 @@
 		311A7AA3252D08660072A16B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		311A7AA5252D08660072A16B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		311A7AA6252D08660072A16B /* ForceTouchPlayer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ForceTouchPlayer.entitlements; sourceTree = "<group>"; };
+		317A217B2541277B00A96DF2 /* CMajorScale.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CMajorScale.swift; sourceTree = "<group>"; };
 		31A156D22530030800777E42 /* HappyBirthday.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HappyBirthday.swift; sourceTree = "<group>"; };
 		31A156D425300B6B00777E42 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		31ED484C252FE058002B9BAD /* Song.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Song.swift; sourceTree = "<group>"; };
@@ -102,6 +104,7 @@
 				31A156D22530030800777E42 /* HappyBirthday.swift */,
 				7DDC3567253DC8D000F48DCD /* ImperialMarch.swift */,
 				7D830401253FB48E002466B0 /* HedwigsTheme.swift */,
+				317A217B2541277B00A96DF2 /* CMajorScale.swift */,
 			);
 			path = Songs;
 			sourceTree = "<group>";
@@ -184,6 +187,7 @@
 				7DDC3568253DC8D000F48DCD /* ImperialMarch.swift in Sources */,
 				31A156D525300B6B00777E42 /* Extensions.swift in Sources */,
 				31ED484F252FE0DA002B9BAD /* SongsRepository.swift in Sources */,
+				317A217C2541277B00A96DF2 /* CMajorScale.swift in Sources */,
 				31ED4852252FE128002B9BAD /* TwinkleTwinkleLittleStar.swift in Sources */,
 				31A156D32530030800777E42 /* HappyBirthday.swift in Sources */,
 				311A7A9A252D08620072A16B /* AppDelegate.swift in Sources */,

ForceTouchPlayer/Song.swift

@@ -3,11 +3,13 @@ import Foundation
 struct Song {
     let name: String
 
+    /// Tempo when user first selects the song
     var defaultTempo: Double = 144.0
 
     /// Padding note added between each note in a song
-    var padding: Note? = Note(frequency: 0, value: 1.0/4.0)
+    var padding: Note? = Note(frequency: 0, value: 0.25)
 
+    /// Raw notes in array-of-tuples form
     let rawNotes: [RawNote]
 
     var notes: [Note] {

ForceTouchPlayer/Songs/CMajorScale.swift

@@ -0,0 +1,41 @@
+//
+//  Scale.swift
+//  ForceTouchPlayer
+//
+//  Created by Danilo Campana Fuchs on 21/10/20.
+//  Copyright © 2020 Danilo Campana Fuchs. All rights reserved.
+//
+
+import Foundation
+
+let cMajorScale = Song(
+    name: "C Major Scale",
+    defaultTempo: 144.0,
+    rawNotes: [
+        (NOTE_C1, 1),
+        (NOTE_D1, 1),
+        (NOTE_E1, 1),
+        (NOTE_F1, 1),
+        (NOTE_G1, 1),
+        (NOTE_A1, 1),
+        (NOTE_B1, 1),
+        (NOTE_C2, 1),
+        (NOTE_D2, 1),
+        (NOTE_E2, 1),
+        (NOTE_F2, 1),
+        
+        (NOTE_G2, 1),
+        
+        (NOTE_F2, 1),
+        (NOTE_E2, 1),
+        (NOTE_D2, 1),
+        (NOTE_C2, 1),
+        (NOTE_B1, 1),
+        (NOTE_A1, 1),
+        (NOTE_G1, 1),
+        (NOTE_F1, 1),
+        (NOTE_E1, 1),
+        (NOTE_D1, 1),
+        (NOTE_C1, 1),
+    ]
+)

ForceTouchPlayer/SongsRepository.swift

@@ -6,7 +6,8 @@ struct SongsRepository {
         tetrisThemeA,
         happyBirthday,
         imperialMarch,
-        hedwigsTheme
+        hedwigsTheme,
+        cMajorScale,
     ]
 
     func listSongs() -> [Song] {