Fix/improve error checking.

2 files changed, 20 insertions, 5 deletions

diff --git a/HISTORY b/HISTORY
index d94382e..0e5835f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -263,7 +263,7 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
   refreshed too often, see FLUSHRATE in Makefile (Luca Olivetti, Ville Skyttä)
 - borrow better OSD scaling routines from the Xine plugin (Luca Olivetti)
 - improve original OSD scaler for small resolutions (#1014339, Luca Olivetti)
-- eliminate some compiler warnings (Ville Skyttä)
+- improve error checking, eliminate some compiler warnings (Ville Skyttä)
 - fix OSD going pink after returning from the MPlayer plugin; while at it,
   remove dxr3palettemanager.* and use VDR's cPalette
   (Ville Skyttä, Martin Cap, Luca Olivetti)
diff --git a/dxr3interface.c b/dxr3interface.c
index cd3c857..19bdd1f 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -665,8 +665,8 @@ void cDxr3Interface::PlayVideoFrame(const uint8_t* pBuf, int length, int times)
 // ==================================
 void cDxr3Interface::PlayAudioFrame(cFixedLengthFrame* pFrame)
 {
-
     // XXX: Call this only with we are not in external mode?
+    int written = 0;
 
     if (m_AudioActive)
     {
@@ -679,7 +679,18 @@ void cDxr3Interface::PlayAudioFrame(cFixedLengthFrame* pFrame)
 	{
 	    if (!cDxr3ConfigData::Instance().GetAc3OutPut())
 		ResampleVolume((short*)pFrame->GetData(), pFrame->GetCount());
-	    write(m_fdAudio, pFrame->GetData(), pFrame->GetCount());
+
+	    written = write(m_fdAudio, pFrame->GetData(), pFrame->GetCount());
+	    if (written < 0)
+	    {
+		esyslog("dxr3: unable to play audio frame: %m");
+		// TODO: Resuscitation() ?
+	    }
+	    else if (written != pFrame->GetCount())
+	    {
+		esyslog("dxr3: unable to play whole audio frame, skipped"
+			" %d bytes", pFrame->GetCount() - written);
+	    }
 	}
 
 	Unlock();
@@ -697,8 +708,12 @@ void cDxr3Interface::PlayAudioFrame(uint8_t* pBuf, int length)
 	if (!cDxr3ConfigData::Instance().GetAc3OutPut())
 	    ResampleVolume((short*)pBuf, length);
 
-	if ((written = write(m_fdAudio, pBuf, length) < 0)) Resuscitation();
-	if (written != length)
+	if ((written = write(m_fdAudio, pBuf, length)) < 0)
+	{
+	    esyslog("dxr3: unable to play audio frame: %m");
+	    Resuscitation();
+	}
+	else if (written != length)
 	{
 	    esyslog("dxr3: unable to play whole audio frame, skipped %d bytes",
 		    length - written);