[vdr] Re: VDR developer version 1.3.13

[Jukka Tastula <jukka.tastula@kotinet.com>]

On Saturday 23 October 2004 15:19, Ville Skyttä wrote:
> This patch does not apply to vanilla dxr3-0.2.3-pre2
> (with or without -l):

Here's what I needed to make the plugin compile and usable.

diff -Nur dxr3-0.2.3-pre2/dxr3interface.c dxr3-pre2-patched/dxr3interface.c
--- dxr3-0.2.3-pre2/dxr3interface.c	2004-07-23 03:00:33.000000000 +0300
+++ dxr3-pre2-patched/dxr3interface.c	2004-10-18 19:15:23.000000000 +0300
@@ -446,6 +446,7 @@
     Lock();
 
     if (cDxr3ConfigData::Instance().GetForceLetterBox()) ratio = EM8300_ASPECTRATIO_16_9;
+    if (Setup.VideoFormat) ratio = EM8300_ASPECTRATIO_4_3;
 
 	if (!m_ExternalReleased && ratio != UNKNOWN_ASPECT_RATIO) 
 	{      
diff -Nur dxr3-0.2.3-pre2/dxr3syncbuffer.c dxr3-pre2-patched/dxr3syncbuffer.c
--- dxr3-0.2.3-pre2/dxr3syncbuffer.c	2004-07-26 05:04:47.000000000 +0300
+++ dxr3-pre2-patched/dxr3syncbuffer.c	2004-10-18 01:29:45.000000000 +0300
@@ -31,7 +31,8 @@
 const int DXR3_MAX_VIDEO_FRAME_LENGTH = 4096;
 const int DXR3_MAX_AUDIO_FRAME_LENGTH = 4096;
 
-// ==================================
+// ==================================
+//! constructor
 cFixedLengthFrame::cFixedLengthFrame(uint32_t length) : 
 m_count(0), m_length(length), m_pts(0), m_type(ftUnknown) {
 
@@ -141,10 +142,14 @@
 // ==================================
 int cDxr3SyncBuffer::Available(void) 
 {
-    int ret = 0;
-    Lock();
+    int ret = 0;
+#if VDRVERSNUM < 10313
+       Lock();
+#endif
     ret = m_count;
-    Unlock();
+#if VDRVERSNUM < 10313
+       Unlock();
+#endif
     return ret;
 }
 
@@ -202,7 +207,9 @@
                 WaitForPut();
             }
         
-            Lock();
+               #if VDRVERSNUM < 10313
+                       Lock();
+               #endif
             if (pts == m_lastPts) 
 			{
                 pts = 0;
@@ -246,7 +253,9 @@
                     m_bWaitPts = false;
                 }
             }
-            Unlock();
+               #if VDRVERSNUM < 10313
+                       Unlock();
+               #endif
             break;
     }
 
@@ -256,7 +265,9 @@
 // ==================================
 void cDxr3SyncBuffer::Pop(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+       Lock();
+#endif
     if (m_count) 
 	{
         uint32_t nextPts = 0;
@@ -279,8 +290,10 @@
             m_next = m_nextFree = m_count = 0;
         } 
     }
-    EnablePut();
-    Unlock();
+    EnablePut();
+#if VDRVERSNUM < 10313
+       Unlock();
+#endif
 }
 
 // ==================================
@@ -297,12 +310,16 @@
             WaitForGet();
         }
         
-        Lock();
+       #if VDRVERSNUM < 10313
+               Lock();
+       #endif
         if (m_nextFree != m_next) 
 		{
             pRet = &m_pBuffer[m_next]; 
         }
-        Unlock();
+       #if VDRVERSNUM < 10313
+               Unlock();
+       #endif
     } 
 	else 
 	{
@@ -315,7 +332,9 @@
 // ==================================
 void cDxr3SyncBuffer::Clear(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+       Lock();
+#endif
     m_next = 0;
     m_nextFree = 0;
     m_count = 0;
@@ -330,7 +349,9 @@
     }
     cFixedLengthFrame::Clear();
     cDxr3NextPts::Instance().Clear();
-    Unlock();
+#if VDRVERSNUM < 10313
+       Unlock();
+#endif
 }
 
 // ==================================
@@ -340,9 +361,13 @@
     m_waitDelta = delta;
     if (!m_bPutBlock) 
 	{
-        Lock();
+       #if VDRVERSNUM < 10313
+               Lock();
+       #endif
         m_bWaitPts = true;
-        Unlock();
+       #if VDRVERSNUM < 10313
+               Unlock();
+       #endif
         m_bGetBlock = true;
         ReceiverStopped();
         WaitForGet();
@@ -382,7 +407,9 @@
 // ==================================
 void cDxr3SyncBuffer::WakeUp(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+       Lock();
+#endif
     if (m_bStartReceiver == true) 
 	{
         if (!m_bWaitPts) 
@@ -399,7 +426,9 @@
             }
         }
     }
-    Unlock();
+#if VDRVERSNUM < 10313
+       Unlock();
+#endif
 }
 
 // ==================================