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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-11T11:27:26-07:00
   Push Date:  2011/05/11 11:28:07 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  5afbba0a3d262cf6bb147fbb0b8742688ab3b601
   Changeset:  https://github.com/MythTV/mythtv/commit/5afbba0a3

Log:

Merge branch 'master' into new-logging

Made changes to the structure in housekeeping (moved the ::run back into the
.cpp file)

Conflicts:
	mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
	mythtv/libs/libmythtv/ThreadedFileWriter.cpp
	mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
	mythtv/libs/libmythtv/darwinfirewiredevice.cpp
	mythtv/libs/libmythtv/dvbcam.cpp
	mythtv/libs/libmythtv/firewirerecorder.cpp
	mythtv/libs/libmythtv/jobqueue.cpp
	mythtv/libs/libmythtv/linuxfirewiredevice.cpp
	mythtv/libs/libmythtv/mhi.cpp
	mythtv/libs/libmythtv/tv_play.cpp
	mythtv/libs/libmythtv/tv_rec.cpp
	mythtv/programs/mythbackend/housekeeper.cpp
	mythtv/programs/mythbackend/housekeeper.h
	mythtv/programs/mythbackend/scheduler.cpp
	mythtv/programs/mythfrontend/networkcontrol.cpp

Modified:

   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythbase/util.h
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.h
   mythtv/libs/libmythtv/ThreadedFileWriter.cpp
   mythtv/libs/libmythtv/ThreadedFileWriter.h
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.h
   mythtv/libs/libmythtv/darwinfirewiredevice.cpp
   mythtv/libs/libmythtv/darwinfirewiredevice.h
   mythtv/libs/libmythtv/dvbcam.cpp
   mythtv/libs/libmythtv/dvbcam.h
   mythtv/libs/libmythtv/dvbrecorder.cpp
   mythtv/libs/libmythtv/fifowriter.cpp
   mythtv/libs/libmythtv/fifowriter.h
   mythtv/libs/libmythtv/firewirerecorder.cpp
   mythtv/libs/libmythtv/frequencies.cpp
   mythtv/libs/libmythtv/hdhrrecorder.cpp
   mythtv/libs/libmythtv/hdhrsignalmonitor.cpp
   mythtv/libs/libmythtv/interactivetv.cpp
   mythtv/libs/libmythtv/iptvrecorder.cpp
   mythtv/libs/libmythtv/iptvrecorder.h
   mythtv/libs/libmythtv/jobqueue.cpp
   mythtv/libs/libmythtv/jobqueue.h
   mythtv/libs/libmythtv/linuxfirewiredevice.cpp
   mythtv/libs/libmythtv/linuxfirewiredevice.h
   mythtv/libs/libmythtv/mhi.cpp
   mythtv/libs/libmythtv/mhi.h
   mythtv/libs/libmythtv/mpegrecorder.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/nuppeldecoder.cpp
   mythtv/libs/libmythtv/recorderbase.cpp
   mythtv/libs/libmythtv/recorderbase.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/tv_rec.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/programs/mythbackend/filetransfer.h
   mythtv/programs/mythbackend/housekeeper.cpp
   mythtv/programs/mythbackend/housekeeper.h
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythbackend/scheduler.h
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythfrontend/networkcontrol.h