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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-06-05T22:17:32-07:00
   Push Date:  2011/06/05 23:12:45 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  3564cc98c3d9361b1b761d2250ed71c09fb0da87
   Changeset:  https://github.com/MythTV/mythtv/commit/3564cc98c

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythbase/libmythbase.pro
	mythtv/programs/mythbackend/mainserver.cpp
	mythtv/programs/mythbackend/scheduler.cpp

Added:

   mythtv/libs/libmyth/filesysteminfo.cpp
   mythtv/libs/libmyth/filesysteminfo.h
   mythtv/libs/libmythbase/referencecounter.cpp
   mythtv/libs/libmythbase/referencecounter.h
   mythtv/libs/libmythprotoserver/libmythprotoserver.pro
   mythtv/libs/libmythprotoserver/mythprotoserverexp.h
   mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
   mythtv/libs/libmythprotoserver/mythsocketmanager.h
   mythtv/libs/libmythprotoserver/requesthandler/basehandler.cpp
   mythtv/libs/libmythprotoserver/requesthandler/basehandler.h
   mythtv/libs/libmythprotoserver/requesthandler/deletethread.cpp
   mythtv/libs/libmythprotoserver/requesthandler/deletethread.h
   mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp
   mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.h
   mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.cpp
   mythtv/libs/libmythprotoserver/requesthandler/fileserverutil.h
   mythtv/libs/libmythprotoserver/sockethandler.cpp
   mythtv/libs/libmythprotoserver/sockethandler.h
   mythtv/libs/libmythprotoserver/sockethandler/filetransfer.cpp
   mythtv/libs/libmythprotoserver/sockethandler/filetransfer.h
   mythtv/libs/libmythprotoserver/socketrequesthandler.h
   mythtv/programs/mythmediaserver/main.cpp
   mythtv/programs/mythmediaserver/mythmediaserver
   mythtv/programs/mythmediaserver/mythmediaserver.pro

Modified:

   mythplugins/mytharchive/mytharchive/mytharchive.pro
   mythplugins/mythgame/mythgame/mythgame.pro
   mythplugins/mythmusic/mythmusic/cddecoder.cpp
   mythplugins/mythmusic/mythmusic/editmetadata.cpp
   mythplugins/mythmusic/mythmusic/filescanner.cpp
   mythplugins/mythmusic/mythmusic/importmusic.cpp
   mythplugins/mythmusic/mythmusic/main.cpp
   mythplugins/mythmusic/mythmusic/mainvisual.cpp
   mythplugins/mythmusic/mythmusic/metadata.cpp
   mythplugins/mythmusic/mythmusic/metadata.h
   mythplugins/mythmusic/mythmusic/metaio.h
   mythplugins/mythmusic/mythmusic/metaioid3.cpp
   mythplugins/mythmusic/mythmusic/metaioid3.h
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/playbackbox.cpp
   mythplugins/mythmusic/mythmusic/visualize.cpp
   mythplugins/mythweather/mythweather/mythweather.pro
   mythtv/bindings/python/MythTV/mythproto.py
   mythtv/libs/libmyth/libmyth.pro
   mythtv/libs/libmyth/remoteutil.cpp
   mythtv/libs/libmyth/remoteutil.h
   mythtv/libs/libmythbase/libmythbase.pro
   mythtv/libs/libmythbase/msocketdevice.cpp
   mythtv/libs/libmythbase/mythsocket.cpp
   mythtv/libs/libmythbase/mythsocket.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythdvdnav/dvdnav/dvdnav.h
   mythtv/libs/libmythdvdnav/dvdnav/highlight.c
   mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c
   mythtv/libs/libmythdvdnav/dvdread/dvd_udf.c
   mythtv/libs/libmythdvdnav/dvdread/dvdread_internal.h
   mythtv/libs/libmythdvdnav/dvdread/ifo_read.c
   mythtv/libs/libmythdvdnav/dvdread/ifo_types.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/fileringbuffer.cpp
   mythtv/libs/libmythtv/jitterometer.cpp
   mythtv/libs/libmythtv/jitterometer.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/ringbuffer.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythupnp/upnpdevice.cpp
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/libs/libs.pro
   mythtv/programs/mythbackend/autoexpire.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mainserver.h
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythcommflag/mythcommflag.pro
   mythtv/programs/mythfrontend/playbackboxhelper.cpp
   mythtv/programs/mythfrontend/statusbox.cpp
   mythtv/programs/mythshutdown/mythshutdown.pro
   mythtv/programs/mythwelcome/mythwelcome.pro
   mythtv/programs/programs-libs.pro
   mythtv/programs/programs.pro