Skip to content

Commit 64d09e7

Browse files
committed
Change kNOTES to kNUM_NOTES and removed useless @Property
1 parent 1c9679d commit 64d09e7

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

Diff for: BrowseOverflow/BrowseOverflow.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@
426426
GCC_PREFIX_HEADER = "BrowseOverflow/BrowseOverflow-Prefix.pch";
427427
INFOPLIST_FILE = "BrowseOverflowTests/BrowseOverflowTests-Info.plist";
428428
PRODUCT_NAME = "$(TARGET_NAME)";
429+
TEST_AFTER_BUILD = NO;
429430
TEST_HOST = "$(BUNDLE_LOADER)";
430431
WRAPPER_EXTENSION = octest;
431432
};
@@ -443,6 +444,7 @@
443444
GCC_PREFIX_HEADER = "BrowseOverflow/BrowseOverflow-Prefix.pch";
444445
INFOPLIST_FILE = "BrowseOverflowTests/BrowseOverflowTests-Info.plist";
445446
PRODUCT_NAME = "$(TARGET_NAME)";
447+
TEST_AFTER_BUILD = NO;
446448
TEST_HOST = "$(BUNDLE_LOADER)";
447449
WRAPPER_EXTENSION = octest;
448450
};

Diff for: Cellular-Sounds/Cellular-Sounds/CellularSoundsViewController.m

-4
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ @interface CellularSoundsViewController () <GridViewDelegate, PoolOfLifeDelegate
4343
@property (nonatomic) NSInteger timeForNextUpdate;
4444
@property (nonatomic) NSInteger startTimeForNextBar;
4545
@property (nonatomic) NSInteger lineDeltaTime;
46-
//WTS
47-
@property (nonatomic, strong) AQSound *sound;
4846
//Model
4947
@property (nonatomic, strong) PoolOfLife *pool;
5048
@property (nonatomic) NSInteger numRows;
@@ -237,14 +235,12 @@ - (IBAction)startStop:(UIButton *)sender {
237235
[self.audioManager setVolume:1];
238236
[sender setTitle:@"Pause" forState:UIControlStateNormal];
239237
self.playing = YES;
240-
[self.sound start];
241238
}
242239
else {
243240
self.playing = NO;
244241
[self.midiClock pause];
245242
[self.audioManager setVolume:0];
246243
[sender setTitle:@"Resume" forState:UIControlStateNormal];
247-
[self.sound stop];
248244
}
249245
}
250246

Diff for: Cellular-Sounds/Cellular-Sounds/NoteDefs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define kMIN_PENT_NOTES @[@(0), @(3), @(5), @(7), @(10), @(12)]
1818
#define kMAJ_ARPEGGIOS @[@(0), @(4), @(7), @(2), @(5), @(9), @(4), @(7), @(10), @(5), @(9), @(12), @(7), @(11), @(14), @(9), @(12), @(16), @(11), @(14), @(17)]
1919
#define kSCALES @{@"Major" : kMAJ_NOTES, @"Minor" : kMIN_NOTES, @"Major Pentatonic" : kMAJ_PENT_NOTES, @"Minor Pentatonic" : kMIN_PENT_NOTES, @"Major Arpeggios" : kMAJ_ARPEGGIOS}
20-
#define kNOTES 120
20+
#define kNUM_NOTES 120
2121
#define kNOTE_NAMES @[@"C", @"C#", @"D", @"D#", @"E", @"F", @"F#", @"G", @"G#", @"A", @"A#", @"B"]
2222
//C D E G A C
2323
//#define C_PENT_MAJ_NOTES @[@(36), @(38), @(40), @(43), @(45), @(48)]

Diff for: Cellular-Sounds/Cellular-Sounds/OptionsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ -(NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInt
5858
if(!component)
5959
{
6060
//First picker
61-
rows = kNOTES;
61+
rows = kNUM_NOTES;
6262
}
6363
else if(component == 1)
6464
{

0 commit comments

Comments
 (0)