Visual tweaks.

mattb · Jul 12, 2009 · d94cd77 · d94cd77
1 parent 6b5eeb0
commit d94cd77
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Classes/AnalyzingViewController.m b/Classes/AnalyzingViewController.m
@@ -90,7 +90,7 @@ -(void)ENTrackUploadValidationFinished:(NSNotification*)not {
 
 -(void)ENTrackTempoLoaded:(NSNotification*)not {
 	if ([[[not userInfo] valueForKey:@"success"] boolValue]) {
-		status.text = [NSString stringWithFormat:@"Tempo analysed: %f BPM",[[not object] tempo]];
+		status.text = [NSString stringWithFormat:@"Tempo: %f BPM. Downloading segments...",[[not object] tempo]];
 	} else {
         status.text = @"Tempo analysis failed.";
     }

diff --git a/Classes/CocosView.h b/Classes/CocosView.h
@@ -16,13 +16,13 @@
 
 @interface CocosView : CocosNode <SegmentAwareNode> {
 	//TODO - add more visualizations
-	FireBall *fireBall;
+	FireBall *fireBall, *fireBall2;
 	BasicEQ *eq1, *eq2, *eq3, *eq4;
 	Spike *spike;
     Walker *walker;
 }
 
-@property(retain, nonatomic) FireBall *fireBall;
+@property(retain, nonatomic) FireBall *fireBall, *fireBall2;
 @property(retain, nonatomic) Spike *spike;
 @property(retain, nonatomic) BasicEQ *eq1, *eq2, *eq3, *eq4;
 @property(retain, nonatomic) Walker *walker;

diff --git a/Classes/CocosView.m b/Classes/CocosView.m
@@ -14,7 +14,7 @@ -(void) addVisualItems;
 @end
 
 @implementation CocosView
-@synthesize fireBall,spike, eq1, eq2, eq3, eq4, walker;
+@synthesize fireBall, fireBall2, spike, eq1, eq2, eq3, eq4, walker;
 
 - (void) dealloc {
 	[fireBall release];
@@ -32,8 +32,13 @@ - (id) init {
 //Todo, could change the track contents on the analysis here..
 -(void) addVisualItems{
 	self.fireBall = [[FireBall alloc]init];
-	self.fireBall.position = ccp(100,100);
+	self.fireBall.emitter.position = ccp(70,350);
 	[self addChild: self.fireBall];
+
+    self.fireBall2 = [[FireBall alloc]init];
+	self.fireBall2.emitter.position = ccp(270,350);
+	[self addChild: self.fireBall2];
+
 	//self.spike = [[Spike alloc]init];
 	//self.spike.position = ccp(0,0);
 	//[self addChild: self.spike];

diff --git a/Classes/RootViewController.m b/Classes/RootViewController.m
@@ -51,7 +51,7 @@ - (void)viewDidLoad
 											 selector:@selector(startVisualization:)
 												 name:@"startVisualization" object:nil];
 
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://api.soundcloud.com/users/thesmith/tracks.json"]];
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://api.soundcloud.com/users/forss/tracks.json"]];
     GTMHTTPFetcher* myFetcher = [GTMHTTPFetcher httpFetcherWithRequest:request];
     [myFetcher setCredential:[NSURLCredential credentialWithUser:@"mattb" password:@"biddulph" persistence:NSURLCredentialPersistenceNone]];
     [myFetcher beginFetchWithDelegate:self