From ec944d9869a74f11f565d8aacc4d822cd8e7a8fd Mon Sep 17 00:00:00 2001 From: Brian Jordan Date: Wed, 28 Mar 2012 13:30:16 -0400 Subject: add open song button. Closes #5 --- Video Tuneup.xcodeproj/project.pbxproj | 6 ++ Video Tuneup/ViewController.h | 2 + Video Tuneup/ViewController.m | 6 +- Video Tuneup/en.lproj/ViewController_iPad.xib | 147 ++++++++++++++++++-------- 4 files changed, 118 insertions(+), 43 deletions(-) diff --git a/Video Tuneup.xcodeproj/project.pbxproj b/Video Tuneup.xcodeproj/project.pbxproj index 19d8695..decab7a 100644 --- a/Video Tuneup.xcodeproj/project.pbxproj +++ b/Video Tuneup.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + D3531C94152380D800E286B8 /* song.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = D3531C93152380D800E286B8 /* song.mp3 */; }; D36CCD3615227D06003CCAFC /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36CCD3515227D06003CCAFC /* UIKit.framework */; }; D36CCD3815227D06003CCAFC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36CCD3715227D06003CCAFC /* Foundation.framework */; }; D36CCD3A15227D06003CCAFC /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36CCD3915227D06003CCAFC /* CoreGraphics.framework */; }; @@ -38,6 +39,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + D3531C93152380D800E286B8 /* song.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = song.mp3; path = ../../../../code_others/python/remix/examples/music/song.mp3; sourceTree = ""; }; D36CCD3115227D05003CCAFC /* Video Tuneup.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Video Tuneup.app"; sourceTree = BUILT_PRODUCTS_DIR; }; D36CCD3515227D06003CCAFC /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; D36CCD3715227D06003CCAFC /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -171,6 +173,7 @@ D36CCD6F1522893F003CCAFC /* Resources */ = { isa = PBXGroup; children = ( + D3531C93152380D800E286B8 /* song.mp3 */, D36CCD7015228952003CCAFC /* airplane.m4v */, ); name = Resources; @@ -268,6 +271,7 @@ D36CCD4C15227D06003CCAFC /* ViewController_iPhone.xib in Resources */, D36CCD4F15227D06003CCAFC /* ViewController_iPad.xib in Resources */, D36CCD7115228952003CCAFC /* airplane.m4v in Resources */, + D3531C94152380D800E286B8 /* song.mp3 in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -485,6 +489,7 @@ D36CCD6915227D06003CCAFC /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; D36CCD6A15227D06003CCAFC /* Build configuration list for PBXNativeTarget "Video TuneupTests" */ = { isa = XCConfigurationList; @@ -493,6 +498,7 @@ D36CCD6C15227D06003CCAFC /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h index 247e770..9ad27d8 100644 --- a/Video Tuneup/ViewController.h +++ b/Video Tuneup/ViewController.h @@ -19,8 +19,10 @@ @property (nonatomic, retain) IBOutlet PlayerView *playerView; @property (nonatomic, retain) IBOutlet UIButton *playButton; @property (nonatomic, retain) IBOutlet UIButton *pauseButton; +@property (nonatomic, retain) IBOutlet UIButton *rewindButton; - (IBAction)loadAssetFromFile:sender; +- (IBAction)loadAudioFromFile:sender; - (IBAction)play:sender; - (IBAction)pause:sender; - (IBAction)rewind:sender; diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m index b88a8f8..bd2a3b5 100644 --- a/Video Tuneup/ViewController.m +++ b/Video Tuneup/ViewController.m @@ -14,7 +14,7 @@ static const NSString *ItemStatusContext; @implementation ViewController -@synthesize player, playerItem, playerView, playButton, pauseButton; +@synthesize player, playerItem, playerView, playButton, pauseButton, rewindButton; #pragma mark - Video playback @@ -78,6 +78,10 @@ static const NSString *ItemStatusContext; }]; } +- (IBAction)loadAudioFromFile:(id)sender { + NSLog(@"Loading audio from file"); +} + - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib index 897fb98..4617cb0 100644 --- a/Video Tuneup/en.lproj/ViewController_iPad.xib +++ b/Video Tuneup/en.lproj/ViewController_iPad.xib @@ -38,10 +38,10 @@ 319 - {{172, 191}, {403, 84}} + {{172, 191}, {194, 84}} - + _NS:241 NO IBIPadFramework @@ -49,7 +49,7 @@ 0 1 Open Movie - + 3 MQA @@ -57,27 +57,49 @@ 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + 3 MC41AA - + 2 15 - + Helvetica-Bold 15 16 + + + 319 + {{384, 191}, {194, 84}} + + + + _NS:241 + NO + IBIPadFramework + 0 + 0 + 1 + Open Song + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + 319 {{181, 369}, {384, 502}} - _NS:212 1 @@ -88,13 +110,13 @@ IBIPadFramework - + 292 {{172, 302}, {72, 37}} - + _NS:241 NO IBIPadFramework @@ -102,22 +124,22 @@ 0 1 Play - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + - + 292 {{337, 302}, {72, 37}} - + _NS:241 NO IBIPadFramework @@ -125,16 +147,16 @@ 0 1 Pause - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + - + 292 {{500, 302}, {78, 37}} @@ -148,14 +170,14 @@ 0 1 Rewind - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + {{0, 20}, {768, 1004}} @@ -174,11 +196,10 @@ IBIPadFramework - - + + 292 {72, 37} - _NS:241 NO IBIPadFramework @@ -186,14 +207,14 @@ 0 1 Play - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + @@ -214,6 +235,22 @@ 10 + + + playButton + + + + 19 + + + + pauseButton + + + + 20 + loadAssetFromFile: @@ -226,7 +263,7 @@ play: - + 7 @@ -235,7 +272,7 @@ pause: - + 7 @@ -244,12 +281,21 @@ rewind: - + 7 18 + + + loadAudioFromFile: + + + 7 + + 27 + @@ -276,9 +322,10 @@ - - - + + + + @@ -294,22 +341,27 @@ 11 - + 12 - + 13 - + 14 - + + + + + 25 + @@ -324,6 +376,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin PlayerView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -332,7 +385,7 @@ - 18 + 27 @@ -349,6 +402,7 @@ UIViewController id + id id id id @@ -358,6 +412,10 @@ loadAssetFromFile: id + + loadAudioFromFile: + id + pause: id @@ -375,6 +433,7 @@ UIButton UIButton PlayerView + UIButton @@ -389,6 +448,10 @@ playerView PlayerView + + rewindButton + UIButton + IBProjectSource -- cgit v1.2.3