[mythtv-firehose] mythtv/jobqueue-rewrite commit: c47876ef3 by Raymond Wagner (wagnerrp)

[MythTV]

      Author:  Raymond Wagner <rwagner at mythtv.org>
 Change Date:  2011-05-03T23:08:16-07:00
   Push Date:  2011/05/13 10:59:40 -0700
  Repository:  mythtv
      Branch:  jobqueue-rewrite
New Revision:  c47876ef3978a7daae7afd202a46af79e4d08a58
   Changeset:  https://github.com/MythTV/mythtv/commit/c47876ef3

Log:

Merge branch 'master' into jobqueue-rewrite

Conflicts:
	mythtv/programs/mythbackend/main_helpers.cpp

Added:

   mythtv/html/buildhtmlstrings.sh
   mythtv/html/getTransStringsFromFile.pl
   mythtv/html/htmlstrings.h

Removed:

   mythtv/html/misc/wsdl.html

Modified:

   mythplugins/mythmusic/mythmusic/avfdecoder.cpp
   mythplugins/mythmusic/mythmusic/goom/zoom_filter_mmx.c
   mythtv/configure
   mythtv/external/FFmpeg/libavcodec/myth_utils.c
   mythtv/external/FFmpeg/libavformat/mpegts.c
   mythtv/html/js/util.qjs
   mythtv/html/menu.qsp
   mythtv/html/misc/overview.qsp
   mythtv/html/samples/storagegroups.qsp
   mythtv/html/setup/channeleditor-channeldetail.html
   mythtv/html/setup/jobqueue-jobs.qsp
   mythtv/html/setup/js/channeleditor.js
   mythtv/html/setup/wizard-network.qsp
   mythtv/i18n/translate.pro
   mythtv/libs/libmyth/audio/audiooutput.h
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.h
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbluray/bluray.c
   mythtv/libs/libmythbluray/hdmv/hdmv_vm.c
   mythtv/libs/libmythbluray/hdmv/hdmv_vm.h
   mythtv/libs/libmythbluray/register.c
   mythtv/libs/libmythmetadata/quicksp.h
   mythtv/libs/libmythtv/ThreadedFileWriter.cpp
   mythtv/libs/libmythtv/audioplayer.cpp
   mythtv/libs/libmythtv/audioplayer.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/channelsettings.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/fileringbuffer.cpp
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/openglvideo.cpp
   mythtv/libs/libmythtv/openglvideo.h
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/subtitlescreen.h
   mythtv/libs/libmythtv/tv_actions.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_opengl.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythmainwindow.h
   mythtv/libs/libmythui/mythrender_base.h
   mythtv/libs/libmythui/mythrender_opengl.cpp
   mythtv/libs/libmythui/mythrender_opengl.h
   mythtv/libs/libmythui/mythrender_opengl1.h
   mythtv/libs/libmythui/mythrender_opengl2.h
   mythtv/libs/libmythui/myththemedmenu.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythupnp/serverSideScripting.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/progfind.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/viewscheduled.cpp