[mythtv-firehose] mythtv/mythtv-rec2 commit: ac7ac8c39 by Daniel Kristjansson (daniel-kristjansson)
MythTV
noreply at mythtv.org
Thu Jul 7 12:44:50 UTC 2011
Author: Daniel Kristjansson <danielk at cuymedia.net>
Change Date: 2011-07-07T05:44:31-07:00
Push Date: 2011/07/07 05:44:40 -0700
Repository: mythtv
Branch: mythtv-rec2
New Revision: ac7ac8c39b73dde68cee12da374cf546bca2b607
Changeset: https://github.com/MythTV/mythtv/commit/ac7ac8c39
Log:
Merge branch 'master' into mythtv-rec2
Conflicts:
mythtv/programs/mythbackend/main_helpers.cpp
mythtv/programs/mythbackend/mainserver.cpp
Added:
mythtv/libs/libmythmetadata/metadatafactory.cpp
mythtv/libs/libmythmetadata/metadatafactory.h
mythtv/libs/libmythmetadata/mythuiimageresults.cpp
mythtv/libs/libmythmetadata/mythuiimageresults.h
mythtv/libs/libmythmetadata/mythuimetadataresults.cpp
mythtv/libs/libmythmetadata/mythuimetadataresults.h
mythtv/libs/libmythprotoserver/requesthandler/outboundhandler.cpp
mythtv/libs/libmythprotoserver/requesthandler/outboundhandler.h
mythtv/programs/mythmediaserver/controlrequesthandler.cpp
mythtv/programs/mythmediaserver/controlrequesthandler.h
mythtv/programs/mythmetadatalookup/.gitignore
mythtv/programs/mythmetadatalookup/lookup.cpp
mythtv/programs/mythmetadatalookup/lookup.h
mythtv/programs/mythmetadatalookup/main.cpp
mythtv/programs/mythmetadatalookup/mythmetadatalookup.pro
Modified:
mythplugins/mytharchive/mytharchivehelper/main.cpp
mythplugins/mythgame/mythgame/gameui.cpp
mythplugins/mythgame/theme/default-wide/game-ui.xml
mythplugins/mythgame/theme/default/game-ui.xml
mythplugins/mythnetvision/mythfillnetvision/main.cpp
mythtv/bindings/perl/MythTV.pm
mythtv/bindings/perl/MythTV/Program.pm
mythtv/bindings/perl/MythTV/Recording.pm
mythtv/bindings/php/MythBackend.php
mythtv/bindings/php/MythTVProgram.php
mythtv/bindings/php/MythTVRecording.php
mythtv/bindings/python/MythTV/mythproto.py
mythtv/bindings/python/MythTV/static.py
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/audiooutputnull.cpp
mythtv/libs/libmyth/audio/audiooutputoss.cpp
mythtv/libs/libmyth/audio/audiooutputpulse.cpp
mythtv/libs/libmyth/audio/audiooutputsettings.cpp
mythtv/libs/libmyth/audio/audiooutputwin.cpp
mythtv/libs/libmyth/audio/audiopulsehandler.cpp
mythtv/libs/libmyth/audio/spdifencoder.cpp
mythtv/libs/libmyth/programinfo.cpp
mythtv/libs/libmyth/programinfo.h
mythtv/libs/libmyth/schemawizard.h
mythtv/libs/libmythbase/mythcommandlineparser.cpp
mythtv/libs/libmythbase/mythcommandlineparser.h
mythtv/libs/libmythbase/mythdbcon.cpp
mythtv/libs/libmythbase/mythlogging.cpp
mythtv/libs/libmythbase/mythlogging.h
mythtv/libs/libmythbase/mythversion.h
mythtv/libs/libmythbase/system-unix.cpp
mythtv/libs/libmythbase/system-windows.cpp
mythtv/libs/libmythbluray/bluray.c
mythtv/libs/libmythbluray/decoders/graphics_controller.c
mythtv/libs/libmythbluray/hdmv/hdmv_vm.c
mythtv/libs/libmythbluray/register.c
mythtv/libs/libmythbluray/register.h
mythtv/libs/libmythfreesurround/freesurround.cpp
mythtv/libs/libmythmetadata/dirscan.cpp
mythtv/libs/libmythmetadata/libmythmetadata.pro
mythtv/libs/libmythmetadata/metadatacommon.cpp
mythtv/libs/libmythmetadata/metadatacommon.h
mythtv/libs/libmythmetadata/metadatadownload.cpp
mythtv/libs/libmythmetadata/metadatadownload.h
mythtv/libs/libmythmetadata/metadataimagedownload.cpp
mythtv/libs/libmythmetadata/parentalcontrols.cpp
mythtv/libs/libmythmetadata/videometadata.cpp
mythtv/libs/libmythmetadata/videometadata.h
mythtv/libs/libmythmetadata/videometadatalistmanager.cpp
mythtv/libs/libmythmetadata/videometadatalistmanager.h
mythtv/libs/libmythmetadata/videoscan.cpp
mythtv/libs/libmythprotoserver/libmythprotoserver.pro
mythtv/libs/libmythtv/DetectLetterbox.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/avformatdecoderdvd.cpp
mythtv/libs/libmythtv/bdoverlayscreen.cpp
mythtv/libs/libmythtv/bdringbuffer.cpp
mythtv/libs/libmythtv/cardutil.cpp
mythtv/libs/libmythtv/cc608decoder.cpp
mythtv/libs/libmythtv/cc608reader.cpp
mythtv/libs/libmythtv/cc708decoder.cpp
mythtv/libs/libmythtv/cc708reader.cpp
mythtv/libs/libmythtv/cc708window.cpp
mythtv/libs/libmythtv/channelbase.cpp
mythtv/libs/libmythtv/channelgroup.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/scaninfo.cpp
mythtv/libs/libmythtv/channelsettings.h
mythtv/libs/libmythtv/channelutil.cpp
mythtv/libs/libmythtv/commbreakmap.cpp
mythtv/libs/libmythtv/darwinavcinfo.cpp
mythtv/libs/libmythtv/darwinfirewiredevice.cpp
mythtv/libs/libmythtv/datadirect.cpp
mythtv/libs/libmythtv/dbchannelinfo.cpp
mythtv/libs/libmythtv/dbcheck.cpp
mythtv/libs/libmythtv/decoderbase.cpp
mythtv/libs/libmythtv/decoderbase.h
mythtv/libs/libmythtv/deletemap.cpp
mythtv/libs/libmythtv/diseqc.cpp
mythtv/libs/libmythtv/diseqcsettings.cpp
mythtv/libs/libmythtv/dsmcc.cpp
mythtv/libs/libmythtv/dsmccbiop.cpp
mythtv/libs/libmythtv/dsmcccache.cpp
mythtv/libs/libmythtv/dsmccobjcarousel.cpp
mythtv/libs/libmythtv/dtvchannel.cpp
mythtv/libs/libmythtv/dtvconfparser.cpp
mythtv/libs/libmythtv/dtvconfparserhelpers.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/dxva2decoder.cpp
mythtv/libs/libmythtv/eitcache.cpp
mythtv/libs/libmythtv/eithelper.cpp
mythtv/libs/libmythtv/eitscanner.cpp
mythtv/libs/libmythtv/fifowriter.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/frequencytables.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/jitterometer.cpp
mythtv/libs/libmythtv/jobqueue.cpp
mythtv/libs/libmythtv/jobqueue.h
mythtv/libs/libmythtv/linuxavcinfo.cpp
mythtv/libs/libmythtv/linuxfirewiredevice.cpp
mythtv/libs/libmythtv/livetvchain.cpp
mythtv/libs/libmythtv/mhi.cpp
mythtv/libs/libmythtv/mpeg/H264Parser.cpp
mythtv/libs/libmythtv/mpeg/atscdescriptors.cpp
mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
mythtv/libs/libmythtv/mpeg/mpegdescriptors.h
mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
mythtv/libs/libmythtv/mpeg/mpegtables.cpp
mythtv/libs/libmythtv/mpeg/pespacket.cpp
mythtv/libs/libmythtv/mpeg/pespacket.h
mythtv/libs/libmythtv/mpegrecorder.cpp
mythtv/libs/libmythtv/myth_imgconvert.cpp
mythtv/libs/libmythtv/mythbdplayer.cpp
mythtv/libs/libmythtv/mythcodecid.cpp
mythtv/libs/libmythtv/mythcommflagplayer.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/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/previewgenerator.h
mythtv/libs/libmythtv/previewgeneratorqueue.cpp
mythtv/libs/libmythtv/privatedecoder_crystalhd.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/recordinginfo.h
mythtv/libs/libmythtv/recordingprofile.cpp
mythtv/libs/libmythtv/recordingrule.cpp
mythtv/libs/libmythtv/recordingrule.h
mythtv/libs/libmythtv/remoteencoder.cpp
mythtv/libs/libmythtv/ringbuffer.cpp
mythtv/libs/libmythtv/scanwizard.cpp
mythtv/libs/libmythtv/scheduledrecording.cpp
mythtv/libs/libmythtv/signalmonitor.cpp
mythtv/libs/libmythtv/signalmonitor.h
mythtv/libs/libmythtv/signalmonitorvalue.cpp
mythtv/libs/libmythtv/sourceutil.cpp
mythtv/libs/libmythtv/streamhandler.cpp
mythtv/libs/libmythtv/streamingringbuffer.cpp
mythtv/libs/libmythtv/subtitlescreen.cpp
mythtv/libs/libmythtv/teletextscreen.cpp
mythtv/libs/libmythtv/transporteditor.cpp
mythtv/libs/libmythtv/tv_play.cpp
mythtv/libs/libmythtv/tv_play_win.cpp
mythtv/libs/libmythtv/tv_rec.cpp
mythtv/libs/libmythtv/tvbrowsehelper.cpp
mythtv/libs/libmythtv/tvremoteutil.cpp
mythtv/libs/libmythtv/util-osd.cpp
mythtv/libs/libmythtv/util-xv.cpp
mythtv/libs/libmythtv/v4lchannel.cpp
mythtv/libs/libmythtv/v4lrecorder.cpp
mythtv/libs/libmythtv/vaapicontext.cpp
mythtv/libs/libmythtv/vbi608extractor.cpp
mythtv/libs/libmythtv/videobuffers.cpp
mythtv/libs/libmythtv/videocolourspace.cpp
mythtv/libs/libmythtv/videodbcheck.cpp
mythtv/libs/libmythtv/videodisplayprofile.cpp
mythtv/libs/libmythtv/videometadatautil.cpp
mythtv/libs/libmythtv/videoout_d3d.cpp
mythtv/libs/libmythtv/videoout_null.cpp
mythtv/libs/libmythtv/videoout_opengl.cpp
mythtv/libs/libmythtv/videoout_openglvaapi.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/libmythtv/videooutwindow.cpp
mythtv/libs/libmythtv/videosource.cpp
mythtv/libs/libmythtv/visualisations/videovisual.cpp
mythtv/libs/libmythtv/visualisations/videovisualcircles.cpp
mythtv/libs/libmythtv/visualisations/videovisualspectrum.cpp
mythtv/libs/libmythtv/vsync.cpp
mythtv/libs/libmythui/mythrender_d3d9.cpp
mythtv/libs/libmythui/mythuifilebrowser.cpp
mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
mythtv/libs/libmythupnp/configuration.cpp
mythtv/libs/libmythupnp/eventing.cpp
mythtv/libs/libmythupnp/httprequest.cpp
mythtv/libs/libmythupnp/httpserver.cpp
mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
mythtv/libs/libmythupnp/mmulticastsocketdevice.h
mythtv/libs/libmythupnp/mythxmlclient.cpp
mythtv/libs/libmythupnp/serverSideScripting.cpp
mythtv/libs/libmythupnp/servicehost.cpp
mythtv/libs/libmythupnp/soapclient.cpp
mythtv/libs/libmythupnp/ssdp.cpp
mythtv/libs/libmythupnp/ssdpcache.cpp
mythtv/libs/libmythupnp/taskqueue.cpp
mythtv/libs/libmythupnp/threadpool.cpp
mythtv/libs/libmythupnp/upnp.cpp
mythtv/libs/libmythupnp/upnpcds.cpp
mythtv/libs/libmythupnp/upnpcmgr.cpp
mythtv/libs/libmythupnp/upnpdevice.cpp
mythtv/libs/libmythupnp/upnpmsrr.cpp
mythtv/libs/libmythupnp/upnpsubscription.cpp
mythtv/libs/libmythupnp/upnptaskcache.h
mythtv/libs/libmythupnp/upnptaskevent.cpp
mythtv/libs/libmythupnp/upnptasknotify.cpp
mythtv/libs/libmythupnp/upnptasksearch.cpp
mythtv/libs/libmythupnp/upnputil.cpp
mythtv/programs/mythavtest/commandlineparser.cpp
mythtv/programs/mythavtest/main.cpp
mythtv/programs/mythbackend/autoexpire.cpp
mythtv/programs/mythbackend/commandlineparser.cpp
mythtv/programs/mythbackend/config_backend_general.xml
mythtv/programs/mythbackend/encoderlink.cpp
mythtv/programs/mythbackend/housekeeper.cpp
mythtv/programs/mythbackend/httpconfig.cpp
mythtv/programs/mythbackend/httpstatus.cpp
mythtv/programs/mythbackend/internetContent.cpp
mythtv/programs/mythbackend/main.cpp
mythtv/programs/mythbackend/main_helpers.cpp
mythtv/programs/mythbackend/main_helpers.h
mythtv/programs/mythbackend/mainserver.cpp
mythtv/programs/mythbackend/mediaserver.cpp
mythtv/programs/mythbackend/mythsettings.cpp
mythtv/programs/mythbackend/playbacksock.cpp
mythtv/programs/mythbackend/scheduler.cpp
mythtv/programs/mythbackend/services/content.cpp
mythtv/programs/mythbackend/services/myth.cpp
mythtv/programs/mythbackend/services/video.cpp
mythtv/programs/mythbackend/upnpcdsmusic.cpp
mythtv/programs/mythbackend/upnpcdstv.cpp
mythtv/programs/mythbackend/upnpcdsvideo.cpp
mythtv/programs/mythcommflag/BlankFrameDetector.cpp
mythtv/programs/mythcommflag/BorderDetector.cpp
mythtv/programs/mythcommflag/CannyEdgeDetector.cpp
mythtv/programs/mythcommflag/ClassicCommDetector.cpp
mythtv/programs/mythcommflag/ClassicLogoDetector.cpp
mythtv/programs/mythcommflag/CommDetector2.cpp
mythtv/programs/mythcommflag/FrameAnalyzer.cpp
mythtv/programs/mythcommflag/HistogramAnalyzer.cpp
mythtv/programs/mythcommflag/PGMConverter.cpp
mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
mythtv/programs/mythcommflag/SceneChangeDetector.cpp
mythtv/programs/mythcommflag/TemplateFinder.cpp
mythtv/programs/mythcommflag/TemplateMatcher.cpp
mythtv/programs/mythcommflag/commandlineparser.cpp
mythtv/programs/mythcommflag/main.cpp
mythtv/programs/mythcommflag/pgm.cpp
mythtv/programs/mythfilldatabase/commandlineparser.cpp
mythtv/programs/mythfrontend/commandlineparser.cpp
mythtv/programs/mythfrontend/editvideometadata.cpp
mythtv/programs/mythfrontend/globalsettings.cpp
mythtv/programs/mythfrontend/mediarenderer.cpp
mythtv/programs/mythfrontend/playbackbox.cpp
mythtv/programs/mythfrontend/playbackbox.h
mythtv/programs/mythfrontend/scheduleeditor.cpp
mythtv/programs/mythfrontend/scheduleeditor.h
mythtv/programs/mythfrontend/upnpscanner.cpp
mythtv/programs/mythfrontend/upnpscanner.h
mythtv/programs/mythfrontend/videodlg.cpp
mythtv/programs/mythfrontend/videodlg.h
mythtv/programs/mythfrontend/videofilter.cpp
mythtv/programs/mythfrontend/videolist.cpp
mythtv/programs/mythfrontend/viewschedulediff.cpp
mythtv/programs/mythjobqueue/commandlineparser.cpp
mythtv/programs/mythjobqueue/main.cpp
mythtv/programs/mythlcdserver/commandlineparser.cpp
mythtv/programs/mythlcdserver/main.cpp
mythtv/programs/mythmediaserver/commandlineparser.cpp
mythtv/programs/mythmediaserver/main.cpp
mythtv/programs/mythmediaserver/mythmediaserver.pro
mythtv/programs/mythmessage/commandlineparser.cpp
mythtv/programs/mythpreviewgen/commandlineparser.cpp
mythtv/programs/mythpreviewgen/main.cpp
mythtv/programs/mythshutdown/commandlineparser.cpp
mythtv/programs/mythtranscode/commandlineparser.cpp
mythtv/programs/mythtranscode/main.cpp
mythtv/programs/mythtv-setup/backendsettings.cpp
mythtv/programs/mythtv-setup/commandlineparser.cpp
mythtv/programs/mythwelcome/commandlineparser.cpp
mythtv/programs/programs.pro
mythtv/programs/scripts/metadata/Television/ttvdb.py
mythtv/themes/MythCenter-wide/base.xml
mythtv/themes/MythCenter-wide/schedule-ui.xml
mythtv/themes/MythCenter-wide/video-ui.xml
mythtv/themes/MythCenter/base.xml
mythtv/themes/MythCenter/schedule-ui.xml
mythtv/themes/MythCenter/video-ui.xml
mythtv/themes/Terra/base.xml
mythtv/themes/Terra/schedule-ui.xml
mythtv/themes/Terra/video-ui.xml
mythtv/themes/default-wide/base.xml
mythtv/themes/default-wide/schedule-ui.xml
mythtv/themes/default-wide/video-ui.xml
mythtv/themes/default/base.xml
mythtv/themes/default/schedule-ui.xml
mythtv/themes/default/video-ui.xml
More information about the mythtv-firehose
mailing list