[mythtv-commits] mythtv commit: r25266 by markk

[mythtv at cvs.mythtv.org]

      Author: markk
        Date: 2010-07-06 04:43:34 +0000 (Tue, 06 Jul 2010)
New Revision: 25266
   Changeset: http://svn.mythtv.org/trac/changeset/25266

Modified:

   trunk/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
   trunk/mythtv/libs/libmythtv/NuppelVideoPlayer.h

Log:

Fix a deadlock when the input changes and we're using the 'softblend'
osd.

A stream change notified from the decoder thread triggers a re-
conditions this can cause a deadlock if the decoder has already been
paused by the player thread. So instead always re-initialise the OSD
from the main thread.

This fixes a deadlock with a clip provided by otto and while it is
treating the symptoms rather than the cause (fix to follow), it is safer
all round and will avoid a number of potential QObject thread related
issues.