diff --git a/Limelight-iOS.xcodeproj/project.pbxproj b/Limelight-iOS.xcodeproj/project.pbxproj index ec011f3..b228523 100644 --- a/Limelight-iOS.xcodeproj/project.pbxproj +++ b/Limelight-iOS.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + FBC18AE3188A2AB500D5D34E /* MainFrame.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FBC18AE2188A2AB500D5D34E /* MainFrame.storyboard */; }; + FBC18B2B188A3B9100D5D34E /* MainFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBC18B2A188A3B9100D5D34E /* MainFrameViewController.m */; }; + FBC18B2F188A4E0500D5D34E /* VideoDepacketizer.m in Sources */ = {isa = PBXBuildFile; fileRef = FBC18B2E188A4E0500D5D34E /* VideoDepacketizer.m */; }; FBF6AE75188A274100B50578 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBF6AE74188A274100B50578 /* Foundation.framework */; }; FBF6AE77188A274100B50578 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBF6AE76188A274100B50578 /* CoreGraphics.framework */; }; FBF6AE79188A274100B50578 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FBF6AE78188A274100B50578 /* UIKit.framework */; }; @@ -35,6 +38,11 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + FBC18AE2188A2AB500D5D34E /* MainFrame.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainFrame.storyboard; path = ../MainFrame.storyboard; sourceTree = ""; }; + FBC18B29188A3B9100D5D34E /* MainFrameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrameViewController.h; sourceTree = ""; }; + FBC18B2A188A3B9100D5D34E /* MainFrameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainFrameViewController.m; sourceTree = ""; }; + FBC18B2D188A4E0500D5D34E /* VideoDepacketizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoDepacketizer.h; path = Video/VideoDepacketizer.h; sourceTree = ""; }; + FBC18B2E188A4E0500D5D34E /* VideoDepacketizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoDepacketizer.m; path = Video/VideoDepacketizer.m; sourceTree = ""; }; FBF6AE71188A274100B50578 /* Limelight-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Limelight-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; FBF6AE74188A274100B50578 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; FBF6AE76188A274100B50578 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -81,6 +89,15 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + FBC18B2C188A4DC900D5D34E /* Video */ = { + isa = PBXGroup; + children = ( + FBC18B2D188A4E0500D5D34E /* VideoDepacketizer.h */, + FBC18B2E188A4E0500D5D34E /* VideoDepacketizer.m */, + ); + name = Video; + sourceTree = ""; + }; FBF6AE68188A274100B50578 = { isa = PBXGroup; children = ( @@ -115,11 +132,15 @@ FBF6AE7C188A274100B50578 /* Limelight-iOS */ = { isa = PBXGroup; children = ( + FBC18B2C188A4DC900D5D34E /* Video */, + FBC18AE2188A2AB500D5D34E /* MainFrame.storyboard */, FBF6AE85188A274100B50578 /* AppDelegate.h */, FBF6AE86188A274100B50578 /* AppDelegate.m */, FBF6AE8B188A274100B50578 /* Images.xcassets */, FBF6AE88188A274100B50578 /* Limelight_iOS.xcdatamodeld */, FBF6AE7D188A274100B50578 /* Supporting Files */, + FBC18B29188A3B9100D5D34E /* MainFrameViewController.h */, + FBC18B2A188A3B9100D5D34E /* MainFrameViewController.m */, ); path = "Limelight-iOS"; sourceTree = ""; @@ -200,6 +221,9 @@ LastUpgradeCheck = 0500; ORGANIZATIONNAME = "Diego Waxemberg"; TargetAttributes = { + FBF6AE70188A274100B50578 = { + DevelopmentTeam = DM46QST4M7; + }; FBF6AE90188A274100B50578 = { TestTargetID = FBF6AE70188A274100B50578; }; @@ -228,6 +252,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + FBC18AE3188A2AB500D5D34E /* MainFrame.storyboard in Resources */, FBF6AE81188A274100B50578 /* InfoPlist.strings in Resources */, FBF6AE8C188A274100B50578 /* Images.xcassets in Resources */, ); @@ -248,9 +273,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + FBC18B2F188A4E0500D5D34E /* VideoDepacketizer.m in Sources */, FBF6AE87188A274100B50578 /* AppDelegate.m in Sources */, FBF6AE8A188A274100B50578 /* Limelight_iOS.xcdatamodeld in Sources */, FBF6AE83188A274100B50578 /* main.m in Sources */, + FBC18B2B188A3B9100D5D34E /* MainFrameViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -371,6 +398,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Limelight-iOS/Limelight-iOS-Prefix.pch"; INFOPLIST_FILE = "Limelight-iOS/Limelight-iOS-Info.plist"; @@ -384,6 +412,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Limelight-iOS/Limelight-iOS-Prefix.pch"; INFOPLIST_FILE = "Limelight-iOS/Limelight-iOS-Info.plist"; @@ -453,6 +482,7 @@ FBF6AEA5188A274100B50578 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; FBF6AEA6188A274100B50578 /* Build configuration list for PBXNativeTarget "Limelight-iOSTests" */ = { isa = XCConfigurationList; @@ -461,6 +491,7 @@ FBF6AEA8188A274100B50578 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ diff --git a/Limelight-iOS/AppDelegate.m b/Limelight-iOS/AppDelegate.m index 69d96bc..8e1e684 100644 --- a/Limelight-iOS/AppDelegate.m +++ b/Limelight-iOS/AppDelegate.m @@ -16,10 +16,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - // Override point for customization after application launch. - self.window.backgroundColor = [UIColor whiteColor]; - [self.window makeKeyAndVisible]; return YES; } diff --git a/Limelight-iOS/Limelight-iOS-Info.plist b/Limelight-iOS/Limelight-iOS-Info.plist index 59da17a..7ddb6dd 100644 --- a/Limelight-iOS/Limelight-iOS-Info.plist +++ b/Limelight-iOS/Limelight-iOS-Info.plist @@ -24,15 +24,22 @@ 1.0 LSRequiresIPhoneOS + UIMainStoryboardFile + MainFrame + UIMainStoryboardFile~ipad + MainFrame UIRequiredDeviceCapabilities armv7 + UIStatusBarHidden~ipad + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown UISupportedInterfaceOrientations~ipad diff --git a/Limelight-iOS/MainFrameViewController.h b/Limelight-iOS/MainFrameViewController.h new file mode 100644 index 0000000..3e30656 --- /dev/null +++ b/Limelight-iOS/MainFrameViewController.h @@ -0,0 +1,16 @@ +// +// MainFrameViewController.h +// Limelight-iOS +// +// Created by Diego Waxemberg on 1/17/14. +// Copyright (c) 2014 Diego Waxemberg. All rights reserved. +// + +#import + +@interface MainFrameViewController : UIViewController +- (IBAction)StreamButton:(UIButton *)sender; +- (IBAction)PairButton:(UIButton *)sender; +@property (strong, nonatomic) IBOutlet UIPickerView *StreamConfigs; +@property (strong, nonatomic) NSArray* streamConfigVals; +@end diff --git a/Limelight-iOS/MainFrameViewController.m b/Limelight-iOS/MainFrameViewController.m new file mode 100644 index 0000000..c5620c7 --- /dev/null +++ b/Limelight-iOS/MainFrameViewController.m @@ -0,0 +1,61 @@ +// +// MainFrameViewController.m +// Limelight-iOS +// +// Created by Diego Waxemberg on 1/17/14. +// Copyright (c) 2014 Diego Waxemberg. All rights reserved. +// + +#import "MainFrameViewController.h" + +@interface MainFrameViewController () + +@end + +@implementation MainFrameViewController + +- (void)PairButton:(UIButton *)sender +{ + NSLog(@"Pair Button Pressed!"); +} + +- (void)StreamButton:(UIButton *)sender +{ + NSLog(@"Stream Button Pressed!"); +} + +- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component +{ + return [self.streamConfigVals objectAtIndex:row]; +} + +- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component +{ + //TODO: figure out how to save this info!! +} + +// returns the number of 'columns' to display. +- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView +{ + return 1; +} + +// returns the # of rows in each component.. +- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component +{ + return 4; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)",@"1280x720 (60Hz)",@"1920x1080 (30Hz)",@"1920x1080 (60Hz)",nil]; +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} +@end diff --git a/MainFrame.storyboard b/MainFrame.storyboard new file mode 100644 index 0000000..40ed4a6 --- /dev/null +++ b/MainFrame.storyboard @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file