[cleanup][libcdio] remove xbox udfx related

xbmc · Oct 3, 2015 · 08a5ab1 · 08a5ab1
1 parent 28567ff
commit 08a5ab1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://kodi.tv/
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,8 +44,7 @@ std::shared_ptr<CLibcdio> CLibcdio::m_pInstance;
 #define UFS_SUPERBLOCK_SECTOR   4  /* buffer[2] */
 #define BOOT_SECTOR            17  /* buffer[3] */
 #define VCD_INFO_SECTOR       150  /* buffer[4] */
-#define UDFX_SECTOR          32  /* buffer[4] */
-#define UDF_ANCHOR_SECTOR   256  /* buffer[5] */
+#define UDF_ANCHOR_SECTOR     256  /* buffer[5] */
 
 
 signature_t CCdIoSupport::sigs[] =
@@ -64,15 +63,14 @@ signature_t CCdIoSupport::sigs[] =
     {3, 7, "EL TORITO", "BOOTABLE"},
     {4, 0, "VIDEO_CD", "VIDEO CD"},
     {4, 0, "SUPERVCD", "Chaoji VCD"},
-    {0, 0, "MICROSOFT*XBOX*MEDIA", "UDFX CD"},
     {0, 1, "BEA01", "UDF"},
     { 0 }
   };
 
 #undef DEBUG_CDIO
 
 static void
-xbox_cdio_log_handler (cdio_log_level_t level, const char message[])
+cdio_log_handler (cdio_log_level_t level, const char message[])
 {
 #ifdef DEBUG_CDIO
   switch (level)
@@ -104,7 +102,7 @@ xbox_cdio_log_handler (cdio_log_level_t level, const char message[])
 //////////////////////////////////////////////////////////////////////
 CLibcdio::CLibcdio(): s_defaultDevice(NULL)
 {
-  cdio_log_set_handler( xbox_cdio_log_handler );
+  cdio_log_set_handler( cdio_log_handler );
 }
 
 CLibcdio::~CLibcdio()
@@ -386,9 +384,6 @@ void CCdIoSupport::PrintAnalysis(int fs, int num_audio)
   case FS_3DO:
     CLog::Log(LOGINFO, "CD-ROM with Panasonic 3DO filesystem");
     break;
-  case FS_UDFX:
-    CLog::Log(LOGINFO, "CD-ROM with UDFX filesystem");
-    break;
   case FS_UNKNOWN:
     CLog::Log(LOGINFO, "CD-ROM with unknown filesystem");
     break;
@@ -607,11 +602,6 @@ int CCdIoSupport::GuessFilesystem(int start_session, track_t track_num)
       ret = FS_EXT2;
       break;
 
-    case CDIO_FS_UDFX:
-      ret = FS_UDFX;
-      udf = true;
-      break;
-
     case CDIO_FS_UDF:
       ret = FS_UDF;
       udf = true;

diff --git a/xbmc/storage/cdioSupport.h b/xbmc/storage/cdioSupport.h
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://kodi.tv/
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -176,9 +176,6 @@ class CCdInfo
   // CD-ROM with Panasonic 3DO filesystem
   bool Is3DO( int nTrack ) { return ((m_ti[nTrack - 1].nfsInfo & FS_MASK) == FS_3DO); }
 
-  // CD-ROM with XBOX UDFX filesystem
-  bool IsUDFX( int nTrack ) { return ((m_ti[nTrack - 1].nfsInfo & FS_MASK) == FS_UDFX); }
-
   // Mixed Mode CD-ROM
   bool IsMixedMode( int nTrack ) { return (m_nFirstData == 1 && m_nNumAudio > 0); }
 
@@ -218,7 +215,7 @@ class CCdInfo
   bool IsUDF( int nTrack ) { return ((m_ti[nTrack - 1].nfsInfo & FS_MASK) == FS_UDF); }
 
   // Has the cd a filesystem that is readable by the xbox
-  bool IsValidFs() { return (IsISOHFS(1) || IsIso9660(1) || IsIso9660Interactive(1) || IsISOUDF(1) || IsUDF(1) || IsUDFX(1) || IsAudio(1)); }
+  bool IsValidFs() { return (IsISOHFS(1) || IsIso9660(1) || IsIso9660Interactive(1) || IsISOUDF(1) || IsUDF(1) || IsAudio(1)); }
 
   void SetFirstTrack( int nTrack ) { m_nFirstTrack = nTrack; }
   void SetTrackCount( int nCount ) { m_nNumTrack = nCount; }