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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-06-29T07:06:42-07:00
   Push Date:  2011/06/29 07:08:50 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  e6609c07f2d36da6470a5a29ec9089fdcaef88b6
   Changeset:  https://github.com/MythTV/mythtv/commit/e6609c07f

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmyth/programinfo.cpp

Added:

   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/programs/mythavtest/commandlineparser.cpp
   mythtv/programs/mythavtest/commandlineparser.h
   mythtv/programs/mythbackend/commandlineparser.cpp
   mythtv/programs/mythbackend/commandlineparser.h
   mythtv/programs/mythcommflag/commandlineparser.cpp
   mythtv/programs/mythcommflag/commandlineparser.h
   mythtv/programs/mythfilldatabase/commandlineparser.cpp
   mythtv/programs/mythfilldatabase/commandlineparser.h
   mythtv/programs/mythfrontend/commandlineparser.cpp
   mythtv/programs/mythfrontend/commandlineparser.h
   mythtv/programs/mythjobqueue/commandlineparser.cpp
   mythtv/programs/mythjobqueue/commandlineparser.h
   mythtv/programs/mythlcdserver/commandlineparser.cpp
   mythtv/programs/mythlcdserver/commandlineparser.h
   mythtv/programs/mythmediaserver/commandlineparser.cpp
   mythtv/programs/mythmediaserver/commandlineparser.h
   mythtv/programs/mythmessage/commandlineparser.cpp
   mythtv/programs/mythmessage/commandlineparser.h
   mythtv/programs/mythpreviewgen/commandlineparser.cpp
   mythtv/programs/mythpreviewgen/commandlineparser.h
   mythtv/programs/mythshutdown/commandlineparser.cpp
   mythtv/programs/mythshutdown/commandlineparser.h
   mythtv/programs/mythtranscode/commandlineparser.cpp
   mythtv/programs/mythtranscode/commandlineparser.h
   mythtv/programs/mythtv-setup/commandlineparser.cpp
   mythtv/programs/mythtv-setup/commandlineparser.h
   mythtv/programs/mythwelcome/commandlineparser.cpp
   mythtv/programs/mythwelcome/commandlineparser.h

Removed:

   mythtv/libs/libmyth/mythcommandlineparser.cpp
   mythtv/libs/libmyth/mythcommandlineparser.h

Modified:

   mythplugins/mytharchive/mytharchivehelper/main.cpp
   mythplugins/mythmusic/mythmusic/cdrip.cpp
   mythtv/external/FFmpeg/libavformat/mpegts.c
   mythtv/libs/libmyth/libmyth.pro
   mythtv/libs/libmyth/mediamonitor-darwin.cpp
   mythtv/libs/libmyth/mediamonitor-unix.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmythbase/dbutil.cpp
   mythtv/libs/libmythbase/httpcomms.cpp
   mythtv/libs/libmythbase/lcddevice.cpp
   mythtv/libs/libmythbase/libmythbase.pro
   mythtv/libs/libmythbase/msocketdevice_unix.cpp
   mythtv/libs/libmythbase/msocketdevice_win.cpp
   mythtv/libs/libmythbase/mythbaseutil.h
   mythtv/libs/libmythbase/mythcdrom-darwin.cpp
   mythtv/libs/libmythbase/mythcdrom-freebsd.cpp
   mythtv/libs/libmythbase/mythcdrom-linux.cpp
   mythtv/libs/libmythbase/mythcdrom.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcoreutil.cpp
   mythtv/libs/libmythbase/mythdb.cpp
   mythtv/libs/libmythbase/mythdbcon.cpp
   mythtv/libs/libmythbase/mythdirs.cpp
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythhttphandler.cpp
   mythtv/libs/libmythbase/mythhttppool.cpp
   mythtv/libs/libmythbase/mythlocale.cpp
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythmedia.cpp
   mythtv/libs/libmythbase/mythsocket.cpp
   mythtv/libs/libmythbase/mythsocketthread.cpp
   mythtv/libs/libmythbase/mythsystem.cpp
   mythtv/libs/libmythbase/mythtranslation.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/oldsettings.cpp
   mythtv/libs/libmythbase/referencecounter.cpp
   mythtv/libs/libmythbase/remotefile.cpp
   mythtv/libs/libmythbase/storagegroup.cpp
   mythtv/libs/libmythbase/system-unix.cpp
   mythtv/libs/libmythbase/system-windows.cpp
   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
   mythtv/libs/libmythprotoserver/requesthandler/basehandler.cpp
   mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
   mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp
   mythtv/libs/libmythprotoserver/sockethandler.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/bdringbuffer.cpp
   mythtv/libs/libmythtv/cc608decoder.cpp
   mythtv/libs/libmythtv/cc608reader.cpp
   mythtv/libs/libmythtv/cc708decoder.cpp
   mythtv/libs/libmythtv/dsmccbiop.cpp
   mythtv/libs/libmythtv/dvbdev/dvbci.cpp
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/fileringbuffer.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/ringbuffer.h
   mythtv/libs/libmythtv/streamingringbuffer.cpp
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/v4lrecorder.cpp
   mythtv/libs/libmythui/AppleRemote.cpp
   mythtv/libs/libmythui/DisplayRes.cpp
   mythtv/libs/libmythui/DisplayResX.cpp
   mythtv/libs/libmythui/jsmenu.cpp
   mythtv/libs/libmythui/lirc.cpp
   mythtv/libs/libmythui/mythdialogbox.cpp
   mythtv/libs/libmythui/mythfontmanager.cpp
   mythtv/libs/libmythui/mythfontproperties.cpp
   mythtv/libs/libmythui/mythgenerictree.cpp
   mythtv/libs/libmythui/mythimage.cpp
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythpainter.cpp
   mythtv/libs/libmythui/mythpainter_d3d9.cpp
   mythtv/libs/libmythui/mythpainter_ogl.cpp
   mythtv/libs/libmythui/mythpainter_qimage.cpp
   mythtv/libs/libmythui/mythpainter_qt.cpp
   mythtv/libs/libmythui/mythpainter_vdpau.cpp
   mythtv/libs/libmythui/mythprogressdialog.cpp
   mythtv/libs/libmythui/mythrender_d3d9.cpp
   mythtv/libs/libmythui/mythrender_opengl.cpp
   mythtv/libs/libmythui/mythrender_opengl1.cpp
   mythtv/libs/libmythui/mythrender_opengl2.cpp
   mythtv/libs/libmythui/mythrender_opengl2es.h
   mythtv/libs/libmythui/mythrender_vdpau.cpp
   mythtv/libs/libmythui/mythscreentype.cpp
   mythtv/libs/libmythui/myththemedmenu.cpp
   mythtv/libs/libmythui/mythudplistener.cpp
   mythtv/libs/libmythui/mythuibutton.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythui/mythuicheckbox.cpp
   mythtv/libs/libmythui/mythuiclock.cpp
   mythtv/libs/libmythui/mythuifilebrowser.cpp
   mythtv/libs/libmythui/mythuiguidegrid.cpp
   mythtv/libs/libmythui/mythuihelper.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythui/mythuiprogressbar.cpp
   mythtv/libs/libmythui/mythuishape.cpp
   mythtv/libs/libmythui/mythuitext.cpp
   mythtv/libs/libmythui/mythuitextedit.cpp
   mythtv/libs/libmythui/mythuiutils.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythvirtualkeyboard.cpp
   mythtv/libs/libmythui/mythxdisplay.cpp
   mythtv/libs/libmythui/screensaver-x11.cpp
   mythtv/libs/libmythui/themeinfo.cpp
   mythtv/libs/libmythui/util-nvctrl.cpp
   mythtv/libs/libmythui/xmlparsebase.cpp
   mythtv/libs/libmythui/xmlparsebase.h
   mythtv/programs/mythavtest/main.cpp
   mythtv/programs/mythavtest/mythavtest.pro
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/mythbackend.pro
   mythtv/programs/mythcommflag/HistogramAnalyzer.cpp
   mythtv/programs/mythcommflag/SceneChangeDetector.cpp
   mythtv/programs/mythcommflag/TemplateMatcher.cpp
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythcommflag/mythcommflag.pro
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfilldatabase/mythfilldatabase.pro
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/mythfrontend.pro
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythjobqueue/main.cpp
   mythtv/programs/mythjobqueue/mythjobqueue.pro
   mythtv/programs/mythlcdserver/main.cpp
   mythtv/programs/mythlcdserver/mythlcdserver.pro
   mythtv/programs/mythmediaserver/main.cpp
   mythtv/programs/mythmediaserver/mythmediaserver.pro
   mythtv/programs/mythmessage/main.cpp
   mythtv/programs/mythmessage/mythmessage.pro
   mythtv/programs/mythpreviewgen/main.cpp
   mythtv/programs/mythpreviewgen/mythpreviewgen.pro
   mythtv/programs/mythshutdown/main.cpp
   mythtv/programs/mythshutdown/mythshutdown.pro
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtranscode/mythtranscode.pro
   mythtv/programs/mythtv-setup/main.cpp
   mythtv/programs/mythtv-setup/mythtv-setup.pro
   mythtv/programs/mythwelcome/main.cpp
   mythtv/programs/mythwelcome/mythwelcome.pro