diff options
| author | Teddy Wing | 2012-04-26 01:55:31 -0400 |
|---|---|---|
| committer | Teddy Wing | 2012-04-26 01:55:31 -0400 |
| commit | 03668582bcd90409def595ea6f4c463e29557664 (patch) | |
| tree | 96a828ad33d9718f78b8295810696d0fb54e29d0 /Video Tuneup/ViewController.h | |
| parent | 33d773e817a33eed4a282ed974700222dce42074 (diff) | |
| parent | 541a72c7fda508ec21e1adf8da66043807687222 (diff) | |
| download | Video-Tuneup-03668582bcd90409def595ea6f4c463e29557664.tar.bz2 | |
Merge branch 'master' of github.com:bcjordan/Video-Tuneup
Diffstat (limited to 'Video Tuneup/ViewController.h')
| -rw-r--r-- | Video Tuneup/ViewController.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h index 6b17a9e..c9ae6a4 100644 --- a/Video Tuneup/ViewController.h +++ b/Video Tuneup/ViewController.h @@ -43,8 +43,10 @@ - (void)hideCameraRollText; -- (IBAction)loadAssetFromFile:sender; -- (IBAction)loadAudioFromFile:sender; +- (IBAction)loadDefaultAssetFromFile:sender; +- (IBAction)loadAssetFromFile:(NSURL *)fileURL; +- (IBAction)loadAudioFromFile:(NSURL *)songFileURL; +- (IBAction)loadDefaultAudioFromFile:sender; - (IBAction)play:sender; - (IBAction)pause:sender; - (IBAction)rewind:sender; |