Skip to content

Commit

Permalink
Merge pull request xbmc#1047 from Montellese/unified_sorting_db
Browse files Browse the repository at this point in the history 
[GSoC] unified sorting & limiting implementation
  • Loading branch information
@Montellese
Montellese committed Jun 9, 2012
2 parents 843ad00 + f35828a commit f5b80e2
Show file tree
Hide file tree
Showing 81 changed files with 3,468 additions and 1,508 deletions.
18 changes: 14 additions & 4 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
18E7CAD11578C671001D4554 /* CDDARipJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18E7CACF1578C671001D4554 /* CDDARipJob.cpp */; };
18ECC9AA13CF17EB00A9ED6C /* StreamUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ECC9A813CF17EB00A9ED6C /* StreamUtils.cpp */; };
32D6D47C1423A9D8003641AC /* JpegIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 32D6D47A1423A9D8003641AC /* JpegIO.cpp */; };
36A9445915821F8300727135 /* DatabaseUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9445715821F8300727135 /* DatabaseUtils.cpp */; };
36A9445D15821FAC00727135 /* SortUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9445B15821FAB00727135 /* SortUtils.cpp */; };
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E121301753F006ABC13 /* CFNetwork.framework */; };
7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */; };
7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */; };
Expand Down Expand Up @@ -818,7 +820,6 @@
F56C7B7F131EC155000AD0F6 /* PartyModeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77F6131EC154000AD0F6 /* PartyModeManager.cpp */; };
F56C7B80131EC155000AD0F6 /* PlayListPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77F8131EC154000AD0F6 /* PlayListPlayer.cpp */; };
F56C7B81131EC155000AD0F6 /* SectionLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77FA131EC154000AD0F6 /* SectionLoader.cpp */; };
F56C7B82131EC155000AD0F6 /* SortFileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77FC131EC154000AD0F6 /* SortFileItem.cpp */; };
F56C7B83131EC155000AD0F6 /* Temperature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77FE131EC154000AD0F6 /* Temperature.cpp */; };
F56C7B84131EC155000AD0F6 /* TextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7800131EC154000AD0F6 /* TextureCache.cpp */; };
F56C7B85131EC155000AD0F6 /* TextureDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7802131EC154000AD0F6 /* TextureDatabase.cpp */; };
Expand Down Expand Up @@ -1004,6 +1005,11 @@
18ECC9A913CF17EB00A9ED6C /* StreamUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamUtils.h; sourceTree = "<group>"; };
32D6D47A1423A9D8003641AC /* JpegIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JpegIO.cpp; sourceTree = "<group>"; };
32D6D47B1423A9D8003641AC /* JpegIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JpegIO.h; sourceTree = "<group>"; };
36A9445715821F8300727135 /* DatabaseUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseUtils.cpp; sourceTree = "<group>"; };
36A9445815821F8300727135 /* DatabaseUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseUtils.h; sourceTree = "<group>"; };
36A9445A15821F9100727135 /* ISortable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISortable.h; sourceTree = "<group>"; };
36A9445B15821FAB00727135 /* SortUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SortUtils.cpp; sourceTree = "<group>"; };
36A9445C15821FAB00727135 /* SortUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortUtils.h; sourceTree = "<group>"; };
4D5D2E121301753F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7ECC13A5DBF900AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2737,7 +2743,6 @@
F56C77F9131EC154000AD0F6 /* PlayListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayListPlayer.h; sourceTree = "<group>"; };
F56C77FA131EC154000AD0F6 /* SectionLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SectionLoader.cpp; sourceTree = "<group>"; };
F56C77FB131EC154000AD0F6 /* SectionLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionLoader.h; sourceTree = "<group>"; };
F56C77FC131EC154000AD0F6 /* SortFileItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SortFileItem.cpp; sourceTree = "<group>"; };
F56C77FD131EC154000AD0F6 /* SortFileItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortFileItem.h; sourceTree = "<group>"; };
F56C77FE131EC154000AD0F6 /* Temperature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Temperature.cpp; sourceTree = "<group>"; };
F56C77FF131EC154000AD0F6 /* Temperature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Temperature.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3594,7 +3599,6 @@
F56C77F9131EC154000AD0F6 /* PlayListPlayer.h */,
F56C77FA131EC154000AD0F6 /* SectionLoader.cpp */,
F56C77FB131EC154000AD0F6 /* SectionLoader.h */,
F56C77FC131EC154000AD0F6 /* SortFileItem.cpp */,
F56C77FD131EC154000AD0F6 /* SortFileItem.h */,
F56C77CC131EC154000AD0F6 /* SystemGlobals.cpp */,
F56C77FE131EC154000AD0F6 /* Temperature.cpp */,
Expand Down Expand Up @@ -5363,6 +5367,8 @@
F56C7717131EC154000AD0F6 /* Crc32.h */,
F5BD0338148D4923001B5583 /* CryptThreading.cpp */,
F5BD0339148D4923001B5583 /* CryptThreading.h */,
36A9445715821F8300727135 /* DatabaseUtils.cpp */,
36A9445815821F8300727135 /* DatabaseUtils.h */,
F56C772D131EC154000AD0F6 /* DownloadQueue.cpp */,
F56C772E131EC154000AD0F6 /* DownloadQueue.h */,
F56C772F131EC154000AD0F6 /* DownloadQueueManager.cpp */,
Expand Down Expand Up @@ -5395,6 +5401,7 @@
DF527787151BAFEE00B5B63B /* HttpResponse.h */,
F56C7741131EC154000AD0F6 /* InfoLoader.cpp */,
F56C7742131EC154000AD0F6 /* InfoLoader.h */,
36A9445A15821F9100727135 /* ISortable.h */,
F56C7747131EC154000AD0F6 /* Job.h */,
F56C7745131EC154000AD0F6 /* JobManager.cpp */,
F56C7746131EC154000AD0F6 /* JobManager.h */,
Expand Down Expand Up @@ -5433,6 +5440,8 @@
F56C775F131EC154000AD0F6 /* ScraperParser.h */,
F56C7760131EC154000AD0F6 /* ScraperUrl.cpp */,
F56C7761131EC154000AD0F6 /* ScraperUrl.h */,
36A9445B15821FAB00727135 /* SortUtils.cpp */,
36A9445C15821FAB00727135 /* SortUtils.h */,
F56C7762131EC154000AD0F6 /* Splash.cpp */,
F56C7763131EC154000AD0F6 /* Splash.h */,
F56C7777131EC154000AD0F6 /* ssrc.cpp */,
Expand Down Expand Up @@ -6960,7 +6969,6 @@
F56C7B7F131EC155000AD0F6 /* PartyModeManager.cpp in Sources */,
F56C7B80131EC155000AD0F6 /* PlayListPlayer.cpp in Sources */,
F56C7B81131EC155000AD0F6 /* SectionLoader.cpp in Sources */,
F56C7B82131EC155000AD0F6 /* SortFileItem.cpp in Sources */,
F56C7B83131EC155000AD0F6 /* Temperature.cpp in Sources */,
F56C7B84131EC155000AD0F6 /* TextureCache.cpp in Sources */,
F56C7B85131EC155000AD0F6 /* TextureDatabase.cpp in Sources */,
Expand Down Expand Up @@ -7209,6 +7217,8 @@
7C6EB586155E3EC80080368A /* ImageFile.cpp in Sources */,
7C6EB708155F3B160080368A /* HTTPImageHandler.cpp in Sources */,
18E7CAD11578C671001D4554 /* CDDARipJob.cpp in Sources */,
36A9445915821F8300727135 /* DatabaseUtils.cpp in Sources */,
36A9445D15821FAC00727135 /* SortUtils.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
18 changes: 14 additions & 4 deletions XBMC-IOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
18ECC99D13CF17D200A9ED6C /* StreamUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ECC99B13CF17D200A9ED6C /* StreamUtils.cpp */; };
3255316612B2D02400837CD2 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3255316512B2D02400837CD2 /* CoreAudio.framework */; };
3291892B1423A9B700E878CD /* JpegIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 329189291423A9B700E878CD /* JpegIO.cpp */; };
36A9444E15821F2C00727135 /* DatabaseUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9444C15821F2C00727135 /* DatabaseUtils.cpp */; };
36A9445215821F5300727135 /* SortUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 36A9445015821F5300727135 /* SortUtils.cpp */; };
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */; };
7C0A7EDE13A5DC2800AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */; };
7C0A7F9D13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */; };
Expand Down Expand Up @@ -913,7 +915,6 @@
F56C8B6D131F42ED000AD0F6 /* PartyModeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87E3131F42ED000AD0F6 /* PartyModeManager.cpp */; };
F56C8B6E131F42ED000AD0F6 /* PlayListPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87E5131F42ED000AD0F6 /* PlayListPlayer.cpp */; };
F56C8B6F131F42ED000AD0F6 /* SectionLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87E7131F42ED000AD0F6 /* SectionLoader.cpp */; };
F56C8B70131F42ED000AD0F6 /* SortFileItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87E9131F42ED000AD0F6 /* SortFileItem.cpp */; };
F56C8B71131F42ED000AD0F6 /* Temperature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87EB131F42ED000AD0F6 /* Temperature.cpp */; };
F56C8B72131F42ED000AD0F6 /* TextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87ED131F42ED000AD0F6 /* TextureCache.cpp */; };
F56C8B73131F42ED000AD0F6 /* TextureDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87EF131F42ED000AD0F6 /* TextureDatabase.cpp */; };
Expand Down Expand Up @@ -1004,6 +1005,11 @@
3255316512B2D02400837CD2 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
329189291423A9B700E878CD /* JpegIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JpegIO.cpp; sourceTree = "<group>"; };
3291892A1423A9B700E878CD /* JpegIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JpegIO.h; sourceTree = "<group>"; };
36A9444C15821F2C00727135 /* DatabaseUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseUtils.cpp; sourceTree = "<group>"; };
36A9444D15821F2C00727135 /* DatabaseUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseUtils.h; sourceTree = "<group>"; };
36A9444F15821F3B00727135 /* ISortable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISortable.h; sourceTree = "<group>"; };
36A9445015821F5300727135 /* SortUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SortUtils.cpp; sourceTree = "<group>"; };
36A9445115821F5300727135 /* SortUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortUtils.h; sourceTree = "<group>"; };
4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2943,7 +2949,6 @@
F56C87E6131F42ED000AD0F6 /* PlayListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayListPlayer.h; sourceTree = "<group>"; };
F56C87E7131F42ED000AD0F6 /* SectionLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SectionLoader.cpp; sourceTree = "<group>"; };
F56C87E8131F42ED000AD0F6 /* SectionLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionLoader.h; sourceTree = "<group>"; };
F56C87E9131F42ED000AD0F6 /* SortFileItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SortFileItem.cpp; sourceTree = "<group>"; };
F56C87EA131F42ED000AD0F6 /* SortFileItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortFileItem.h; sourceTree = "<group>"; };
F56C87EB131F42ED000AD0F6 /* Temperature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Temperature.cpp; sourceTree = "<group>"; };
F56C87EC131F42ED000AD0F6 /* Temperature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Temperature.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3950,7 +3955,6 @@
F56C87E6131F42ED000AD0F6 /* PlayListPlayer.h */,
F56C87E7131F42ED000AD0F6 /* SectionLoader.cpp */,
F56C87E8131F42ED000AD0F6 /* SectionLoader.h */,
F56C87E9131F42ED000AD0F6 /* SortFileItem.cpp */,
F56C87EA131F42ED000AD0F6 /* SortFileItem.h */,
F56C87B9131F42ED000AD0F6 /* SystemGlobals.cpp */,
F56C87EB131F42ED000AD0F6 /* Temperature.cpp */,
Expand Down Expand Up @@ -5728,6 +5732,8 @@
F56C8706131F42EB000AD0F6 /* Crc32.h */,
F5BD034D148D496A001B5583 /* CryptThreading.cpp */,
F5BD034E148D496A001B5583 /* CryptThreading.h */,
36A9444C15821F2C00727135 /* DatabaseUtils.cpp */,
36A9444D15821F2C00727135 /* DatabaseUtils.h */,
F56C871C131F42EC000AD0F6 /* DownloadQueue.cpp */,
F56C871D131F42EC000AD0F6 /* DownloadQueue.h */,
F56C871E131F42EC000AD0F6 /* DownloadQueueManager.cpp */,
Expand Down Expand Up @@ -5760,6 +5766,7 @@
DF52775F151BAFA000B5B63B /* HttpResponse.h */,
F56C8730131F42EC000AD0F6 /* InfoLoader.cpp */,
F56C8731131F42EC000AD0F6 /* InfoLoader.h */,
36A9444F15821F3B00727135 /* ISortable.h */,
F56C8736131F42EC000AD0F6 /* Job.h */,
F56C8734131F42EC000AD0F6 /* JobManager.cpp */,
F56C8735131F42EC000AD0F6 /* JobManager.h */,
Expand Down Expand Up @@ -5798,6 +5805,8 @@
F56C874E131F42EC000AD0F6 /* ScraperParser.h */,
F56C874F131F42EC000AD0F6 /* ScraperUrl.cpp */,
F56C8750131F42EC000AD0F6 /* ScraperUrl.h */,
36A9445015821F5300727135 /* SortUtils.cpp */,
36A9445115821F5300727135 /* SortUtils.h */,
F56C8751131F42EC000AD0F6 /* Splash.cpp */,
F56C8752131F42EC000AD0F6 /* Splash.h */,
F56C8766131F42EC000AD0F6 /* ssrc.cpp */,
Expand Down Expand Up @@ -7067,7 +7076,6 @@
F56C8B6D131F42ED000AD0F6 /* PartyModeManager.cpp in Sources */,
F56C8B6E131F42ED000AD0F6 /* PlayListPlayer.cpp in Sources */,
F56C8B6F131F42ED000AD0F6 /* SectionLoader.cpp in Sources */,
F56C8B70131F42ED000AD0F6 /* SortFileItem.cpp in Sources */,
F56C8B71131F42ED000AD0F6 /* Temperature.cpp in Sources */,
F56C8B72131F42ED000AD0F6 /* TextureCache.cpp in Sources */,
F56C8B73131F42ED000AD0F6 /* TextureDatabase.cpp in Sources */,
Expand Down Expand Up @@ -7220,6 +7228,8 @@
7C6EB570155E3E680080368A /* ImageFile.cpp in Sources */,
7C6EB71A155F3B330080368A /* HTTPImageHandler.cpp in Sources */,
18E7CAD71578C691001D4554 /* CDDARipJob.cpp in Sources */,
36A9444E15821F2C00727135 /* DatabaseUtils.cpp in Sources */,
36A9445215821F5300727135 /* SortUtils.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading

0 comments on commit f5b80e2

Please sign in to comment.