[PATCH 2/9] Remove remnants of old experimental code.
Jon Severinsson
jon at severinsson.net
Sat Oct 6 19:15:44 BST 2012
---
Mainpage.dox | 2 +-
PhononConfig.cmake.in | 16 +---------------
doc/CMakeLists.txt | 1 -
includes/CMakeLists.txt | 14 --------------
.../old/Phonon/Experimental/AbstractVideoDataOutput | 1 -
includes/old/Phonon/Experimental/AudioDataOutput | 1 -
includes/old/Phonon/Experimental/SnapshotInterface | 1 -
includes/old/Phonon/Experimental/VideoDataOutput | 1 -
.../old/Phonon/Experimental/VideoDataOutputInterface | 1 -
includes/old/Phonon/Experimental/VideoFrame | 1 -
includes/old/Phonon/Experimental/VideoFrame2 | 1 -
includes/old/Phonon/Experimental/Visualization | 1 -
includes/phonon/AvCapture | 1 -
lib-descriptor.xml.cmake | 1 -
phonon/abstractvideooutput.h | 8 --------
phonon/backendcapabilities.h | 2 --
phonon/phononnamespace.cpp | 3 ---
phonon/phononnamespace.h.in | 1 -
18 filer ändrade, 2 tillägg(+), 55 borttagningar(-)
delete mode 100644 includes/old/Phonon/Experimental/AbstractVideoDataOutput
delete mode 100644 includes/old/Phonon/Experimental/AudioDataOutput
delete mode 100644 includes/old/Phonon/Experimental/SnapshotInterface
delete mode 100644 includes/old/Phonon/Experimental/VideoDataOutput
delete mode 100644 includes/old/Phonon/Experimental/VideoDataOutputInterface
delete mode 100644 includes/old/Phonon/Experimental/VideoFrame
delete mode 100644 includes/old/Phonon/Experimental/VideoFrame2
delete mode 100644 includes/old/Phonon/Experimental/Visualization
delete mode 100644 includes/phonon/AvCapture
diff --git a/Mainpage.dox b/Mainpage.dox
index a5df2f5..7747a3d 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -68,7 +68,7 @@ If you want more immediate help, try the \#phonon IRC channel on Freenode.
// DOXYGEN_NAME=Phonon
// DOXYGEN_ENABLE=YES
// DOXYGEN_SET_INPUT = @topdir@/phonon/
-// DOXYGEN_SET_EXCLUDE = @topdir@/phonon/backend/ @topdir@/phonon/experimental/
+// DOXYGEN_SET_EXCLUDE = @topdir@/phonon/backend/
// DOXYGEN_SET_FILE_PATTERNS = *.h *.dox
// DOXYGEN_SET_EXCLUDE_PATTERNS = *interface.h *_p.h
diff --git a/PhononConfig.cmake.in b/PhononConfig.cmake.in
index 4e46016..c6f5eb9 100644
--- a/PhononConfig.cmake.in
+++ b/PhononConfig.cmake.in
@@ -7,7 +7,6 @@ get_filename_component(currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the dir
get_filename_component(rootDir ${currentDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix
set(PHONON_PULSESUPPORT @PHONON_PULSESUPPORT@)
-set(PHONON_FOUND_EXPERIMENTAL @PHONON_BUILD_EXPERIMENTAL@)
# install locations
set(PHONON_INCLUDE_DIR "${rootDir}/@INCLUDE_INSTALL_DIR@")
@@ -18,23 +17,10 @@ set(PHONON_BUILDSYSTEM_DIR "${rootDir}/@BUILDSYSTEM_INSTALL_DIR@")
include(${currentDir}/PhononTargets.cmake )
set(PHONON_LIBRARY Phonon::phonon)
-if(PHONON_FOUND_EXPERIMENTAL)
- set(PHONON_EXPERIMENTAL_LIBRARY Phonon::phononexperimental)
-endif(PHONON_FOUND_EXPERIMENTAL)
-set(PHONON_LIBRARIES ${PHONON_LIBRARY} ${PHONON_EXPERIMENTAL_LIBRARY})
+set(PHONON_LIBRARIES ${PHONON_LIBRARY})
# The following one is only for compatiblity
set(PHONON_LIBS ${PHONON_LIBRARIES})
set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR} ${PHONON_INCLUDE_DIR}/KDE )
include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake )
-
-
-# set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
-
-# if(PHONON_INCLUDE_DIR_EXPERIMENTAL AND PHONON_LIBRARY_EXPERIMENTAL)
-# set(PHONON_LIBS ${PHONON_LIBS} ${PHONON_LIBRARY_EXPERIMENTAL})
-# set(PHONON_INCLUDES ${PHONON_INCLUDES} ${PHONON_INCLUDE_DIR_EXPERIMENTAL})
-# set(PHONON_FOUND_EXPERIMENTAL TRUE)
-# message(STATUS "Found Phonon Experimental: ${PHONON_LIBRARY_EXPERIMENTAL}")
-# endif(PHONON_INCLUDE_DIR_EXPERIMENTAL AND PHONON_LIBRARY_EXPERIMENTAL)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 692442a..4e4d86b 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -12,7 +12,6 @@ string(REGEX REPLACE ";" " " PHONON_DOXYGEN_SOURCE_DIR "${PHONON_DOXYGEN_SOURCE_
set(PHONON_DOXYGEN_EXCLUDE
${PHONON_SOURCE_DIR}/phonon/backend
- ${PHONON_SOURCE_DIR}/phonon/experimental
)
string(REGEX REPLACE ";" " " PHONON_DOXYGEN_EXCLUDE "${PHONON_DOXYGEN_EXCLUDE}")
diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 7f88f08..227b1dc 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -14,7 +14,6 @@ install( FILES
phonon/AudioOutputInterface
phonon/AudioOutputInterface40
phonon/AudioOutputInterface42
- phonon/AvCapture
phonon/BackendCapabilities
phonon/BackendInterface
phonon/Effect
@@ -92,16 +91,3 @@ install( FILES
old/Phonon/VolumeFaderInterface
old/Phonon/VolumeSlider
DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
-
-if (PHONON_BUILD_EXPERIMENTAL)
- install(FILES
- old/Phonon/Experimental/AbstractVideoDataOutput
- old/Phonon/Experimental/AudioDataOutput
- old/Phonon/Experimental/SnapshotInterface
- old/Phonon/Experimental/VideoDataOutput
- old/Phonon/Experimental/VideoDataOutputInterface
- old/Phonon/Experimental/VideoFrame
- old/Phonon/Experimental/VideoFrame2
- old/Phonon/Experimental/Visualization
- DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon/Experimental COMPONENT Devel)
-endif (PHONON_BUILD_EXPERIMENTAL)
diff --git a/includes/old/Phonon/Experimental/AbstractVideoDataOutput b/includes/old/Phonon/Experimental/AbstractVideoDataOutput
deleted file mode 100644
index c019215..0000000
--- a/includes/old/Phonon/Experimental/AbstractVideoDataOutput
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/abstractvideodataoutput.h"
diff --git a/includes/old/Phonon/Experimental/AudioDataOutput b/includes/old/Phonon/Experimental/AudioDataOutput
deleted file mode 100644
index 06d181d..0000000
--- a/includes/old/Phonon/Experimental/AudioDataOutput
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/audiodataoutput.h"
diff --git a/includes/old/Phonon/Experimental/SnapshotInterface b/includes/old/Phonon/Experimental/SnapshotInterface
deleted file mode 100644
index 5e59306..0000000
--- a/includes/old/Phonon/Experimental/SnapshotInterface
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/snapshotinterface.h"
diff --git a/includes/old/Phonon/Experimental/VideoDataOutput b/includes/old/Phonon/Experimental/VideoDataOutput
deleted file mode 100644
index 9878ccf..0000000
--- a/includes/old/Phonon/Experimental/VideoDataOutput
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/videodataoutput.h"
diff --git a/includes/old/Phonon/Experimental/VideoDataOutputInterface b/includes/old/Phonon/Experimental/VideoDataOutputInterface
deleted file mode 100644
index 870f683..0000000
--- a/includes/old/Phonon/Experimental/VideoDataOutputInterface
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/videodataoutputinterface.h"
diff --git a/includes/old/Phonon/Experimental/VideoFrame b/includes/old/Phonon/Experimental/VideoFrame
deleted file mode 100644
index 97c137e..0000000
--- a/includes/old/Phonon/Experimental/VideoFrame
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/videoframe.h"
diff --git a/includes/old/Phonon/Experimental/VideoFrame2 b/includes/old/Phonon/Experimental/VideoFrame2
deleted file mode 100644
index 29d1af9..0000000
--- a/includes/old/Phonon/Experimental/VideoFrame2
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/videoframe2.h"
diff --git a/includes/old/Phonon/Experimental/Visualization b/includes/old/Phonon/Experimental/Visualization
deleted file mode 100644
index b5aab38..0000000
--- a/includes/old/Phonon/Experimental/Visualization
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../phonon/experimental/visualization.h"
diff --git a/includes/phonon/AvCapture b/includes/phonon/AvCapture
deleted file mode 100644
index 15e92c5..0000000
--- a/includes/phonon/AvCapture
+++ /dev/null
@@ -1 +0,0 @@
-#include "experimental/avcapture.h"
diff --git a/lib-descriptor.xml.cmake b/lib-descriptor.xml.cmake
index fe8a0d6..9228a39 100644
--- a/lib-descriptor.xml.cmake
+++ b/lib-descriptor.xml.cmake
@@ -8,5 +8,4 @@
<libs>
@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libphonon.so. at PHONON_LIB_VERSION@
- @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libphononexperimental.so. at PHONON_LIB_VERSION@
</libs>
diff --git a/phonon/abstractvideooutput.h b/phonon/abstractvideooutput.h
index b44ceb2..ef546d8 100644
--- a/phonon/abstractvideooutput.h
+++ b/phonon/abstractvideooutput.h
@@ -34,12 +34,6 @@ class QString;
namespace Phonon
{
-namespace Experimental
-{
- class Visualization;
- class VisualizationPrivate;
-} // namespace Experimental
-
class AbstractVideoOutputPrivate;
/** \class AbstractVideoOutput abstractvideooutput.h phonon/AbstractVideoOutput
@@ -49,8 +43,6 @@ namespace Experimental
*/
class PHONON_EXPORT AbstractVideoOutput : public MediaNode
{
- friend class Experimental::Visualization;
- friend class Experimental::VisualizationPrivate;
P_DECLARE_PRIVATE(AbstractVideoOutput)
protected:
/**
diff --git a/phonon/backendcapabilities.h b/phonon/backendcapabilities.h
index 0e8f7ec..3f0e45d 100644
--- a/phonon/backendcapabilities.h
+++ b/phonon/backendcapabilities.h
@@ -171,11 +171,9 @@ namespace BackendCapabilities
*
* \warning Creating two separate MediaObject instances for the same capture
* device, one for video and the other for audio, most probably doesn't work.
- * But, if there are two separate devices, use Experimental::AVCapture.
*
* \see availableVideoCaptureDevices()
* \see availableAudioCaptureDevices()
- * \see Experimental::AVCapture
*/
#if !defined(PHONON_NO_VIDEOCAPTURE) && !defined(PHONON_NO_AUDIOCAPTURE)
PHONON_EXPORT QList<VideoCaptureDevice> availableAVCaptureDevices();
diff --git a/phonon/phononnamespace.cpp b/phonon/phononnamespace.cpp
index ba31353..8780fd0 100644
--- a/phonon/phononnamespace.cpp
+++ b/phonon/phononnamespace.cpp
@@ -24,8 +24,6 @@
#include "phononnamespace_p.h"
#include "phonondefs_p.h"
-#include "experimental/videoframe2.h"
-
#include "factory_p.h"
#include <QtCore/QCoreApplication>
@@ -207,7 +205,6 @@ static int registerPhononMetaTypes()
// need those for QSettings
qRegisterMetaType<QList<int> >();
qRegisterMetaTypeStreamOperators<QList<int> >("QList<int>");
- qRegisterMetaType<Phonon::Experimental::VideoFrame2>();
qRegisterMetaType<Phonon::DeviceAccess>();
qRegisterMetaTypeStreamOperators<Phonon::DeviceAccess>("Phonon::DeviceAccess");
diff --git a/phonon/phononnamespace.h.in b/phonon/phononnamespace.h.in
index 08a33c2..999ec17 100644
--- a/phonon/phononnamespace.h.in
+++ b/phonon/phononnamespace.h.in
@@ -221,7 +221,6 @@ namespace Phonon
*
* \see MediaObject::setVideoCaptureDevice
* \see MediaObject::setAudioCaptureDevice
- * \see AvCapture
*/
enum CaptureCategory {
/**
--
1.7.10.4
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel at kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
More information about the kde-multimedia
mailing list