diff --git a/.idea/kplayer.iml b/.idea/kplayer.iml index 3e4db0f..8f4724a 100644 --- a/.idea/kplayer.iml +++ b/.idea/kplayer.iml @@ -14,70 +14,70 @@ + + + + - - - + + - - - - + + - - - + + - - - + + - + - + + - - + + - + + - @@ -120,72 +120,72 @@ - - + + - - + + + + - - - - - + + + - + - + - - + - + - + - - - - + + + + + - + + - @@ -193,12 +193,12 @@ - + + - diff --git a/kplayer/AppDelegate.swift b/kplayer/AppDelegate.swift index fe48985..8c6a924 100644 --- a/kplayer/AppDelegate.swift +++ b/kplayer/AppDelegate.swift @@ -26,6 +26,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele let controller = masterNavigationController.topViewController as! MasterViewController controller.model.items = [ + MediaItem(name: "sp", path:"", root: "/srv/samba/ren/sp/video", type: ItemType.VIDEOROOT), MediaItem(name: "fav", path:"", root: "/srv/samba/ren/fav", type: ItemType.VIDEOROOT), MediaItem(name: "knk", path:"", root: "/srv/samba/ren/knk", type: ItemType.VIDEOROOT), MediaItem(name: "knk_archiv", path:"", root: "/srv/samba/ren/knk_archiv", type: ItemType.VIDEOROOT), diff --git a/kplayer/core/MediaItem.swift b/kplayer/core/MediaItem.swift index 0d968a6..2034a5e 100644 --- a/kplayer/core/MediaItem.swift +++ b/kplayer/core/MediaItem.swift @@ -96,7 +96,7 @@ class MediaItem: CustomDebugStringConvertible { private func computeSortName(sname: String) -> String { var lsortName = sname.stringByReplacingOccurrencesOfString("full", withString: "") - var fullNameArr = sortName.characters.split { + var fullNameArr = lsortName.characters.split { $0 == "_" }.map { String($0)