[mythtv-commits] mythtv branch master updated by danielk. v0.26-pre-1454-g5758f14
Git Repo Owner
noreply at mythtv.org
Sun Nov 25 21:06:13 UTC 2012
The branch, master has been updated on the
mythtv repository by gitolite user danielk.
via 5758f14cb60428f93a7f30fdbbd0b7a9b521a167 (commit)
via 8a50db8230b45d6677badb1f75dc32c3128ef957 (commit)
via ae2b26d347a4121b82a14451c9e7122a1e65bc8b (commit)
via 943b142dfe3c208e1fa83e74d4e6ec6ea262a49c (commit)
via 4bb97ceecc53080533de903c05b06f3920fd6a3d (commit)
via 987c42039430f32e9384cd54d76a6931d28a0278 (commit)
via 0fced3e50cf72a098b78351dac068796ac948b8d (commit)
via 975783016bb90083d042187e3fa668f642664ae1 (commit)
via b72c3ae34c681004829331f0dc8d93990ce012cb (commit)
via ca7d6f2bb03da26d14ea2941da31b06e6979c87a (commit)
via 85a727a836bdd04444f4be3c17ffa866a315240f (commit)
via 8572a1a64b1516d9ac3d18150a3540451352cb64 (commit)
via db8e0fa09f904367a84f47f4186bf5334e2be7e0 (commit)
via dae00d3fe69fd04e8286a83e03dd7cbab727e4c3 (commit)
via 0b106b10692ed7efd5eae81b498f591ad39b6222 (commit)
via 4587563bb21e80e79674c5c440a9d1bf83a78057 (commit)
via c51b33303536ae31993f0f9aedf1fa829d6dec7b (commit)
via 52a8f4be33896e43f83fb086cc7a1d97c0fddb1c (commit)
via 484a393520ac9cd7a7110bf015747986bb3cd0b4 (commit)
via fa1c6d623979603c459446763f4532faccb70c59 (commit)
via 1000b65b7dd655677b868db76681d4640e2f082a (commit)
via a9c91441e628cff2f3a6107b086feeef009fca6f (commit)
via 6c43f0cbd35178848756b99eac1f566684d7d34e (commit)
via a825deedcf380d76a7447bc3ebd00272eff5be89 (commit)
via 2ad384ebb8c0d7ed22fee1cac4b9c466c5cd7ef7 (commit)
via 7c7b4fef7015d92f7aaea440105e7c6a32b24734 (commit)
via eff4e11fa07b0256c1a6a547818933eeae7897d4 (commit)
via 33f2b96acfe4333aa6e275812e9b056089c53861 (commit)
via ccb065dec8c7755c2da1cedf08263fd33aa04735 (commit)
via 3a0e65d0c10cf3954d125923e2b5c1372dc26a91 (commit)
via 0d0f8c9baba277568be1755024ad012dae9ba082 (commit)
via ade9bad9697e4cda742973ed71a00db382a19fff (commit)
via dc09143852e560266e8454ed9854705c87f330b9 (commit)
via 62ba2dcd6c2e81dab46d0f319824f33e38a3a7ab (commit)
via 9fd02899b7bfa7b63d170a887c03f8a1dce8289d (commit)
via 50957d5b668a190c658e3961ac1036587dcc6b22 (commit)
via f612576017d1cdd0d2f815dce162cf0fd5310ab0 (commit)
via 38257011f7f445f239f24f3e1e87ed7113743b6f (commit)
via 07acf0e850d62d6c54cec498c675cc8f82d83d64 (commit)
via 0496f3fdc17531bd125cde82e6a8f4e45dc19e1a (commit)
via 5f04f275d50d69f81dbaa05a0b37acd0b68fc9ec (commit)
via 772eaf13bdc378e01416ea33e70c73d5ec0477a8 (commit)
via 28b8cd906a598d40206a083ac33ca523f13dd088 (commit)
via caac2d5d11ed5d685b9bff82f10912144e01b9a0 (commit)
via 1fdddac65a9addf6ac17f841c524f5a5969a78e0 (commit)
via 1675dd2a7eaa53f15b769e76f0d0f8bd7d80b99a (commit)
via 40b0770272a601ce335a9fc7227221ea3c11cd5b (commit)
via d9337490a493cbf57cf05be02a674e5def593f1b (commit)
via 7f544d6e35eaa8e6122feeae1388614b377eebbf (commit)
via b60534bf4c7de8c0ca7ba44864a79b8e852c5244 (commit)
via 8d25283abd51ab913e627fc10a379ccaf2a7b0d3 (commit)
via 7cbfd10b8d224e20589daf7eebbbcddac6c2e030 (commit)
via c2a8791d5ea4362864fc93ec7bf08562628592f0 (commit)
via 6119188de212a509ea822deafdcb309207ae7614 (commit)
via 88817964d66d0a18c43f3ff370994108ebe46c13 (commit)
via 067ebe942a5ca1519d09a2b7b80da48abbd4bf51 (commit)
via cb1775bd23a2c587bb6f73bfb049410e49720507 (commit)
via 589efb43b7b0422975516128d836bd54cee79785 (commit)
via 868a566c1d635be3e60f83438f87b6f21d9f1780 (commit)
via 640963b1b1259f5a6847a5930ce7a1886399ce67 (commit)
via 71869c79befb98d32d920248ccc0c9d19ae3ceb8 (commit)
via 2f03c9176d44b304633f3b30edf176f5227333b4 (commit)
via bf285bb6758092d1949ee17db6dd1fa8e3456895 (commit)
via c0438994abb64f2e22b655f11146899be8cec886 (commit)
via cb152cb4cdc890a48e12d14cdb58517b54959d00 (commit)
via dea4880ac87967182dfc0c34cc57cab1b3528301 (commit)
via 8cdf5daa069a55712996afc7c5a3b9e3d97ff82b (commit)
via d07523a83462b31ec33f8d4e706324f8892a3970 (commit)
via 24c688e333c133c957628c4d70ea1d05adb83249 (commit)
via 42aae944078492ba464bc53c80fa21b734345f4d (commit)
via 31f09a84b2f2fe9e4be80f00e8737370bec28678 (commit)
via 24da25f3f2be46f5b029c0d28a502f9cb0048cdc (commit)
via 77d58af568e728891c6ff35f4c367c00fe870ac7 (commit)
via ac4e2d9e917939ced46b497da608127d0be03941 (commit)
via 27c9d464ba29b3cdd0addcfe98276be2ebb61a79 (commit)
via a0e517efb3f974e397f59cf99fd3e26d7481acb3 (commit)
via a708e694b5870b288bcbe9e3ff10ff88fbce59c7 (commit)
via ebf4860a3d812b0108ca3327a463ca53fff2b359 (commit)
via 92083c8577c19e4e0adb9b9e1a9754219cc3fbc6 (commit)
via 15d9bca14027a10caec8de3c726f9fa579c56118 (commit)
via 44f23ce84f649b216e9b202b20ca6df47dc1bdaf (commit)
via ae1eeea1e2eab6ff7d53d8dcb8420d21742fe9b9 (commit)
via 04ce3c23efc854e23ee8d28802b1ff03e8b45720 (commit)
via bde24c5cd3050252687890f9261e4706b513acd3 (commit)
via 356e59a09e76ba0888b783ee2ba2bc8a17ae45d4 (commit)
via ab33b8866927ca4288c60c84fafecb0090e1bfe7 (commit)
via d5137aa7677001d1f76acb9ef0b58b3b5b4b9dc1 (commit)
via cdde562f332ee3b074da1a176b02365cefa1c8ec (commit)
via a32d5e31ad2833c6e55f3161732faa7fe2f00cfc (commit)
via c722636fec8a7afc9202863bab58e282fde5b2b5 (commit)
via 70f02af9fe11bacc3465736ccd00b56a9865f49d (commit)
via 6c234ae2aca1e455dd1a005dc011a6d065b11690 (commit)
via 7624433ddd3e6c3b02de1f424a8c70a9299d6aa0 (commit)
via 103d8a1f8ccfdf5a4c377465b08df56431fa27d8 (commit)
via 3756e329c177ecd9dde5481a2738fe07eee99196 (commit)
via d7a27a144257e1f96dae7c921ccc2347fc69dc44 (commit)
via 28d9324ed93dbf9232e4a2947bd31bf4b5e55485 (commit)
via b14972440de88991027efe51eea7ee52e8d62e68 (commit)
via 462c6eb89cabab9486592daa072587ad72121dfa (commit)
via 8072c0e71b4e0aec711c5714b015b4dd6488c3fc (commit)
via bfbd67b438c20e9bb693a00985505b411033b5e3 (commit)
via 2699d8650c783c8a22fcfe017c9295855916e370 (commit)
via ca273324961b95e300890ed40e833249b5460bd8 (commit)
via ed1bb0c1026debc71abd09be3fd56373c849d261 (commit)
via 9170d84baba0410ffc784156bee3c312bce3012a (commit)
via abc52edc1fbd4bc5eb7a19c633f9de4ef2da1dce (commit)
via 0a864fdeeff080cda227f9d489f38cd9429765d0 (commit)
via 2ffbeb83617157c66dfccb1e23da369e61dddf80 (commit)
via d94970b06a4b725a62ef5bf308644bd7a4dd1946 (commit)
via e4f3d088815b7f08650eec915da97acacf565d21 (commit)
via acaccbb983690589ba663418d6d2f53f6c341c7c (commit)
via 7dae5c752d28333675aeaeaddb5e67a0fdfdcaa0 (commit)
via 42e5084daee390da6b9df7fccba854aa567b4d21 (commit)
via 992cba7eb9eef85aa91d6e23028213f659868f2b (commit)
via 18ca1dd616e7325a510277f2897a7a63ca0b1a06 (commit)
via a7c7b5232e30e1e1af0a44c072dc5aae6e7ece92 (commit)
via f668f405ed08ed16eef664235604b817ac7f2d09 (commit)
via 81cc283e9e0dd27b9fe60fd4bccb8ac2ddaa7d2c (commit)
via aa162d5546ec9327078f62207b42e2acaf3a983c (commit)
via 04a961ea7fe1de3229f63f1326ff708ab5659766 (commit)
via 28ed490522a113fda1ce57cad1b40a7d9d3312ca (commit)
via b8a78aeb35167a676a7e25c342a1869e8016d76a (commit)
via 7bbcf8b05d8b41a4d3446cc6b3b50cb66aec2d07 (commit)
via 1a56a47bb849693138326a5d8a8af8699a569c58 (commit)
via e2a0efd88ce48698451a36fe9c15b390e7fdd73d (commit)
via cff550c4b18a8966458cdf9416f2e4a01fa2d33a (commit)
via 0998b7ae567eaac0db87fc74b0852a4e4ac1fc4d (commit)
via 9d3bc8dcf0018092019b27e0d99156b7df6e017f (commit)
via dda4a4fa747b8323ba677f876dd75ea619073035 (commit)
via 6b444ad32ecf1cfdbf80fb7c9a2c93593aa3c3d1 (commit)
via 4957e215a8387896e4108a49c823e54ea3e5a682 (commit)
via 5e986097e1aba0ff8157e75a771ec718a8805421 (commit)
via 99f949eb4c33f00f5b44a189d719334b22ed82e8 (commit)
via c46be30362950ca6cf2784d3be9ab42a24f364c4 (commit)
via ea6ec5b5f029966653b2866f626a9f7d400f30cd (commit)
via fe00ebc8715f6e3296d222e1df04917428aa95ce (commit)
via 31ea20d424de0cb898f0aa7ffb9b7120c8be2b3f (commit)
via 85e8db231d35411cebfce994b16c2ebbd033b2e3 (commit)
via 61163ba90178fcdec55bb6ab0a1c3992e3c199df (commit)
via b6d65fcce17031cb729b6f68c1edabcfd5f11670 (commit)
via aa93d3f6194020fa9e9d2b6e4b4e52d892fe8575 (commit)
via e9a7a132f846df25c6c171255218794d798b911a (commit)
via d92b6d4543bdf173a7f8714c23ea92786e6a7e93 (commit)
via d553247877aad709257f684a792f26133c12729c (commit)
via b5718743b36447213abb005401ac9df8e24e652c (commit)
via aad4f63582397ceae4206d1aaf5eac2ded5b1a13 (commit)
via 7aea3131a8801c09617012d3e892ec4fa68f626a (commit)
via c53542f4a2410591972f394944d6e97fbe6d7671 (commit)
via 2e800530b51da3d59bcbcc4bb5fcdb73708244aa (commit)
via de2eef39d5334f510ceeb61acb954f9c0382d3b9 (commit)
via 86eee5ef0ae45b0eb7f4b35db90de705bd5374ad (commit)
via 6f4f87bf554819e3090c749f91c5c0266e628209 (commit)
via ed0212883168ec2dc2d3bc532ef40530da0b180d (commit)
via 4b07742e8af6f18e1b353f1f866211e9331f4c4b (commit)
via c2883d035eb06ae0bdd054fe933c716ccd6edcfb (commit)
via f21c868e241bdf83583d8b6b19dc7842abc84a29 (commit)
from fc89b36c0fd879f850a1b7077cceb33177318f9a (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 5758f14cb60428f93a7f30fdbbd0b7a9b521a167
Author: Daniel Thor Kristjansson <danielk at cuymedia.net> at Sun, 25 Nov 2012 15:49:31 -0500
Committer: Daniel Thor Kristjansson <danielk at cuymedia.net> at Sun, 25 Nov 2012 15:49:31 -0500
URL: http://code.mythtv.org/cgit/mythtv/commit/?id=5758f14cb60428f93a7f30fdbbd0b7a9b521a167
Update binary version for devel/mythsocket -> master merge.
I highly recommend a distclean and full recompile.
The changes merged in from the mythsocket branch change
MythSocket from using the old Qt3 QSocketDevice API to
the Qt4 QTcpSocket API. We had preserved QSocketDevice
as MSocketDevice during the initial Qt4 port because
the changes to the API were drastic and much of the
functionality we depended on was no longer present in
the new API.
Note: The new QTcpSocket requires that be owned by a
QThread with a Qt event loop that doesn't contain code
blocking on sockets. This isn't something we can expect
of every (or really any) thread in MythTV that uses
MythSocket. MythSocket uses QMetaObject::invokeMethod()
and a carefully selected set of direct and queued
signal/slot connections to present a MythSocket API
available in any thread, that communicates behind the
schenes with a set QTcpSocket which exists in a thread
meeting the strict requirements for a thread using
QTcpSocket.
-----------------------------------------------------------------------
Summary of changes:
.../mythzoneminder/mythzoneminder/zmclient.cpp | 33 +-
mythtv/configure | 2 +-
mythtv/libs/libmyth/mythcontext.cpp | 2 -
mythtv/libs/libmythbase/lcddevice.cpp | 45 +-
mythtv/libs/libmythbase/lcddevice.h | 16 +-
mythtv/libs/libmythbase/libmythbase.pro | 9 +-
mythtv/libs/libmythbase/mythcorecontext.cpp | 219 ++--
mythtv/libs/libmythbase/mythmiscutil.cpp | 12 +-
mythtv/libs/libmythbase/mythsocket.cpp | 1286 ++++++++++----------
mythtv/libs/libmythbase/mythsocket.h | 198 ++--
mythtv/libs/libmythbase/mythsocket_cb.h | 1 +
mythtv/libs/libmythbase/mythsocketthread.cpp | 389 ------
mythtv/libs/libmythbase/mythsocketthread.h | 49 -
mythtv/libs/libmythbase/mythsystem.cpp | 2 +
mythtv/libs/libmythbase/mythversion.h | 2 +-
mythtv/libs/libmythbase/remotefile.cpp | 160 +--
mythtv/libs/libmythbase/remotefile.h | 5 -
.../libs/libmythprotoserver/mythsocketmanager.cpp | 68 +-
mythtv/libs/libmythprotoserver/mythsocketmanager.h | 10 +-
.../requesthandler/basehandler.cpp | 15 +-
.../requesthandler/fileserverhandler.cpp | 67 +-
.../requesthandler/messagehandler.cpp | 4 +-
.../requesthandler/outboundhandler.cpp | 16 +-
mythtv/libs/libmythprotoserver/sockethandler.cpp | 10 +-
mythtv/libs/libmythprotoserver/sockethandler.h | 2 +-
.../sockethandler/filetransfer.cpp | 8 +-
mythtv/libs/libmythtv/inputinfo.cpp | 2 -
mythtv/libs/libmythtv/inputinfo.h | 6 +-
mythtv/libs/libmythtv/libmythtv.pro | 1 -
mythtv/libs/libmythtv/mythsystemevent.cpp | 1 +
.../recorders/rtp/{README.RTSP => README.RTP} | 19 +-
mythtv/libs/libmythtv/recorders/v4lchannel.cpp | 732 ++++--------
mythtv/libs/libmythtv/recorders/v4lchannel.h | 3 -
mythtv/libs/libmythtv/remoteencoder.cpp | 4 +-
mythtv/libs/libmythtv/videosource.cpp | 3 +-
mythtv/libs/libmythupnp/libmythupnp.pro | 4 +
.../{libmythbase => libmythupnp}/msocketdevice.cpp | 0
.../{libmythbase => libmythupnp}/msocketdevice.h | 4 +-
.../msocketdevice_unix.cpp | 0
.../msocketdevice_win.cpp | 0
mythtv/programs/mythbackend/encoderlink.cpp | 1 +
mythtv/programs/mythbackend/filetransfer.cpp | 6 +-
mythtv/programs/mythbackend/main_helpers.cpp | 11 +-
mythtv/programs/mythbackend/mainserver.cpp | 181 ++-
mythtv/programs/mythbackend/mainserver.h | 4 +-
mythtv/programs/mythbackend/playbacksock.cpp | 22 +-
mythtv/programs/mythbackend/server.cpp | 5 +-
mythtv/programs/mythbackend/server.h | 2 +-
.../mythfrontend/backendconnectionmanager.cpp | 29 +-
.../mythfrontend/backendconnectionmanager.h | 1 +
50 files changed, 1494 insertions(+), 2177 deletions(-)
delete mode 100644 mythtv/libs/libmythbase/mythsocketthread.cpp
delete mode 100644 mythtv/libs/libmythbase/mythsocketthread.h
copy mythtv/libs/libmythtv/recorders/rtp/{README.RTSP => README.RTP} (71%)
rename mythtv/libs/{libmythbase => libmythupnp}/msocketdevice.cpp (100%)
rename mythtv/libs/{libmythbase => libmythupnp}/msocketdevice.h (98%)
rename mythtv/libs/{libmythbase => libmythupnp}/msocketdevice_unix.cpp (100%)
rename mythtv/libs/{libmythbase => libmythupnp}/msocketdevice_win.cpp (100%)
--
More information about the mythtv-commits
mailing list