From patchwork Tue Nov  1 19:21:41 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Reinhard Nissl <rnissl@gmx.de>
X-Patchwork-Id: 12077
Received: from pop.gmx.net ([213.165.64.20] helo=mail.gmx.net)
	by www.linuxtv.org with smtp (Exim 4.50) id 1EX1i1-0006W0-1W
	for vdr@linuxtv.org; Tue, 01 Nov 2005 20:22:13 +0100
Received: (qmail invoked by alias); 01 Nov 2005 19:21:42 -0000
Received: from Af3a6.a.pppool.de (EHLO [192.168.101.15]) [213.6.243.166]
	by mail.gmx.net (mp008) with SMTP; 01 Nov 2005 20:21:42 +0100
X-Authenticated: #527675
Message-ID: <4367C045.9020303@gmx.de>
Date: Tue, 01 Nov 2005 20:21:41 +0100
From: Reinhard Nissl <rnissl@gmx.de>
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050716)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
Subject: Re: [vdr] Problem with transfer mode, xine plugin and ActualDevice
References: <43679260.9060403@ventoso.org> <4367A306.5050308@gmx.de>
	<4367ABAC.1060501@ventoso.org>
In-Reply-To: <4367ABAC.1060501@ventoso.org>
X-Y-GMX-Trusted: 0
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Nov 2005 19:22:13 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 5773

Hi,

Luca Olivetti wrote:

>>Could you please proof the case, where this functionality is turned off
>>and you change the primary device in the ways which VDR offers, i. e.
>>setup menu respectively SVDRP interface?
> 
> I tried that and there's no such problem (I used the dvb setup menu, I
> couldn't find the SVDRP command to switch the primary device).
> The difference is that when I do that through the menu vdr will show a
> message telling me that it's switching the primary interface, while I
> see no such message when xine automatically changes over (btw, now with
> xine-plugin 0.7.6 and vdr 1.3.35)

Please test the attached patch.

Bye.

--- ../xine-0.7.6/xineDevice.c	2005-09-11 21:17:06.000000000 +0200
+++ xineDevice.c	2005-11-01 20:17:54.000000000 +0100
@@ -2582,6 +2590,8 @@ store_frame(jumboPESdata, todo, __LINE__
   {
     if (On)
       new cXineOsdProvider(*this);
+    else
+      cOsdProvider::Shutdown();
     
     originalPrimaryDevice = 0;
   }
@@ -2630,7 +2640,12 @@ store_frame(jumboPESdata, todo, __LINE__
     {
       cDevice *primaryDevice = cDevice::PrimaryDevice();
       if (this != primaryDevice)
+      {
+        cControl::Shutdown();
+        Skins.Message(mtInfo, tr("Switching primary DVB to vdr-xine..."));
         SetPrimaryDevice(1 + DeviceNumber());
+      }
+
       originalPrimaryDevice = primaryDevice;
     }