CQTexperiment
vspader 2008-02-22 03:09:03 +00:00
parent d1adc3d53e
commit c6dc1fd141
4 changed files with 2363 additions and 2194 deletions

View File

@ -66,9 +66,13 @@
- (IBAction)playPauseResume:(id)sender - (IBAction)playPauseResume:(id)sender
{ {
if (playbackStatus == kCogStatusStopped) if (playbackStatus == kCogStatusStopped)
{
[self play:self]; [self play:self];
}
else else
{
[self pauseResume:self]; [self pauseResume:self];
}
} }
- (IBAction)pauseResume:(id)sender - (IBAction)pauseResume:(id)sender
@ -123,8 +127,6 @@
int clickedSegment = [sender selectedSegment]; int clickedSegment = [sender selectedSegment];
if (clickedSegment == 0) //Previous if (clickedSegment == 0) //Previous
{ {
[sender setSelected:YES forSegment:0];
[sender setSelected:YES forSegment:1];
[self prev:sender]; [self prev:sender];
} }
else if (clickedSegment == 1) //Play else if (clickedSegment == 1) //Play
@ -150,12 +152,15 @@
{ {
if (playbackStatus != kCogStatusStopped) if (playbackStatus != kCogStatusStopped)
[self stop:self]; [self stop:self];
[playlistController setCurrentEntry:pe];
[positionSlider setDoubleValue:0.0]; NSLog(@"PLAYLIST CONTROLLER: %@", [playlistController class]);
[playlistController setCurrentEntry:pe];
[positionSlider setDoubleValue:0.0];
[self updateTimeField:0.0f]; [self updateTimeField:0.0f];
if (pe == nil)
return;
[audioPlayer play:[pe URL] withUserInfo:pe]; [audioPlayer play:[pe URL] withUserInfo:pe];
@ -554,12 +559,10 @@
} }
if (status == kCogStatusStopped) { if (status == kCogStatusStopped) {
[positionSlider setEnabled:NO]; [playlistController setCurrentEntry:nil];
}
else {
[positionSlider setEnabled:[[[playlistController currentEntry] seekable] boolValue]];
} }
playbackStatus = status; playbackStatus = status;
} }

View File

@ -9,8 +9,8 @@
enum enum
{ {
kCogStatusPaused = 0, kCogStatusStopped = 0,
kCogStatusStopped, kCogStatusPaused,
kCogStatusPlaying, kCogStatusPlaying,
kCogStatusFading, kCogStatusFading,
// kCogStatusEndOfFile, // kCogStatusEndOfFile,

View File

@ -692,15 +692,15 @@
080E96DDFE201D6D7F000001 /* Classes */ = { 080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
569C52C50D5F2BD500BDBDC9 /* Spotlight */,
177042960B8BC53600B86321 /* Application */, 177042960B8BC53600B86321 /* Application */,
1766C68D0B911DF1004A7AE4 /* AudioScrobbler */, 8E75752A09F31D5A0080F1EE /* Playlist */,
8E07AAEA0AAC90DC00A4B32F /* Preferences */, 8E07AAEA0AAC90DC00A4B32F /* Preferences */,
17211A5E0D68B79700911CA9 /* FileTreeWindow */, 17211A5E0D68B79700911CA9 /* FileTreeWindow */,
8E75752309F31D5A0080F1EE /* Feedback */, 8E75752309F31D5A0080F1EE /* Feedback */,
8E75752A09F31D5A0080F1EE /* Playlist */, 569C52C50D5F2BD500BDBDC9 /* Spotlight */,
177EBF770B8BC2A70000BC8C /* ThirdParty */, 1766C68D0B911DF1004A7AE4 /* AudioScrobbler */,
177EC0110B8BC2CF0000BC8C /* Utils */, 177EC0110B8BC2CF0000BC8C /* Utils */,
177EBF770B8BC2A70000BC8C /* ThirdParty */,
); );
name = Classes; name = Classes;
sourceTree = "<group>"; sourceTree = "<group>";

File diff suppressed because it is too large Load Diff