[mythtv-firehose] mythtv/new-logging commit: d62cc57c6 by Gavin Hurlbut (Beirdo)

MythTV noreply at mythtv.org
Mon May 16 22:02:52 UTC 2011 

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-16T15:02:31-07:00
   Push Date:  2011/05/16 15:02:47 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  d62cc57c69a1d6007442f8683911a061b36cf006
   Changeset:  https://github.com/MythTV/mythtv/commit/d62cc57c6

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythtv/DeviceReadBuffer.cpp
	mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
	mythtv/libs/libmythtv/ThreadedFileWriter.cpp
	mythtv/libs/libmythtv/channelbase.cpp
	mythtv/libs/libmythtv/dvbrecorder.cpp
	mythtv/libs/libmythtv/dvbstreamhandler.cpp
	mythtv/libs/libmythtv/firewiresignalmonitor.cpp
	mythtv/libs/libmythtv/hdhrrecorder.cpp
	mythtv/libs/libmythtv/hdhrstreamhandler.cpp
	mythtv/libs/libmythtv/iptvrecorder.cpp
	mythtv/libs/libmythtv/iptvsignalmonitor.cpp
	mythtv/libs/libmythtv/signalmonitor.cpp
	mythtv/libs/libmythtv/tv_rec.cpp
	mythtv/programs/mythbackend/main_helpers.h
	mythtv/programs/mythbackend/scheduler.cpp
	mythtv/programs/mythtranscode/mpeg2fix.cpp

Added:

   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/Black-Background.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/description.txt
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/intro_preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/mainmenu_preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/theme.xml
   mythtv/VERSION
   mythtv/libs/libmythtv/asichannel.cpp
   mythtv/libs/libmythtv/asichannel.h
   mythtv/libs/libmythtv/asirecorder.cpp
   mythtv/libs/libmythtv/asirecorder.h
   mythtv/libs/libmythtv/asisignalmonitor.cpp
   mythtv/libs/libmythtv/asisignalmonitor.h
   mythtv/libs/libmythtv/asistreamhandler.cpp
   mythtv/libs/libmythtv/asistreamhandler.h
   mythtv/libs/libmythtv/scriptsignalmonitor.h
   mythtv/libs/libmythtv/streamhandler.cpp
   mythtv/libs/libmythtv/streamhandler.h
   mythtv/libs/libmythtv/v4lrecorder.cpp
   mythtv/libs/libmythtv/v4lrecorder.h
   mythtv/libs/libmythtv/vbi608extractor.cpp
   mythtv/libs/libmythtv/vbi608extractor.h

Removed:

   mythtv/libs/libmythtv/channelchangemonitor.cpp
   mythtv/libs/libmythtv/channelchangemonitor.h

Modified:

   mythplugins/mythgallery/dcrawplugin/dcrawplugin.cpp
   mythtv/bindings/php/MythBackend.php
   mythtv/configure
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmythbase/msocketdevice.cpp
   mythtv/libs/libmythbase/msocketdevice.h
   mythtv/libs/libmythbase/msocketdevice_unix.cpp
   mythtv/libs/libmythbase/msocketdevice_win.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/storagegroup.cpp
   mythtv/libs/libmythmetadata/metadataimagedownload.cpp
   mythtv/libs/libmythmetadata/videoutils.h
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/DeviceReadBuffer.h
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.h
   mythtv/libs/libmythtv/ThreadedFileWriter.cpp
   mythtv/libs/libmythtv/ThreadedFileWriter.h
   mythtv/libs/libmythtv/analogsignalmonitor.cpp
   mythtv/libs/libmythtv/cardutil.cpp
   mythtv/libs/libmythtv/cardutil.h
   mythtv/libs/libmythtv/channelbase.cpp
   mythtv/libs/libmythtv/channelbase.h
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.h
   mythtv/libs/libmythtv/channelscan/channelscanner.cpp
   mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
   mythtv/libs/libmythtv/channelscan/scanwizardconfig.h
   mythtv/libs/libmythtv/channelsettings.cpp
   mythtv/libs/libmythtv/channelsettings.h
   mythtv/libs/libmythtv/channelutil.cpp
   mythtv/libs/libmythtv/channelutil.h
   mythtv/libs/libmythtv/dtvchannel.cpp
   mythtv/libs/libmythtv/dtvchannel.h
   mythtv/libs/libmythtv/dtvconfparserhelpers.cpp
   mythtv/libs/libmythtv/dtvconfparserhelpers.h
   mythtv/libs/libmythtv/dtvrecorder.cpp
   mythtv/libs/libmythtv/dtvrecorder.h
   mythtv/libs/libmythtv/dtvsignalmonitor.cpp
   mythtv/libs/libmythtv/dtvsignalmonitor.h
   mythtv/libs/libmythtv/dummychannel.h
   mythtv/libs/libmythtv/dvbchannel.cpp
   mythtv/libs/libmythtv/dvbchannel.h
   mythtv/libs/libmythtv/dvbrecorder.cpp
   mythtv/libs/libmythtv/dvbrecorder.h
   mythtv/libs/libmythtv/dvbsignalmonitor.cpp
   mythtv/libs/libmythtv/dvbsignalmonitor.h
   mythtv/libs/libmythtv/dvbstreamhandler.cpp
   mythtv/libs/libmythtv/dvbstreamhandler.h
   mythtv/libs/libmythtv/firewirechannel.cpp
   mythtv/libs/libmythtv/firewirechannel.h
   mythtv/libs/libmythtv/firewirerecorder.cpp
   mythtv/libs/libmythtv/firewirerecorder.h
   mythtv/libs/libmythtv/firewiresignalmonitor.cpp
   mythtv/libs/libmythtv/firewiresignalmonitor.h
   mythtv/libs/libmythtv/hdhrchannel.cpp
   mythtv/libs/libmythtv/hdhrchannel.h
   mythtv/libs/libmythtv/hdhrrecorder.cpp
   mythtv/libs/libmythtv/hdhrrecorder.h
   mythtv/libs/libmythtv/hdhrsignalmonitor.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.h
   mythtv/libs/libmythtv/importrecorder.cpp
   mythtv/libs/libmythtv/importrecorder.h
   mythtv/libs/libmythtv/iptvchannel.cpp
   mythtv/libs/libmythtv/iptvchannel.h
   mythtv/libs/libmythtv/iptvrecorder.cpp
   mythtv/libs/libmythtv/iptvrecorder.h
   mythtv/libs/libmythtv/iptvsignalmonitor.cpp
   mythtv/libs/libmythtv/iptvsignalmonitor.h
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mpegrecorder.cpp
   mythtv/libs/libmythtv/mpegrecorder.h
   mythtv/libs/libmythtv/recorderbase.cpp
   mythtv/libs/libmythtv/recorderbase.h
   mythtv/libs/libmythtv/recordinginfo.cpp
   mythtv/libs/libmythtv/recordingprofile.cpp
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/scanwizard.cpp
   mythtv/libs/libmythtv/signalmonitor.cpp
   mythtv/libs/libmythtv/signalmonitor.h
   mythtv/libs/libmythtv/sourceutil.cpp
   mythtv/libs/libmythtv/tv.h
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/tv_rec.h
   mythtv/libs/libmythtv/v4lchannel.cpp
   mythtv/libs/libmythtv/v4lchannel.h
   mythtv/libs/libmythtv/vbitext/cc.h
   mythtv/libs/libmythtv/vbitext/dllist.h
   mythtv/libs/libmythtv/vbitext/hamm.h
   mythtv/libs/libmythtv/vbitext/lang.h
   mythtv/libs/libmythtv/vbitext/vbi.h
   mythtv/libs/libmythtv/videosource.cpp
   mythtv/libs/libmythtv/videosource.h
   mythtv/libs/libmythui/mythudplistener.cpp
   mythtv/libs/libmythui/mythuifilebrowser.cpp
   mythtv/libs/libmythupnp/broadcast.h
   mythtv/libs/libmythupnp/httpserver.cpp
   mythtv/libs/libmythupnp/multicast.cpp
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/libs/libmythupnp/upnpdevice.cpp
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/libs/libmythupnp/upnptasknotify.h
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/programs/mythbackend/httpconfig.cpp
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/httpstatus.h
   mythtv/programs/mythbackend/main_helpers.h
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mainserver.h
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythbackend/scheduler.h
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/networkcontrol.h
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackboxhelper.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythlcdserver/lcdserver.cpp
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/mpeg2fix.h
   mythtv/programs/mythtv-setup/channeleditor.cpp
   mythtv/programs/mythtv-setup/channeleditor.h
   mythtv/programs/programs-libs.pro

More information about the mythtv-firehose mailing list