[mythtv-firehose] mythtv branch master updated by beirdo. v0.26-pre-665-gdcf3007

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user beirdo.
       via  dcf3007ee3facf79bd8011dc5e008c26735762f6 (commit)
       via  25478deae45312f2ae2fa54ef2ea087392268c4d (commit)
      from  2b189a9a2a3826128f7f9767990548bd5dd2a97e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dcf3007ee3facf79bd8011dc5e008c26735762f6
Author:    Gary Buhrmaster <gary.buhrmaster at gmail.com> at Mon, 18 Jun 2012 15:04:16 -0700
Committer: Gavin Hurlbut <ghurlbut at mythtv.org> at Mon, 18 Jun 2012 15:04:16 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=dcf3007ee3facf79bd8011dc5e008c26735762f6

Build zeromq without documentation
Fixes #10840

Signed-off-by: Gavin Hurlbut <ghurlbut at mythtv.org>



commit 25478deae45312f2ae2fa54ef2ea087392268c4d
Author:    Gavin Hurlbut <ghurlbut at mythtv.org> at Mon, 18 Jun 2012 13:33:33 -0700
Committer: Gavin Hurlbut <ghurlbut at mythtv.org> at Mon, 18 Jun 2012 13:33:33 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=25478deae45312f2ae2fa54ef2ea087392268c4d

Change MythSignalingTimer to use QWaitCondition
When you do a MythSignalingTimer::stop(), the method would not return until
the next timer expiry.  This is an issue as I'm using it for a QTimer
replacement with a 5 minute timer...  Changed it to use QWaitCondition such
that it is interrupted nearly immediately when ::stop() is run.  Also, unlock
the mutex before running wait() as this avoids a deadlock.

Also changed the locking in the loggingserver to avoid more possible
deadlock situations.



-----------------------------------------------------------------------

Summary of changes:
 mythtv/external/Makefile                       |    2 +-
 mythtv/libs/libmythbase/loggingserver.cpp      |    7 ++++++-
 mythtv/libs/libmythbase/mythsignalingtimer.cpp |   10 ++++++----
 mythtv/libs/libmythbase/mythsignalingtimer.h   |    4 +++-
 4 files changed, 16 insertions(+), 7 deletions(-)

--