Commit 9a159f58 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Update MLKit to add support for music albums with more than 1 disk

parent 6ecad04e
2.7.0:
------
* Dropped support for iOS 6.1. VLC requires iOS 7.0 now
* Added support for music albums with more than 1 disk (#14650)
2.6.0:
------
......
......@@ -70,6 +70,8 @@
7AC862A91765E9510011611A /* jquery.ui.widget.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC862A11765E90C0011611A /* jquery.ui.widget.js */; };
7D00161C177056B700649F27 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 7D00161A17704DAC00649F27 /* main.js */; };
7D0117F1187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D0117F0187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib */; };
7D0363AC1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */; };
7D0363AD1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */; };
7D1052E61A4DC5FF00295F08 /* LiveSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D1052E51A4DC5FF00295F08 /* LiveSDK.framework */; };
7D1052E91A4DCC1100295F08 /* VLCOneDriveTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1052E81A4DCC1100295F08 /* VLCOneDriveTableViewController.m */; };
7D1052EE1A4DCD1E00295F08 /* VLCOneDriveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1052ED1A4DCD1E00295F08 /* VLCOneDriveController.m */; };
......@@ -124,7 +126,6 @@
7D3EB014174A353E002062C2 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D3EB013174A353E002062C2 /* SystemConfiguration.framework */; };
7D4625881A5614A1001A80B4 /* VLCEqualizerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D4625871A5614A1001A80B4 /* VLCEqualizerView.m */; };
7D50903218F41C7900180139 /* VLCAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D50903118F41C7900180139 /* VLCAlertView.m */; };
7D54ECA91B1B3F370025BE2D /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DDC7BFAF1B03829100160878 /* MediaLibrary.xcdatamodeld */; };
7D5CAA891A4AD763003F2CBC /* VLCTrackSelectorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5CAA881A4AD763003F2CBC /* VLCTrackSelectorTableViewCell.m */; };
7D5CAA8C1A4AD8E5003F2CBC /* VLCTrackSelectorHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5CAA8B1A4AD8E5003F2CBC /* VLCTrackSelectorHeaderView.m */; };
7D5DD5C717590ABF001421E3 /* About Contents.html in Resources */ = {isa = PBXBuildFile; fileRef = 7D5DD5C617590ABF001421E3 /* About Contents.html */; };
......@@ -240,7 +241,6 @@
DDACEB561ADAD11300735484 /* WKInterfaceObject+VLCProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = DDACEB551ADAD11300735484 /* WKInterfaceObject+VLCProgress.m */; };
DDB959421AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */; };
DDC10BE41AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDC10BE31AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m */; };
DDC7BFB31B03829100160878 /* MediaLibrary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DDC7BFAF1B03829100160878 /* MediaLibrary.xcdatamodeld */; };
DDE4906C1ACDB63F00B1B5E3 /* VLCNotificationRelay.m in Sources */ = {isa = PBXBuildFile; fileRef = DDE4906B1ACDB63F00B1B5E3 /* VLCNotificationRelay.m */; };
DDE4906D1ACDBEA000B1B5E3 /* VLCNotificationRelay.m in Sources */ = {isa = PBXBuildFile; fileRef = DDE4906B1ACDB63F00B1B5E3 /* VLCNotificationRelay.m */; };
DDE490701ACE8BBC00B1B5E3 /* VLCDetailInterfaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = DDE4906F1ACE8BBC00B1B5E3 /* VLCDetailInterfaceController.m */; };
......@@ -397,6 +397,10 @@
7AC862A11765E90C0011611A /* jquery.ui.widget.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jquery.ui.widget.js; sourceTree = "<group>"; };
7D00161A17704DAC00649F27 /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.js; sourceTree = "<group>"; };
7D0117F0187F4BA400C5671C /* VLCFirstStepsFirstPageViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCFirstStepsFirstPageViewController~ipad.xib"; path = "Resources/VLCFirstStepsFirstPageViewController~ipad.xib"; sourceTree = SOURCE_ROOT; };
7D0363A81B2F325500CC0343 /* MediaLibrary-2.1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.1.xcdatamodel"; sourceTree = "<group>"; };
7D0363A91B2F325500CC0343 /* MediaLibrary-2.5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.5.xcdatamodel"; sourceTree = "<group>"; };
7D0363AA1B2F325500CC0343 /* MediaLibrary-2.6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.6.xcdatamodel"; sourceTree = "<group>"; };
7D0363AB1B2F325500CC0343 /* MediaLibrary-2.7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.7.xcdatamodel"; sourceTree = "<group>"; };
7D1052E51A4DC5FF00295F08 /* LiveSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LiveSDK.framework; path = External/OneDrive/LiveSDK.framework; sourceTree = "<group>"; };
7D1052E71A4DCC1100295F08 /* VLCOneDriveTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCOneDriveTableViewController.h; path = Sources/VLCOneDriveTableViewController.h; sourceTree = SOURCE_ROOT; };
7D1052E81A4DCC1100295F08 /* VLCOneDriveTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCOneDriveTableViewController.m; path = Sources/VLCOneDriveTableViewController.m; sourceTree = SOURCE_ROOT; };
......@@ -706,9 +710,6 @@
DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; name = MappingModel_2_5_to_2_6.xcmappingmodel; path = ImportedSources/MediaLibraryKit/MappingModel_2_5_to_2_6.xcmappingmodel; sourceTree = "<group>"; };
DDC10BE21AEE8EA700890DC3 /* VLCTimeNavigationTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCTimeNavigationTitleView.h; path = Sources/VLCTimeNavigationTitleView.h; sourceTree = SOURCE_ROOT; };
DDC10BE31AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCTimeNavigationTitleView.m; path = Sources/VLCTimeNavigationTitleView.m; sourceTree = SOURCE_ROOT; };
DDC7BFB01B03829100160878 /* MediaLibrary-2.1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.1.xcdatamodel"; sourceTree = "<group>"; };
DDC7BFB11B03829100160878 /* MediaLibrary-2.5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.5.xcdatamodel"; sourceTree = "<group>"; };
DDC7BFB21B03829100160878 /* MediaLibrary-2.6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MediaLibrary-2.6.xcdatamodel"; sourceTree = "<group>"; };
DDE4906A1ACDB63F00B1B5E3 /* VLCNotificationRelay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCNotificationRelay.h; sourceTree = "<group>"; };
DDE4906B1ACDB63F00B1B5E3 /* VLCNotificationRelay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCNotificationRelay.m; sourceTree = "<group>"; };
DDE4906E1ACE8BBC00B1B5E3 /* VLCDetailInterfaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDetailInterfaceController.h; sourceTree = "<group>"; };
......@@ -1225,8 +1226,8 @@
isa = PBXGroup;
children = (
DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */,
DDC7BFAF1B03829100160878 /* MediaLibrary.xcdatamodeld */,
7D31719C19FEC91F0019357A /* VLC for iOS.entitlements */,
7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */,
7DB638AA185BC0890003887C /* Images.xcassets */,
7D94FCE416DE7D1000F2623B /* Classes */,
7DADC55C1704FAA8001DAC63 /* XIBs */,
......@@ -1862,7 +1863,7 @@
7D298F451AD58A0700A0BF68 /* UIImage+Blur.m in Sources */,
7D871F521AD7257100348D27 /* UIImage+Scaling.m in Sources */,
DDE490731ACE964200B1B5E3 /* VLCBaseInterfaceController.m in Sources */,
7D54ECA91B1B3F370025BE2D /* MediaLibrary.xcdatamodeld in Sources */,
7D0363AD1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */,
DDE4906C1ACDB63F00B1B5E3 /* VLCNotificationRelay.m in Sources */,
DD7110F11AF38B2B00854776 /* MLMediaLibrary+playlist.m in Sources */,
DD670C971AFBEED400A2D7AB /* MappingModel_2_5_to_2_6.xcmappingmodel in Sources */,
......@@ -1889,7 +1890,6 @@
4171D35818A2D90200A16EF9 /* LXReorderableCollectionViewFlowLayout.m in Sources */,
2915540417490A1E00B86CAD /* HTTPAuthenticationRequest.m in Sources */,
2915540517490A1E00B86CAD /* HTTPConnection.m in Sources */,
DDC7BFB31B03829100160878 /* MediaLibrary.xcdatamodeld in Sources */,
2915540617490A1E00B86CAD /* HTTPMessage.m in Sources */,
7DC19B0C1868D21800810BF7 /* VLCFirstStepsSixthPageViewController.m in Sources */,
2915540717490A1E00B86CAD /* HTTPServer.m in Sources */,
......@@ -1901,6 +1901,7 @@
2915542417490A9C00B86CAD /* DDAbstractDatabaseLogger.m in Sources */,
2915542517490A9C00B86CAD /* DDASLLogger.m in Sources */,
2915542617490A9C00B86CAD /* DDFileLogger.m in Sources */,
7D0363AC1B2F325500CC0343 /* MediaLibrary.xcdatamodeld in Sources */,
26D4AF8D1A78379000D5EC65 /* VLCSharedLibraryListViewController.m in Sources */,
2915542717490A9C00B86CAD /* DDLog.m in Sources */,
7D95610B1AF3E9E800779745 /* VLCMiniPlaybackView.m in Sources */,
......@@ -2650,14 +2651,15 @@
/* End XCConfigurationList section */
/* Begin XCVersionGroup section */
DDC7BFAF1B03829100160878 /* MediaLibrary.xcdatamodeld */ = {
7D0363A71B2F325500CC0343 /* MediaLibrary.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
DDC7BFB01B03829100160878 /* MediaLibrary-2.1.xcdatamodel */,
DDC7BFB11B03829100160878 /* MediaLibrary-2.5.xcdatamodel */,
DDC7BFB21B03829100160878 /* MediaLibrary-2.6.xcdatamodel */,
7D0363A81B2F325500CC0343 /* MediaLibrary-2.1.xcdatamodel */,
7D0363A91B2F325500CC0343 /* MediaLibrary-2.5.xcdatamodel */,
7D0363AA1B2F325500CC0343 /* MediaLibrary-2.6.xcdatamodel */,
7D0363AB1B2F325500CC0343 /* MediaLibrary-2.7.xcdatamodel */,
);
currentVersion = DDC7BFB21B03829100160878 /* MediaLibrary-2.6.xcdatamodel */;
currentVersion = 7D0363AB1B2F325500CC0343 /* MediaLibrary-2.7.xcdatamodel */;
name = MediaLibrary.xcdatamodeld;
path = ImportedSources/MediaLibraryKit/MediaLibrary.xcdatamodeld;
sourceTree = "<group>";
......
......@@ -13,7 +13,7 @@ NONETWORK=no
SKIPLIBVLCCOMPILATION=no
TESTEDVLCKITHASH=ae8c1142
TESTEDMEDIALIBRARYKITHASH=d7e992d4
TESTEDMEDIALIBRARYKITHASH=ee79bd9d
usage()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment