kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed debugging messages.

CQTexperiment
vspader 2007-07-11 01:20:32 +00:00
parent 5c8819db6c
commit daba91b462
37 changed files with 33 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Application/AppController.m
View File

@ -252,7 +252,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
{
[playbackController stop:self];
// DBLog(@"QUITTING");
NSFileManager *fileManager = [NSFileManager defaultManager];
NSString *folder = @"~/Library/Application Support/Cog/";
@ -279,7 +278,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
DBLog(@"Adding path: %@", filename);
[playlistLoader addURLs:[NSArray arrayWithObject:[NSURL fileURLWithPath:filename]] sort:NO];
return YES;
@ -333,7 +331,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[infoButton setState:NSOffState];
}
else if ([notification object] == fileDrawer) {
NSLog(@"CLOSED");
[fileButton setState:NSOffState];
[mainWindow makeFirstResponder: playlistView];
@ -407,7 +404,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
}
else if ([keyPath isEqualToString:@"values.remoteEnabled"] || [keyPath isEqualToString:@"values.remoteOnlyOnActive"]) {
if([[NSUserDefaults standardUserDefaults] boolForKey:@"remoteEnabled"]) {
NSLog(@"Remote enabled...");
BOOL onlyOnActive = [[NSUserDefaults standardUserDefaults] boolForKey:@"remoteOnlyOnActive"];
if (!onlyOnActive || [NSApp isActive]) {
[remote startListening: self];
@ -417,7 +413,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
}
}
else {
NSLog(@"DISABLE REMOTE");
[remote stopListening: self];
}
}
@ -425,8 +420,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
- (void)registerHotKeys
{
NSLog(@"REGISTERING HOTKEYS");
[playHotKey release];
playHotKey = [[NDHotKeyEvent alloc]
initWithKeyCode: [[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"hotKeyPlayKeyCode"] intValue]
@ -464,13 +457,11 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
- (void)clickPrev
{
NSLog(@"PREV");
[prevButton performClick:nil];
}
- (void)clickNext
{
NSLog(@"NEXT");
[nextButton performClick:nil];
}

17
Application/PlaybackController.m
View File

@ -1,7 +1,6 @@
#import "PlaybackController.h"
#import "PlaylistView.h"
#import "DBLog.h"
#import "CogAudio/Status.h"
#import "PlaylistController.h"
@ -59,7 +58,6 @@
- (IBAction)playPauseResume:(id)sender
{
DBLog(@"PLAYING");
if (playbackStatus == kCogStatusStopped)
[self play:self];
else
@ -68,7 +66,6 @@
- (IBAction)pauseResume:(id)sender
{
// DBLog(@"Pause/Resume Sent!");
if (playbackStatus == kCogStatusPaused)
[self resume:self];
else
@ -77,7 +74,6 @@
- (IBAction)pause:(id)sender
{
// DBLog(@"Pause Sent!");
[audioPlayer pause];
if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
@ -87,7 +83,6 @@
- (IBAction)resume:(id)sender
{
// DBLog(@"Resume Sent!");
[audioPlayer resume];
@ -98,8 +93,6 @@
- (IBAction)stop:(id)sender
{
// DBLog(@"Stop Sent!");
[audioPlayer stop];
if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableAudioScrobbler"]) {
@ -126,7 +119,6 @@
- (void)playEntry:(PlaylistEntry *)pe
{
// DBLog(@"PlayEntry: %@ Sent!", [pe filename]);
if (playbackStatus != kCogStatusStopped)
[self stop:self];
@ -163,7 +155,6 @@
- (IBAction)prev:(id)sender
{
DBLog(@"CALLING");
if ([playlistController prev] == nil)
return;
@ -173,7 +164,6 @@
- (IBAction)seek:(id)sender
{
// DBLog(@"SEEKING?");
double time;
time = [positionSlider doubleValue];
@ -191,11 +181,11 @@
[alt retain];
if (img == nil)
{
DBLog(@"NIL IMAGE!!!");
NSLog(@"Error loading image!");
}
if (alt == nil)
{
DBLog(@"NIL ALT");
NSLog(@"Error loading alt image...");
}
[playButton setImage:img];
@ -298,7 +288,6 @@
}
else
{
DBLog(@"NEXT SONG: %@", [pe url]);
[player setNextStream:[pe url] withUserInfo:pe];
}
}
@ -332,7 +321,6 @@
if ([positionSlider tracking] == NO)
{
// DBLog(@"Received pos update: %f", pos);
[positionSlider setDoubleValue:pos];
[self updateTimeField:pos];
}
@ -345,7 +333,6 @@
int status = [s intValue];
if (status == kCogStatusStopped || status == kCogStatusPaused)
{
DBLog(@"INVALIDATING");
if (positionTimer)
{
[positionTimer invalidate];

8
Audio/AudioPlayer.m
View File

@ -80,7 +80,6 @@
url = nextStream;
if (url == nil)
{
NSLog(@"End of playlist? Nothing left.");
return;
}
@ -96,7 +95,7 @@
[self setShouldContinue:YES];
outputLaunched = NO;
NSLog(@"Launching input thread!");
[bufferChain launchThreads];
}
@ -168,12 +167,10 @@
{
[self setPlaybackStatus:kCogStatusPlaying];
if (outputLaunched == NO) {
NSLog(@"Launching output thread!");
[output launchThread];
outputLaunched = YES;
}
else {
NSLog(@"Resuming not launching");
[self setShouldContinue:YES];
[output resume];
}
@ -227,15 +224,12 @@
if ([chainQueue count] <= 0)
{
//End of playlist
DBLog(@"STOPPED");
[self stop];
return;
}
// NSLog(@"SWAPPING BUFFERS");
[bufferChain release];
DBLog(@"END OF INPUT PLAYED");
bufferChain = [chainQueue objectAtIndex:0];
[bufferChain retain];

2
Audio/Chain/BufferChain.m
View File

@ -60,7 +60,6 @@
- (void)launchThreads
{
DBLog(@"LAUNCHING THREAD FOR INPUT");
[inputNode launchThread];
}
@ -97,7 +96,6 @@
- (void)initialBufferFilled
{
NSLog(@"Filled initial buffer!");
[controller launchOutputThread];
}

13
Audio/Chain/Converter.m
View File

@ -66,7 +66,6 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
- (void)reset
{
NSLog(@"RESETTING");
AudioConverterReset(converter);
}
@ -105,7 +104,6 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
- (void)setupWithInputFormat:(AudioStreamBasicDescription)inf outputFormat:(AudioStreamBasicDescription)outf
{
NSLog(@"CREATING THE CONVERTER");
//Make the converter
OSStatus stat = noErr;
@ -135,20 +133,15 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
kAudioConverterPropertyCalculateOutputBufferSize,
&dataSize,
(void*)&outputSize);
NSLog(@"Output size: %i %i", outputSize, CHUNK_SIZE);
if (outputBuffer)
{
NSLog(@"FREEING");
free(outputBuffer);
NSLog(@"FREED");
}
outputBuffer = malloc(outputSize);
NSLog(@"Converter setup!");
PrintStreamDesc(&inf);
PrintStreamDesc(&outf);
//PrintStreamDesc(&inf);
//PrintStreamDesc(&outf);
}

15
Audio/Chain/InputNode.m
View File

@ -17,7 +17,6 @@
{
outputFormat = of;
NSLog(@"Opening: %@", url);
decoder = [AudioDecoder audioDecoderForURL:url];
[decoder retain];
@ -27,7 +26,6 @@
[self registerObservers];
NSLog(@"Got decoder...%@", decoder);
if (decoder == nil)
return NO;
@ -40,7 +38,6 @@
shouldContinue = YES;
shouldSeek = NO;
NSLog(@"OPENED");
return YES;
}
@ -51,8 +48,6 @@
options:(NSKeyValueObservingOptionNew)
context:NULL];
NSLog(@"ADDED OBSERVER!!!");
[decoder addObserver:self
forKeyPath:@"metadata"
options:(NSKeyValueObservingOptionNew)
@ -65,12 +60,9 @@
context:(void *)context
{
if ([keyPath isEqual:@"properties"]) {
NSLog(@"Properties changed!");
//Setup converter!
[converter cleanUp];
NSLog(@"CLEANED UP");
[converter setupWithInputFormat:propertiesToASBD([decoder properties]) outputFormat:outputFormat];
NSLog(@"CREATED CONVERTED");
//Inform something of properties change
}
else if ([keyPath isEqual:@"metadata"]) {
@ -82,14 +74,11 @@
{
int amountRead = 0, amountConverted = 0, amountInBuffer = 0;
void *inputBuffer = malloc(CHUNK_SIZE);
NSLog(@"Playing file: %i", self);
while ([self shouldContinue] == YES && [self endOfStream] == NO)
{
if (shouldSeek == YES)
{
NSLog(@"Actually seeking");
[decoder seekToTime:seekTime];
shouldSeek = NO;
@ -114,7 +103,6 @@
[controller initialBufferFilled];
}
NSLog(@"END OF FILE?! %i %i", amountRead, amountConverted);
endOfStream = YES;
[controller endOfInputReached];
break; //eof
@ -127,13 +115,10 @@
[converter cleanUp];
free(inputBuffer);
NSLog(@"CLOSED: %i", self);
}
- (void)seek:(double)time
{
NSLog(@"SEEKING IN INPUTNODE");
seekTime = time;
shouldSeek = YES;
[self resetBuffer];

9
Audio/Chain/Node.m
View File

@ -76,7 +76,6 @@
//Should be overwriten by subclass.
- (void)process
{
DBLog(@"WRONG PROCESS");
}
- (void)threadEntry:(id)arg
@ -84,7 +83,6 @@
[self retain];
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
DBLog(@"In thread entry");
[self process];
@ -105,20 +103,18 @@
if (availInput <= amount && [previousNode endOfStream] == YES)
{
NSLog(@"END OF NODE");
// NSLog(@"RELEASING: %i %i %i", availInput, [previousNode endOfStream], shouldContinue);
// [previousNode release];
//If it is the outputNode, [soundController newInputChain];
//else
endOfStream = YES;
}
if (availInput <= 0) {
/* if (availInput <= 0) {
NSLog(@"BUFFER RAN DRY!");
}
else if (availInput < amount) {
NSLog(@"BUFFER IN DANGER");
}
*/
amountToCopy = availInput;
if (amountToCopy > amount)
{
@ -140,7 +136,6 @@
- (void)launchThread
{
DBLog(@"THREAD LAUNCHED");
[NSThread detachNewThreadSelector:@selector(threadEntry:) toTarget:self withObject:nil];
}

8
Audio/Chain/OutputNode.m
View File

@ -24,7 +24,6 @@
- (void)seek:(double)time
{
NSLog(@"SEEKING!");
[output pause];
amountPlayed = time*format.mBytesPerFrame*(format.mSampleRate/1000.0);
@ -38,13 +37,11 @@
- (void)pause
{
[output pause];
NSLog(@"PAUSED!");
}
- (void)resume
{
[output resume];
NSLog(@"RESUMED");
}
- (int)readData:(void *)ptr amount:(int)amount
@ -57,15 +54,14 @@
n = [super readData:ptr amount:amount];
if (endOfStream == YES)
{
NSLog(@"End of stream reached!");
amountPlayed = 0;
[controller endOfInputPlayed]; //Updates shouldContinue appropriately?
}
if (n == 0) {
/* if (n == 0) {
NSLog(@"Output Buffer dry!");
}
*/
amountPlayed += n;
[pool release];

28
Audio/Output/OutputCoreAudio.m
View File

@ -27,7 +27,6 @@
static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
{
//NSLog(@"ASKING FOR DATA!");
OutputCoreAudio *output = (OutputCoreAudio *)inRefCon;
OSStatus err = noErr;
void *readPointer = ioData->mBuffers[0].mData;
@ -36,7 +35,6 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
if ([output->outputController shouldContinue] == NO)
{
//NSLog(@"STOPPING");
AudioOutputUnitStop(output->outputUnit);
// [output stop];
@ -48,7 +46,6 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
if ((amountRead < amountToRead) && [output->outputController endOfStream] == NO) //Try one more time! for track changes!
{
//NSLog(@"READING AGAIN! %i/%i", amountRead, amountToRead);
int amountRead2; //Use this since return type of readdata isnt known...may want to fix then can do a simple += to readdata
amountRead2 = [output->outputController readData:(readPointer+amountRead) amount:amountToRead-amountRead];
amountRead += amountRead2;
@ -65,12 +62,11 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
if ([keyPath isEqualToString:@"values.outputDevice"]) {
NSLog(@"CHANGED!");
NSDictionary *device = [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"outputDevice"];
NSNumber *deviceID = [device objectForKey:@"deviceID"];
NSLog(@"Selecting output device %d %@", [deviceID longValue], [device objectForKey:@"name"]);
[self setOutputDevice:[deviceID longValue]];
}
}
@ -81,7 +77,6 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
{
// Set the output device
AudioDeviceID deviceID = outputDevice; //XXX use default if null
NSLog(@"Using output device %d", deviceID);
OSStatus err;
if (outputDevice == -1) {
@ -91,12 +86,10 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
&deviceID);
if (err != noErr) {
NSLog(@"THERES NO DEFAULT OUTPUT DEVICE! GARRRGGHHH");
NSLog(@"THERES NO DEFAULT OUTPUT DEVICE");
return NO;
}
NSLog(@"Default output device: %i", deviceID);
}
@ -108,7 +101,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
sizeof(AudioDeviceID));
if (err != noErr) {
NSLog(@"THERES NO OUTPUT DEVICE! AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!! %i", err);
NSLog(@"THERES NO OUTPUT DEVICE!!!!!! %i", err);
return NO;
}
@ -143,8 +136,6 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
if (err != noErr)
return NO;
NSLog(@"SETUP");
UInt32 size = sizeof (AudioStreamBasicDescription);
Boolean outWritable;
//Gets the size of the Stream Format Property and if it is writable
@ -172,7 +163,7 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
// deviceFormat.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;
deviceFormat.mBytesPerFrame = deviceFormat.mChannelsPerFrame*(deviceFormat.mBitsPerChannel/8);
deviceFormat.mBytesPerPacket = deviceFormat.mBytesPerFrame * deviceFormat.mFramesPerPacket;
// DBLog(@"stuff: %i %i %i %i", deviceFormat.mBitsPerChannel, deviceFormat.mBytesPerFrame, deviceFormat.mBytesPerPacket, deviceFormat.mFramesPerPacket);
err = AudioUnitSetProperty (outputUnit,
kAudioUnitProperty_StreamFormat,
kAudioUnitScope_Output,
@ -196,12 +187,9 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
[outputController setFormat:&deviceFormat];
DBLog(@"Audio output successfully initialized");
NSDictionary *device = [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"outputDevice"];
if (device) {
NSLog(@"THIS ONE");
BOOL ok = [self setOutputDevice:[[device objectForKey:@"deviceID"] longValue]];
if (!ok) {
//Ruh roh.
@ -211,12 +199,9 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
}
}
else {
NSLog(@"THAT ONE");
[self setOutputDevice: -1];
}
NSLog(@"DONE SETTING UP");
return (err == noErr);
}
@ -232,13 +217,11 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
- (void)start
{
DBLog(@"START OUTPUT\n");
AudioOutputUnitStart(outputUnit);
}
- (void)stop
{
DBLog(@"STOP!");
if (outputUnit)
{
AudioOutputUnitStop(outputUnit);
@ -257,15 +240,12 @@ static OSStatus Sound_Renderer(void *inRefCon, AudioUnitRenderActionFlags *ioAc
- (void)pause
{
NSLog(@"PAUSE");
AudioOutputUnitStop(outputUnit);
}
- (void)resume
{
NSLog(@"RESUME");
OSStatus err = AudioOutputUnitStart(outputUnit);
NSLog(@"Resume: %i", err);
}
@end

13
Audio/PluginController.m
View File

@ -85,7 +85,6 @@ static PluginController *sharedPluginController = nil;
NSString *pname;
NSLog(@"Loading plugins at %@, candidates: %@", path, dirContents);
while (pname = [dirEnum nextObject])
{
NSString *ppath;
@ -96,12 +95,10 @@ static PluginController *sharedPluginController = nil;
NSBundle *b = [NSBundle bundleWithPath:ppath];
if (b)
{
NSLog(@"Loaded bundle: %@", b);
Class plugin = [b principalClass];
NSLog(@"Candidate: %@", plugin);
if ([plugin respondsToSelector:@selector(pluginInfo)])
{
NSLog(@"Responds to selector...");
//PluginInfo is a dictionary that contains keys/values like pluginClass,classType...ex: VorbisDecoder, Decoder
NSDictionary *pluginInfo = [plugin pluginInfo];
NSEnumerator *e = [pluginInfo keyEnumerator];
@ -109,19 +106,15 @@ static PluginController *sharedPluginController = nil;
while (className = [e nextObject]) {
id pluginType = [pluginInfo objectForKey:className];
if ([pluginType isEqualToString:kCogDecoder]) {
NSLog(@"DECODER");
[self setupDecoder:className];
}
else if ([pluginType isEqualToString:kCogMetadataReader]) {
NSLog(@"Metadata");
[self setupMetadataReader:className];
}
else if ([pluginType isEqualToString:kCogPropertiesReader]) {
NSLog(@"Properties");
[self setupPropertiesReader:className];
}
else if ([pluginType isEqualToString:kCogSource]) {
NSLog(@"Source");
[self setupSource:className];
}
else {
@ -194,10 +187,10 @@ static PluginController *sharedPluginController = nil;
- (void)printPluginInfo
{
NSLog(@"Sources: %@", sources);
/* NSLog(@"Sources: %@", sources);
NSLog(@"Decoders: %@", decoders);
NSLog(@"Metadata Readers: %@", metadataReaders);
NSLog(@"Properties Readers: %@", propertiesReaders);
NSLog(@"Properties Readers: %@", propertiesReaders); */
}
- (NSDictionary *)sources

8
Audio/ThirdParty/VirtualRingBuffer/VirtualRingBuffer.m vendored
View File

@ -236,7 +236,7 @@ void *allocateVirtualBuffer(UInt32 bufferLength)
}
if (realAddress != originalAddress) {
#if DEBUG
DBLog(@"allocateVirtualBuffer: vm_allocate 2nd time didn't return same address (%p vs %p)", originalAddress, realAddress);
NSLog(@"allocateVirtualBuffer: vm_allocate 2nd time didn't return same address (%p vs %p)", originalAddress, realAddress);
#endif
goto errorReturn;
}
@ -252,13 +252,13 @@ void *allocateVirtualBuffer(UInt32 bufferLength)
}
if (!memoryEntry) {
#if DEBUG
DBLog(@"mach_make_memory_entry: returned memoryEntry of NULL");
NSLog(@"mach_make_memory_entry: returned memoryEntry of NULL");
#endif
goto errorReturn;
}
if (memoryEntryLength != bufferLength) {
#if DEBUG
DBLog(@"mach_make_memory_entry: size changed (from %0x to %0x)", bufferLength, memoryEntryLength);
NSLog(@"mach_make_memory_entry: size changed (from %0x to %0x)", bufferLength, memoryEntryLength);
#endif
goto errorReturn;
}
@ -277,7 +277,7 @@ void *allocateVirtualBuffer(UInt32 bufferLength)
}
if (virtualAddress != realAddress + bufferLength) {
#if DEBUG
DBLog(@"vm_map: didn't return correct address (%p vs %p)", realAddress + bufferLength, virtualAddress);
NSLog(@"vm_map: didn't return correct address (%p vs %p)", realAddress + bufferLength, virtualAddress);
#endif
goto errorReturn;
}

6
Feedback/FeedbackController.m
View File

@ -31,7 +31,7 @@
- (void)FeedbackErrorOccurred:(NSNotification *)aNotification
{
DBLog(@"Error sending feedback");
NSLog(@"Error sending feedback");
[sendingIndicator stopAnimation:self];
@ -44,8 +44,6 @@
- (void)FeedbackSent:(NSNotification *)aNotification
{
// DBLog(@"Feedback Sent");
[sendingIndicator stopAnimation:self];
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
@ -58,8 +56,6 @@
- (IBAction)sendFeedback:(id)sender
{
// DBLog(@"Sending feedback...");
[sendingIndicator startAnimation:self];
//Using this so that if its a bad connection, it doesnt sit there looking stupid..or should it

3
Feedback/FeedbackSocket.m
View File

@ -43,7 +43,7 @@ NSString *encodeForURL(NSString *s)
NSURLResponse* response;
NSData* resultData = [NSURLConnection sendSynchronousRequest:post returningResponse:&response error:&error];
NSString *resultString = [[[NSString alloc] initWithData:resultData encoding:NSASCIIStringEncoding] autorelease];
DBLog(@"RESULT: %@", resultString);
//NSLog(@"RESULT: %@", resultString);
if ([resultString caseInsensitiveCompare:@"SUCCESS"] == NSOrderedSame)
{
[self performSelectorOnMainThread:@selector(returnSuccess:) withObject:nil waitUntilDone:NO];
@ -58,7 +58,6 @@ NSString *encodeForURL(NSString *s)
- (void)sendFeedback: (NSString *)f subject:(NSString *)s message:(NSString *)m version:(NSString *)v
{
// DBLog(@"Detaching thread for feedback");
if ([f isEqualToString:@""])
{
f = @"Anonymous";

1
FileDrawer/DirectoryNode.m
View File

@ -26,7 +26,6 @@
- (void)dealloc {
[[controller watcher] removePath:[self path]];
NSLog(@"DEALLOC: %@", self);
if (subpaths)
[subpaths release];

4
FileDrawer/FileTreeController.m
View File

@ -21,7 +21,6 @@
[watcher setDelegate:self];
[self setRootPath: [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileDrawerRootPath"] ];
NSLog(@"AWAKENED");
}
- (void)dealloc
@ -29,8 +28,6 @@
[rootPath release];
[watcher release];
NSLog(@"DEALLOCATING CONTROLLER");
[super dealloc];
}
@ -203,7 +200,6 @@
[url release];
}
NSLog(@"Adding URLs: %@", urls);
[playlistLoader addURLs:urls sort:YES];
[urls release];
}

13
FileDrawer/SmartFolderNode.m
View File

@ -39,13 +39,11 @@
//need to merge this and directorynode
- (void)processContents: (NSArray *)contents
{
NSLog(@"PROCESSING: %@", contents);
NSEnumerator *e = [contents objectEnumerator];
NSString *s;
while (s = [e nextObject])
{
NSLog(@"STRING: %@", s);
/* if ([s characterAtIndex:0] == '.')
{
continue;
@ -64,10 +62,9 @@
[[NSFileManager defaultManager] fileExistsAtPath:s isDirectory:&isDir];
NSLog(@"IS IT ACCEPTABLE?");
if (!isDir && ![[controller acceptableFileTypes] containsObject:[s pathExtension]])
continue;
NSLog(@"IS IT A FILE?");
if (isDir)
newNode = [[DirectoryNode alloc] initWithPath: s controller:controller];
else
@ -75,7 +72,7 @@
}
[subpaths addObject:newNode];
NSLog(@"SUBPATHS IN PROCESS: %@", subpaths);
[newNode release];
}
}
@ -90,7 +87,6 @@
NSString *rawQuery = [doc objectForKey:@"RawQuery"];
NSArray *searchPaths = [[doc objectForKey:@"SearchCriteria"] objectForKey:@"CurrentFolderPath"];
NSLog(@"Query: %@", rawQuery);
// Ugh, Carbon from now on...
MDQueryRef query = MDQueryCreate(kCFAllocatorDefault, (CFStringRef)rawQuery, NULL, NULL);
@ -99,9 +95,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(queryFinished:) name:(NSString*)kMDQueryDidFinishNotification object:(id)query];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(queryUpdate:) name:(NSString*)kMDQueryDidUpdateNotification object:(id)query];
NSLog(@"PATHS: %@", searchPaths);
MDQueryExecute(query, kMDQueryWantsUpdates);
NSLog(@"QUERY FINISHED: %@", subpaths);
}
return subpaths;
@ -139,7 +133,6 @@
MDItemRef item = (MDItemRef)MDQueryGetResultAtIndex(query, i);
NSString *itemPath = (NSString*)MDItemCopyAttribute(item, kMDItemPath);
NSLog(@"RESULT PATH: %@", itemPath);
[results addObject:itemPath];
@ -154,8 +147,6 @@
- (void)queryUpdate:(NSNotification *)notification
{
NSLog(@"QUERY UPDATE: %@", notification);
[subpaths removeAllObjects];
[self queryFinished: notification];
}

2
Playlist/PlaylistController.m
View File

@ -154,7 +154,6 @@
- (void)removeObjectsAtArrangedObjectIndexes:(NSIndexSet *)indexes
{
NSLog(@"REMOVING");
NSArray *a = [[self arrangedObjects] objectsAtIndexes:indexes]; //Screw 10.3
if ([a containsObject:currentEntry])
@ -265,7 +264,6 @@
{
if (repeat == YES)
{
NSLog(@"Adding shuffled list to back!");
[self addShuffledListToBack];
}
else

3
Playlist/PlaylistEntry.m
View File

@ -79,7 +79,7 @@
{
[i retain];
[idx release];
NSLog(@"INDEX: %@", i);
idx = i;
}
@ -149,7 +149,6 @@
- (NSString *)title
{
// DBLog(@"HERE FUCK: %@", title);
return title;
}

16
Playlist/PlaylistLoader.m
View File

@ -111,8 +111,6 @@
- (NSArray *)urlsFromM3u:(NSString *)filename
{
NSLog(@"Loading playlist: %@", filename);
NSError *error = nil;
NSString *contents = [NSString stringWithContentsOfFile:filename encoding:NSUTF8StringEncoding error:&error];
if (error || !contents) {
@ -140,13 +138,11 @@
{
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filename createFile:YES];
if (!fileHandle) {
NSLog(@"Error!");
NSLog(@"Error saving m3u!");
return nil;
}
[fileHandle truncateFileAtOffset:0];
NSLog(@"Saving: %@", filename);
PlaylistEntry *pe;
NSEnumerator *e = [[playlistController content] objectEnumerator];
@ -263,7 +259,6 @@
if (index < 0)
index = 0;
NSLog(@"URLS: %@", urls);
NSEnumerator *urlEnumerator = [urls objectEnumerator];
NSURL *url;
while (url = [urlEnumerator nextObject])
@ -290,8 +285,6 @@
}
}
NSLog(@"Expanded URLs: %@", expandedURLs);
NSArray *sortedURLs;
if (sort == YES)
{
@ -306,8 +299,6 @@
sortedURLs = [expandedURLs copy];
}
NSLog(@"Sorted URLs: %@", expandedURLs);
urlEnumerator = [sortedURLs objectEnumerator];
while (url = [urlEnumerator nextObject])
{
@ -321,8 +312,6 @@
}
}
NSLog(@"All URLs: %@", allURLs);
urlEnumerator = [allURLs objectEnumerator];
while (url = [urlEnumerator nextObject])
{
@ -341,9 +330,6 @@
}
}
NSLog(@"Valid URLs: %@", validURLs);
//Create actual entries
int i;
NSMutableArray *entries = [NSMutableArray array];

9
Playlist/PlaylistView.m
View File

@ -151,7 +151,7 @@
[self selectRow:row byExtendingSelection:NO];
}
}
NSLog(@"Number of selected rows: %i", [self numberOfSelectedRows]);
if ([self numberOfSelectedRows] <=0)
{
//No rows are selected, so the table should be displayed with all items disabled
@ -159,9 +159,8 @@
int i;
for (i=0;i<[tableViewMenu numberOfItems];i++) {
[[tableViewMenu itemAtIndex:i] setEnabled:NO];
NSLog(@"Enabled: %@ %i", [[tableViewMenu itemAtIndex:i] title], [[tableViewMenu itemAtIndex:i] isEnabled]);
}
NSLog(@"All disabled!");
return [tableViewMenu autorelease];
}
else
@ -176,7 +175,7 @@
unsigned int modifiers = [e modifierFlags] & (NSCommandKeyMask | NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask);
NSString *characters = [e characters];
unichar c;
NSLog(@"DOWN!");
if ([characters length] != 1) {
[super keyDown:e];
@ -184,7 +183,6 @@
}
c = [characters characterAtIndex:0];
NSLog(@"Modifiers: %i", modifiers);
if (modifiers == 0 && (c == NSDeleteCharacter || c == NSBackspaceCharacter || c == NSDeleteFunctionKey))
{
[playlistController remove:self];
@ -198,7 +196,6 @@
[playbackController play:self];
}
else if (modifiers == 0 && c == 0x1b) { //Escape
NSLog(@"ESCAPE!");
[playlistController clearFilterPredicate:self];
}
else

2
Playlist/Shuffle.m
View File

@ -40,7 +40,7 @@ int randint(int low, int high)
t = sum([a count]);
r = randint(1, t);
p = reverse_sum(r) - 1;
printf("%i, %i, %i, %i\n", [a count], t, r, p);
//printf("%i, %i, %i, %i\n", [a count], t, r, p);
[b insertObject:[a objectAtIndex:p] atIndex:0];
[a removeObjectAtIndex:p];

1
Plugins/HTTPSource/HTTPSource.m
View File

@ -65,7 +65,6 @@
int l = [_socket receive:buffer amount:amount];
uint8_t *f;
while(NULL == (f = (uint8_t *)strnstr((const char *)buffer, "\r\n\r\n", l))) {
NSLog(@"LOOKING FOR HEADER! %i", f);
fwrite(buffer, 1,l, testFout);
//Need to check for boundary conditions
memmove(buffer, (uint8_t *)buffer + (l - delimeter_size), delimeter_size);

3
Plugins/HTTPSource/Utils/Socket.m
View File

@ -26,7 +26,6 @@
struct hostent *he;
if (_fd < 0) {
NSLog(@"%s\n", strerror(errno));
return nil;
}
@ -42,7 +41,7 @@
memcpy(&sin.sin_addr, he->h_addr, 4);
if (connect(_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
NSLog(@"%s\n", strerror(errno));
NSLog(@"Error: %s\n", strerror(errno));
close(_fd);
return nil;
}

3
Plugins/MAD/MADDecoder.m
View File

@ -517,7 +517,6 @@ static inline signed int scale (mad_fixed_t sample)
channels = MAD_NCHANNELS(&_frame.header);
bitsPerSample = 16;
NSLog(@"FORMAT CHANGED: %f", frequency);
[self willChangeValueForKey:@"properties"];
[self didChangeValueForKey:@"properties"];
@ -578,8 +577,6 @@ static inline signed int scale (mad_fixed_t sample)
_seekSkip = YES;
NSLog(@"Seeking: %lf", seconds*1000.0);
return seconds*1000.0;
}

9
Plugins/Musepack/MusepackDecoder.m
View File

@ -12,7 +12,6 @@
mpc_int32_t ReadProc(void *data, void *ptr, mpc_int32_t size)
{
NSLog(@"MPC Read: %i", size);
MusepackDecoder *decoder = (MusepackDecoder *) data;
return [[decoder source] read:ptr amount:size];
@ -21,13 +20,12 @@ mpc_int32_t ReadProc(void *data, void *ptr, mpc_int32_t size)
mpc_bool_t SeekProc(void *data, mpc_int32_t offset)
{
MusepackDecoder *decoder = (MusepackDecoder *) data;
NSLog(@"MPC Seek: %i", offset);
return [[decoder source] seek:offset whence:SEEK_SET];
}
mpc_int32_t TellProc(void *data)
{
NSLog(@"MPC Tell");
MusepackDecoder *decoder = (MusepackDecoder *) data;
return [[decoder source] tell];
@ -35,7 +33,6 @@ mpc_int32_t TellProc(void *data)
mpc_int32_t GetSizeProc(void *data)
{
NSLog(@"MPC GetSize");
MusepackDecoder *decoder = (MusepackDecoder *) data;
if ([[decoder source] seekable]) {
@ -55,7 +52,6 @@ mpc_int32_t GetSizeProc(void *data)
mpc_bool_t CanSeekProc(void *data)
{
NSLog(@"MPC Canseek");
MusepackDecoder *decoder = (MusepackDecoder *) data;
return [[decoder source] seekable];
@ -71,7 +67,6 @@ mpc_bool_t CanSeekProc(void *data)
reader.get_size = GetSizeProc;
reader.canseek = CanSeekProc;
reader.data = self;
NSLog(@"%@", reader.data);
mpc_streaminfo_init(&info);
if (mpc_streaminfo_read(&info, &reader) != ERROR_CODE_OK)
@ -94,8 +89,6 @@ mpc_bool_t CanSeekProc(void *data)
length = ((double)mpc_streaminfo_get_length_samples(&info)*1000.0)/frequency;
NSLog(@"Length: %lf", length);
[self willChangeValueForKey:@"properties"];
[self didChangeValueForKey:@"properties"];

1
Plugins/Shorten/ShortenDecoder.mm
View File

@ -93,7 +93,6 @@
{
if(decoder)
{
NSLog(@"Exiting decoder!");
decoder->exit();
delete decoder;
decoder = NULL;

3
Plugins/Vorbis/VorbisDecoder.m
View File

@ -64,13 +64,11 @@ long sourceTell(void *datasource)
bitrate = (vi->bitrate_nominal/1000.0);
channels = vi->channels;
frequency = vi->rate;
NSLog(@"INFO: %i", bitsPerSample);
seekable = ov_seekable(&vorbisRef);
length = ((double)ov_pcm_total(&vorbisRef, -1) * 1000.0)/frequency;
NSLog(@"Ok to go WITH OGG. %i", seekable);
[self willChangeValueForKey:@"properties"];
[self didChangeValueForKey:@"properties"];
@ -91,7 +89,6 @@ long sourceTell(void *datasource)
channels = vi->channels;
frequency = vi->rate;
NSLog(@"Format changed...");
[self willChangeValueForKey:@"properties"];
[self didChangeValueForKey:@"properties"];
}

1
Plugins/WavPack/WavPackDecoder.m
View File

@ -130,7 +130,6 @@ int32_t WriteBytesProc(void *ds, void *data, int32_t bcount)
void *sampleBuf = malloc(size*2);
numsamples = size/(bitsPerSample/8)/channels;
// DBLog(@"NUM SAMPLES: %i %i", numsamples, size);
n = WavpackUnpackSamples(wpc, sampleBuf, numsamples);
int i;

2
Preferences/General/HotKeyControl.m
View File

@ -59,7 +59,6 @@ extern CGError CGSSetGlobalHotKeyOperatingMode(CGSConnection connection,
- (BOOL)becomeFirstResponder
{
NSLog(@"BECAME FIRST");
[self startObserving];
return YES;
@ -94,7 +93,6 @@ extern CGError CGSSetGlobalHotKeyOperatingMode(CGSConnection connection,
- (void)mouseDown:(NSEvent *)theEvent
{
NSLog(@"MOUSE DOWN");
[self startObserving];
}