Merge pull request #2820 from Fice/dnd_favourites_dir
authorjmarshallnz <jcmarsha@gmail.com>
Tue, 4 Jun 2013 19:55:26 +0000 (12:55 -0700)
committerjmarshallnz <jcmarsha@gmail.com>
Tue, 4 Jun 2013 19:55:26 +0000 (12:55 -0700)
[RFC] convert CFavourites into CFavouritesDirectory

1  2 
xbmc/filesystem/DirectoryFactory.cpp

@@@ -18,7 -18,7 +18,7 @@@
   *
   */
  
 -#if (defined HAVE_CONFIG_H) && (!defined WIN32)
 +#if (defined HAVE_CONFIG_H) && (!defined TARGET_WINDOWS)
    #include "config.h"
  #endif
  #include "network/Network.h"
@@@ -33,6 -33,7 +33,7 @@@
  #include "MusicDatabaseDirectory.h"
  #include "MusicSearchDirectory.h"
  #include "VideoDatabaseDirectory.h"
+ #include "FavouritesDirectory.h"
  #include "LibraryDirectory.h"
  #include "AddonsDirectory.h"
  #include "SourcesDirectory.h"
@@@ -46,7 -47,7 +47,7 @@@
  #include "network/WakeOnAccess.h"
  
  #ifdef HAS_FILESYSTEM_SMB
 -#ifdef _WIN32
 +#ifdef TARGET_WINDOWS
  #include "windows/WINSMBDirectory.h"
  #else
  #include "SMBDirectory.h"
@@@ -165,6 -166,7 +166,7 @@@ IDirectory* CDirectoryFactory::Create(c
    if (strProtocol == "musicsearch") return new CMusicSearchDirectory();
    if (strProtocol == "videodb") return new CVideoDatabaseDirectory();
    if (strProtocol == "library") return new CLibraryDirectory();
+   if (strProtocol == "favourites") return new CFavouritesDirectory();
    if (strProtocol == "filereader")
      return CDirectoryFactory::Create(url.GetFileName());
  
      if (strProtocol == "sftp" || strProtocol == "ssh") return new CSFTPDirectory();
  #endif
  #ifdef HAS_FILESYSTEM_SMB
 -#ifdef _WIN32
 +#ifdef TARGET_WINDOWS
      if (strProtocol == "smb") return new CWINSMBDirectory();
  #else
      if (strProtocol == "smb") return new CSMBDirectory();