Changeset 1038
- Timestamp:
- 10/27/07 00:20:47 (15 months ago)
- Location:
- trunk
- Files:
-
- 13 modified
-
AudioLibrary/AudioLibrary.m (modified) (2 diffs)
-
Browser/AlbumsNode.m (modified) (1 diff)
-
Browser/ArtistsNode.m (modified) (1 diff)
-
Browser/ComposersNode.m (modified) (1 diff)
-
Browser/GenresNode.m (modified) (1 diff)
-
Browser/HighestRatedNode.m (modified) (1 diff)
-
Browser/MostPopularNode.m (modified) (1 diff)
-
Browser/RecentlyAddedNode.m (modified) (1 diff)
-
Browser/RecentlyPlayedNode.m (modified) (1 diff)
-
Browser/RecentlySkippedNode.m (modified) (1 diff)
-
Database/CollectionManager.m (modified) (1 diff)
-
ThirdParty/PTHotKey/PTHotKeyCenter.m (modified) (2 diffs)
-
ThirdParty/RemoteControlWrapper/GlobalKeyboardDevice.m (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/AudioLibrary/AudioLibrary.m
r1034 r1038 162 162 #define STREAM_TABLE_COLUMNS_MENU_ITEM_INDEX 6 163 163 164 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 164 165 // ======================================== 165 166 // Completely bogus NSTreeController bindings hack … … 168 169 - (id) observedObject; 169 170 @end 171 #endif 170 172 171 173 // ======================================== -
trunk/Browser/AlbumsNode.m
r659 r1038 40 40 [[[CollectionManager manager] streamManager] addObserver:self 41 41 forKeyPath:MetadataAlbumTitleKey 42 options: nil42 options:0 43 43 context:nil]; 44 44 -
trunk/Browser/ArtistsNode.m
r659 r1038 40 40 [[[CollectionManager manager] streamManager] addObserver:self 41 41 forKeyPath:MetadataArtistKey 42 options: nil42 options:0 43 43 context:nil]; 44 44 -
trunk/Browser/ComposersNode.m
r659 r1038 40 40 [[[CollectionManager manager] streamManager] addObserver:self 41 41 forKeyPath:MetadataComposerKey 42 options: nil42 options:0 43 43 context:nil]; 44 44 -
trunk/Browser/GenresNode.m
r659 r1038 40 40 [[[CollectionManager manager] streamManager] addObserver:self 41 41 forKeyPath:MetadataGenreKey 42 options: nil42 options:0 43 43 context:nil]; 44 44 -
trunk/Browser/HighestRatedNode.m
r756 r1038 43 43 [[[CollectionManager manager] streamManager] addObserver:self 44 44 forKeyPath:StatisticsRatingKey 45 options: nil45 options:0 46 46 context:nil]; 47 47 -
trunk/Browser/MostPopularNode.m
r659 r1038 43 43 [[[CollectionManager manager] streamManager] addObserver:self 44 44 forKeyPath:StatisticsPlayCountKey 45 options: nil45 options:0 46 46 context:nil]; 47 47 -
trunk/Browser/RecentlyAddedNode.m
r659 r1038 43 43 [[[CollectionManager manager] streamManager] addObserver:self 44 44 forKeyPath:StatisticsDateAddedKey 45 options: nil45 options:0 46 46 context:nil]; 47 47 -
trunk/Browser/RecentlyPlayedNode.m
r680 r1038 42 42 [[[CollectionManager manager] streamManager] addObserver:self 43 43 forKeyPath:StatisticsLastPlayedDateKey 44 options: nil44 options:0 45 45 context:nil]; 46 46 -
trunk/Browser/RecentlySkippedNode.m
r680 r1038 42 42 [[[CollectionManager manager] streamManager] addObserver:self 43 43 forKeyPath:StatisticsLastSkippedDateKey 44 options: nil44 options:0 45 45 context:nil]; 46 46 -
trunk/Database/CollectionManager.m
r1021 r1038 26 26 #import "AudioStream.h" 27 27 #import "Playlist.h" 28 #import "SmartPlaylist.h" 29 #import "WatchFolder.h" 28 30 29 31 #import "SQLiteUtilityFunctions.h" -
trunk/ThirdParty/PTHotKey/PTHotKeyCenter.m
r651 r1038 76 76 hotKeyID, 77 77 GetEventDispatcherTarget(), 78 nil,78 0, 79 79 &carbonHotKey ); 80 80 … … 233 233 234 234 NSAssert( hotKeyID.signature == 'HCHk', @"Invalid hot key id" ); 235 NSAssert( hotKeyID.id != nil, @"Invalid hot key id" );235 NSAssert( hotKeyID.id != 0, @"Invalid hot key id" ); 236 236 237 237 hotKey = (PTHotKey*)hotKeyID.id; -
trunk/ThirdParty/RemoteControlWrapper/GlobalKeyboardDevice.m
r957 r1038 173 173 hotKeyID.id = (long)keycode; 174 174 175 err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), nil, &carbonHotKey );175 err = RegisterEventHotKey(keycode, modifiers, hotKeyID, GetEventDispatcherTarget(), 0, &carbonHotKey ); 176 176 177 177 if( err )
