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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-10T18:19:15-07:00
   Push Date:  2011/07/10 18:59:28 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  98561f388b4510b7c3515bce85e6b13c2a7f5929
   Changeset:  https://github.com/MythTV/mythtv/commit/98561f388

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythplugins/mytharchive/mytharchive/archiveutil.cpp
   mythplugins/mytharchive/mytharchive/dbcheck.cpp
   mythplugins/mytharchive/mytharchive/editmetadata.cpp
   mythplugins/mytharchive/mytharchive/exportnative.cpp
   mythplugins/mytharchive/mytharchive/fileselector.cpp
   mythplugins/mytharchive/mytharchive/importnative.cpp
   mythplugins/mytharchive/mytharchive/logviewer.cpp
   mythplugins/mytharchive/mytharchive/main.cpp
   mythplugins/mytharchive/mytharchive/mythburn.cpp
   mythplugins/mytharchive/mytharchive/recordingselector.cpp
   mythplugins/mytharchive/mytharchive/selectdestination.cpp
   mythplugins/mytharchive/mytharchive/themeselector.cpp
   mythplugins/mytharchive/mytharchive/thumbfinder.cpp
   mythplugins/mytharchive/mytharchive/videoselector.cpp
   mythplugins/mytharchive/mytharchivehelper/main.cpp
   mythplugins/mythbrowser/mythbrowser/bookmarkeditor.cpp
   mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
   mythplugins/mythbrowser/mythbrowser/browserdbutil.cpp
   mythplugins/mythbrowser/mythbrowser/main.cpp
   mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
   mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp
   mythplugins/mythgallery/mythgallery/dbcheck.cpp
   mythplugins/mythgallery/mythgallery/galleryutil.cpp
   mythplugins/mythgallery/mythgallery/glsingleview.cpp
   mythplugins/mythgallery/mythgallery/iconview.cpp
   mythplugins/mythgallery/mythgallery/singleview.cpp
   mythplugins/mythgallery/mythgallery/thumbgenerator.cpp
   mythplugins/mythgame/mythgame/dbcheck.cpp
   mythplugins/mythgame/mythgame/gamehandler.cpp
   mythplugins/mythgame/mythgame/gameui.cpp
   mythplugins/mythgame/mythgame/main.cpp
   mythplugins/mythgame/mythgame/rom_metadata.cpp
   mythplugins/mythgame/mythgame/romedit.cpp
   mythplugins/mythgame/mythgame/rominfo.cpp
   mythplugins/mythmusic/mythmusic/avfdecoder.cpp
   mythplugins/mythmusic/mythmusic/bumpscope.cpp
   mythplugins/mythmusic/mythmusic/cddecoder-darwin.cpp
   mythplugins/mythmusic/mythmusic/cddecoder.cpp
   mythplugins/mythmusic/mythmusic/cdrip.cpp
   mythplugins/mythmusic/mythmusic/databasebox.cpp
   mythplugins/mythmusic/mythmusic/dbcheck.cpp
   mythplugins/mythmusic/mythmusic/decoder.cpp
   mythplugins/mythmusic/mythmusic/decoderhandler.cpp
   mythplugins/mythmusic/mythmusic/editmetadata.cpp
   mythplugins/mythmusic/mythmusic/encoder.cpp
   mythplugins/mythmusic/mythmusic/filescanner.cpp
   mythplugins/mythmusic/mythmusic/flacencoder.cpp
   mythplugins/mythmusic/mythmusic/globalsettings.cpp
   mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp
   mythplugins/mythmusic/mythmusic/importmusic.cpp
   mythplugins/mythmusic/mythmusic/lameencoder.cpp
   mythplugins/mythmusic/mythmusic/libvisualplugin.cpp
   mythplugins/mythmusic/mythmusic/main.cpp
   mythplugins/mythmusic/mythmusic/metadata.cpp
   mythplugins/mythmusic/mythmusic/metaioid3.cpp
   mythplugins/mythmusic/mythmusic/metaiomp4.cpp
   mythplugins/mythmusic/mythmusic/metaiotaglib.cpp
   mythplugins/mythmusic/mythmusic/miniplayer.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/musicplayer.cpp
   mythplugins/mythmusic/mythmusic/playbackbox.cpp
   mythplugins/mythmusic/mythmusic/playlist.cpp
   mythplugins/mythmusic/mythmusic/playlistcontainer.cpp
   mythplugins/mythmusic/mythmusic/pls.cpp
   mythplugins/mythmusic/mythmusic/shoutcast.cpp
   mythplugins/mythmusic/mythmusic/smartplaylist.cpp
   mythplugins/mythmusic/mythmusic/streaminput.cpp
   mythplugins/mythmusic/mythmusic/synaesthesia.cpp
   mythplugins/mythmusic/mythmusic/vorbisencoder.cpp
   mythplugins/mythnetvision/mythfillnetvision/main.cpp
   mythplugins/mythnetvision/mythnetvision/netsearch.cpp
   mythplugins/mythnetvision/mythnetvision/nettree.cpp
   mythplugins/mythnetvision/mythnetvision/rsseditor.cpp
   mythplugins/mythnetvision/mythnetvision/searcheditor.cpp
   mythplugins/mythnetvision/mythnetvision/treeeditor.cpp
   mythplugins/mythnews/mythnews/dbcheck.cpp
   mythplugins/mythnews/mythnews/main.cpp
   mythplugins/mythnews/mythnews/mythnews.cpp
   mythplugins/mythnews/mythnews/mythnewsconfig.cpp
   mythplugins/mythnews/mythnews/mythnewseditor.cpp
   mythplugins/mythnews/mythnews/newssite.cpp
   mythplugins/mythweather/mythweather/dbcheck.cpp
   mythplugins/mythweather/mythweather/main.cpp
   mythplugins/mythweather/mythweather/sourceManager.cpp
   mythplugins/mythweather/mythweather/weather.cpp
   mythplugins/mythweather/mythweather/weatherScreen.cpp
   mythplugins/mythweather/mythweather/weatherSetup.cpp
   mythplugins/mythweather/mythweather/weatherSource.cpp
   mythplugins/mythweather/mythweather/weatherUtils.cpp
   mythplugins/mythzoneminder/mythzoneminder/main.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmconsole.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp
   mythtv/bindings/perl/MythTV.pm
   mythtv/bindings/php/MythBackend.php
   mythtv/bindings/python/MythTV/__init__.py
   mythtv/bindings/python/MythTV/methodheap.py
   mythtv/bindings/python/MythTV/mythproto.py
   mythtv/bindings/python/MythTV/static.py
   mythtv/bindings/python/MythTV/system.py
   mythtv/filters/kerneldeint/filter_kerneldeint.c
   mythtv/html/misc/overview.qsp
   mythtv/libs/libmyth/audio/audiooutput.cpp
   mythtv/libs/libmyth/audio/audiooutputalsa.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.h
   mythtv/libs/libmyth/audio/audiooutputca.cpp
   mythtv/libs/libmyth/audio/audiooutputca.h
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
   mythtv/libs/libmyth/audio/audiooutputdx.cpp
   mythtv/libs/libmyth/audio/audiooutputjack.cpp
   mythtv/libs/libmyth/audio/audiooutputoss.cpp
   mythtv/libs/libmyth/audio/audiooutputpulse.cpp
   mythtv/libs/libmyth/audio/audiooutputsettings.cpp
   mythtv/libs/libmyth/audio/audiooutpututil.cpp
   mythtv/libs/libmyth/audio/audiooutputwin.cpp
   mythtv/libs/libmyth/audio/audiopulsehandler.cpp
   mythtv/libs/libmyth/audio/spdifencoder.cpp
   mythtv/libs/libmyth/filesysteminfo.cpp
   mythtv/libs/libmyth/generictree.cpp
   mythtv/libs/libmyth/managedlist.cpp
   mythtv/libs/libmyth/mediamonitor-darwin.cpp
   mythtv/libs/libmyth/mediamonitor-unix.cpp
   mythtv/libs/libmyth/mediamonitor-windows.cpp
   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmyth/mythrssmanager.cpp
   mythtv/libs/libmyth/netgrabbermanager.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmyth/remoteutil.cpp
   mythtv/libs/libmyth/rssparse.h
   mythtv/libs/libmyth/storagegroupeditor.cpp
   mythtv/libs/libmyth/uilistbtntype.cpp
   mythtv/libs/libmyth/uitypes.cpp
   mythtv/libs/libmyth/virtualkeyboard_qt.cpp
   mythtv/libs/libmyth/xmlparse.cpp
   mythtv/libs/libmythbase/dbutil.cpp
   mythtv/libs/libmythbase/lcddevice.cpp
   mythtv/libs/libmythbase/mythcdrom-darwin.cpp
   mythtv/libs/libmythbase/mythcdrom-linux.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythdb.cpp
   mythtv/libs/libmythbase/mythdbcon.cpp
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythhttphandler.cpp
   mythtv/libs/libmythbase/mythhttppool.cpp
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythsocket.cpp
   mythtv/libs/libmythbase/mythsocketthread.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/oldsettings.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/libmythbase/verbosedefs.h
   mythtv/libs/libmythbluray/bdnav/mpls_parse.c
   mythtv/libs/libmythfreemheg/Engine.cpp
   mythtv/libs/libmythfreemheg/Engine.h
   mythtv/libs/libmythfreemheg/Groups.cpp
   mythtv/libs/libmythfreemheg/Groups.h
   mythtv/libs/libmythfreemheg/Presentable.h
   mythtv/libs/libmythfreemheg/Programs.cpp
   mythtv/libs/libmythfreemheg/Stream.cpp
   mythtv/libs/libmythfreemheg/Stream.h
   mythtv/libs/libmythfreemheg/Variables.cpp
   mythtv/libs/libmythfreemheg/freemheg.h
   mythtv/libs/libmythmetadata/metadatadownload.cpp
   mythtv/libs/libmythmetadata/videoscan.cpp
   mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythtv/ThreadedFileWriter.cpp
   mythtv/libs/libmythtv/analogsignalmonitor.cpp
   mythtv/libs/libmythtv/asichannel.cpp
   mythtv/libs/libmythtv/asirecorder.cpp
   mythtv/libs/libmythtv/asisignalmonitor.cpp
   mythtv/libs/libmythtv/asistreamhandler.cpp
   mythtv/libs/libmythtv/audioinput.cpp
   mythtv/libs/libmythtv/audioinputalsa.cpp
   mythtv/libs/libmythtv/audioinputoss.cpp
   mythtv/libs/libmythtv/audioplayer.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoderbd.cpp
   mythtv/libs/libmythtv/avformatdecoderdvd.cpp
   mythtv/libs/libmythtv/bdoverlayscreen.cpp
   mythtv/libs/libmythtv/bdringbuffer.cpp
   mythtv/libs/libmythtv/cardutil.cpp
   mythtv/libs/libmythtv/cc708decoder.cpp
   mythtv/libs/libmythtv/cc708reader.cpp
   mythtv/libs/libmythtv/channelbase.cpp
   mythtv/libs/libmythtv/channelgroup.cpp
   mythtv/libs/libmythtv/channelgroupsettings.cpp
   mythtv/libs/libmythtv/channelscan/channelimporter.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/channelscan/channelscanner.cpp
   mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp
   mythtv/libs/libmythtv/channelscan/channelscanner_gui.cpp
   mythtv/libs/libmythtv/channelutil.cpp
   mythtv/libs/libmythtv/commbreakmap.cpp
   mythtv/libs/libmythtv/darwinfirewiredevice.cpp
   mythtv/libs/libmythtv/datadirect.cpp
   mythtv/libs/libmythtv/decoderbase.cpp
   mythtv/libs/libmythtv/deletemap.cpp
   mythtv/libs/libmythtv/diseqc.cpp
   mythtv/libs/libmythtv/dsmcc.cpp
   mythtv/libs/libmythtv/dsmccbiop.cpp
   mythtv/libs/libmythtv/dsmcccache.cpp
   mythtv/libs/libmythtv/dsmccobjcarousel.cpp
   mythtv/libs/libmythtv/dsmccobjcarousel.h
   mythtv/libs/libmythtv/dtvchannel.cpp
   mythtv/libs/libmythtv/dtvmultiplex.cpp
   mythtv/libs/libmythtv/dtvrecorder.cpp
   mythtv/libs/libmythtv/dtvsignalmonitor.cpp
   mythtv/libs/libmythtv/dvbcam.cpp
   mythtv/libs/libmythtv/dvbchannel.cpp
   mythtv/libs/libmythtv/dvbrecorder.cpp
   mythtv/libs/libmythtv/dvbsignalmonitor.cpp
   mythtv/libs/libmythtv/dvbstreamhandler.cpp
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/eithelper.cpp
   mythtv/libs/libmythtv/fileringbuffer.cpp
   mythtv/libs/libmythtv/filtermanager.cpp
   mythtv/libs/libmythtv/firewirechannel.cpp
   mythtv/libs/libmythtv/firewiredevice.cpp
   mythtv/libs/libmythtv/firewirerecorder.cpp
   mythtv/libs/libmythtv/firewiresignalmonitor.cpp
   mythtv/libs/libmythtv/hdhrchannel.cpp
   mythtv/libs/libmythtv/hdhrrecorder.cpp
   mythtv/libs/libmythtv/hdhrsignalmonitor.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   mythtv/libs/libmythtv/importrecorder.cpp
   mythtv/libs/libmythtv/iptv/iptvchannelfetcher.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederfile.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederlive.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederrtp.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederrtsp.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederudp.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederwrapper.cpp
   mythtv/libs/libmythtv/iptv/iptvmediasink.cpp
   mythtv/libs/libmythtv/iptvchannel.cpp
   mythtv/libs/libmythtv/iptvrecorder.cpp
   mythtv/libs/libmythtv/iptvsignalmonitor.cpp
   mythtv/libs/libmythtv/jobqueue.cpp
   mythtv/libs/libmythtv/linuxavcinfo.cpp
   mythtv/libs/libmythtv/linuxfirewiredevice.cpp
   mythtv/libs/libmythtv/mhi.cpp
   mythtv/libs/libmythtv/mhi.h
   mythtv/libs/libmythtv/mpegrecorder.cpp
   mythtv/libs/libmythtv/mythbdplayer.cpp
   mythtv/libs/libmythtv/mythdvdplayer.cpp
   mythtv/libs/libmythtv/mythiowrapper.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythsystemevent.cpp
   mythtv/libs/libmythtv/nuppeldecoder.cpp
   mythtv/libs/libmythtv/ocurchannel.cpp
   mythtv/libs/libmythtv/ocurrecorder.cpp
   mythtv/libs/libmythtv/ocursignalmonitor.cpp
   mythtv/libs/libmythtv/ocurstreamhandler.cpp
   mythtv/libs/libmythtv/openglvideo.cpp
   mythtv/libs/libmythtv/osd.cpp
   mythtv/libs/libmythtv/osdchromakey.cpp
   mythtv/libs/libmythtv/playercontext.cpp
   mythtv/libs/libmythtv/previewgenerator.cpp
   mythtv/libs/libmythtv/previewgeneratorqueue.cpp
   mythtv/libs/libmythtv/privatedecoder_vda.cpp
   mythtv/libs/libmythtv/programdata.cpp
   mythtv/libs/libmythtv/recorderbase.cpp
   mythtv/libs/libmythtv/recordinginfo.cpp
   mythtv/libs/libmythtv/remoteencoder.cpp
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/scanwizard.cpp
   mythtv/libs/libmythtv/streamhandler.cpp
   mythtv/libs/libmythtv/transporteditor.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/tvbrowsehelper.cpp
   mythtv/libs/libmythtv/v4lchannel.cpp
   mythtv/libs/libmythtv/v4lrecorder.cpp
   mythtv/libs/libmythtv/vbi608extractor.cpp
   mythtv/libs/libmythtv/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videometadatautil.cpp
   mythtv/libs/libmythtv/videoout_d3d.cpp
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_quartz.cpp
   mythtv/libs/libmythtv/videoout_vdpau.cpp
   mythtv/libs/libmythtv/videoout_xv.cpp
   mythtv/libs/libmythtv/videooutbase.cpp
   mythtv/libs/libmythui/AppleRemote.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/mythmainwindow.cpp
   mythtv/libs/libmythui/mythpainter_d3d9.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/mythudplistener.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuiguidegrid.cpp
   mythtv/libs/libmythui/mythuihelper.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythui/mythuitextedit.cpp
   mythtv/libs/libmythui/mythuivideo.cpp
   mythtv/libs/libmythui/mythvirtualkeyboard.cpp
   mythtv/libs/libmythui/screensaver-x11.cpp
   mythtv/libs/libmythui/themeinfo.cpp
   mythtv/libs/libmythui/xmlparsebase.cpp
   mythtv/libs/libmythui/xmlparsebase.h
   mythtv/libs/libmythupnp/httprequest.cpp
   mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
   mythtv/libs/libmythupnp/soapclient.cpp
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/libs/libmythupnp/upnpsubscription.cpp
   mythtv/libs/libmythupnp/upnputil.cpp
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythbackend/services/content.cpp
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfilldatabase/commandlineparser.cpp
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackbox.h
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythfrontend/videolist.cpp
   mythtv/programs/mythjobqueue/main.cpp
   mythtv/programs/mythlcdserver/lcdprocclient.cpp
   mythtv/programs/mythlcdserver/lcdserver.cpp
   mythtv/programs/mythlcdserver/main.cpp
   mythtv/programs/mythmediaserver/main.cpp
   mythtv/programs/mythmessage/main.cpp
   mythtv/programs/mythmetadatalookup/lookup.cpp
   mythtv/programs/mythmetadatalookup/main.cpp
   mythtv/programs/mythpreviewgen/main.cpp
   mythtv/programs/mythshutdown/main.cpp
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/mpeg2fix.h
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/mythtv-setup/channeleditor.cpp
   mythtv/programs/mythtv-setup/checksetup.cpp
   mythtv/programs/mythtv-setup/exitprompt.cpp
   mythtv/programs/mythtv-setup/importicons.cpp
   mythtv/programs/mythtv-setup/main.cpp
   mythtv/programs/mythtv-setup/startprompt.cpp
   mythtv/programs/mythwelcome/main.cpp
   mythtv/programs/mythwelcome/welcomedialog.cpp
   mythtv/programs/scripts/metadata/Television/ttvdb.py
   mythtv/themes/MythCenter-wide/recordings-ui.xml
   mythtv/themes/MythCenter/recordings-ui.xml
   mythtv/themes/default/recordings-ui.xml