Merge branch 'container_foldername'

[vuplus_xbmc] / xbmc / video / VideoDatabase.h

diff --git a/xbmc/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h
index 24aa3aa..d951dff 100644 (file)
--- a/xbmc/video/VideoDatabase.h
+++ b/xbmc/video/VideoDatabase.h
@@ -354,9 +354,13 @@ public:
   bool HasMusicVideoInfo(const CStdString& strFilenameAndPath);
 
   void GetFilePathById(int idMovie, CStdString &filePath, VIDEODB_CONTENT_TYPE iType);
-  bool GetGenreById(int idGenre, CStdString& strGenre);
-  bool GetCountryById(int idCountry, CStdString& strCountry);
-  bool GetSetById(int idSet, CStdString& strSet);
+  CStdString GetGenreById(int id);
+  CStdString GetCountryById(int id);
+  CStdString GetSetById(int id);
+  CStdString GetPersonById(int id);
+  CStdString GetStudioById(int id);
+  CStdString GetTvShowTitleById(int id);
+  CStdString GetMusicVideoAlbumById(int id);
   int GetTvShowForEpisode(int idEpisode);
 
   void GetMovieInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int idMovie = -1);
@@ -430,7 +434,15 @@ public:
    \return A content type string for the current path.
    */
   CStdString GetContentForPath(const CStdString& strPath);
-  
+
+  /*! \brief Get a video of the given content type from the given path, if it exists
+   \param content the content type to fetch.
+   \param path the path to fetch a video from.
+   \param item the returned item.
+   \return true if an item is found, false otherwise.
+   */
+  bool GetItemForPath(const CStdString &content, const CStdString &path, CFileItem &item);
+
   /*! \brief Check whether a given scraper is in use.
    \param scraperID the scraper to check for.
    \return true if the scraper is in use, false otherwise.
@@ -664,7 +676,8 @@ private:
    */
   void UpdateBasePath(const char *table, const char *id, int column, bool shows = false);
 
-  virtual int GetMinVersion() const { return 46; };
+  virtual int GetMinVersion() const { return 48; };
+  virtual int GetExportVersion() const { return 1; };
   const char *GetBaseDBName() const { return "MyVideos"; };
 
   void ConstructPath(CStdString& strDest, const CStdString& strPath, const CStdString& strFileName);