From kde-commits Tue Mar 01 15:08:21 2011 From: Trever Fischer Date: Tue, 01 Mar 2011 15:08:21 +0000 To: kde-commits Subject: =?utf-8?q?=5Bphonon=5D_/=3A_Merge_branch_=27master=27_of_git=2Ek?= Message-Id: <20110301150821.9B8DDA60CD () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129899214705675 Git commit b550ea553da5a4722242a3d6a453ad6bae34a6d1 by Trever Fischer. Committed on 01/03/2011 at 15:43. Pushed by tdfischer into branch 'master'. Merge branch 'master' of git.kde.org:phonon I +2 -0 Mainpage.dox I +8 -33 cmake/FindAutomoc4.cmake I +6 -0 cmake/FindPhononInternal.cmake I +1 -2 demos/CMakeLists.txt I +0 -21 demos/captureapp/CMakeLists.txt I +0 -176 demos/captureapp/captureapp.cpp I +0 -71 demos/captureapp/captureapp.h I +0 -44 demos/captureapp/captureapp_main.cpp I +0 -21 demos/captureapp2/CMakeLists.txt I +0 -148 demos/captureapp2/captureapp2.cpp I +0 -72 demos/captureapp2/captureapp2.h I +0 -47 demos/captureapp2/captureapp2_main.cpp I +21 -0 demos/simplecapture/CMakeLists.txt I +207 -0 demos/simplecapture/capture.cpp I +96 -0 demos/simplecapture/capture.h I +37 -0 demos/simplecapture/main.cpp I +1 -1 demos/simpleplayer/CMakeLists.txt I +8 -5 demos/simpleplayer/main.cpp I +20 -18 demos/simpleplayer/player.cpp I +8 -8 demos/simpleplayer/player.h I +1 -0 includes/CMakeLists.txt I +1 -0 includes/phonon/AvCapture I +20 -0 phonon/experimental/avcapture.cpp I +36 -5 phonon/experimental/avcapture.h I +2 -1 phonon/experimental/avcapture_p.h I +2 -0 phonon/experimental/avcaptureinterface.h I +11 -12 phonon/mediaobject.cpp I +3 -0 phonon/mediaobject.h I +41 -20 phonon/mediasource.cpp I +20 -0 phonon/mediasource.h I +3 -3 phonon/tests/fakebackend/stream.cpp http://commits.kde.org/phonon/b550ea553da5a4722242a3d6a453ad6bae34a6d1