aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2012-04-26 01:55:25 -0400
committerTeddy Wing2012-04-26 01:55:25 -0400
commit33d773e817a33eed4a282ed974700222dce42074 (patch)
treee4a74486eb033129c868180a3152409030278733
parentb2ce2ee890be7020ac0b09fe490fe2ee72fd80a9 (diff)
downloadVideo-Tuneup-33d773e817a33eed4a282ed974700222dce42074.tar.bz2
Added a button to test HTTPRequest
-rw-r--r--Video Tuneup/ViewController.h4
-rw-r--r--Video Tuneup/ViewController.m12
-rw-r--r--Video Tuneup/en.lproj/ViewController_iPad.xib66
3 files changed, 77 insertions, 5 deletions
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index ce21edf..6b17a9e 100644
--- a/Video Tuneup/ViewController.h
+++ b/Video Tuneup/ViewController.h
@@ -39,6 +39,8 @@
@property (nonatomic, retain) IBOutlet UIButton *mediaLibraryButton;
@property (nonatomic, retain) UIPopoverController *mediaLibraryPopover;
+@property (nonatomic, retain) IBOutlet UIButton *derpSendPostRequestButton;
+
- (void)hideCameraRollText;
- (IBAction)loadAssetFromFile:sender;
@@ -59,4 +61,6 @@
- (void)exportDidFinish:(AVAssetExportSession*)session;
- (IBAction)showMediaLibrary:(id)sender;
+
+- (IBAction)derpSendPostRequest:(id)sender;
@end \ No newline at end of file
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index da1616c..efe3686 100644
--- a/Video Tuneup/ViewController.m
+++ b/Video Tuneup/ViewController.m
@@ -11,6 +11,8 @@
#import "SimpleEditor.h"
#import "AssetsViewController.h"
+#import "WebserviceCommunicator.h"
+
// Define this constant for the key-value observation context.
static const NSString *ItemStatusContext;
@@ -20,6 +22,8 @@ static const NSString *ItemStatusContext;
@synthesize player, playerItem, playerView, playButton, pauseButton, rewindButton, editor, videoNavBar, exportStatus,
mScrubber, mediaLibraryButton, mediaLibraryPopover;
+@synthesize derpSendPostRequestButton;
+
#pragma mark - Video playback
- (void)syncUI {
@@ -447,6 +451,14 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover;
[self.mediaLibraryPopover presentPopoverFromRect:[theButton bounds] inView:theButton permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
}
+#pragma mark DEEEERRRRRRRRRRRRPPPPPPPPPPPPP
+
+- (IBAction)derpSendPostRequest:(id)sender {
+ WebserviceCommunicator *com = [[WebserviceCommunicator alloc] init];
+ NSURL *songFileURL = [[NSBundle mainBundle] URLForResource:@"song" withExtension:@"mp3"];
+ [com mixMusic:songFileURL];
+}
+
#pragma mark - View controller boilerplate
- (void)didReceiveMemoryWarning {
diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib
index 94aaab0..9925af3 100644
--- a/Video Tuneup/en.lproj/ViewController_iPad.xib
+++ b/Video Tuneup/en.lproj/ViewController_iPad.xib
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1280</int>
- <string key="IBDocument.SystemVersion">11D50d</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
@@ -267,7 +267,7 @@
<string key="NSFrame">{{580, 906}, {75, 37}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="267035392"/>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
@@ -283,6 +283,28 @@
<reference key="IBUIFontDescription" ref="1067550929"/>
<reference key="IBUIFont" ref="361109798"/>
</object>
+ <object class="IBUIButton" id="267035392">
+ <reference key="NSNextResponder" ref="766721923"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{7, 960}, {262, 37}}</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>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <int key="IBUIButtonType">1</int>
+ <string key="IBUINormalTitle">DerpyButtonToSendPostRequest</string>
+ <reference key="IBUIHighlightedTitleColor" ref="804940373"/>
+ <object class="NSColor" key="IBUINormalTitleColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+ </object>
+ <reference key="IBUINormalTitleShadowColor" ref="752673392"/>
+ <reference key="IBUIFontDescription" ref="1067550929"/>
+ <reference key="IBUIFont" ref="361109798"/>
+ </object>
</array>
<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
<reference key="NSSuperview"/>
@@ -371,6 +393,14 @@
<int key="connectionID">60</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">derpSendPostRequestButton</string>
+ <reference key="source" ref="841351856"/>
+ <reference key="destination" ref="267035392"/>
+ </object>
+ <int key="connectionID">66</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">loadAssetFromFile:</string>
<reference key="source" ref="1049445720"/>
@@ -467,6 +497,15 @@
</object>
<int key="connectionID">64</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">derpSendPostRequest:</string>
+ <reference key="source" ref="267035392"/>
+ <reference key="destination" ref="841351856"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">67</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -498,6 +537,7 @@
<reference ref="761978491"/>
<reference ref="938661883"/>
<reference ref="27096655"/>
+ <reference ref="267035392"/>
</array>
<reference key="parent" ref="0"/>
</object>
@@ -595,6 +635,11 @@
<reference key="object" ref="27096655"/>
<reference key="parent" ref="766721923"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">65</int>
+ <reference key="object" ref="267035392"/>
+ <reference key="parent" ref="766721923"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -618,6 +663,7 @@
<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="65.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.CustomClassName">PlayerView</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
@@ -625,7 +671,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">64</int>
+ <int key="maxID">67</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -641,6 +687,7 @@
<string key="className">ViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
+ <string key="derpSendPostRequest:">id</string>
<string key="exportToCameraRoll:">id</string>
<string key="loadAssetFromFile:">id</string>
<string key="loadAudioFromFile:">id</string>
@@ -650,6 +697,10 @@
<string key="showMediaLibrary:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="derpSendPostRequest:">
+ <string key="name">derpSendPostRequest:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo" key="exportToCameraRoll:">
<string key="name">exportToCameraRoll:</string>
<string key="candidateClassName">id</string>
@@ -680,6 +731,7 @@
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
+ <string key="derpSendPostRequestButton">UIButton</string>
<string key="exportStatus">UILabel</string>
<string key="mScrubber">UISlider</string>
<string key="mediaLibraryButton">UIButton</string>
@@ -690,6 +742,10 @@
<string key="videoNavBar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="derpSendPostRequestButton">
+ <string key="name">derpSendPostRequestButton</string>
+ <string key="candidateClassName">UIButton</string>
+ </object>
<object class="IBToOneOutletInfo" key="exportStatus">
<string key="name">exportStatus</string>
<string key="candidateClassName">UILabel</string>