diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 3c29717f9..9bfd4dc56 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -11,6 +11,10 @@ 170680630B950158006BA573 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 170680620B950158006BA573 /* Growl.framework */; }; 170680840B950164006BA573 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 170680620B950158006BA573 /* Growl.framework */; }; 171678C00AC8C39E00C28CF3 /* SmartFolderNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 171678BE0AC8C39E00C28CF3 /* SmartFolderNode.m */; }; + 171B57DD0C091F2B00F6AFAF /* flac.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57D90C091F2B00F6AFAF /* flac.icns */; }; + 171B57DE0C091F2B00F6AFAF /* m4a.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DA0C091F2B00F6AFAF /* m4a.icns */; }; + 171B57DF0C091F2B00F6AFAF /* mp3.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DB0C091F2B00F6AFAF /* mp3.icns */; }; + 171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */ = {isa = PBXBuildFile; fileRef = 171B57DC0C091F2B00F6AFAF /* ogg.icns */; }; 1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */; }; 1766C6930B911DF1004A7AE4 /* AudioScrobbler.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C68F0B911DF1004A7AE4 /* AudioScrobbler.m */; }; 1766C6950B911DF1004A7AE4 /* AudioScrobblerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C6910B911DF1004A7AE4 /* AudioScrobblerClient.m */; }; @@ -154,6 +158,10 @@ 170680620B950158006BA573 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = ThirdParty/Frameworks/Growl.framework; sourceTree = ""; }; 171678BD0AC8C39E00C28CF3 /* SmartFolderNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartFolderNode.h; sourceTree = ""; }; 171678BE0AC8C39E00C28CF3 /* SmartFolderNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SmartFolderNode.m; sourceTree = ""; }; + 171B57D90C091F2B00F6AFAF /* flac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = flac.icns; sourceTree = ""; }; + 171B57DA0C091F2B00F6AFAF /* m4a.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = m4a.icns; sourceTree = ""; }; + 171B57DB0C091F2B00F6AFAF /* mp3.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mp3.icns; sourceTree = ""; }; + 171B57DC0C091F2B00F6AFAF /* ogg.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ogg.icns; sourceTree = ""; }; 1755E1F60BA0D2B600CA3560 /* PlaylistLoader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlaylistLoader.h; sourceTree = ""; }; 1755E1F70BA0D2B600CA3560 /* PlaylistLoader.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PlaylistLoader.m; sourceTree = ""; }; 1766C68E0B911DF1004A7AE4 /* AudioScrobbler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AudioScrobbler.h; sourceTree = ""; }; @@ -655,6 +663,10 @@ 8E75758E09F31D800080F1EE /* Icons */ = { isa = PBXGroup; children = ( + 171B57D90C091F2B00F6AFAF /* flac.icns */, + 171B57DA0C091F2B00F6AFAF /* m4a.icns */, + 171B57DB0C091F2B00F6AFAF /* mp3.icns */, + 171B57DC0C091F2B00F6AFAF /* ogg.icns */, 8E7575A609F31D800080F1EE /* wheel.icns */, ); path = Icons; @@ -760,6 +772,10 @@ 1766C8980B912FB4004A7AE4 /* shuffle_off.png in Resources */, 1766C8990B912FB4004A7AE4 /* shuffle_on.png in Resources */, 179790F20C087B46001D6996 /* OpenURLPanel.nib in Resources */, + 171B57DD0C091F2B00F6AFAF /* flac.icns in Resources */, + 171B57DE0C091F2B00F6AFAF /* m4a.icns in Resources */, + 171B57DF0C091F2B00F6AFAF /* mp3.icns in Resources */, + 171B57E00C091F2B00F6AFAF /* ogg.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Icons/flac.icns b/Icons/flac.icns new file mode 100644 index 000000000..45214a8b8 Binary files /dev/null and b/Icons/flac.icns differ diff --git a/Icons/m4a.icns b/Icons/m4a.icns new file mode 100644 index 000000000..c140456df Binary files /dev/null and b/Icons/m4a.icns differ diff --git a/Icons/mp3.icns b/Icons/mp3.icns new file mode 100644 index 000000000..6fb45fb3c Binary files /dev/null and b/Icons/mp3.icns differ diff --git a/Icons/ogg.icns b/Icons/ogg.icns new file mode 100644 index 000000000..943fd3597 Binary files /dev/null and b/Icons/ogg.icns differ diff --git a/Info.plist b/Info.plist index c24ed81dd..c98e916f2 100644 --- a/Info.plist +++ b/Info.plist @@ -1,7 +1,6 @@ - - + - + CFBundleDevelopmentRegion English @@ -28,6 +27,8 @@ aiff aifc + CFBundleTypeIconFile + aiff.icns CFBundleTypeName AIFF Audio File CFBundleTypeRole @@ -39,52 +40,128 @@ wav wave + CFBundleTypeIconFile + wav.icns CFBundleTypeName Wave Audio File + CFBundleTypeRole + Viewer CFBundleTypeExtensions mp3 + CFBundleTypeIconFile + mp3.icns CFBundleTypeName MP3 Audio File + CFBundleTypeRole + Viewer CFBundleTypeExtensions flac + CFBundleTypeIconFile + flac.icns CFBundleTypeName Flac Audio File + CFBundleTypeRole + Viewer CFBundleTypeExtensions ape + CFBundleTypeIconFile + ape.icns CFBundleTypeName Monkey's Audio File + CFBundleTypeRole + Viewer CFBundleTypeExtensions mpc + CFBundleTypeIconFile + mpc.icns CFBundleTypeName Musepack Audio File + CFBundleTypeRole + Viewer CFBundleTypeExtensions ogg + CFBundleTypeIconFile + ogg.icns CFBundleTypeName Ogg Vorbis File + CFBundleTypeRole + Viewer + + + CFBundleTypeExtensions + + shn + + CFBundleTypeIconFile + shn.icns + CFBundleTypeName + Shorten File + CFBundleTypeRole + Viewer + LSTypeIsPackage + + NSPersistentStoreTypeKey + Binary + + + CFBundleTypeExtensions + + wv + + CFBundleTypeIconFile + wv.icns + CFBundleTypeName + Wavpack File + CFBundleTypeRole + Viewer + LSTypeIsPackage + + NSPersistentStoreTypeKey + Binary + + + CFBundleTypeExtensions + + m4a + + CFBundleTypeIconFile + m4a.icns + CFBundleTypeName + M4A File + CFBundleTypeRole + Viewer + LSTypeIsPackage + + NSPersistentStoreTypeKey + Binary CFBundleExecutable Cog + CFBundleHelpBookFolder + Help + CFBundleHelpBookName + Cog Help CFBundleIconFile wheel CFBundleIdentifier @@ -97,19 +174,13 @@ ???? CFBundleVersion 0.06 - CFBundleHelpBookFolder - Help - CFBundleHelpBookName - Cog Help NSAppleScriptEnabled YES NSMainNibFile MainMenu NSPrincipalClass NSApplication - - SUFeedURL + SUFeedURL http://cogosx.sourceforge.net/appcast.xml - diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index d0dad756c..c1c63b9b6 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -121,14 +121,12 @@ - (void)mouseDown:(NSEvent *)e { + [super mouseDown:e]; + if ([e type] == NSLeftMouseDown && [e clickCount] == 2 && [self selectedRow] != -1) { [playbackController play:self]; } - else - { - [super mouseDown:e]; - } } // enables right-click selection for "Show in Finder" contextual menu diff --git a/TODO b/TODO index fb794641c..83eb3032f 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,5 @@ Bug fixes: - Broken MP3: http://sbooth.org/forums/viewtopic.php?t=1103 - Fix playlist/file loading so it never loads duplicates in a single action. Ex: If you load (an m3u containing a bunch of files) AND (the files themselves), only load them once! However, if you load the m3u, THEN load the group of files, they should appear twice! + SHN resulting in high CPU usage: http://sbooth.org/forums/viewtopic.php?p=4711#4711 + Window Menu: http://sbooth.org/forums/viewtopic.php?p=4717 -Document Icons? +Fix playlist/file loading so it never loads duplicates in a single action. Ex: If you load (an m3u containing a bunch of files) AND (the files themselves), only load them once! However, if you load the m3u, THEN load the group of files, they should appear twice!