[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/phonon
From: Matthias Kretz <kretz () kde ! org>
Date: 2008-05-26 19:24:38
Message-ID: 1211829878.033093.31922.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 812984 by mkretz:
this will be the new home of KDE-dependent Phonon code that was in kdelibs before
A kcm (directory) trunk/KDE/kdelibs/phonon/kcm#807621
M +1 -1 kcm/CMakeLists.txt
A kcm/devicepreference.cpp \
trunk/KDE/kdelibs/phonon/kcm/devicepreference.cpp#812574 [License: LGPL (v2/3)] M \
+1 -1 kcm/devicepreference_update.cpp A kcm/factory_p.h \
trunk/KDE/kdelibs/phonon/factory_p.h#807621 [License: LGPL (v2)] A \
kcm/globalconfig.cpp trunk/KDE/kdelibs/phonon/globalconfig.cpp#807621 [License: \
LGPL (v2)] A kcm/globalconfig_p.h \
trunk/KDE/kdelibs/phonon/globalconfig_p.h#807621 [License: LGPL (v2)] A \
kcm/medianode_p.h trunk/KDE/kdelibs/phonon/medianode_p.h#807621 [License: LGPL \
(v2)] A kcm/phonondefs_p.h \
trunk/KDE/kdelibs/phonon/phonondefs_p.h#807621 [License: LGPL (v2)] A \
kcm/phononnamespace_p.h trunk/KDE/kdelibs/phonon/phononnamespace_p.h#807621 \
[License: LGPL (v2)] A kcm/qsettingsgroup_p.h \
trunk/KDE/kdelibs/phonon/qsettingsgroup_p.h#807621 [License: LGPL (v2/3)] A \
libkaudiodevicelist (directory) trunk/KDE/kdelibs/phonon/libkaudiodevicelist#807621 \
M +1 -1 libkaudiodevicelist/CMakeLists.txt A \
libkaudiodevicelist/audiodevice.cpp \
trunk/KDE/kdelibs/phonon/libkaudiodevicelist/audiodevice.cpp#812574 [License: LGPL \
(v2)] A platform_kde (directory) \
trunk/KDE/kdelibs/phonon/platform_kde#807621 M +1 -0 \
platform_kde/CMakeLists.txt M +1 -2 platform_kde/devicelisting.h
M +0 -2 platform_kde/kdepluginfactory.cpp
M +1 -1 platform_kde/kdepluginfactory.h
M +4 -1 platform_kde/kiomediastream.cpp
M +3 -1 platform_kde/kiomediastream.h
M +3 -2 platform_kde/kiomediastream_p.h
A platform_kde/phonon.notifyrc \
trunk/KDE/kdelibs/phonon/platform_kde/phonon.notifyrc#812574 A \
platform_kde/phononbackend.desktop \
trunk/KDE/kdelibs/phonon/phononbackend.desktop#807621 [TRAILING SPACE] A \
tests (directory) A tests/CMakeLists.txt \
trunk/KDE/kdelibs/phonon/tests/CMakeLists.txt#807621 A tests/TODO \
trunk/KDE/kdelibs/phonon/tests/TODO#807621 A \
tests/audiodevicelisttest.cpp \
trunk/KDE/kdelibs/phonon/tests/audiodevicelisttest.cpp#807621 [License: GPL (v2/3)] \
A tests/backendtester.cpp \
trunk/KDE/kdelibs/phonon/tests/backendtester.cpp#807621 [License: LGPL (v2)] A \
tests/backendtester.h trunk/KDE/kdelibs/phonon/tests/backendtester.h#807621 \
[License: LGPL (v2)] A tests/backendtester.ui \
trunk/KDE/kdelibs/phonon/tests/backendtester.ui#807621 A tests/guitest \
(directory) trunk/KDE/kdelibs/phonon/tests/guitest#807621 A \
tests/loadfakebackend.h trunk/KDE/kdelibs/phonon/tests/loadfakebackend.h#807621 \
[License: LGPL (v2)] A tests/mediacontrols.cpp \
trunk/KDE/kdelibs/phonon/tests/mediacontrols.cpp#807621 [License: LGPL (v2)] A \
tests/mediacontrols.h trunk/KDE/kdelibs/phonon/tests/mediacontrols.h#807621 \
[License: LGPL (v2)] A tests/mediacontrols_p.h \
trunk/KDE/kdelibs/phonon/tests/mediacontrols_p.h#807621 [License: LGPL (v2)] A \
tests/mediaplayer.cpp trunk/KDE/kdelibs/phonon/tests/mediaplayer.cpp#807621 \
[License: GPL (v2/3)] A tests/qtesthelper.h \
trunk/KDE/kdelibs/phonon/tests/qtesthelper.h#807621 [License: LGPL (v2)] A \
tests/testresources.qrc trunk/KDE/kdelibs/phonon/tests/testresources.qrc#807621
--- trunk/KDE/kdebase/runtime/phonon/kcm/CMakeLists.txt #807621:812984
@@ -1,6 +1,6 @@
include_directories(${KDE4_KIO_INCLUDES} ${CMAKE_SOURCE_DIR}/kio/kio \
${CMAKE_SOURCE_DIR}/kutils ${CMAKE_SOURCE_DIR}/solid ${CMAKE_BINARY_DIR}/solid)
-set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp \
../globalconfig.cpp) +set(kcmphonon_SRCS main.cpp devicepreference.cpp \
backendselection.cpp globalconfig.cpp) kde4_add_ui_files(kcmphonon_SRCS \
devicepreference.ui backendselection.ui)
kde4_add_plugin(kcm_phonon ${kcmphonon_SRCS})
--- trunk/KDE/kdebase/runtime/phonon/kcm/devicepreference_update.cpp #807621:812984
@@ -21,7 +21,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QMutableListIterator>
#include <QtCore/QList>
-#include "../qsettingsgroup_p.h"
+#include "qsettingsgroup_p.h"
#include <kcomponentdata.h>
#include <kconfig.h>
#include <kconfiggroup.h>
--- trunk/KDE/kdebase/runtime/phonon/libkaudiodevicelist/CMakeLists.txt \
#807621:812984 @@ -28,7 +28,7 @@
endif(ALSA_FOUND)
kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
-target_link_libraries(kaudiodevicelist ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} \
${ASOUND_LIBRARY}) +target_link_libraries(kaudiodevicelist ${KDE4_SOLID_LIBS} \
${KDE4_PHONON_LIBS} ${KDE4_KDECORE_LIBS} ${ASOUND_LIBRARY})
set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION})
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/CMakeLists.txt #807621:812984
@@ -16,3 +16,4 @@
endif(NOT WIN32)
install(TARGETS kde DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_platform)
install(FILES phonon.notifyrc DESTINATION ${DATA_INSTALL_DIR}/phonon)
+install(FILES phononbackend.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/devicelisting.h #807621:812984
@@ -28,9 +28,8 @@
#include <QtCore/QMultiMap>
#include <QtCore/QObject>
#include <QtCore/QVariant>
+#include <Phonon/ObjectDescription>
-#include "../objectdescription.h"
-
namespace Phonon
{
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kdepluginfactory.cpp #807621:812984
@@ -20,8 +20,6 @@
#include "kdepluginfactory.h"
#include "kiomediastream.h"
-#include "../config-phonon.h"
-
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QtPlugin>
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kdepluginfactory.h #807621:812984
@@ -20,7 +20,7 @@
#ifndef PHONON_KDEPLUGINFACTORY_H
#define PHONON_KDEPLUGINFACTORY_H
-#include "../platformplugin.h"
+#include <Phonon/PlatformPlugin>
#include <QtCore/QObject>
#include <kservice.h>
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kiomediastream.cpp #807621:812984
@@ -29,8 +29,10 @@
{
KioMediaStream::KioMediaStream(const QUrl &url, QObject *parent)
- : AbstractMediaStream(*new KioMediaStreamPrivate(url), parent)
+ : AbstractMediaStream(parent),
+ d_ptr(new KioMediaStreamPrivate(url))
{
+ d_ptr->q_ptr = this;
kDebug(600);
reset();
}
@@ -85,6 +87,7 @@
}
d->kiojob->kill();
}
+ delete d_ptr;
}
void KioMediaStream::needData()
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kiomediastream.h #807621:812984
@@ -20,7 +20,7 @@
#ifndef PHONON_KIOMEDIASTREAM_H
#define PHONON_KIOMEDIASTREAM_H
-#include "../abstractmediastream.h"
+#include <Phonon/AbstractMediaStream>
class QUrl;
@@ -43,6 +43,8 @@
void enoughData();
void seekStream(qint64);
+ KioMediaStreamPrivate *d_ptr;
+
private:
Q_PRIVATE_SLOT(d_func(), void _k_bytestreamData(KIO::Job *, const QByteArray \
&)) Q_PRIVATE_SLOT(d_func(), void _k_bytestreamResult(KJob *))
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/kiomediastream_p.h #807621:812984
@@ -23,15 +23,16 @@
#include "kiomediastream.h"
#include <kurl.h>
#include <kio/jobclasses.h>
-#include "../abstractmediastream_p.h"
namespace Phonon
{
-class KioMediaStreamPrivate : public AbstractMediaStreamPrivate
+class KioMediaStreamPrivate
{
Q_DECLARE_PUBLIC(KioMediaStream)
protected:
+ KioMediaStream *q_ptr;
+
KioMediaStreamPrivate(const KUrl &u)
: url(u),
endOfDataSent(false),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic