No subject

[tiber-guest at alioth.debian.org]

Subject: r4597 - in vdr/vdr-plugin-dxr3/trunk/debian: . patches
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: tiber-guest
Date: 2007-05-13 19:26:58 +0000 (Sun, 13 May 2007)
New Revision: 4597

Removed:
   vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch
Modified:
   vdr/vdr-plugin-dxr3/trunk/debian/changelog
   vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
Log:
* Removed 90_audioid.dpatch (fixed upstream)

Modified: vdr/vdr-plugin-dxr3/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-05-13 19:23:53 UTC (rev 4596)
+++ vdr/vdr-plugin-dxr3/trunk/debian/changelog	2007-05-13 19:26:58 UTC (rev 4597)
@@ -2,6 +2,7 @@
 
   * New upstream release
   * Reformatted debian/copyright
+  * Removed 90_audioid.dpatch (fixed upstream)
 
  -- Tobias Grimm <tg at e-tobi.net>  Sun, 13 May 2007 21:23:22 +0200
 

Modified: vdr/vdr-plugin-dxr3/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/00list	2007-05-13 19:23:53 UTC (rev 4596)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/00list	2007-05-13 19:26:58 UTC (rev 4597)
@@ -1,4 +1,2 @@
 01_Makefile-fPIC-fix
 02_debian_ffmpeg
-
-90_audioid

Deleted: vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch
===================================================================
--- vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch	2007-05-13 19:23:53 UTC (rev 4596)
+++ vdr/vdr-plugin-dxr3/trunk/debian/patches/90_audioid.dpatch	2007-05-13 19:26:58 UTC (rev 4597)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_audioid.dpatch by Marco Schluessler <marco at lordzodiac.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes audio playback problem with dvd plugin
-## DP: See also: http://vdr-portal.de/board/thread.php?postid=356853#post356853
-
- at DPATCH@
-diff -urNad vdr-plugin-dxr3-0.2.6~/dxr3device.c vdr-plugin-dxr3-0.2.6/dxr3device.c
---- vdr-plugin-dxr3-0.2.6~/dxr3device.c	2006-05-02 21:32:01.000000000 +0200
-+++ vdr-plugin-dxr3-0.2.6/dxr3device.c	2006-05-02 21:32:39.000000000 +0200
-@@ -284,6 +284,8 @@
- 
-     m_AC3Present = true;
- 
-+    bool m_isAc3 = ((Id & 0xF0) == 0x80) || Id == 0xbd;
-+
-     if ((m_DemuxDevice.GetDemuxMode() == DXR3_DEMUX_TRICK_MODE &&
- 	 m_DemuxDevice.GetTrickState() == DXR3_FREEZE) ||
- 	cDxr3Interface::Instance().IsExternalReleased())
-@@ -299,7 +301,7 @@
- 	{
- 	    retLength = m_DemuxDevice.DemuxAudioPes((const uint8_t*)m_strBuf.data(), m_strBuf.length());
- 	} else {
--	    retLength = m_DemuxDevice.DemuxPes((const uint8_t*)m_strBuf.data(), m_strBuf.length(), true);
-+	    retLength = m_DemuxDevice.DemuxPes((const uint8_t*)m_strBuf.data(), m_strBuf.length(), m_isAc3);
- 	}
-     }
-     else if (m_PlayMode == pmAudioOnly)
-@@ -308,7 +310,7 @@
-     }
-     else
-     {
--	retLength = m_DemuxDevice.DemuxPes((const uint8_t*)Data, Length, true);
-+	retLength = m_DemuxDevice.DemuxPes((const uint8_t*)Data, Length, m_isAc3);
-     }
- 
-     Length -= retLength;