tweak buttons, fading

5 files changed, 25 insertions, 29 deletions

diff --git a/Video Tuneup/Classes/WebserviceCommunicator.m b/Video Tuneup/Classes/WebserviceCommunicator.m
index c8ca27f..05b35fa 100644
--- a/Video Tuneup/Classes/WebserviceCommunicator.m
+++ b/Video Tuneup/Classes/WebserviceCommunicator.m
@@ -73,13 +73,19 @@
 
 -(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
 	NSLog(@"Song send failed");
+    if(_viewController != nil) {
+        [_viewController.internetRequestButton setTitle:@"Internet Tune-up (failed)" forState:UIControlStateNormal];
+    }
 }
 
 -(void)connectionDidFinishLoading:(NSURLConnection *)connection {
 	NSLog(@"Song send finished loading.");
 
     [fileHandle closeFile];
-
+    if(_viewController != nil) {
+        [_viewController.internetRequestButton setTitle:@"Internet Tune-up (failed)" forState:UIControlStateNormal];
+    }
+    
     // This is happening before file is completely sent back. Need to change timeout.
 
     NSLog(@"Received song path is %@", songPath);
diff --git a/Video Tuneup/SimpleEditor.m b/Video Tuneup/SimpleEditor.m
index c37bcba..4a0ad99 100644
--- a/Video Tuneup/SimpleEditor.m
+++ b/Video Tuneup/SimpleEditor.m
@@ -78,7 +78,7 @@
 - (void)addSongTrackToComposition:(AVMutableComposition *)composition withAudioMix:(AVMutableAudioMix *)audioMix
 {	
 	// Clip song duration to composition duration.
-	CMTimeRange songTimeRange = CMTimeRangeMake(self.songStartTime, self.song.duration);
+	CMTimeRange songTimeRange = CMTimeRangeMake(self.songStartTime, self.video.duration);
 	if (CMTIME_COMPARE_INLINE(CMTimeRangeGetEnd(songTimeRange), >, [composition duration]))
 		songTimeRange.duration = CMTimeSubtract([composition duration], songTimeRange.start);
 	
@@ -89,12 +89,14 @@
 	// Ramp tracks down and up at beginning and end.
 	NSMutableArray *trackMixArray = [NSMutableArray array];
 
-    CMTime rampDuration = CMTimeMake(1, 2); // half-second ramps
-
+    CMTime rampDuration = CMTimeMake(1, 2); // half-second ramp-ups
+    CMTime endRampDuration = CMTimeMake(4, 2); // two-second ramp-downs
+    
     // Ramp song down and up
     AVMutableAudioMixInputParameters *trackMix = [AVMutableAudioMixInputParameters audioMixInputParametersWithTrack:compositionSongTrack];
-    [trackMix setVolumeRampFromStartVolume:0.2 toEndVolume:1.0 timeRange:CMTimeRangeMake(CMTimeSubtract(songTimeRange.start, rampDuration), rampDuration)];
-    [trackMix setVolumeRampFromStartVolume:1.0 toEndVolume:0.2 timeRange:CMTimeRangeMake(CMTimeRangeGetEnd(songTimeRange), rampDuration)];
+    // CMTimeRangeMake(CMTimeSubtract(songTimeRange.start, rampDuration)
+    [trackMix setVolumeRampFromStartVolume:0.3 toEndVolume:0.5 timeRange:CMTimeRangeMake(songTimeRange.start, rampDuration)];
+    [trackMix setVolumeRampFromStartVolume:0.5 toEndVolume:0.0 timeRange:CMTimeRangeMake(CMTimeSubtract(CMTimeRangeGetEnd(songTimeRange), endRampDuration), endRampDuration)];
     [trackMixArray addObject:trackMix];
 
 	audioMix.inputParameters = trackMixArray;
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index b39cfbd..2a6b09e 100644
--- a/Video Tuneup/ViewController.h
+++ b/Video Tuneup/ViewController.h
@@ -40,7 +40,7 @@
 @property (nonatomic, retain) IBOutlet UIButton *mediaLibraryButton;
 @property (nonatomic, retain) UIPopoverController *mediaLibraryPopover;
 
-@property (nonatomic, retain) IBOutlet UIButton *derpSendPostRequestButton;
+@property (nonatomic, retain) IBOutlet UIButton *internetRequestButton;
 
 
 - (void)hideCameraRollText;
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index 90e709e..3b99759 100644
--- a/Video Tuneup/ViewController.m
+++ b/Video Tuneup/ViewController.m
@@ -22,7 +22,7 @@ static const NSString *ItemStatusContext;
 @synthesize player, playerItem, playerView, playButton, pauseButton, rewindButton, editor, videoNavBar, exportStatus,
 mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton;
 
-@synthesize derpSendPostRequestButton;
+@synthesize internetRequestButton;
 
 #pragma mark - Video playback
 
@@ -477,6 +477,7 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton;
     NSURL *songFileURL = [[NSBundle mainBundle] URLForResource:@"song" withExtension:@"mp3"];
     [com setParentController:self];
     [com mixMusic:songFileURL];
+    [internetRequestButton setTitle:@"Attempting..." forState:UIControlStateNormal];
 }
 
 #pragma mark - View controller boilerplate
diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib
index 2810a4b..b627411 100644
--- a/Video Tuneup/en.lproj/ViewController_iPad.xib
+++ b/Video Tuneup/en.lproj/ViewController_iPad.xib
@@ -36,7 +36,7 @@
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 			</object>
 			<object class="IBUIView" id="766721923">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIButton" id="1049445720">
@@ -44,7 +44,6 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{99, 162}, {151, 37}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="267035392"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -79,7 +78,6 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{514, 162}, {155, 37}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1061865793"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -116,7 +114,6 @@
 										<int key="NSvFlags">290</int>
 										<string key="NSFrame">{{93, 11}, {564, 23}}</string>
 										<reference key="NSSuperview" ref="812339394"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="425377558"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -126,7 +123,6 @@
 								</array>
 								<string key="NSFrame">{{0, 587}, {671, 44}}</string>
 								<reference key="NSSuperview" ref="1061865793"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="119532371"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -171,7 +167,6 @@
 						</array>
 						<string key="NSFrame">{{36, 217}, {671, 631}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="812339394"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="347621421">
 							<int key="NSColorSpace">1</int>
@@ -187,8 +182,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{244, 886}, {255, 73}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
@@ -216,7 +209,6 @@
 						<int key="NSvFlags">271</int>
 						<string key="NSFrame">{{160, 878}, {422, 90}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="806269495"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -244,7 +236,6 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{99, 27}, {281, 127}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="27096655"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -273,7 +264,6 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{388, 27}, {281, 127}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1049445720"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -295,7 +285,6 @@
 						<int key="NSvFlags">293</int>
 						<string key="NSFrame">{{286, 162}, {198, 37}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="761978491"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -321,8 +310,6 @@
 					</object>
 				</array>
 				<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="938661883"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@@ -408,19 +395,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">derpSendPostRequestButton</string>
+						<string key="label">exportButton</string>
 						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="267035392"/>
+						<reference key="destination" ref="806269495"/>
 					</object>
-					<int key="connectionID">66</int>
+					<int key="connectionID">68</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">exportButton</string>
+						<string key="label">internetRequestButton</string>
 						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="806269495"/>
+						<reference key="destination" ref="267035392"/>
 					</object>
-					<int key="connectionID">68</int>
+					<int key="connectionID">69</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
@@ -693,7 +680,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">68</int>
+			<int key="maxID">69</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">