TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed logging

This commit is contained in:
Thong Nguyen 2012-09-02 00:58:49 +01:00
parent 2a83e2b733
commit 8508bc20be
3 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Audjustable/AppDelegate.m
View File

@ -34,7 +34,7 @@
-(void) audioPlayerViewPlayFromHTTPSelected:(AudioPlayerView*)audioPlayerView
{
NSURL* url = [NSURL URLWithString:@"http://audjustable.googlecode.com/files/sample.m4a"];
NSURL* url = [NSURL URLWithString:@"https://github.com/downloads/tumtumtum/audjustable/sample.m4a"];
[audioPlayer setDataSource:[audioPlayer dataSourceFromURL:url] withQueueItemId:url];
}

45
Audjustable/Classes/AudioPlayer/AudioPlayer.m
View File

@ -741,12 +741,8 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
entry.bufferIndex = -1;
BLOG(@"Finished playing %@", entry.queueItemId);
if (playbackThread)
{
BLOG(@"Trying to call CFRunLoopPerformBlock due to finished playing %@", entry.queueItemId);
CFRunLoopPerformBlock([playbackThreadRunLoop getCFRunLoop], NSDefaultRunLoopMode, ^
{
[self audioQueueFinishedPlaying:entry];
@ -903,7 +899,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
if (error)
{
BLOG(@"Could not set hardware codec policy");
}
#endif
@ -1086,9 +1081,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
pthread_mutex_lock(&queueBuffersMutex);
}
}
BLOG(@"Started buffering %@", entry.queueItemId);
if (audioFileStream)
{
AudioFileStreamClose(audioFileStream);
@ -1100,8 +1093,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
if (error)
{
BLOG(@"Error creating AudioFileStream");
return;
}
@ -1134,8 +1125,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
pthread_mutex_lock(&queueBuffersMutex);
BLOG(@"didFinishPlaying on runloop");
QueueEntry* next = [bufferingQueue dequeue];
[self processDidFinishPlaying:entry withNext:next];
@ -1174,20 +1163,14 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
dispatch_async(dispatch_get_main_queue(), ^
{
BLOG(@"didFinishPlaying: %@", queueItemId);
[self.delegate audioPlayer:self didFinishPlayingQueueItemId:queueItemId withReason:stopReason andProgress:progress andDuration:duration];
});
}
if (nextIsDifferent)
{
BLOG(@"Switch to playing: %@", currentlyPlayingEntry.queueItemId);
dispatch_async(dispatch_get_main_queue(), ^
{
BLOG(@"didStartPlaying: %@", playingQueueItemId);
[self.delegate audioPlayer:self didStartPlayingQueueItemId:playingQueueItemId];
});
}
@ -1205,8 +1188,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
dispatch_async(dispatch_get_main_queue(), ^
{
BLOG(@"didFinishPlaying: %@", queueItemId);
[self.delegate audioPlayer:self didFinishPlayingQueueItemId:queueItemId withReason:stopReason andProgress:progress andDuration:duration];
});
}
@ -1223,8 +1204,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
}
else if (newFileToPlay)
{
BLOG(@"Playing new file");
QueueEntry* entry = [upcomingQueue dequeue];
self.internalState = AudioPlayerInternalStateWaitingForData;
@ -1236,8 +1215,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
}
else if (seekToTimeWasRequested && currentlyPlayingEntry && currentlyPlayingEntry != currentlyReadingEntry)
{
BLOG(@"Seek was requested -- switching files necessary");
currentlyPlayingEntry.bufferIndex = -1;
[self setCurrentlyReadingEntry:currentlyPlayingEntry andStartPlaying:YES];
@ -1248,11 +1225,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
}
else if (currentlyReadingEntry == nil)
{
BLOG(@"Finished reading previous file");
if (nextIsIncompatible && currentlyPlayingEntry != nil)
{
BLOG(@"Holding off cause next is incompatible");
// Holding off cause next is incompatible
}
else
{
@ -1268,8 +1243,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
if (self.internalState != AudioPlayerInternalStateStopped)
{
BLOG(@"End of playing queue -- Stopping AudioQueue");
[self stopAudioQueue];
}
}
@ -1338,8 +1311,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
if (seekToTimeWasRequested && currentlyReadingEntry == currentlyPlayingEntry)
{
BLOG(@"Seeking to %d in file %@", (int)requestedSeekTime, currentlyReadingEntry.queueItemId);
[self processSeekToTime];
seekToTimeWasRequested = NO;
@ -1481,8 +1452,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
audioQueueFlushing = YES;
BLOG(@"AudioQueueStop");
error = AudioQueueStop(audioQueue, true);
audioQueue = nil;
@ -1530,8 +1499,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
audioQueueFlushing = YES;
BLOG(@"AudioQueueReset");
error = AudioQueueReset(audioQueue);
if (error)
@ -1636,8 +1603,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
-(void) dataSourceEof:(DataSource*)dataSourceIn
{
BLOG(@"eof %@", [dataSourceIn description]);
if (currentlyReadingEntry.dataSource != dataSourceIn)
{
return;
@ -1659,9 +1624,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
if (audioQueue)
{
BLOG(@"Finished buffering %@", currentlyReadingEntry.queueItemId);
currentlyReadingEntry.bufferIndex = audioPacketsReadCount;
currentlyReadingEntry.bufferIndex = audioPacketsReadCount;
currentlyReadingEntry = nil;
}
else
@ -1682,8 +1645,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
{
self.internalState = AudioPlayerInternalStatePaused;
BLOG(@"AudioQueuePause");
if (audioQueue)
{
error = AudioQueuePause(audioQueue);

4
Audjustable/Classes/AudioPlayer/LocalFileDataSource.m
View File

@ -74,8 +74,6 @@
{
NSURL* url = [[NSURL alloc] initFileURLWithPath:self.filePath];
BLOG(@"Opening %@", filePath);
if (stream)
{
CFReadStreamClose(stream);
@ -148,8 +146,6 @@
if (CFReadStreamSetProperty(stream, kCFStreamPropertyFileCurrentOffset, (__bridge CFTypeRef)[NSNumber numberWithLongLong:offset]) != TRUE)
{
position = 0;
BLOG(@"Problem setting stream position");
}
else
{