diff options
| author | Arne Morten Kvarving <spiff@kodi.tv> | 2024-02-11 00:59:50 +0100 |
|---|---|---|
| committer | Arne Morten Kvarving <spiff@kodi.tv> | 2024-05-05 21:44:18 +0200 |
| commit | d349d0d04bf53143e1bcdbdc643ca31fcdccb9b2 (patch) | |
| tree | 880e16124b07185e0a9f1e26b9f09440cf355b68 | |
| parent | 2cc38c11e5526ab483bdd42afce2633afb6df6e5 (diff) | |
| download | xbmc-d349d0d04bf53143e1bcdbdc643ca31fcdccb9b2.tar.xz | |
drop CFileItem::IsOnLAN
there is only a single callsite for this method
and it simply calls on to URIUtils. inline call instead
| -rw-r--r-- | xbmc/FileItem.cpp | 5 | ||||
| -rw-r--r-- | xbmc/FileItem.h | 1 | ||||
| -rw-r--r-- | xbmc/cores/paplayer/AudioDecoder.cpp | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp index 6798314241..8b7012a0e6 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -1156,11 +1156,6 @@ bool CFileItem::IsNfs() const return URIUtils::IsNfs(m_strPath); } -bool CFileItem::IsOnLAN() const -{ - return URIUtils::IsOnLAN(m_strPath); -} - bool CFileItem::IsISO9660() const { return URIUtils::IsISO9660(m_strPath); diff --git a/xbmc/FileItem.h b/xbmc/FileItem.h index 365d5adea0..7083cf77e0 100644 --- a/xbmc/FileItem.h +++ b/xbmc/FileItem.h @@ -192,7 +192,6 @@ public: bool IsISO9660() const; bool IsDVD() const; bool IsOnDVD() const; - bool IsOnLAN() const; bool IsHD() const; bool IsNfs() const; bool IsSmb() const; diff --git a/xbmc/cores/paplayer/AudioDecoder.cpp b/xbmc/cores/paplayer/AudioDecoder.cpp index a960776287..96075fd67e 100644 --- a/xbmc/cores/paplayer/AudioDecoder.cpp +++ b/xbmc/cores/paplayer/AudioDecoder.cpp @@ -17,11 +17,14 @@ #include "music/tags/MusicInfoTag.h" #include "settings/Settings.h" #include "settings/SettingsComponent.h" +#include "utils/URIUtils.h" #include "utils/log.h" #include <cmath> #include <mutex> +using namespace KODI; + CAudioDecoder::CAudioDecoder() { m_codec = NULL; @@ -75,7 +78,7 @@ bool CAudioDecoder::Create(const CFileItem &file, int64_t seekOffset) filecache = settings->GetInt(CSettings::SETTING_CACHE_HARDDISK); else if ( file.IsOnDVD() ) filecache = settings->GetInt(CSettings::SETTING_CACHEAUDIO_DVDROM); - else if (file.IsOnLAN()) + else if (URIUtils::IsOnLAN(file.GetPath())) filecache = settings->GetInt(CSettings::SETTING_CACHEAUDIO_LAN); // create our codec |