diff options
| author | Nick Dedekind <nicholas.dedekind@gmail.com> | 2012-08-09 15:10:31 +0100 |
|---|---|---|
| committer | Nick Dedekind <nicholas.dedekind@gmail.com> | 2012-08-09 15:10:31 +0100 |
| commit | 0f73e622d4ccd0cb5c66a011c7246aaab0a550b6 (patch) | |
| tree | 4c846e770499abda3f85483743dcbe4f48a1eaa4 | |
| parent | 8f916207583699241f72d3465d6b0b2da303cf51 (diff) | |
Fixed preview music standalone navigation enabling
(bzr r2419.4.52)
| -rw-r--r-- | dash/previews/StandaloneMusicPreview.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dash/previews/StandaloneMusicPreview.cpp b/dash/previews/StandaloneMusicPreview.cpp index 19c749a19..c672e28fd 100644 --- a/dash/previews/StandaloneMusicPreview.cpp +++ b/dash/previews/StandaloneMusicPreview.cpp @@ -156,10 +156,10 @@ TestRunner::TestRunner (std::string const& search_string) results_->result_added.connect([&](Result const& result) { previews::Navigation navDisabled = previews::Navigation::BOTH; - if (nav_iter < results_->count.Get()) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::RIGHT)); + if (nav_iter < results_->count.Get() - 1) + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::RIGHT)); if (results_->count.Get() > 0 && nav_iter > 0) - navDisabled = previews::Navigation( (unsigned int)results_ & ~((unsigned int)previews::Navigation::LEFT)); + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::LEFT)); if (first_) { @@ -203,10 +203,10 @@ void TestRunner::NavRight() Preview(result.uri); previews::Navigation navDisabled = previews::Navigation::BOTH; - if (nav_iter < results_->count.Get()-1) - navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::RIGHT)); + if (nav_iter < results_->count.Get() - 1) + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::RIGHT)); if (results_->count.Get() > 0 && nav_iter > 0) - navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::LEFT)); + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::LEFT)); container_->DisableNavButton(navDisabled); } @@ -219,10 +219,10 @@ void TestRunner::NavLeft() Preview(result.uri); previews::Navigation navDisabled = previews::Navigation::BOTH; - if (nav_iter < results_->count.Get()-1) - navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::RIGHT)); + if (nav_iter < results_->count.Get() - 1) + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::RIGHT)); if (results_->count.Get() > 0 && nav_iter > 0) - navDisabled = previews::Navigation( (unsigned int)navDisabled & ~((unsigned int)previews::Navigation::LEFT)); + navDisabled = previews::Navigation( static_cast<unsigned>(navDisabled) & ~static_cast<unsigned>(previews::Navigation::LEFT)); container_->DisableNavButton(navDisabled); } |