Merge lp:~rockstar/ubuntuone-ios-music/replace-streaming-player into lp:ubuntuone-ios-music

[Paul Hummer]

Replace StreamingPlayer with UOPlayer

This branch adds the polish to the Player View Controller. Most of the UI is copied directly from the older app. I just learned while working on this that you can tap the album art and get extended controls (scrubbing, shuffle, and repeat). Here's some screenshots.

http://ubuntuone.com/1Qba6PUSOgHgk6bNp29ktt

http://ubuntuone.com/7E2Eq9pSTdCYgmC8co7mY0

I also implemented a new player. The one problem I still have is that I can't quite get the app to react to remote control events. I'll look into that once I have the polish applied to the other views.

[Mike McCracken (mikemc)]

Needs-fixing because of the currentIndex issues in UOPlayer, otherwise please treat my naming comments as friendly suggestions, I won't complain if you decide you don't like them.

General comment: this really could have been split into a few smaller
branches to ease reviewing. For example, these all seem like
independent changes:

- adding the CGImage reflection
- updating duration to int64
- the secondsToClock change
- adding UOPlayer
- maybe also the XIB changes, if only to de-clutter the other branches

1. NSNumber+UbuntuOne:

Why is secondsToClock a category on NSNumber? NSNumber isn't
involved. Why not just make it a function?

Or if you really want a category, maybe a category on NSString
like "+clockStringFromSeconds:"...

2. UIImage+UbuntuOne: (~MINOR)

reflectedImage:(1) toImageView:(2) wasn't clear from the name what it
does. For one, both args are image views but the name makes it sound
like they're different. Also I think it needs a verb, like
"setImageView:(2) toReflectionOfImageView:(1)" or something.

Just my 2c, it's up to you.

3. UOPlayer.m:

In -next, I think that the two tests of (currentIndex +1 >
[... count]) might be off by one - if there are ten tracks and I'm on
track #10 (index 9), this will evaluate (10 > 10) = false and set
currentIndex to 10, which will be an invalid index into songs.

In prev, if currentIndex is 0, won't we get an invalid index there
too? I'm not 100% sure what unsigneds do when you do 0-1, but it's
probably not a good idea anyway. What should it do in that case?
Actually, prev looks unfinished, right? Should it always set the state
to stop?

addSongs:atIndex: was a confusing name, and it made it hard to understand
prepareForSegue in the view controller, because I was wondering what
happened to the indexing if there were already songs in the player
when you called it from prepareForSegue...
But - we're not *adding* songs, we're *replacing* the songs array
completely. I think the method would be much clearer if it was named
something like "setSongs:withStartingIndex:".

(MINOR): IMO, enums are more readable with underscores: e.g. REPEAT_OFF

review: Needs Fixing

[Paul Hummer (rockstar)]

Yeah, I noticed the problems with currentIndex yesterday, but there's also another problem where we're not fetching enough of the songs from the U1AutoDownloadsManager (that needs to be replaced because it's both not smart enough and too smart...)

[lp:~rockstar/ubuntuone-ios-music/replace-streaming-player]

283. By Paul Hummer on 2013-02-09

Move NSNumber+UbuntuOne to NSString+UbuntuOne

284. By Paul Hummer on 2013-02-09

Move [NSNumber secondsToClock] to [NSString secondsToClock]

285. By Paul Hummer on 2013-02-09

Rename secondsToClock to clockStringFromSeconds

286. By Paul Hummer on 2013-02-09

Move UIImage+UbuntuOne to UIImageView+UbuntuOne

287. By Paul Hummer on 2013-02-09

Change the reflection method to be a UIImageView category method

288. By Paul Hummer on 2013-02-09

Fix downloadManager bug and the off by one errors in next/prev

289. By Paul Hummer on 2013-02-09

Reset album art image view

290. By Paul Hummer on 2013-02-09

Merge in trunk, resolve conflicts

[Paul Hummer (rockstar)]

Changes have now been made. I found a few other bugs while I was testing this, which I fixed here, because that was most appropriate.

[Mike McCracken (mikemc)]

review: Approve

=== added directory 'Music/Categories'
=== added file 'Music/Categories/NSString+UbuntuOne.h'
--- Music/Categories/NSString+UbuntuOne.h	1970-01-01 00:00:00 +0000
+++ Music/Categories/NSString+UbuntuOne.h	2013-02-09 04:48:21 +0000
@@ -0,0 +1,13 @@
+//
+//  NSNumber+UbuntuOne.h
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (UbuntuOne)
++ (NSString *)clockStringFromSeconds:(int)seconds;
+@end

=== added file 'Music/Categories/NSString+UbuntuOne.m'
--- Music/Categories/NSString+UbuntuOne.m	1970-01-01 00:00:00 +0000
+++ Music/Categories/NSString+UbuntuOne.m	2013-02-09 04:48:21 +0000
@@ -0,0 +1,24 @@
+//
+//  NSNumber+UbuntuOne.m
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "NSString+UbuntuOne.h"
+
+@implementation NSString (UbuntuOne)
+
++ (NSString *)clockStringFromSeconds:(int)_seconds {
+    NSUInteger hours = _seconds / (60 * 60);
+    NSUInteger minutes = (_seconds / 60) % 60;
+    NSUInteger seconds = _seconds % 60;
+    if (hours > 0) {
+        return [NSString stringWithFormat:@"%d:%02d:%02d", hours, minutes, seconds];
+    } else {
+        return [NSString stringWithFormat:@"%d:%02d", minutes, seconds];
+    }
+}
+
+@end

=== added file 'Music/Categories/UIImageView+UbuntuOne.h'
--- Music/Categories/UIImageView+UbuntuOne.h	1970-01-01 00:00:00 +0000
+++ Music/Categories/UIImageView+UbuntuOne.h	2013-02-09 04:48:21 +0000
@@ -0,0 +1,13 @@
+//
+//  UIImage+UbuntuOne.h
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImageView (UbuntuOne)
+- (void)reflectOn:(UIImageView *)toImageView;
+@end

=== added file 'Music/Categories/UIImageView+UbuntuOne.m'
--- Music/Categories/UIImageView+UbuntuOne.m	1970-01-01 00:00:00 +0000
+++ Music/Categories/UIImageView+UbuntuOne.m	2013-02-09 04:48:21 +0000
@@ -0,0 +1,53 @@
+//
+//  UIImage+UbuntuOne.m
+//  U1Music
+//
+//  Created by Paul Hummer on 2/6/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "UIImageView+UbuntuOne.h"
+
+@implementation UIImageView (UbuntuOne)
+
+- (void)reflectOn:(UIImageView *)toImageView {
+    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+    CGContextRef context = CGBitmapContextCreate(NULL, self.bounds.size.width, toImageView.bounds.size.height,
+                                                 8, 0, colorSpace, (kCGBitmapByteOrder32Little|kCGImageAlphaPremultipliedFirst));
+    CGColorSpaceRelease(colorSpace);
+    
+    colorSpace = CGColorSpaceCreateDeviceGray();
+    CGContextRef gradientBitmapContext = CGBitmapContextCreate(NULL, 1, toImageView.bounds.size.height,
+                                                               8, 0, colorSpace, kCGImageAlphaNone);
+    /* Start and end grayscale values */
+    CGFloat colors[] = {0.0, 1.0, 1.0, 1.0};
+    
+    CGGradientRef grayScaleGradient = CGGradientCreateWithColorComponents(colorSpace, colors, NULL, 2);
+    CGColorSpaceRelease(colorSpace);
+    CGPoint gradientStartPoint = CGPointZero;
+    CGPoint gradientEndPoint = CGPointMake(0, toImageView.bounds.size.height);
+    
+    CGContextDrawLinearGradient(gradientBitmapContext, grayScaleGradient, gradientStartPoint,
+                                gradientEndPoint, kCGGradientDrawsAfterEndLocation);
+    CGGradientRelease(grayScaleGradient);
+    
+    CGImageRef mask = CGBitmapContextCreateImage(gradientBitmapContext);
+    CGContextRelease(gradientBitmapContext);
+    
+    CGContextClipToMask(context, CGRectMake(0.f, 0.f, self.bounds.size.width, toImageView.bounds.size.height), mask);
+    CGImageRelease(mask);
+    
+    CGContextTranslateCTM(context, 0.f, toImageView.bounds.size.height);
+    CGContextScaleCTM(context, 1.0, -1.0);
+    CGContextDrawImage(context, self.bounds, self.image.CGImage);
+    
+    CGImageRef reflectionImageRef = CGBitmapContextCreateImage(context);
+    CGContextRelease(context);
+    
+    UIImage *reflectionImage = [UIImage imageWithCGImage:reflectionImageRef];
+    CGImageRelease(reflectionImageRef);
+    
+    [toImageView setImage:reflectionImage];
+}
+
+@end

=== modified file 'Music/Models/Song.h'
--- Music/Models/Song.h	2013-01-27 21:34:28 +0000
+++ Music/Models/Song.h	2013-02-09 04:48:21 +0000
@@ -20,7 +20,7 @@
 @property (nonatomic, retain) NSString *title;
 @property (nonatomic) int32_t bitRate;
 @property (nonatomic, retain) NSString *songId;
-@property (nonatomic) int32_t duration;
+@property (nonatomic) int64_t duration;
 @property (nonatomic, retain) NSString *discNumber;
 @property (nonatomic, retain) NSString *streamUrl;
 @property (nonatomic, retain) NSString *contentType;

=== modified file 'Music/Storyboard_iPhone.storyboard'
--- Music/Storyboard_iPhone.storyboard	2013-01-28 22:16:30 +0000
+++ Music/Storyboard_iPhone.storyboard	2013-02-09 04:48:21 +0000
@@ -299,7 +299,7 @@
                         <rect key="frame" x="0.0" y="20" width="320" height="460"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="blackTranslucent" id="uGB-Cu-Aav">
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="blackOpaque" id="uGB-Cu-Aav">
                                 <rect key="frame" x="0.0" y="416" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <items>
@@ -329,8 +329,8 @@
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="MBV-c6-BMY"/>
                                 </items>
                             </toolbar>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Yam-lV-Vc9">
-                                <rect key="frame" x="0.0" y="58" width="320" height="321"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="Yam-lV-Vc9">
+                                <rect key="frame" x="10" y="54" width="300" height="300"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
                                 <state key="normal" backgroundImage="default-album-art-640.png">
@@ -339,10 +339,98 @@
                                 </state>
                                 <state key="disabled" backgroundImage="default-album-art-640.png"/>
                                 <state key="selected" backgroundImage="default-album-art-640.png"/>
-                                <state key="highlighted" backgroundImage="default-album-art-640.png">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
+                                <state key="highlighted" backgroundImage="default-album-art-640.png"/>
+                                <connections>
+                                    <action selector="toggleExtendedControls:" destination="hRX-A4-gMJ" eventType="touchUpInside" id="0nY-gN-scF"/>
+                                </connections>
                             </button>
+                            <view hidden="YES" contentMode="scaleToFill" id="S10-hS-OX1">
+                                <rect key="frame" x="0.0" y="44" width="320" height="100"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" alpha="0.79999999999999993" contentMode="scaleToFill" image="player_overlay_bg.png" id="2dO-51-f8w">
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </imageView>
+                                    <slider opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" id="AzX-yt-lI2">
+                                        <rect key="frame" x="58" y="28" width="204" height="23"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        <accessibility key="accessibilityConfiguration">
+                                            <accessibilityTraits key="traits" none="YES" notEnabled="YES"/>
+                                            <bool key="isElement" value="NO"/>
+                                        </accessibility>
+                                    </slider>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="mWB-Z0-neD">
+                                        <rect key="frame" x="14" y="47" width="44" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
+                                        <state key="normal" image="03-loopback.png">
+                                            <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <state key="highlighted">
+                                            <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="changeRepeat:" destination="hRX-A4-gMJ" eventType="touchUpInside" id="FKm-JK-m5u"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="VtE-rw-Yf4">
+                                        <rect key="frame" x="264" y="48" width="44" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
+                                        <state key="normal" image="05-shuffle.png">
+                                            <color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <state key="highlighted">
+                                            <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="changeShuffle:" destination="hRX-A4-gMJ" eventType="touchUpInside" id="Ve2-P1-mUH"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0:00" textAlignment="right" lineBreakMode="tailTruncation" minimumFontSize="10" id="pNU-Jr-yiV">
+                                        <rect key="frame" x="12" y="31" width="42" height="15"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                        <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="10:00" lineBreakMode="tailTruncation" minimumFontSize="10" id="fsV-6P-1Kb">
+                                        <rect key="frame" x="266" y="31" width="42" height="15"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                        <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="3 of 100" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="KsY-jo-7df">
+                                        <rect key="frame" x="12" y="5" width="296" height="19"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                        <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <attributedString key="userComments">
+                                    <fragment content="XXX: Return to normal size when we figure out the loop/shuffle buttons">
+                                        <attributes>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                            </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" id="ljH-X3-s0I">
+                                <rect key="frame" x="10" y="359" width="300" height="57"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
                             <navigationBar contentMode="scaleToFill" barStyle="blackTranslucent" id="oeU-qV-gKe">
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@@ -387,11 +475,19 @@
                         <outlet property="albumart" destination="Yam-lV-Vc9" id="5e5-A4-rMc"/>
                         <outlet property="artistLabel" destination="h2R-82-j69" id="Juf-cx-6ta"/>
                         <outlet property="controlBar" destination="uGB-Cu-Aav" id="Wgb-Ct-TjW"/>
+                        <outlet property="elapsedTime" destination="pNU-Jr-yiV" id="D3O-1N-k6n"/>
+                        <outlet property="extendedControlView" destination="S10-hS-OX1" id="7bJ-7h-Oce"/>
                         <outlet property="nextButton" destination="QEO-UP-PKx" id="ZgA-sN-VU1"/>
                         <outlet property="pauseButton" destination="DQV-3Q-HbM" id="nKw-2H-EHB"/>
                         <outlet property="playButton" destination="1LC-YT-al7" id="2PE-Uy-AbM"/>
+                        <outlet property="playlistInfo" destination="KsY-jo-7df" id="hc5-Rd-tM8"/>
                         <outlet property="previousButton" destination="1xR-vh-5t6" id="ekr-RG-Qqb"/>
+                        <outlet property="progressView" destination="AzX-yt-lI2" id="vdA-4u-TTx"/>
+                        <outlet property="reflectionImage" destination="ljH-X3-s0I" id="8fj-Fq-yMJ"/>
+                        <outlet property="repeatButton" destination="mWB-Z0-neD" id="gau-aR-t4J"/>
+                        <outlet property="shuffleButton" destination="VtE-rw-Yf4" id="cWi-Rz-4Cf"/>
                         <outlet property="titleLabel" destination="eua-we-ECS" id="XMu-px-khb"/>
+                        <outlet property="totalTime" destination="fsV-6P-1Kb" id="Tmf-XN-8VS"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="ase-Pp-0S0" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -518,6 +614,7 @@
                                     <outlet property="clock" destination="vws-t4-lyH" id="Fb3-aG-7Ym"/>
                                     <outlet property="title" destination="cHc-6o-Le1" id="XJD-HL-AWU"/>
                                     <outlet property="track" destination="URM-e4-2yc" id="CNs-EV-tVd"/>
+                                    <segue destination="hRX-A4-gMJ" kind="modal" id="ebj-wD-yft"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -863,6 +960,8 @@
         </scene>
     </scenes>
     <resources>
+        <image name="03-loopback.png" width="32" height="22"/>
+        <image name="05-shuffle.png" width="28" height="20"/>
         <image name="albums.png" width="30" height="30"/>
         <image name="artists.png" width="30" height="30"/>
         <image name="default-album-art-120.png" width="60" height="60"/>
@@ -870,6 +969,7 @@
         <image name="download-grey.png" width="28" height="28"/>
         <image name="download.png" width="28" height="28"/>
         <image name="grabber.png" width="22" height="44"/>
+        <image name="player_overlay_bg.png" width="320" height="100"/>
         <image name="playlists.png" width="30" height="30"/>
         <image name="settings.png" width="30" height="30"/>
         <image name="songs.png" width="30" height="30"/>
@@ -894,12 +994,13 @@
         <class className="ArtistCell" superclassName="UITableViewCell">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistCell.h"/>
         </class>
-        <class className="ArtistViewController" superclassName="SubsonicTableViewController">
+        <class className="ArtistViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/ArtistViewController.h"/>
             <relationships>
                 <relationship kind="outlet" name="albumArt" candidateClass="UIImageView"/>
                 <relationship kind="outlet" name="artistDescription" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="artistName" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="nowPlayingButton" candidateClass="UIBarButtonItem"/>
                 <relationship kind="outlet" name="tableView" candidateClass="UITableView"/>
             </relationships>
         </class>
@@ -917,19 +1018,30 @@
         <class className="PlayerViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/PlayerViewController.h"/>
             <relationships>
+                <relationship kind="action" name="changeRepeat:"/>
+                <relationship kind="action" name="changeShuffle:"/>
                 <relationship kind="action" name="hide:"/>
                 <relationship kind="action" name="next:"/>
                 <relationship kind="action" name="pause:"/>
                 <relationship kind="action" name="play:"/>
                 <relationship kind="action" name="previous:"/>
+                <relationship kind="action" name="toggleExtendedControls:"/>
                 <relationship kind="outlet" name="albumart" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="artistLabel" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="controlBar" candidateClass="UIToolbar"/>
+                <relationship kind="outlet" name="elapsedTime" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="extendedControlView" candidateClass="UIView"/>
                 <relationship kind="outlet" name="nextButton" candidateClass="UIBarButtonItem"/>
                 <relationship kind="outlet" name="pauseButton" candidateClass="UIBarButtonItem"/>
                 <relationship kind="outlet" name="playButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="playlistInfo" candidateClass="UILabel"/>
                 <relationship kind="outlet" name="previousButton" candidateClass="UIBarButtonItem"/>
+                <relationship kind="outlet" name="progressView" candidateClass="UISlider"/>
+                <relationship kind="outlet" name="reflectionImage" candidateClass="UIImageView"/>
+                <relationship kind="outlet" name="repeatButton" candidateClass="UIButton"/>
+                <relationship kind="outlet" name="shuffleButton" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="titleLabel" candidateClass="UILabel"/>
+                <relationship kind="outlet" name="totalTime" candidateClass="UILabel"/>
             </relationships>
         </class>
         <class className="PlaylistCell" superclassName="UITableViewCell">
@@ -938,9 +1050,6 @@
         <class className="PlaylistsViewController" superclassName="UOIndexedViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/PlaylistsViewController.h"/>
         </class>
-        <class className="PullRefreshTableViewController" superclassName="UITableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/PullRefreshTableViewController.h"/>
-        </class>
         <class className="SettingsAuthenticationViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsAuthenticationViewController.h"/>
             <relationships>
@@ -951,7 +1060,7 @@
                 <relationship kind="outlet" name="usernameField" candidateClass="UITextField"/>
             </relationships>
         </class>
-        <class className="SettingsViewController" superclassName="UIViewController">
+        <class className="SettingsViewController" superclassName="UITableViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/SettingsViewController.h"/>
             <relationships>
                 <relationship kind="action" name="deleteCaches:"/>
@@ -977,13 +1086,6 @@
         <class className="SongsViewController" superclassName="UOIndexedViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/SongsViewController.h"/>
         </class>
-        <class className="SubsonicTableViewController" superclassName="PullRefreshTableViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/SubsonicTableViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="nowPlayingAction:"/>
-                <relationship kind="action" name="reload:"/>
-            </relationships>
-        </class>
         <class className="UOIndexedViewController" superclassName="UITableViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/UOIndexedViewController.h"/>
             <relationships>
@@ -998,6 +1100,6 @@
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
         <segue reference="jMd-4K-zoU"/>
-        <segue reference="kr6-1e-khR"/>
+        <segue reference="e8X-Xp-0ra"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file

=== modified file 'Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents'
--- Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	2013-01-24 19:08:51 +0000
+++ Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents	2013-02-09 04:48:21 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model name="" userDefinedModelVersionIdentifier="UOMusic0" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1811" systemVersion="12C60" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
+<model name="" userDefinedModelVersionIdentifier="UOMusic0" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2057" systemVersion="12C60" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="Album" representedClassName="Album" syncable="YES">
         <attribute name="albumId" attributeType="String" indexed="YES" syncable="YES"/>
         <attribute name="artHash" optional="YES" attributeType="String" syncable="YES"/>
@@ -36,7 +36,7 @@
         <attribute name="contentType" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dearticlizedTitle" attributeType="String" syncable="YES"/>
         <attribute name="discNumber" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="duration" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="duration" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
         <attribute name="genre" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="index" optional="YES" transient="YES" attributeType="String" syncable="YES"/>
         <attribute name="path" attributeType="String" syncable="YES"/>

=== added file 'Music/Utilities/UOPlayer.h'
--- Music/Utilities/UOPlayer.h	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOPlayer.h	2013-02-09 04:48:21 +0000
@@ -0,0 +1,48 @@
+//
+//  UOPlayer.h
+//  U1Music
+//
+//  Created by Paul Hummer on 1/28/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class Song;
+
+#define kPlayerStateChanged @"UOPlayerStateChanged"
+#define kPlayerSongChanged @"UOPlayerSongChanged"
+#define kPlayerShuffleChanged @"UOPlayerShuffleChanged"
+#define kPlayerRepeatChanged @"UOPlayerRepeatChanged"
+
+typedef enum {
+    REPEATOFF,
+    REPEATONE,
+    REPEATALL
+} RepeatState;
+
+typedef enum {
+    PLAYERSTATESTOP,
+    PLAYERSTATEPLAY,
+    PLAYERSTATEPAUSE
+} PlayerState;
+
+@interface UOPlayer : NSObject
++ (id)player;
+
+- (void)addSongs:(NSArray *)songs;
+- (void)addSongs:(NSArray *)songs withIndex:(NSUInteger)index;
+
+- (void)playPause;
+- (void)next;
+- (void)prev;
+
+@property (nonatomic, readonly) NSUInteger currentIndex;
+@property (nonatomic, readonly) Song *currentSong;
+@property (nonatomic, readonly) NSArray *currentPlaylist;
+@property PlayerState state;
+
+@property (nonatomic) BOOL shuffle;
+@property (nonatomic) RepeatState repeat;
+
+@end

=== added file 'Music/Utilities/UOPlayer.m'
--- Music/Utilities/UOPlayer.m	1970-01-01 00:00:00 +0000
+++ Music/Utilities/UOPlayer.m	2013-02-09 04:48:21 +0000
@@ -0,0 +1,286 @@
+//
+//  UOPlayer.m
+//  U1Music
+//
+//  Created by Paul Hummer on 1/28/13.
+//  Copyright (c) 2013 Canonical. All rights reserved.
+//
+
+#import "UOPlayer.h"
+#import "AudioStreamer.h"
+#import "Song.h"
+
+#import "U1AutoDownloadsManager.h"
+
+@interface UOPlayer () {
+    NSArray *songs;
+    NSArray *shuffledSongs;
+    
+    AudioStreamer *streamer;
+    float seekTime;
+}
+@property (nonatomic, readwrite) NSUInteger currentIndex;
+@property (nonatomic, strong) U1AutoDownloadsManager *downloadManager;
+@end
+
+@implementation UOPlayer
+@synthesize currentPlaylist;
+@synthesize currentIndex;
+
+@synthesize state;
+@synthesize downloadManager;
+
+@synthesize shuffle;
+@synthesize repeat;
+
++ (id)player {
+    static UOPlayer *instance = nil;
+    static dispatch_once_t once;
+    dispatch_once(&once, ^{
+        instance = [[UOPlayer alloc] init];
+    });
+    return instance;
+}
+
+- (id)init {
+    self = [super init];
+    if (self == nil) { return self; }
+    
+    [self restoreSettings];
+    
+    self.downloadManager = [[U1AutoDownloadsManager alloc] init];
+    
+    self.state = PLAYERSTATESTOP;
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+    
+    [self addObserver:self forKeyPath:@"currentIndex" options:nil context:NULL];
+    
+    return self;
+}
+
+- (void)dealloc {
+    if (streamer) {
+        [streamer stop];
+        streamer = nil;
+    }
+    songs = nil;
+    shuffledSongs = nil;
+    downloadManager = nil;
+}
+
+#pragma mark - KVO methods
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+    if ([keyPath isEqual:@"currentIndex"]) {
+        [self.downloadManager setPlaylist:[self currentPlaylist] andIndex:self.currentIndex];
+    } else {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
+}
+
+#pragma mark - Settings
+
+- (void)saveSettings {
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	[defaults setBool:shuffle forKey:@"playerShuffle"];
+	[defaults setInteger:repeat forKey:@"playerRepeat"];
+	[defaults synchronize];
+}
+
+- (void)restoreSettings {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	shuffle = [defaults boolForKey:@"playerShuffle"];
+	NSUInteger repeatMode = [defaults integerForKey:@"playerRepeat"];
+	switch (repeatMode) {
+        case REPEATALL:
+        case REPEATONE:
+        case REPEATOFF:
+			repeat = repeatMode;
+			break;
+		default:
+			repeat = REPEATOFF;
+			break;
+	}
+}
+
+#pragma mark - Player state
+
+- (double)progress {
+    return streamer.progress;
+}
+
+#pragma mark - Play queue management
+
+- (Song *)currentSong {
+    if ([songs count] == 0) {
+        return nil;
+    }
+    return [[self currentPlaylist] objectAtIndex:self.currentIndex];
+}
+
+- (NSArray *)currentPlaylist {
+    return (shuffle ? shuffledSongs : songs);
+}
+
+- (void)addSongs:(NSArray *)_songs {
+    [self addSongs:_songs withIndex:0];
+}
+
+- (void)addSongs:(NSArray *)_songs withIndex:(NSUInteger)index {
+    if (streamer != nil) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+        self.state = PLAYERSTATESTOP;
+        [streamer stop];
+        streamer = nil;
+    }
+
+    songs = _songs;
+    
+    NSMutableArray *_shuffled = [_songs mutableCopy];
+    NSUInteger count = [_shuffled count];
+    for (NSUInteger i = 0; i < count; ++i) {
+        NSInteger nElements = count - i;
+        NSInteger n = (arc4random() % nElements) + i;
+        [_shuffled exchangeObjectAtIndex:i withObjectAtIndex:n];
+    }
+    shuffledSongs = _shuffled;
+    
+    if (shuffle) {
+        self.currentIndex = [shuffledSongs indexOfObject:[songs objectAtIndex:index]];
+    } else {
+        self.currentIndex = index;
+    }
+
+    
+}
+
+#pragma mark - Player controls
+
+- (void)playPause {
+    if ([streamer isPaused]) {
+        self.state = PLAYERSTATEPLAY;
+        [streamer start];
+    } else if ([streamer isPlaying]) {
+        self.state = PLAYERSTATEPAUSE;
+        [streamer pause];
+    } else {
+        [self _playCurrentSong];
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+}
+
+- (void)next {
+    switch (repeat) {
+        case REPEATOFF:
+            [streamer stop];
+            self.state = PLAYERSTATESTOP;
+            if (self.currentIndex == ([[self currentPlaylist] count] - 1)) {
+                [streamer stop];
+                streamer = nil;
+            } else {
+                self.currentIndex = self.currentIndex + 1;
+                [self playPause];
+            }
+            break;
+        case REPEATONE:
+            [streamer stop];
+            [self playPause];
+            break;
+        case REPEATALL:
+            if (self.currentIndex == [[self currentPlaylist] count] - 1) {
+                self.currentIndex = 0;
+            } else {
+                self.currentIndex = self.currentIndex + 1;
+            }
+            self.state = PLAYERSTATESTOP;
+            [streamer stop];
+            [self playPause];
+            break;
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+}
+
+- (void)prev {
+    switch (repeat) {
+        case REPEATOFF:
+            [streamer stop];
+            self.state = PLAYERSTATESTOP;
+            if (self.currentIndex == 0) {
+                [streamer stop];
+                streamer = nil;
+            } else {
+                self.currentIndex = self.currentIndex - 1;
+                [self playPause];
+            }
+            break;
+        case REPEATONE:
+            [streamer stop];
+            [self playPause];
+            break;
+        case REPEATALL:
+            if (self.currentIndex == 0) {
+                self.currentIndex = [[self currentPlaylist] count] - 1;
+            } else {
+                self.currentIndex = self.currentIndex - 1;
+            }
+            self.state = PLAYERSTATESTOP;
+            [streamer stop];
+            [self playPause];
+            break;
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+}
+
+#pragma mark - Setters
+
+- (void)setShuffle:(BOOL)_shuffle {
+    shuffle = _shuffle;
+    
+    if (shuffle) {
+        self.currentIndex = [shuffledSongs indexOfObject:[songs objectAtIndex:self.currentIndex]];
+    } else {
+        self.currentIndex = [songs indexOfObject:[shuffledSongs objectAtIndex:self.currentIndex]];
+    }
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerShuffleChanged object:nil];
+    [self saveSettings];
+}
+
+- (void)setRepeat:(RepeatState)_repeat {
+    repeat = _repeat;
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerRepeatChanged object:nil];
+    [self saveSettings];
+}
+
+#pragma mark - Private methods
+
+- (void)_playCurrentSong {
+    if (streamer != nil) {
+        [streamer stop];
+        streamer = nil;
+    }
+    
+    seekTime = 0.0;
+    
+    Song *currentSong = [[self currentPlaylist] objectAtIndex:self.currentIndex];
+    
+    NSString *songPath = [[currentSong idPath] urlParameterEncodedString];
+    NSURL *localURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:9990/%@", songPath]];
+    streamer = [[AudioStreamer alloc] initWithURL:localURL];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(streamerStateChanged:) name:ASStatusChangedNotification object:streamer];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerStateChanged object:nil];
+    self.state = PLAYERSTATEPLAY;
+    [streamer start];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:kPlayerSongChanged object:nil];
+}
+
+- (void)streamerStateChanged:(NSNotification *)notification {
+    if ([streamer isIdle]) {
+        [self next];
+    }
+}
+
+@end

=== modified file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	2013-01-28 00:40:22 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-02-09 04:48:21 +0000
@@ -14,7 +14,7 @@
 #import "UOWebServiceController.h"
 #import "UODownloader.h"
 
-#import "StreamingPlayer.h"
+#import "UOPlayer.h"
 
 @interface AlbumViewController () <UITableViewDataSource, UOWebServiceDelegate> {
     NSArray *tableData;
@@ -38,10 +38,10 @@
 - (void)viewWillAppear:(BOOL)animated {
     [self fetchAlbum];
     
-    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+    if ([[UOPlayer player] currentSong]) {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    } else {
         self.navigationItem.rightBarButtonItem = nil;
-    } else {
-        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
     }
     
     self.title = album.title;
@@ -136,17 +136,11 @@
         return; // Hit 'Now Playing'
     }
     Song *song = ((SongCell *)sender).song;
-    
-    StreamingPlayer *player = [StreamingPlayer sharedStreamingPlayer];
-    player.currentSong = song;
-    player.currentPlaylist = songs;
-    player.isNewSong = YES;
-    player.isShuffle = NO;
-    
-    if (player.streamer) {
-        [player.streamer stop];
-    }
-    [player playPauseSong];
+    NSUInteger index = [songs indexOfObject:song];
+    
+    UOPlayer *player = [UOPlayer player];
+    [player addSongs:songs withIndex:index];
+    [player playPause];
 }
 
 @end

=== modified file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	2013-01-28 00:40:22 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-02-09 04:48:21 +0000
@@ -16,7 +16,7 @@
 #import "AlbumViewController.h"
 #import "UOWebServiceController.h"
 #import "UOAppDelegate.h"
-#import "StreamingPlayer.h"
+#import "UOPlayer.h"
 #import "UODownloader.h"
 
 @interface ArtistViewController () <UITableViewDataSource, UOWebServiceDelegate> {
@@ -53,10 +53,10 @@
         [self.albumArt setImage:artist.art];
     }
     
-    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+    if ([[UOPlayer player] currentSong]) {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    } else {
         self.navigationItem.rightBarButtonItem = nil;
-    } else {
-        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
     }
     
     NSString *pluralizedNoun = @"albums";

=== modified file 'Music/View Controllers/PlayerViewController.h'
--- Music/View Controllers/PlayerViewController.h	2013-01-24 16:30:26 +0000
+++ Music/View Controllers/PlayerViewController.h	2013-02-09 04:48:21 +0000
@@ -14,11 +14,22 @@
 @property (weak, nonatomic) IBOutlet UIToolbar *controlBar;
 
 @property (weak, nonatomic) IBOutlet UIButton *albumart;
+@property (weak, nonatomic) IBOutlet UIImageView *reflectionImage;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *previousButton;
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *playButton;
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *pauseButton;
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *nextButton;
 
+@property (weak, nonatomic) IBOutlet UIView *extendedControlView;
+@property (weak, nonatomic) IBOutlet UISlider *progressView;
+@property (weak, nonatomic) IBOutlet UIButton *repeatButton;
+@property (weak, nonatomic) IBOutlet UIButton *shuffleButton;
+@property (weak, nonatomic) IBOutlet UILabel *elapsedTime;
+@property (weak, nonatomic) IBOutlet UILabel *totalTime;
+
+@property (weak, nonatomic) IBOutlet UILabel *playlistInfo;
+
+
 - (IBAction)hide:(id)sender;
 
 - (IBAction)previous:(id)sender;
@@ -26,6 +37,12 @@
 - (IBAction)pause:(id)sender;
 - (IBAction)next:(id)sender;
 
+- (IBAction)changeRepeat:(id)sender;
+- (IBAction)changeShuffle:(id)sender;
+
+
+- (IBAction)toggleExtendedControls:(id)sender;
+
 @property (weak, nonatomic) IBOutlet UILabel *artistLabel;
 @property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 @end

=== modified file 'Music/View Controllers/PlayerViewController.m'
--- Music/View Controllers/PlayerViewController.m	2013-01-24 16:30:26 +0000
+++ Music/View Controllers/PlayerViewController.m	2013-02-09 04:48:21 +0000
@@ -7,13 +7,16 @@
 //
 
 #import "PlayerViewController.h"
+#import "NSString+UbuntuOne.h"
+#import "UIImageView+UbuntuOne.h"
 #import "Song.h"
 #import "Artist.h"
 #import "Album.h"
-
-#import "StreamingPlayer.h"
-
-@interface PlayerViewController ()
+#import "UOPlayer.h"
+
+@interface PlayerViewController () {
+    NSTimer *heartbeat;
+}
 
 @end
 
@@ -28,21 +31,30 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [[StreamingPlayer sharedStreamingPlayer] addObserver:self forKeyPath:@"currentSong" options:0 context:NULL];
-    [[StreamingPlayer sharedStreamingPlayer] addObserver:self forKeyPath:@"isPlaying" options:0 context:NULL];
-    
-    [self updatePlayPause];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(songChanged:) name:kPlayerSongChanged object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncControls:) name:kPlayerShuffleChanged object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncControls:) name:kPlayerStateChanged object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncControls:) name:kPlayerRepeatChanged object:nil];
+    
+    [self syncControls:nil];
     [self updateCurrentSong];
+    
+    heartbeat = [NSTimer scheduledTimerWithTimeInterval:0.5f target:self selector:@selector(heartbeat:) userInfo:nil repeats:YES];
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
+- (void)viewDidDisappear:(BOOL)animated {
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kPlayerSongChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kPlayerShuffleChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kPlayerStateChanged object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kPlayerRepeatChanged object:nil];
     
-    [[StreamingPlayer sharedStreamingPlayer] removeObserver:self forKeyPath:@"currentSong"];
-    [[StreamingPlayer sharedStreamingPlayer] removeObserver:self forKeyPath:@"isPlaying"];
+    [heartbeat invalidate];
+    heartbeat = nil;
 }
 
 - (void)viewDidUnload {
+    
     [self setAlbumart:nil];
     [self setPreviousButton:nil];
     [self setPlayButton:nil];
@@ -51,17 +63,18 @@
     [self setControlBar:nil];
     [self setArtistLabel:nil];
     [self setTitleLabel:nil];
+    [self setExtendedControlView:nil];
+    [self setProgressView:nil];
+    [self setShuffleButton:nil];
+    [self setRepeatButton:nil];
+    [self setShuffleButton:nil];
+    [self setPlaylistInfo:nil];
+    [self setTotalTime:nil];
+    [self setElapsedTime:nil];
+    [self setReflectionImage:nil];
     [super viewDidUnload];
 }
 
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
-	if ([keyPath isEqual:@"currentSong"]) {
-		[self updateCurrentSong];
-	} else if ([keyPath isEqual:@"isPlaying"]) {
-		[self updatePlayPause];
-	}
-}
-
 #pragma mark - IBAction methods
 
 - (IBAction)hide:(id)sender {
@@ -69,28 +82,56 @@
 }
 
 - (IBAction)previous:(id)sender {
-    [[StreamingPlayer sharedStreamingPlayer] prevSong];
+    [[UOPlayer player] prev];
 }
 
 - (IBAction)play:(id)sender {
-    [[StreamingPlayer sharedStreamingPlayer] playPauseSong];
-    [self updatePlayPause];
+    [[UOPlayer player] playPause];
 }
 
 - (IBAction)next:(id)sender {
-    [[StreamingPlayer sharedStreamingPlayer] nextSong];
+    [[UOPlayer player] next];
+}
+
+- (IBAction)changeRepeat:(id)sender {
+    if ([[UOPlayer player] repeat] == REPEATOFF) {
+        [[UOPlayer player] setRepeat:REPEATONE];
+    } else if ([[UOPlayer player] repeat] == REPEATONE) {
+        [[UOPlayer player] setRepeat:REPEATALL];
+    } else {
+        [[UOPlayer player] setRepeat:REPEATOFF];
+    }
+}
+
+- (IBAction)changeShuffle:(id)sender {
+    if ([[UOPlayer player] shuffle]) {
+        [[UOPlayer player] setShuffle:NO];
+    } else {
+        [[UOPlayer player] setShuffle:YES];
+    }
+}
+
+- (IBAction)toggleExtendedControls:(id)sender {
+    if (self.extendedControlView.hidden) {
+        [self.extendedControlView setHidden:NO];
+    } else {
+        [self.extendedControlView setHidden:YES];
+    }
 }
 
 - (IBAction)pause:(id)sender {
-    [[StreamingPlayer sharedStreamingPlayer] playPauseSong];
-    [self updatePlayPause];
+    [[UOPlayer player] playPause];
 }
 
 #pragma mark - Private methods
 
-- (void)updatePlayPause {
+- (void)songChanged:(id)sender {
+    [self updateCurrentSong];
+}
+
+- (void)syncControls:(id)sender {
     NSMutableArray *controlItems = [[self.controlBar items] mutableCopy];
-    if ([[StreamingPlayer sharedStreamingPlayer] isPlaying]) {
+    if ([[UOPlayer player] state] == PLAYERSTATEPLAY) {
         if ([controlItems containsObject:self.playButton]) {
             NSInteger index = [controlItems indexOfObject:self.playButton];
             [controlItems removeObjectAtIndex:index];
@@ -105,14 +146,48 @@
             [self.controlBar setItems:controlItems];
         }
     }
+    
+    if ([[UOPlayer player] shuffle]) {
+        [self.shuffleButton setImage:[UIImage imageNamed:@"shuffle-highlight.png"] forState:UIControlStateNormal];
+    } else {
+        [self.shuffleButton setImage:[UIImage imageNamed:@"05-shuffle.png"] forState:UIControlStateNormal];
+    }
+    
+    if ([[UOPlayer player] repeat] == REPEATOFF) {
+        [self.repeatButton setImage:[UIImage imageNamed:@"03-loopback.png"] forState:UIControlStateNormal];
+    } else if ([[UOPlayer player] repeat] == REPEATONE) {
+        [self.repeatButton setImage:[UIImage imageNamed:@"loopback-one-highlight.png"] forState:UIControlStateNormal];
+    } else {
+        [self.repeatButton setImage:[UIImage imageNamed:@"loopback-highlight.png"] forState:UIControlStateNormal];
+    }
 }
 
 - (void)updateCurrentSong {
-    Song *song = [StreamingPlayer sharedStreamingPlayer].currentSong;
+    /* Update the "X of Y" text */
+    self.playlistInfo.text = [NSString stringWithFormat:@"%d of %d", [[UOPlayer player] currentIndex]+1, [[[UOPlayer player] currentPlaylist] count]];
+    
+    Song *song = [[UOPlayer player] currentSong];
+    
+    /* Update duration and progress view */
+    self.totalTime.text = [NSString clockStringFromSeconds:song.duration];
+    self.progressView.maximumValue = (float)song.duration;
+    
+    /* Update song header */
     [self.artistLabel setText:song.artist.name];
     [self.titleLabel setText:song.title];
     
-    [self.albumart setImage:song.art forState:UIControlStateNormal];
+    if (song.art) {
+        [self.albumart setImage:song.art forState:UIControlStateNormal];
+    } else {
+        [self.albumart setImage:[UIImage imageNamed:@"default-album-art-640.png"] forState:UIControlStateNormal];
+    }
+    [self.albumart.imageView reflectOn:self.reflectionImage];
+}
+
+- (void)heartbeat:(NSTimer*)timer {
+    NSInteger progress = (NSInteger)[[UOPlayer player] progress];
+    self.elapsedTime.text = [NSString clockStringFromSeconds:progress];
+    self.progressView.value = progress;
 }
 
 @end

=== modified file 'Music/View Controllers/SongsViewController.m'
--- Music/View Controllers/SongsViewController.m	2013-01-24 18:31:49 +0000
+++ Music/View Controllers/SongsViewController.m	2013-02-09 04:48:21 +0000
@@ -12,7 +12,7 @@
 #import "SongCell.h"
 #import "NSString+Extras.h"
 #import "UOWebServiceController.h"
-#import "StreamingPlayer.h"
+#import "UOPlayer.h"
 
 @interface SongsViewController ()
 
@@ -49,23 +49,16 @@
 }
 
 - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    NSArray *songs = [[self.fetchedResultsController fetchedObjects] copy];
     if (![sender respondsToSelector:@selector(song)]) {
         return; // Hit 'Now Playing'
     }
-    
-    NSArray *songs = [[self.fetchedResultsController fetchedObjects] copy];
     Song *song = ((SongCell *)sender).song;
-    
-    StreamingPlayer *player = [StreamingPlayer sharedStreamingPlayer];
-    player.currentSong = song;
-    player.currentPlaylist = songs;
-    player.isNewSong = YES;
-    player.isShuffle = NO;
-    
-    if (player.streamer) {
-        [player.streamer stop];
-    }
-    [player playPauseSong];
+    NSUInteger index = [songs indexOfObject:song];
+    
+    UOPlayer *player = [UOPlayer player];
+    [player addSongs:songs withIndex:index];
+    [player playPause];
 }
 
 @end

=== modified file 'Music/View Controllers/UOIndexedViewController.m'
--- Music/View Controllers/UOIndexedViewController.m	2013-01-24 15:46:16 +0000
+++ Music/View Controllers/UOIndexedViewController.m	2013-02-09 04:48:21 +0000
@@ -9,7 +9,7 @@
 #import "UOIndexedViewController.h"
 #import <RestKit/RestKit.h>
 #import "UOAppDelegate.h"
-#import "StreamingPlayer.h"
+#import "UOPlayer.h"
 
 @interface UOIndexedViewController () {
     NSFetchedResultsController *_fetchedResultsController;
@@ -59,10 +59,10 @@
     [super viewWillAppear:animated];
     [self update];
     
-    if (![[StreamingPlayer sharedStreamingPlayer] currentSong]) {
+    if ([[UOPlayer player] currentSong]) {
+        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
+    } else {
         self.navigationItem.rightBarButtonItem = nil;
-    } else {
-        self.navigationItem.rightBarButtonItem = self.nowPlayingButton;
     }
 }
 

=== modified file 'Music/Views/Table Cells/SongCell.m'
--- Music/Views/Table Cells/SongCell.m	2013-01-28 00:40:22 +0000
+++ Music/Views/Table Cells/SongCell.m	2013-02-09 04:48:21 +0000
@@ -10,6 +10,7 @@
 #import "Artist.h"
 #import "UODownloader.h"
 #import "UODownloadPanGestureRecognizer.h"
+#import "NSString+UbuntuOne.h"
 
 @implementation SongCell
 @synthesize song = _song;
@@ -46,9 +47,7 @@
     [self.track setText:[NSString stringWithFormat:@"%d", song.track]];
     [self updateCacheIndicator];
     
-    NSInteger minutes = song.duration / 60;
-    NSInteger seconds = song.duration % 60;
-    [self.clock setText:[NSString stringWithFormat:@"%d:%02d", minutes, seconds]];
+    [self.clock setText:[NSString clockStringFromSeconds:song.duration]];
 }
 
 #pragma mark - Private methods

=== modified file 'U1Music.xcodeproj/project.pbxproj'
--- U1Music.xcodeproj/project.pbxproj	2013-02-08 17:05:40 +0000
+++ U1Music.xcodeproj/project.pbxproj	2013-02-09 04:48:21 +0000
@@ -28,6 +28,8 @@
 		523B3CFA15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF615B73BA0004394F4 /* [e-mail] */; };
 		523B3CFB15B73BA0004394F4 /* download.png in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF715B73BA0004394F4 /* download.png */; };
 		523B3CFC15B73BA0004394F4 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 523B3CF815B73BA0004394F4 /* [e-mail] */; };
+		5257417716C5CC5D00530CCC /* NSString+UbuntuOne.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257417616C5CC5D00530CCC /* NSString+UbuntuOne.m */; };
+		5257417A16C5CDA900530CCC /* UIImageView+UbuntuOne.m in Sources */ = {isa = PBXBuildFile; fileRef = 5257417916C5CDA900530CCC /* UIImageView+UbuntuOne.m */; };
 		5257416D16C5653100530CCC /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5257416C16C5653100530CCC /* Crashlytics.framework */; };
 		5268509716AE5267001F65A6 /* libRestKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5268509016AE516C001F65A6 /* libRestKit.a */; };
 		526850A816AEE4E1001F65A6 /* Storyboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 526850A516AEE4E1001F65A6 /* Storyboard_iPhone.storyboard */; };
@@ -60,6 +62,7 @@
 		5268510616AEFCB2001F65A6 /* U1CachedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 960E4B3414E58844002AAB79 /* U1CachedFile.m */; };
 		5268510816AEFD20001F65A6 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5268510716AEFD20001F65A6 /* MobileCoreServices.framework */; };
 		5279764915F00B2600F8435F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5279764815F00B2600F8435F /* libz.dylib */; };
+		5295FD2416B7559F00A07440 /* UOPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5295FD2316B7559F00A07440 /* UOPlayer.m */; };
 		52AC3D671604513E00B4785D /* about_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4B1604513E00B4785D /* about_logo.png */; };
 		52AC3D681604513E00B4785D /* albums.png in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4C1604513E00B4785D /* albums.png */; };
 		52AC3D691604513E00B4785D /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 52AC3D4D1604513E00B4785D /* [e-mail] */; };
@@ -271,6 +274,10 @@
 		523B3CF615B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
 		523B3CF715B73BA0004394F4 /* download.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = download.png; sourceTree = "<group>"; };
 		523B3CF815B73BA0004394F4 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
+		5257417516C5CC5D00530CCC /* NSString+UbuntuOne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+UbuntuOne.h"; path = "Categories/NSString+UbuntuOne.h"; sourceTree = "<group>"; };
+		5257417616C5CC5D00530CCC /* NSString+UbuntuOne.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+UbuntuOne.m"; path = "Categories/NSString+UbuntuOne.m"; sourceTree = "<group>"; };
+		5257417816C5CDA900530CCC /* UIImageView+UbuntuOne.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImageView+UbuntuOne.h"; path = "Categories/UIImageView+UbuntuOne.h"; sourceTree = "<group>"; };
+		5257417916C5CDA900530CCC /* UIImageView+UbuntuOne.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImageView+UbuntuOne.m"; path = "Categories/UIImageView+UbuntuOne.m"; sourceTree = "<group>"; };
 		5257416C16C5653100530CCC /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
 		5268508516AE516B001F65A6 /* RestKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RestKit.xcodeproj; path = ../RestKit/RestKit.xcodeproj; sourceTree = "<group>"; };
 		526850A516AEE4E1001F65A6 /* Storyboard_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Storyboard_iPhone.storyboard; sourceTree = "<group>"; };
@@ -324,6 +331,8 @@
 		5268510716AEFD20001F65A6 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		5279764815F00B2600F8435F /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		5285158E1604F16B004A1F7C /* UbuntuOneAuthKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UbuntuOneAuthKit.xcodeproj; path = ../UbuntuOneAuthKit/UbuntuOneAuthKit.xcodeproj; sourceTree = "<group>"; };
+		5295FD2216B7559F00A07440 /* UOPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UOPlayer.h; sourceTree = "<group>"; };
+		5295FD2316B7559F00A07440 /* UOPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UOPlayer.m; sourceTree = "<group>"; };
 		52AC3D4B1604513E00B4785D /* about_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = about_logo.png; sourceTree = "<group>"; };
 		52AC3D4C1604513E00B4785D /* albums.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = albums.png; sourceTree = "<group>"; };
 		52AC3D4D1604513E00B4785D /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[e-mail]"; sourceTree = "<group>"; };
@@ -693,6 +702,17 @@
 			name = Controls;
 			sourceTree = "<group>";
 		};
+		5257413916C3405800530CCC /* Categories */ = {
+			isa = PBXGroup;
+			children = (
+				5257417516C5CC5D00530CCC /* NSString+UbuntuOne.h */,
+				5257417616C5CC5D00530CCC /* NSString+UbuntuOne.m */,
+				5257417816C5CDA900530CCC /* UIImageView+UbuntuOne.h */,
+				5257417916C5CDA900530CCC /* UIImageView+UbuntuOne.m */,
+			);
+			name = Categories;
+			sourceTree = "<group>";
+		};
 		5268508616AE516B001F65A6 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -752,6 +772,8 @@
 			children = (
 				520BBF2216B51F2A00307F32 /* UODownloader.h */,
 				520BBF2316B51F2A00307F32 /* UODownloader.m */,
+				5295FD2216B7559F00A07440 /* UOPlayer.h */,
+				5295FD2316B7559F00A07440 /* UOPlayer.m */,
 				526850D016AEFA7C001F65A6 /* UOWebServiceController.h */,
 				526850D116AEFA7C001F65A6 /* UOWebServiceController.m */,
 			);
@@ -1084,6 +1106,7 @@
 		93F3346C1247FB78006C6707 /* Music */ = {
 			isa = PBXGroup;
 			children = (
+				5257413916C3405800530CCC /* Categories */,
 				522B24E716B4BBC30084B023 /* Controls */,
 				526850F416AEFC6A001F65A6 /* Models */,
 				528515571604EED8004A1F7C /* Supporting Files */,
@@ -1607,6 +1630,9 @@
 				5268510316AEFC6A001F65A6 /* UOModel.m in Sources */,
 				522B24EA16B4BC1E0084B023 /* UODownloadPanGestureRecognizer.m in Sources */,
 				520BBF2416B51F2A00307F32 /* UODownloader.m in Sources */,
+				5295FD2416B7559F00A07440 /* UOPlayer.m in Sources */,
+				5257417716C5CC5D00530CCC /* NSString+UbuntuOne.m in Sources */,
+				5257417A16C5CDA900530CCC /* UIImageView+UbuntuOne.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'utilities/StreamingPlayer.m'
--- utilities/StreamingPlayer.m	2013-01-26 02:37:04 +0000
+++ utilities/StreamingPlayer.m	2013-02-09 04:48:21 +0000
@@ -87,7 +87,7 @@
 		case RepeatModeOff:
 			self.repeatMode = savedRepeatMode;
 			break;
-			
+
 		default:
 			self.repeatMode = RepeatModeOff;
 			break;

=== modified file 'xibs/SongViewController.xib'
--- xibs/SongViewController.xib	2012-06-22 17:57:12 +0000
+++ xibs/SongViewController.xib	2013-02-09 04:48:21 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E2620</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2541</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
-		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<int key="IBDocument.SystemTarget">1552</int>
+		<string key="IBDocument.SystemVersion">12C60</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1875</string>
+			<string key="NS.object.0">2083</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@@ -189,6 +189,11 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<string key="IBUIText">Interpol</string>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
+						</object>
 						<object class="NSColor" key="IBUIHighlightedColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
@@ -196,14 +201,10 @@
 						<object class="NSColor" key="IBUIShadowColor" id="207782929">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
+							<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
 						</object>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
-						<string key="IBUIText">Interpol</string>
-						<object class="NSColor" key="IBUITextColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
-						</object>
 						<int key="IBUITextAlignment">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="295205315">
 							<string key="name">Helvetica-Bold</string>
@@ -217,7 +218,6 @@
 							<int key="NSfFlags">16</int>
 						</object>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 					<object class="IBUILabel" id="188765676">
 						<reference key="NSNextResponder" ref="962247428"/>
@@ -230,17 +230,16 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">Interpol</string>
 						<reference key="IBUITextColor" ref="193107363"/>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="295205315"/>
 						<reference key="IBUIFont" ref="956421100"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 					<object class="IBUILabel" id="405973632">
 						<reference key="NSNextResponder" ref="962247428"/>
@@ -252,20 +251,19 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">Interpol</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC42MjM1Mjk0MTE4IDAuNjIzNTI5NDExOCAwLjYyMzUyOTQxMTgAA</bytes>
 						</object>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="295205315"/>
 						<reference key="IBUIFont" ref="956421100"/>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<int key="IBUIAutoshrinkMode">0</int>
 					</object>
 				</array>
 				<string key="NSFrameSize">{200, 45}</string>
@@ -274,9 +272,10 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIButton" id="959908150">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{44, 29}</string>
+				<reference key="NSSuperview"/>
 				<bool key="IBUIOpaque">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<int key="IBUIContentHorizontalAlignment">0</int>
@@ -304,7 +303,7 @@
 				</object>
 			</object>
 			<object class="IBUIView" id="938289822">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIImageView" id="169132852">
@@ -396,10 +395,6 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">0:00</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
@@ -408,6 +403,10 @@
 								<int key="NSID">1</int>
 							</object>
 						</object>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">2</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="911767061">
 							<string key="name">Helvetica-Bold</string>
@@ -420,7 +419,6 @@
 							<double key="NSSize">14</double>
 							<int key="NSfFlags">16</int>
 						</object>
-						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 					<object class="IBUILabel" id="451378775">
 						<reference key="NSNextResponder" ref="938289822"/>
@@ -433,19 +431,18 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">-18:88</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEAA</bytes>
 							<reference key="NSCustomColorSpace" ref="400680623"/>
 						</object>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<reference key="IBUIFontDescription" ref="911767061"/>
 						<reference key="IBUIFont" ref="733486606"/>
-						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 					<object class="IBUILabel" id="650617321">
 						<reference key="NSNextResponder" ref="938289822"/>
@@ -458,23 +455,23 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUIHighlightedColor" ref="193107363"/>
-						<reference key="IBUIShadowColor" ref="207782929"/>
-						<int key="IBUIBaselineAdjustment">1</int>
-						<float key="IBUIMinimumFontSize">10</float>
 						<string key="IBUIText">10 of 11</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAxIDEAA</bytes>
 							<reference key="NSCustomColorSpace" ref="400680623"/>
 						</object>
+						<reference key="IBUIHighlightedColor" ref="193107363"/>
+						<reference key="IBUIShadowColor" ref="207782929"/>
+						<int key="IBUIBaselineAdjustment">1</int>
+						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">1</int>
 						<reference key="IBUIFontDescription" ref="911767061"/>
 						<reference key="IBUIFont" ref="733486606"/>
-						<int key="IBUIAutoshrinkMode">2</int>
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 100}</string>
+				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="169132852"/>
 				<reference key="IBUIBackgroundColor" ref="811861181"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -964,6 +961,6 @@
 			<string key="player_back.png">{44, 29}</string>
 			<string key="player_overlay_bg.png">{320, 100}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1875</string>
+		<string key="IBCocoaTouchPluginVersion">2083</string>
 	</data>
 </archive>