Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[Fix] PlayerSelectionRule GetPlayers() #2588

Merged
merged 1 commit into from

2 participants

@ace20022
Collaborator

This partially reverts commit e575a7f .

Thanks @manio for reporting the problem.

@ace20022 ace20022 [Fix] PlayerSelectionRule GetPlayers().
This partially reverts commit e575a7f
[Cores] Remove redundant predicates in conditions.
81aea9b
@davilla davilla merged commit eff81e8 into xbmc:master
@ace20022 ace20022 deleted the ace20022:fix_PlayerSelectionRule branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 10, 2013
  1. @ace20022

    [Fix] PlayerSelectionRule GetPlayers().

    ace20022 authored
    This partially reverts commit e575a7f
    [Cores] Remove redundant predicates in conditions.
This page is out of date. Refresh to see the latest.
Showing with 9 additions and 9 deletions.
  1. +9 −9 xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
View
18 xbmc/cores/playercorefactory/PlayerSelectionRule.cpp
@@ -108,15 +108,15 @@ void CPlayerSelectionRule::GetPlayers(const CFileItem& item, VECPLAYERCORES &vec
CLog::Log(LOGDEBUG, "CPlayerSelectionRule::GetPlayers: considering rule: %s", m_name.c_str());
if (m_bStreamDetails && !item.HasVideoInfoTag()) return;
- if ((m_tAudio > 0) != item.IsAudio()) return;
- if ((m_tVideo > 0) != item.IsVideo()) return;
- if ((m_tInternetStream > 0) != item.IsInternetStream()) return;
- if ((m_tRemote > 0) != item.IsRemote()) return;
-
- if ((m_tBD > 0) != (item.IsBDFile() && item.IsOnDVD())) return;
- if ((m_tDVD > 0) != item.IsDVD()) return;
- if ((m_tDVDFile > 0) != item.IsDVDFile()) return;
- if ((m_tDVDImage > 0) != item.IsDVDImage()) return;
+ if (m_tAudio >= 0 && (m_tAudio > 0) != item.IsAudio()) return;
+ if (m_tVideo >= 0 && (m_tVideo > 0) != item.IsVideo()) return;
+ if (m_tInternetStream >= 0 && (m_tInternetStream > 0) != item.IsInternetStream()) return;
+ if (m_tRemote >= 0 && (m_tRemote > 0) != item.IsRemote()) return;
+
+ if (m_tBD >= 0 && (m_tBD > 0) != (item.IsBDFile() && item.IsOnDVD())) return;
+ if (m_tDVD >= 0 && (m_tDVD > 0) != item.IsDVD()) return;
+ if (m_tDVDFile >= 0 && (m_tDVDFile > 0) != item.IsDVDFile()) return;
+ if (m_tDVDImage >= 0 && (m_tDVDImage > 0) != item.IsDVDImage()) return;
CRegExp regExp;
Something went wrong with that request. Please try again.