added testurls

Signed-off-by: trailblazr <jollyjinx@planetexpress.local>
trailblazr · Dec 5, 2012 · 1ca6b44 · 1ca6b44
1 parent e09a5c5
commit 1ca6b44
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 38 deletions.
diff --git a/barfbag/AppDelegate.m b/barfbag/AppDelegate.m
@@ -74,6 +74,14 @@ - (void) alertWithTag:(NSInteger)tag title:(NSString*)title andMessage:(NSString
     [alert release];
 }
 
+- (void) configureAppearance {
+    if( ![[UINavigationBar class] respondsToSelector:@selector(appearance)] ) return;
+
+    // MPAVController
+    // MPAVController *proxyMpavController = [MPAVController appearance];
+
+}
+
 #pragma mark - BarfBagParserDelegate
 
 - (void) barfBagParser:(BarfBagParser*)parser parsedConferences:(NSArray *)conferencesArray {
@@ -230,7 +238,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
     self.themeColor = [self randomColor];
-
+
+    // CONFIGURE CUSTOM UI APPEARANCE
+    [self configureAppearance];
+
     // SETUP ROOT CONTROLLER
     NSMutableArray *viewControllers = [NSMutableArray array];
     if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {

diff --git a/barfbag/EventsViewController.m b/barfbag/EventsViewController.m
@@ -164,6 +164,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease];
         cell.textLabel.backgroundColor = kCOLOR_CLEAR;
         cell.detailTextLabel.backgroundColor = kCOLOR_CLEAR;
+        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
     }
 
     // Configure the cell...

diff --git a/barfbag/GenericTabBarController.m b/barfbag/GenericTabBarController.m
@@ -11,8 +11,7 @@
 
 @implementation GenericTabBarController
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
     if (self) {
         // Custom initialization
@@ -27,12 +26,19 @@ - (void)viewDidLoad {
     self.tabBar.selectedImageTintColor = [self themeColor];
 }
 
-- (void)didReceiveMemoryWarning
-{
+- (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
 
+- (BOOL) shouldAutorotate {
+    return YES;
+}
+
+- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation {
+    return YES;
+}
+
 - (AppDelegate*) appDelegate {
     return (AppDelegate*)[UIApplication sharedApplication].delegate;
 }

diff --git a/barfbag/GenericTableViewController.m b/barfbag/GenericTableViewController.m
@@ -136,5 +136,4 @@ - (UIColor*) darkColor {
     return [UIColor colorWithHue:hue saturation:0.5 brightness:0.7 alpha:1.0];
 }
 
-
 @end
diff --git a/barfbag/VideoStreamsViewController.m b/barfbag/VideoStreamsViewController.m
@@ -62,16 +62,23 @@ - (void) webViewDidStartLoad:(UIWebView *)webView {
 }
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
+    [self hideActivityIndicator];
+    BOOL shouldShowAlert = NO;
     NSString *errorString = nil;
     if( error ) {
+        NSInteger errorCode = [error code];
+        if( errorCode != 204 ) { // KNOWN ERRORS WHICH ARE NONE
+            shouldShowAlert = YES;
+        }
         errorString = [NSString stringWithFormat:@"\n\n%@", error];
     }
     else {
         errorString = @"";
     }
-    NSString *message = [NSString stringWithFormat:@"Videostreams could not be loaded successfully.%@", errorString];
-    [self alertWithTag:0 title:@"Problem" andMessage:message];
+    if( shouldShowAlert ) {
+        NSString *message = [NSString stringWithFormat:@"Videostreams could not be loaded successfully.%@", errorString];
+        [self alertWithTag:0 title:@"Problem" andMessage:message];
+    }
 }
 
-
 @end
diff --git a/barfbag/barfbag-Info.plist b/barfbag/barfbag-Info.plist
@@ -8,30 +8,6 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.noxymo.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIAppFonts</key>
-	<array>
-		<string>SourceCodePro-Black.ttf</string>
-		<string>SourceCodePro-Bold.ttf</string>
-		<string>SourceCodePro-ExtraLight.ttf</string>
-		<string>SourceCodePro-Light.ttf</string>
-		<string>SourceCodePro-Semibold.ttf</string>
-	</array>
 	<key>CFBundleIconFile</key>
 	<string>Icon_57.png</string>
 	<key>CFBundleIcons</key>
@@ -54,12 +30,36 @@
 			<array>
 				<string></string>
 			</array>
-			<key>UINewsstandBindingType</key>
-			<string>UINewsstandBindingTypeMagazine</string>
 			<key>UINewsstandBindingEdge</key>
 			<string>UINewsstandBindingEdgeLeft</string>
+			<key>UINewsstandBindingType</key>
+			<string>UINewsstandBindingTypeMagazine</string>
 		</dict>
 	</dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.noxymo.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>SourceCodePro-Black.ttf</string>
+		<string>SourceCodePro-Bold.ttf</string>
+		<string>SourceCodePro-ExtraLight.ttf</string>
+		<string>SourceCodePro-Light.ttf</string>
+		<string>SourceCodePro-Semibold.ttf</string>
+	</array>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -79,6 +79,7 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

diff --git a/html/streams.html b/html/streams.html
@@ -20,13 +20,21 @@
 </head>
 
 <body>
-<h2>Streams from 29C3</h1>
+    <h2>Streams from 29C3</h2>
     <ul style="list-style-type:square;line-height:1.5em;">
-        <li><strong>Teststream:</strong><br><a href="http://qthttp.apple.com.edgesuite.net/1010qwoeiuryfg/sl.m3u8">Stream (by Apple Inc.)</a></li>
         <li><strong>Saal 1:</strong><br><a href="http://http.28c3.fem-net.de/live/stream_saal1.m3u8">Stream (by FEM)</a></li>
         <li><strong>Saal 2:</strong><br><a href="http://http.28c3.fem-net.de/live/stream_saal2.m3u8">Stream (by FEM)</a></li>
         <li><strong>Saal 3:</strong><br><a href="http://http.28c3.fem-net.de/live/stream_saal3.m3u8">Stream (by FEM)</a></li>
     </ul>
-
+    <h2>Test Streams / H.264 @ 30Hz</h2>
+    <ul style="list-style-type:square;line-height:1.5em;">
+        <li><strong>Test 4:3</strong>&nbsp;<a href="https://devimages.apple.com.edgekey.net/resources/http-streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8">Autoadjust</a></li>
+        <li><strong>Test 16:9</strong>&nbsp;<a href="https://devimages.apple.com.edgekey.net/resources/http-streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8">Autoadjust</a></li>
+        <li><strong>Test content:&nbsp;<a href="http://qthttp.apple.com.edgesuite.net/1010qwoeiuryfg/sl.m3u8">Apple Keynote</a></li>
+        <li><strong>Test 1:</strong>&nbsp;<a href="http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8">Gear 1 - 400x300 @ 232 kbps</a></li>
+        <li><strong>Test 2:</strong>&nbsp;<a href="http://devimages.apple.com/iphone/samples/bipbop/gear2/prog_index.m3u8">Gear 2 - 640x480 @ 650 kbps</a></li>
+        <li><strong>Test 3:</strong>&nbsp;<a href="http://devimages.apple.com/iphone/samples/bipbop/gear3/prog_index.m3u8">Gear 3 - 640x480 @ 1 Mbps</a></li>
+        <li><strong>Test 4:</strong>&nbsp;<a href="http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8">Gear 4 - 960x720 @ 2 Mbps</a></li>
+    </ul>
 </body>
 </html>