Permalink
Browse files

Merge pull request #1028 from RasPlex/PR-ThemeMusic

[RasPlex][FIX] Playing theme music for Tv shows.
  • Loading branch information...
2 parents b32d4a2 + ddcd2bc commit 4dda4e81e71ece0367e901296bb4891ebe832d0c @tru tru committed Feb 22, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 plex/PlexThemeMusicPlayer.cpp
View
4 plex/PlexThemeMusicPlayer.cpp 100644 → 100755
@@ -26,8 +26,6 @@ void CPlexThemeMusicPlayer::initPlayer()
{
m_player = CPlayerCoreFactory::CreatePlayer(EPC_PAPLAYER, *this);
m_player->RegisterAudioCallback(this);
- m_player->SetVolume(g_guiSettings.GetInt("backgroundmusic.bgmusicvolume") / 100.0);
- m_player->FadeOut(2 * 1000);
}
}
@@ -97,6 +95,8 @@ void CPlexThemeMusicPlayer::OnJobComplete(unsigned int jobID, bool success, CJob
initPlayer();
m_player->OpenFile(*m_currentItem.get(), CPlayerOptions());
+ m_player->SetVolume(g_guiSettings.GetInt("backgroundmusic.bgmusicvolume") / 100.0);
+ m_player->FadeOut(2 * 1000);
}
}
else if (m_player && m_player->IsPlaying() && !m_player->IsPaused())

0 comments on commit 4dda4e8

Please sign in to comment.