Sync extra log command removal from HEAD.

1 files changed, 3 insertions, 68 deletions

diff --git a/dxr3outputthread.c b/dxr3outputthread.c
index 685d10e..300d0e7 100644
--- a/dxr3outputthread.c
+++ b/dxr3outputthread.c
@@ -95,10 +95,6 @@ void cDxr3AudioOutThread::Action()
         
         if (pts && abs((int)pts-(int)SCR) > 30000 || m_dxr3Device.IsExternalReleased()) 
 		{
-			if (cDxr3ConfigData::Instance().GetDebugEverything())
-			{
-				cLog::Instance() << "cDxr3AudioOutThread::Action " << "pts = " << pts << " scr = " << SCR << "\n";
-			}
             m_buffer.Clear();
             m_bNeedResync = true;
         } 
@@ -106,10 +102,6 @@ void cDxr3AudioOutThread::Action()
 		{
             if (!pts || pts < SCR) 
 			{
-				if (cDxr3ConfigData::Instance().GetDebugEverything())
-				{
-//					if (pts) cLog::Instance() << "cDxr3AudioOutThread::Action pts " << pNext->GetPts() << " scr " << SCR << " delta " << (pts - SCR) << "\n";
-				}
                 if (!pts && resync) 
 				{
                     continue;
@@ -121,10 +113,6 @@ void cDxr3AudioOutThread::Action()
                 
                 if (pts && (pts < SCR) && ((SCR - pts) > 5000)) 
 				{
-					if (cDxr3ConfigData::Instance().GetDebugEverything())
-					{
-//						cLog::Instance() << "cDxr3AudioOutThread::Action pts audio too small " << (SCR - pts) << "\n";
-					}
                     m_dxr3Device.SetSysClock(pts+ 1 * AUDIO_OFFSET);
                     m_dxr3Device.PlayAudioFrame(pNext);
                     if (m_buffer.IsPolled()) 
@@ -135,10 +123,6 @@ void cDxr3AudioOutThread::Action()
                 } 
 				else 
 				{                
-					if (cDxr3ConfigData::Instance().GetDebugEverything())
-					{
-//						cLog::Instance() << "cDxr3AudioOutThread::Action write audio\n";
-					}
                     m_dxr3Device.PlayAudioFrame(pNext);
                     m_buffer.Pop();
                 }                                   
@@ -147,10 +131,6 @@ void cDxr3AudioOutThread::Action()
 			{
                 if (abs((int)pts - (int)SCR) < (AUDIO_OFFSET )) 
 				{
-					if (cDxr3ConfigData::Instance().GetDebugEverything())
-					{
-//						if (pts) cLog::Instance() << "cDxr3AudioOutThread::Action pts " << pNext->GetPts() << " scr " << SCR << " delta " << (pts - SCR) << "\n";
-					}
                     m_dxr3Device.PlayAudioFrame(pNext);
                     m_buffer.Pop();    
                 } 
@@ -159,17 +139,7 @@ void cDxr3AudioOutThread::Action()
         
         if ((pts > SCR && abs((int)pts - (int)SCR) > AUDIO_OFFSET)) 
 		{
-			if (cDxr3ConfigData::Instance().GetDebugEverything())
-			{
-//				cLog::Instance() << "cDxr3AudioOutThread::Action Stopping audio " << SCR << " " << pts << "\n";
-			}
-
-            usleep(10000);
-
-			if (cDxr3ConfigData::Instance().GetDebugEverything())
-			{
-//				cLog::Instance() << "cDxr3AudioOutThread::Action Starting audio " << SCR << " " << pts << "\n";
-			}
+			usleep(10000);
         }
     }
 }
@@ -198,7 +168,7 @@ void cDxr3VideoOutThread::Action()
 
     if (!pthread_setschedparam(pthread_self(), SCHED_RR, &temp)) 
 	{
-//        cLog::Instance() << "cDxr3VideoOutThread::Action(): Error can't set priority\n";
+        cLog::Instance() << "cDxr3VideoOutThread::Action(): Error can't set priority\n";
     }      
 
     while (!GetStopSignal()) 
@@ -226,38 +196,13 @@ void cDxr3VideoOutThread::Action()
 			{
                 if ((pts > SCR) && abs((int)pts - (int)SCR) < 7500) 
 				{
-					if (cDxr3ConfigData::Instance().GetDebugEverything())
-					{
-//						cLog::Instance() << "cDxr3VideoOutThread::Action pts " << pts << " scr " << SCR << " delta " << (pts - SCR) << "\n";
-					}
-
                     m_dxr3Device.SetPts(pts);
 
-					if (cDxr3ConfigData::Instance().GetDebugEverything())
-					{
-//						cLog::Instance() << "cDxr3VideoOutThread::Action done\n";
-					}
-
                     if (m_buffer.Available() && pNext->GetData() && pNext->GetCount()) 
 					{
                         m_dxr3Device.PlayVideoFrame(pNext);
-
-						if (cDxr3ConfigData::Instance().GetDebugEverything())
-						{
-//							cLog::Instance() << "cDxr3VideoOutThread::Action write\n";
-						}
-
-                        m_buffer.Pop();    
-
-						if (cDxr3ConfigData::Instance().GetDebugEverything())
-						{
-//							cLog::Instance() << "cDxr3VideoOutThread::Action done pop\n";
-						}
+                        m_buffer.Pop();
                     }
-					if (cDxr3ConfigData::Instance().GetDebug())
-					{
-//						cLog::Instance() << "cDxr3VideoOutThread::Action done complete\n";
-					}
                 } 
 				else 
 				{
@@ -278,17 +223,7 @@ void cDxr3VideoOutThread::Action()
         
             if ((pts > SCR && abs((int)pts - (int)SCR) > 7500 )) 
 			{
-				if (cDxr3ConfigData::Instance().GetDebugEverything())
-				{
-//					cLog::Instance() << "cDxr3VideoOutThread::Action Stopping video "  << SCR << " " << pts << "\n";
-				}
-
                 usleep(10000);
-
-				if (cDxr3ConfigData::Instance().GetDebugEverything())
-				{
-//					cLog::Instance() << "cDxr3VideoOutThread::Action Starting video "  << SCR << " " << pts << "\n";
-				}
             }
         }
     }