completed multiple movie in folder support

3 files changed, 3 insertions, 19 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 87aa471ea..cc2e82b1f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -55,6 +55,8 @@ namespace MediaBrowser.Controller.Entities
         public const string ThemeVideosFolderName = "backdrops";
         public const string XbmcTrailerFileSuffix = "-trailer";
 
+        public bool IsInMixedFolder { get; set; }
+        
         private string _name;
         /// <summary>
         /// Gets or sets the name.
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index 63a04e520..9a787b3d3 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -25,29 +25,13 @@ namespace MediaBrowser.Controller.Entities
         public string GameSystem { get; set; }
 
         /// <summary>
-        /// Returns true if the game is combined with other games in the same folder
-        /// </summary>
-        public bool IsInMixedFolder { get; set; }
-
-        /// <summary>
         /// 
         /// </summary>
         public override string MetaLocation
         {
             get
             {
-                var directoryName = System.IO.Path.GetDirectoryName(Path);
-
-                if (IsInMixedFolder)
-                {
-                    // It's a file
-                    var baseMetaPath = System.IO.Path.Combine(directoryName, "metadata");
-                    var fileName = System.IO.Path.GetFileNameWithoutExtension(Path);
-
-                    return fileName != null ? System.IO.Path.Combine(baseMetaPath, fileName) : null;
-                }
-
-                return directoryName;
+                return System.IO.Path.GetDirectoryName(Path);
             }
         }
 
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 8bc519a43..e8896db6f 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -65,8 +65,6 @@ namespace MediaBrowser.Controller.Entities
             return GetPlayableStreamFiles(Path);
         }
 
-        public bool IsInMixedFolder { get; set; }
-
         /// <summary>
         /// Should be overridden to return the proper folder where metadata lives
         /// </summary>