[vdr] Re: Quickfix: mp3-plugin against vdr-1.1.31

[Andreas Kool <akool@akool.de>]

On Sun, May 11, 2003 at 10:41:43PM +0200, Sascha Volkenandt wrote:
> Hello list,
>
> this is a quickfix for those who want to use the mp3-plugin immediately with
> VDR 1.1.31 and don't know much about coding:
>
> http://www.magoa.net/linux/files/vdr-mp3-0.7.13-1.1.31.diff
>
> Apply with patch -p1 <vdr-mp3-0.7.13-1.1.31.diff inside the plugin's directory

As an extend to Saschas really nice patch:

the DXR3-Plugin does work with vdr-1.1.31 the same way:
simply remove any line reading
  EnableGet()
  EnablePut()
  WaitForGet()
or
  WaitForPut()

maybe with this patch:

---8<-----if--you--cut--here--you--will--probably--destroy--your--monitor---
diff -ub vdr-1.1.31.orig/PLUGINS/src/dxr3-0.1.9/dxr3syncbuffer.c vdr-1.1.31/PLUGINS/src/dxr3/dxr3syncbuffer.c
--- vdr-1.1.31.orig/PLUGINS/src/dxr3-0.1.9/dxr3syncbuffer.c	2003-05-07 18:43:34.000000000 +0200
+++ vdr-1.1.31/PLUGINS/src/dxr3/dxr3syncbuffer.c	2003-05-11 21:04:23.000000000 +0200
@@ -103,9 +103,9 @@
                 // DXR3_DIAG << "cDxr3SyncBuffer::Poll Timeout" << TimeoutMs << endl;

                 m_bPutBlock = true;
-                EnableGet();
+                // EnableGet();
                 m_bWaitPts = false;
-                WaitForPut();
+                // WaitForPut();

             }
             if (Available() >= Size() - (Size()*BUFFER_LIMIT_2)/100) {
@@ -132,9 +132,9 @@
             while ((Available() >= Size() - (Size()*10)/100)) {
                 DXR3_DIAG_DETAIL << "cDxr3SyncBuffer::Push replay block\n";
                 m_bPutBlock = true;
-                EnableGet();
+                // EnableGet();
                 m_bWaitPts = false;
-                WaitForPut();
+                // WaitForPut();
             }

             Lock();
@@ -162,12 +162,12 @@
             if (!m_bWaitPts) {
                 if (m_bStartReceiver) {
                     DXR3_DIAG_DETAIL << "cDxr3SyncBuffer::Push Enable get\n";
-                    EnableGet();
+                    // EnableGet();
                 }
             } else {
                 if (m_waitPts < m_dxr3Device.GetSysClock() ||
                 m_waitPts - m_dxr3Device.GetSysClock() < m_waitDelta) {
-                    EnableGet();
+                    // EnableGet();
                     m_bWaitPts = false;
                 }
             }
@@ -203,7 +203,7 @@
             m_next = m_nextFree = m_count = 0;
         }
     }
-    EnablePut();
+    // EnablePut();
     Unlock();
 }

@@ -217,7 +217,7 @@
             DXR3_DIAG_DETAIL << "cDxr3SyncBuffer::Get wait for get\n";
             m_bGetBlock = true;
             ReceiverStopped();
-            WaitForGet();
+            // WaitForGet();
         }

         Lock();
@@ -225,9 +225,9 @@
             pRet = &m_pBuffer[m_next];
         }
         Unlock();
-    } else {
-        WaitForGet();
-    }
+    } // else {
+    //     WaitForGet();
+    // }

     return pRet;
 }
@@ -243,7 +243,7 @@
     m_bStartReceiver = false;
     m_bPollSync = false;
     if (m_bPutBlock) {
-        EnablePut();
+        // EnablePut();
         m_bPutBlock = false;
     }
     cFixedLengthFrame::Clear();
@@ -260,7 +260,7 @@
         Unlock();
         m_bGetBlock = true;
         ReceiverStopped();
-        WaitForGet();
+        // WaitForGet();
     } else {
         usleep(1); //* (pts - pSysClock->GetSysClock()));
     }
@@ -270,7 +270,7 @@
     if (!m_bPutBlock) {
         m_bGetBlock = true;
         ReceiverStopped();
-        WaitForGet();
+        // WaitForGet();
     } else {
         usleep(1);
     }
@@ -279,9 +279,9 @@
 void cDxr3SyncBuffer::Start(void) {
     m_bStartReceiver = true;
     m_bStopped = false;
-    if (Available()) {
-        EnableGet();
-    }
+    // if (Available()) {
+    //     EnableGet();
+    // }
 }

 void cDxr3SyncBuffer::WakeUp(void) {
@@ -289,11 +289,11 @@
     if (m_bStartReceiver == true) {
         if (!m_bWaitPts) {
             DXR3_DIAG_DETAIL << "cDxr3SyncBuffer::WakeUp Enable get\n";
-            EnableGet();
+            // EnableGet();
         } else {
             if (m_waitPts < m_dxr3Device.GetSysClock() ||
             m_waitPts - m_dxr3Device.GetSysClock() < m_waitDelta) {
-                EnableGet();
+                // EnableGet();
                 m_bWaitPts = false;
             }
         }
---8<-----if--you--cut--here--you--will--probably--destroy--your--monitor---

> Greetings,
> Sascha Volkenandt

Ciao,
Andreas
--
Andreas Kool (akool@akool.de * akool@isdn4linux.de * http://www.akool.de)
PGP: 3FBF2411 Fingerprint: B5 35 34 74 25 60 2A 7A  89 06 92 C4 08 BA A5 BD
(To get my PGP key, send me a mail with subject "send pgp key")
		X <-- Nail here for a new Monitor
Transmission of this message via the Microsoft Network is prohibited


-- 
Info:
To unsubscribe send a mail to ecartis@linuxtv.org with "unsubscribe vdr" as subject.