From kde-commits  Thu Jul 17 15:32:38 2008
From: Matthias Kretz <kretz () kde ! org>
Date: Thu, 17 Jul 2008 15:32:38 +0000
To: kde-commits
Subject: KDE/kdebase/runtime/phonon/xine
Message-Id: <1216308758.328956.22041.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121630876608908

SVN commit 833929 by mkretz:

merge branches/work/phonon-xine-with-engine-per-stream

 M  +0 -1      CMakeLists.txt  
 M  +141 -12   audiooutput.cpp  
 M  +8 -4      audiooutput.h  
 M  +266 -116  backend.cpp  
 M  +104 -16   backend.h  
 M  +2 -2      bytestream.cpp  
 M  +11 -12    bytestreamplugin.cpp  
 M  +3 -0      connectnotificationinterface.h  
 M  +140 -78   effect.cpp  
 M  +11 -3     effect.h  
 M  +10 -5     events.h  
 M  +10 -26    kcm/xineoptions.cpp  
 M  +10 -14    kcm/xineoptions.h  
 M  +4 -74     kcm/xineoptions.ui  
 A             keepreference.h   branches/work/phonon-xine-with-engine-per-stream/keepreference.h#827239 [License: LGPL (v2)]
 M  +27 -43    mediaobject.cpp  
 M  +3 -2      mediaobject.h  
 A             mediaproducer.cpp   branches/work/phonon-xine-with-engine-per-stream/mediaproducer.cpp#827239 [License: Trivial file.]
 M  +17 -16    nullsink.cpp  
 M  +9 -5      nullsink.h  
 M  +3 -3      plugins.c  
 M  +41 -3     sinknode.cpp  
 M  +12 -4     sinknode.h  
 M  +11 -1     sourcenode.cpp  
 M  +6 -2      sourcenode.h  
 M  +4 -4      videoeffect.cpp  
 M  +154 -61   videowidget.cpp  
 M  +36 -11    videowidget.h  
 M  +1 -2      visualization.cpp  
 M  +45 -19    volumefadereffect.cpp  
 M  +1 -0      volumefadereffect.h  
 M  +4 -0      wirecall.h  
 M  +30 -366   xineengine.cpp  
 M  +16 -131   xineengine.h  
 D             xineengine_p.h  
 M  +195 -110  xinestream.cpp  
 M  +10 -0     xinestream.h  
 M  +31 -1     xinethread.cpp  
 M  +3 -0      xinethread.h