[mythtv-firehose] mythtv/mythtv-rec2 commit: 43b7b0ce7 by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-06-17T10:00:28-07:00
   Push Date:  2011/06/17 10:00:36 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  43b7b0ce7530e1841ffb8e023dd99820591ab384
   Changeset:  https://github.com/MythTV/mythtv/commit/43b7b0ce7

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythtv/signalmonitor.cpp

Added:

   mythtv/themes/Slave/mainmenu.xml
   mythtv/themes/Slave/themeinfo.xml

Modified:

   mythplugins/mythgame/mythgame/gamehandler.cpp
   mythtv/libs/libmyth/audio/audiooutput.cpp
   mythtv/libs/libmyth/audio/audiooutputalsa.cpp
   mythtv/libs/libmyth/audio/audiooutputalsa.h
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputca.cpp
   mythtv/libs/libmyth/audio/audiooutputca.h
   mythtv/libs/libmyth/generictree.cpp
   mythtv/libs/libmyth/libmyth.pro
   mythtv/libs/libmyth/managedlist.cpp
   mythtv/libs/libmyth/mythcommandlineparser.cpp
   mythtv/libs/libmyth/mythcommandlineparser.h
   mythtv/libs/libmyth/remoteutil.cpp
   mythtv/libs/libmyth/uilistbtntype.cpp
   mythtv/libs/libmyth/uitypes.cpp
   mythtv/libs/libmyth/xmlparse.cpp
   mythtv/libs/libmythbase/httpcomms.cpp
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythtv/DetectLetterbox.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/bdoverlayscreen.cpp
   mythtv/libs/libmythtv/cc608reader.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/datadirect.cpp
   mythtv/libs/libmythtv/decoderbase.cpp
   mythtv/libs/libmythtv/firewiredevice.cpp
   mythtv/libs/libmythtv/interactivescreen.cpp
   mythtv/libs/libmythtv/mpeg/H264Parser.cpp
   mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp
   mythtv/libs/libmythtv/mpeg/mpegdescriptors.h
   mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
   mythtv/libs/libmythtv/mpeg/pespacket.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/nuppeldecoder.cpp
   mythtv/libs/libmythtv/playercontext.cpp
   mythtv/libs/libmythtv/signalmonitor.cpp
   mythtv/libs/libmythtv/signalmonitorvalue.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/teletextscreen.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/util-xv.cpp
   mythtv/libs/libmythtv/videoout_d3d.cpp
   mythtv/libs/libmythtv/videoout_d3d.h
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_opengl.h
   mythtv/libs/libmythtv/videoout_xv.cpp
   mythtv/libs/libmythtv/videooutbase.h
   mythtv/libs/libmythtv/vsync.cpp
   mythtv/libs/libmythui/DisplayResX.cpp
   mythtv/libs/libmythui/mythuihelper.cpp
   mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libmythupnp/taskqueue.cpp
   mythtv/programs/mythbackend/encoderlink.cpp
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythfilldatabase/filldata.cpp
   mythtv/programs/mythfrontend/videometadatasettings.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/themes/default/osd.xml
   mythtv/themes/themes.pro