← Back to branch summary

~ubuntuone-ios-client-team/ubuntuone-ios-contacts/trunk

« back to all changes in this revision

Viewing changes to musicstreaming/utilities/StreamingPlayer.m

  • Committer: Jason Foreman
  • Date: 2011-06-16 18:33:42 UTC
  • mfrom: (191.1.60 master)
  • Revision ID: jason.foreman@canonical.com-20110616183342-vl7a4804xsf0s1b5
Merging branches for v 2.0.

lp:~threeve/ubuntuone-ios-client/master
lp:~urbanape/ubuntuone-ios-client/downloader

Show diffs side-by-side

added added

removed removed

Lines of Context:
musicstreaming/utilities/StreamingPlayer.m
154
154
        {
155
155
                [self destroyStreamer];
156
156
                
157
 
                AudioStreamer *as = [[AudioStreamer alloc] initWithURL:songUrl];
 
157
                AudioStreamer *as = nil;
 
158
                
 
159
                if ([self.currentSong cachedSongExists])
 
160
                {
 
161
                        as = [[AudioStreamer alloc] initWithFileURL:[self.currentSong cachedSongURL]];
 
162
                }
 
163
                else
 
164
                {
 
165
                        as = [[AudioStreamer alloc] initWithURL:songUrl];
 
166
                }
 
167
 
158
168
                self.streamer = as;
159
169
                [as release];
160
170
#if DEBUG_STREAMER_RETAIN