[mythtv-commits] mythtv branch devel/logging updated by danielk. v0.27-pre2-1186-g875b024

[Git Repo Owner]

The branch, devel/logging has been updated on the
mythtv repository by gitolite user danielk.
       via  875b024ad278814ed38c1817f0809554024de4a1 (commit)
       via  4ccf2558ef3f810b45d7be3acd872b770f3def1c (commit)
       via  cb66cb3f8f168abd162df34430fb0c078a62a962 (commit)
       via  ee668f11048ed3e0e49a6270dd09a26f6ff2f39c (commit)
       via  d0e3184d8239a3a655052d51fdc2e792ea260bf5 (commit)
       via  3e0fd3cbc1897ec0570f15b837b60cd67eb34800 (commit)
       via  5748540894853ffdebe2b209f81b77a4005f83ec (commit)
       via  d7a8c532a45476aa10263838430922a37ab4961d (commit)
       via  ca53b20d9244b515e49e1e9450c69b865061b888 (commit)
       via  be8258e25cd7e14321592daacf91f3a5aa96eaa5 (commit)
       via  2366b4dbb89ddf13665f5b2ebe8ae0a52e5b5f4e (commit)
       via  2968f52c5cdcaeeffde4b02f0a834ba92756f698 (commit)
       via  4c86e28957efdef7494e7eb86a80f2b3b66c9443 (commit)
       via  bae657950c9069c0ab1cfb336f91d3294a217568 (commit)
       via  c3b575c571ad5ff7a5a6bd06f25e08805949c10e (commit)
       via  cee46621741f1d11004d5b8804412fd1bc1e3486 (commit)
       via  bc0240298ba4d6b2838ebbdf5308c31499ff5f6b (commit)
       via  50c7efa0ec251f59633858b130a1d96e3f60c071 (commit)
       via  f32a610c384c5fd397cd322578aff3bc81dd9f3d (commit)
       via  be249d670a383d85e7d12faa631d35db46749868 (commit)
       via  b9927ebe1111ed699dd591476005d5f9b80a1f3b (commit)
       via  e0ff8878c9b3a8964f9bcfaa328c9c2ad8b9a7a3 (commit)
       via  f9c342ee50a2c03cf36a2e31c4d6273925b60193 (commit)
       via  e1fc778455cd4e1c88f651c2e02440a117a6b579 (commit)
       via  dff7ef9fe5e87845718ddcd04ab0502537713a5d (commit)
       via  4715f1379a3521f50248d729e9688c289027efaf (commit)
       via  8d7a29a797eeb45bd7a7dbef2627aa8aaf8dc19f (commit)
       via  98cfe057da06980aebda75ae62f425b34114563f (commit)
       via  ba1f339093045799b98a95714bc0d29de281afa1 (commit)
       via  0e19c388bb2afaf1fe36621bf3979a237b2cdabd (commit)
      from  13ac4d06b6329d36d99dd4759440c5c6fc7c502e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 875b024ad278814ed38c1817f0809554024de4a1
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Fri, 24 May 2013 20:22:09 -0400
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Fri, 24 May 2013 20:22:09 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=875b024ad278814ed38c1817f0809554024de4a1

Merge branch 'master' into devel/logging
Conflicts:
	mythtv/libs/libmythbase/libmythbase.pro



commit 4ccf2558ef3f810b45d7be3acd872b770f3def1c
Author:    Daniel Kristjansson <danielk at cuymedia.net> at Fri, 24 May 2013 20:19:17 -0400
Committer: Daniel Kristjansson <danielk at cuymedia.net> at Fri, 24 May 2013 20:19:17 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4ccf2558ef3f810b45d7be3acd872b770f3def1c

Fix myth logging tests.



-----------------------------------------------------------------------

Summary of changes:
 .../mythbrowser/mythbrowser/mythflashplayer.cpp    |    8 +-
 mythplugins/mythgame/mythgame/gameui.cpp           |   12 +-
 mythplugins/mythmusic/mythmusic/cdrip.cpp          |   17 +-
 mythplugins/mythmusic/mythmusic/visualize.cpp      |    5 +-
 mythplugins/mythmusic/mythmusic/visualize.h        |    1 +
 .../mythweather/mythweather/weatherSource.cpp      |    3 +-
 mythtv/libs/libmythbase/lcddevice.cpp              |  317 +++---
 mythtv/libs/libmythbase/lcddevice.h                |  185 ++--
 mythtv/libs/libmythbase/libmythbase.pro            |   11 +-
 mythtv/libs/libmythbase/mythbaseexp.h              |   12 +
 mythtv/libs/libmythbase/mythcorecontext.cpp        |   18 +-
 mythtv/libs/libmythbase/mythevent.h                |   53 +-
 mythtv/libs/libmythbase/mythsystem.cpp             |   33 +-
 mythtv/libs/libmythbase/mythsystem.h               |  109 +--
 mythtv/libs/libmythbase/mythsystemprivate.h        |   81 ++
 mythtv/libs/libmythbase/mythsystemunix.cpp         | 1081 ++++++++++++++++++++
 mythtv/libs/libmythbase/mythsystemunix.h           |  115 +++
 mythtv/libs/libmythbase/mythsystemwindows.cpp      |  779 ++++++++++++++
 mythtv/libs/libmythbase/mythsystemwindows.h        |  114 ++
 mythtv/libs/libmythbase/mythversion.h              |    2 +-
 mythtv/libs/libmythbase/system-unix.cpp            | 1081 --------------------
 mythtv/libs/libmythbase/system-unix.h              |  112 --
 mythtv/libs/libmythbase/system-windows.cpp         |  779 --------------
 mythtv/libs/libmythbase/system-windows.h           |  111 --
 .../test/test_mythlogging/test_mythloggingbase.h   |    2 +-
 mythtv/libs/libmythtv/HLS/httplivestream.cpp       |    6 +-
 mythtv/libs/libmythtv/cardutil.cpp                 |    2 +
 mythtv/libs/libmythtv/eithelper.h                  |    2 +-
 mythtv/libs/libmythtv/nuppeldecoder.h              |    4 +-
 mythtv/libs/libmythtv/recorders/audioinputoss.cpp  |   20 +-
 mythtv/libs/libmythtv/tv_play.cpp                  |  197 +++--
 mythtv/libs/libmythtv/tv_play.h                    |   31 +-
 mythtv/libs/libmythui/mythuiguidegrid.cpp          |  101 +-
 mythtv/libs/libmythui/mythuiguidegrid.h            |   65 +-
 mythtv/programs/mythscreenwizard/screenwizard.cpp  |    4 +-
 mythtv/programs/mythscreenwizard/screenwizard.h    |    2 -
 mythtv/themes/default/menu_cutlist.xml             |    4 +-
 mythtv/themes/default/menu_cutlist_compact.xml     |   10 +
 mythtv/themes/default/menu_cutlist_exit.xml        |    8 -
 39 files changed, 2823 insertions(+), 2674 deletions(-)
 create mode 100644 mythtv/libs/libmythbase/mythsystemprivate.h
 create mode 100644 mythtv/libs/libmythbase/mythsystemunix.cpp
 create mode 100644 mythtv/libs/libmythbase/mythsystemunix.h
 create mode 100644 mythtv/libs/libmythbase/mythsystemwindows.cpp
 create mode 100644 mythtv/libs/libmythbase/mythsystemwindows.h
 delete mode 100644 mythtv/libs/libmythbase/system-unix.cpp
 delete mode 100644 mythtv/libs/libmythbase/system-unix.h
 delete mode 100644 mythtv/libs/libmythbase/system-windows.cpp
 delete mode 100644 mythtv/libs/libmythbase/system-windows.h
 create mode 100644 mythtv/themes/default/menu_cutlist_compact.xml
 delete mode 100644 mythtv/themes/default/menu_cutlist_exit.xml

--