aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2015-04-03 10:49:55 +0200
committerRainer Hochecker <fernetmenta@online.de>2015-04-10 18:31:12 +0200
commit58c028f8ac206523991c0df1c155767a48a6a192 (patch)
tree84c9c816f4d20db94b00bfc70139227951ffef0f
parentd38eafcdbd1ffc5e1c26c0b99c53f0f8b5fd83a1 (diff)
dvdplayer: cosmetics
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayer.cpp41
1 files changed, 22 insertions, 19 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 143ea0625c..c146331e2a 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1391,16 +1391,18 @@ void CDVDPlayer::Process()
m_OmxPlayerState.bOmxSentEOFs = true;
}
+
if(m_CurrentAudio.inited)
- m_dvdPlayerAudio->SendMessage (new CDVDMsg(CDVDMsg::GENERAL_EOF));
+ m_dvdPlayerAudio->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
if(m_CurrentVideo.inited)
- m_dvdPlayerVideo->SendMessage (new CDVDMsg(CDVDMsg::GENERAL_EOF));
+ m_dvdPlayerVideo->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
if(m_CurrentSubtitle.inited)
m_dvdPlayerSubtitle->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
if(m_CurrentTeletext.inited)
m_dvdPlayerTeletext->SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
- m_CurrentAudio.inited = false;
- m_CurrentVideo.inited = false;
+
+ m_CurrentAudio.inited = false;
+ m_CurrentVideo.inited = false;
m_CurrentSubtitle.inited = false;
m_CurrentTeletext.inited = false;
@@ -1510,21 +1512,22 @@ bool CDVDPlayer::CheckIsCurrent(CCurrentStream& current, CDemuxStream* stream, D
void CDVDPlayer::ProcessPacket(CDemuxStream* pStream, DemuxPacket* pPacket)
{
- /* process packet if it belongs to selected stream. for dvd's don't allow automatic opening of streams*/
-
- if (CheckIsCurrent(m_CurrentAudio, pStream, pPacket))
- ProcessAudioData(pStream, pPacket);
- else if (CheckIsCurrent(m_CurrentVideo, pStream, pPacket))
- ProcessVideoData(pStream, pPacket);
- else if (CheckIsCurrent(m_CurrentSubtitle, pStream, pPacket))
- ProcessSubData(pStream, pPacket);
- else if (CheckIsCurrent(m_CurrentTeletext, pStream, pPacket))
- ProcessTeletextData(pStream, pPacket);
- else
- {
- pStream->SetDiscard(AVDISCARD_ALL);
- CDVDDemuxUtils::FreeDemuxPacket(pPacket); // free it since we won't do anything with it
- }
+ // process packet if it belongs to selected stream.
+ // for dvd's don't allow automatic opening of streams*/
+
+ if (CheckIsCurrent(m_CurrentAudio, pStream, pPacket))
+ ProcessAudioData(pStream, pPacket);
+ else if (CheckIsCurrent(m_CurrentVideo, pStream, pPacket))
+ ProcessVideoData(pStream, pPacket);
+ else if (CheckIsCurrent(m_CurrentSubtitle, pStream, pPacket))
+ ProcessSubData(pStream, pPacket);
+ else if (CheckIsCurrent(m_CurrentTeletext, pStream, pPacket))
+ ProcessTeletextData(pStream, pPacket);
+ else
+ {
+ pStream->SetDiscard(AVDISCARD_ALL);
+ CDVDDemuxUtils::FreeDemuxPacket(pPacket); // free it since we won't do anything with it
+ }
}
void CDVDPlayer::CheckStreamChanges(CCurrentStream& current, CDemuxStream* stream)