[vdr] Re: VDR developer version 1.3.13

[Christian Gmeiner <christian@visual-page.de>]

Christian Gmeiner wrote:
> Laz wrote:
>
> > On Sunday 17 Oct 2004 15:27, Klaus Schmidinger wrote:
> >
> > > VDR developer version 1.3.13 is now available at
> > >
> > >    ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.3.13.tar.bz2
> > >
> > > *** NOTE THAT THE WARNINGS REGARDING THE USE OF VPS CONTROLLED
> > > *** TIMERS FROM PREVIOUS RELEASE NOTES STILL APPLY!
> >
> >
> > {snippage}
> >
> > Compiles fine for me with recentish dvb-kernel drivers. All of the 
> > plugins I use compiled fine, except for the dxr3 which gives:
> >
> > g++ -O2 -Wall -Woverloaded-virtual -c -DPLUGIN_NAME_I18N='"dxr3"' 
> > -DSOCKET_CHMOD=0660 -D_GNU_SOURCE -I../../../include 
> > -I../../../../DVB/include -I/usr/include/ffmpeg -I/usr/include 
> > dxr3syncbuffer.c
> > dxr3syncbuffer.c: In member function `virtual int 
> > cDxr3SyncBuffer::Available()
> >    ':
> > dxr3syncbuffer.c:145: error: `Lock' undeclared (first use this function)
> > dxr3syncbuffer.c:145: error: (Each undeclared identifier is reported 
> > only once
> >    for each function it appears in.)
> > dxr3syncbuffer.c:147: error: `Unlock' undeclared (first use this 
> > function)
> > make[1]: *** [dxr3syncbuffer.o] Error 1
> >
> > I had a quick look and Lock and Unlock are no longer part of cRingBuffer.
>
> Thanks for reporting this error. I will fix it tonight in cvs.
Changes are now in cvs - there is also a patch for it, see attachment.

Greets,
Christian
--- dxr3_old/dxr3syncbuffer.c	2004-07-26 04:04:47.000000000 +0200
+++ dxr3/dxr3syncbuffer.c	2004-10-17 22:59:10.812346976 +0200
@@ -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) {
 
@@ -102,7 +103,8 @@
 
 
 
-// ==================================
+// ==================================
+//! constructor
 cDxr3SyncBuffer::cDxr3SyncBuffer(int frameCount, int frameLength, cDxr3Interface& dxr3Device) : cRingBuffer(frameCount, true), m_dxr3Device(dxr3Device) 
 {
     m_pBuffer = new cFixedLengthFrame[frameCount](frameLength);
@@ -141,10 +143,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 +208,9 @@
                 WaitForPut();
             }
         
-            Lock();
+		#if VDRVERSNUM < 10313
+			Lock();
+		#endif
             if (pts == m_lastPts) 
 			{
                 pts = 0;
@@ -246,7 +254,9 @@
                     m_bWaitPts = false;
                 }
             }
-            Unlock();
+		#if VDRVERSNUM < 10313
+			Unlock();
+		#endif
             break;
     }
 
@@ -256,7 +266,9 @@
 // ==================================
 void cDxr3SyncBuffer::Pop(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+	Lock();
+#endif
     if (m_count) 
 	{
         uint32_t nextPts = 0;
@@ -279,8 +291,10 @@
             m_next = m_nextFree = m_count = 0;
         } 
     }
-    EnablePut();
-    Unlock();
+    EnablePut();
+#if VDRVERSNUM < 10313
+	Unlock();
+#endif
 }
 
 // ==================================
@@ -297,12 +311,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 +333,9 @@
 // ==================================
 void cDxr3SyncBuffer::Clear(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+	Lock();
+#endif
     m_next = 0;
     m_nextFree = 0;
     m_count = 0;
@@ -330,7 +350,9 @@
     }
     cFixedLengthFrame::Clear();
     cDxr3NextPts::Instance().Clear();
-    Unlock();
+#if VDRVERSNUM < 10313
+	Unlock();
+#endif
 }
 
 // ==================================
@@ -340,9 +362,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 +408,9 @@
 // ==================================
 void cDxr3SyncBuffer::WakeUp(void) 
 {
-    Lock();
+#if VDRVERSNUM < 10313
+	Lock();
+#endif
     if (m_bStartReceiver == true) 
 	{
         if (!m_bWaitPts) 
@@ -399,7 +427,9 @@
             }
         }
     }
-    Unlock();
+#if VDRVERSNUM < 10313
+	Unlock();
+#endif
 }
 
 // ==================================