[mythtv-firehose] mythtv branch devel/mythsocket updated by danielk. v0.26-pre-1417-gae2b26d

Git Repo Owner noreply at mythtv.org
Tue Nov 20 17:07:22 UTC 2012


The branch, devel/mythsocket has been updated on the
mythtv repository by gitolite user danielk.
       via  ae2b26d347a4121b82a14451c9e7122a1e65bc8b (commit)
       via  0e281107a8254c77317f9997625b6e3c04097742 (commit)
       via  3e01436a867332ae2aaa24b89b1c5b8ec35480e0 (commit)
       via  8bfc700c8c2155247901c5a70c613b40ab4572ed (commit)
       via  a75dd13c440d2e1b8565091d3e1c74d3fcd7b1de (commit)
       via  1b99dbaafc03952d2fe37ff81fbbb6782c651771 (commit)
       via  bceaffc5d33dca69cfc61920c200afa235707677 (commit)
       via  ba2533f1b167ae864e830b0cf2e195bad950d322 (commit)
       via  00f1f6e6858fd62deb674675a4e9920f87bdb4ad (commit)
       via  f28e5e6d01bdced90c0996bfc30e4d821a3f27e2 (commit)
       via  2e11c6aa842d14d1e79b3c9e403059f6a39d9b66 (commit)
       via  e72b8bf3761015f1bdaff03afbed830347f9a766 (commit)
       via  f9ac736ddd178d95e37380d228368c235df646ee (commit)
       via  2653de8643929aeaaaae3dd5e2a8aa3b86220c47 (commit)
       via  31f36c415766898509e38e7946fda394ade4fc02 (commit)
       via  f0f1afd5d404e31d5f724740b813b773b0d3bce7 (commit)
       via  5e1c14e8c295fb00a3f2e359021be026104863db (commit)
       via  729e3d56d3e984d35b4fecd249da7c3e1bdcbfb9 (commit)
       via  6a147ecf09aea985f95d8dcbe4edacc9e18f4a38 (commit)
       via  a1c4f4fea13f8ac481ee8ce959f168a139922fb2 (commit)
       via  d3048cae80f213b00e33b5cf07a1d8882178df47 (commit)
       via  70143c30dfb67812ecd6cb29e66a10353579054f (commit)
       via  92d3fcc5fb61c5c9003e45e03b9bb11cdc8c473c (commit)
       via  0b63eb4b6383eea62e0c1724d20ae8e3e5b6ec9b (commit)
       via  dc3f3be49ebc2335c8175119cb04917626bf3655 (commit)
       via  45160ef6fc2f50056cd7182cc5bff5b815947680 (commit)
       via  ee42f13d12721b7566bbb0ec013abff1938f48aa (commit)
       via  38db960402cea0807a48a85bb61afbb6d1b5dd53 (commit)
       via  e13600c833eff1919479ecefca5ad18945777c70 (commit)
       via  9c95f5aabfe779eecb9a3c5f7938d4408e74272c (commit)
       via  5c8337421f457277104dda3445a231c2945e4053 (commit)
       via  d4778cae2874469cac4f36f37537a916f3786590 (commit)
       via  4a11c0cac0e72e93157bde62bd49e8bab030fb8c (commit)
       via  4c405f010c9636320fe70ce6a515d5383150dc49 (commit)
      from  943b142dfe3c208e1fa83e74d4e6ec6ea262a49c (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 ae2b26d347a4121b82a14451c9e7122a1e65bc8b
Author:    Daniel Thor Kristjansson <danielk at cuymedia.net> at Tue, 20 Nov 2012 11:18:57 -0500
Committer: Daniel Thor Kristjansson <danielk at cuymedia.net> at Tue, 20 Nov 2012 11:18:57 -0500
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=ae2b26d347a4121b82a14451c9e7122a1e65bc8b

Merge branch 'master' into devel/mythsocket
Conflicts:
	mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp



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

Summary of changes:
 mythplugins/mytharchive/mytharchive/main.cpp       |    2 +-
 mythplugins/mythbrowser/mythbrowser/main.cpp       |    2 +-
 mythplugins/mythgallery/mythgallery/main.cpp       |    2 +-
 mythplugins/mythgame/mythgame/main.cpp             |    2 +-
 mythplugins/mythmusic/mythmusic/cdrip.cpp          |    2 +-
 mythplugins/mythmusic/mythmusic/main.cpp           |   10 +-
 mythplugins/mythmusic/mythmusic/metadata.cpp       |    5 +-
 mythplugins/mythmusic/mythmusic/metaio.h           |    2 +-
 mythplugins/mythmusic/mythmusic/musiccommon.cpp    |    1 +
 mythplugins/mythmusic/mythmusic/playlist.cpp       |   74 +++--
 mythplugins/mythmusic/mythmusic/playlist.h         |   11 +-
 .../mythmusic/mythmusic/playlistcontainer.cpp      |  256 ++++---------
 .../mythmusic/mythmusic/playlistcontainer.h        |   48 +--
 mythplugins/mythnetvision/mythnetvision/main.cpp   |    2 +-
 mythplugins/mythnews/mythnews/main.cpp             |    2 +-
 mythplugins/mythweather/mythweather/main.cpp       |    2 +-
 mythplugins/mythzoneminder/mythzoneminder/main.cpp |    2 +-
 .../mythzoneminder/mythzoneminder/zmclient.cpp     |  157 +++++++--
 .../mythzoneminder/mythzoneminder/zmdefines.h      |   65 +++-
 .../mythzoneminder/mythzoneminder/zmevents.cpp     |   10 +-
 .../mythzoneminder/mythzoneminder/zmplayer.cpp     |   11 +-
 mythtv/bindings/python/MythTV/static.py            |    2 +-
 mythtv/bindings/python/setup.py                    |    2 +-
 mythtv/contrib/imports/mirobridge/mirobridge.py    |   23 +-
 mythtv/libs/libmyth/libmyth.pro                    |    6 +-
 mythtv/libs/libmyth/mythcontext.cpp                |   49 +---
 mythtv/libs/libmyth/mythcontext.h                  |    8 -
 mythtv/libs/libmythbase/libmythbase.pro            |    3 +
 mythtv/libs/libmythbase/mythcorecontext.cpp        |   27 ++
 mythtv/libs/libmythbase/mythcorecontext.h          |    8 +
 .../libs/{libmyth => libmythbase}/mythplugin.cpp   |   69 +----
 mythtv/libs/{libmyth => libmythbase}/mythplugin.h  |   22 +-
 .../libs/{libmyth => libmythbase}/mythpluginapi.h  |    3 -
 mythtv/libs/libmythbase/mythversion.h              |    2 +-
 mythtv/libs/libmythtv/Bluray/bdringbuffer.h        |    6 +-
 mythtv/libs/libmythtv/Bluray/mythbdplayer.cpp      |    4 +-
 mythtv/libs/libmythtv/DVD/dvdringbuffer.h          |    6 +-
 mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp        |    8 +-
 mythtv/libs/libmythtv/avformatdecoder.cpp          |   11 +-
 mythtv/libs/libmythtv/decoderbase.cpp              |   36 ++-
 mythtv/libs/libmythtv/decoderbase.h                |    3 +-
 mythtv/libs/libmythtv/mythplayer.cpp               |    2 +-
 .../libmythtv/recorders/analogsignalmonitor.cpp    |    5 -
 .../libs/libmythtv/recorders/analogsignalmonitor.h |    2 +-
 mythtv/libs/libmythtv/recorders/mpegrecorder.cpp   |   10 +-
 mythtv/libs/libmythtv/recorders/vbitext/lang.h     |    2 +-
 mythtv/libs/libmythtv/ringbuffer.h                 |    4 +-
 mythtv/libs/libmythtv/tv_play.cpp                  |  405 +++++++++++---------
 mythtv/libs/libmythtv/tv_rec.cpp                   |    6 +-
 mythtv/libs/libmythtv/vbilut.cpp                   |    2 +-
 mythtv/libs/libmythtv/vbilut.h                     |    2 +-
 mythtv/libs/libmythui/myththemedmenu.cpp           |   11 +-
 mythtv/programs/mythbackend/mainserver.cpp         |    2 +
 mythtv/programs/mythbackend/scheduler.cpp          |   14 +-
 mythtv/programs/mythfrontend/main.cpp              |    2 +-
 mythtv/programs/scripts/metadata/Movie/tmdb3.py    |   14 +-
 56 files changed, 743 insertions(+), 706 deletions(-)
 rename mythtv/libs/{libmyth => libmythbase}/mythplugin.cpp (78%)
 rename mythtv/libs/{libmyth => libmythbase}/mythplugin.h (76%)
 rename mythtv/libs/{libmyth => libmythbase}/mythpluginapi.h (69%)

-- 



More information about the mythtv-firehose mailing list