diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-10-04 11:15:56 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-10-04 12:00:38 -0300 |
| commit | 2f8381e71213a1ecaed3ceda9ed9cdd981b79893 (patch) | |
| tree | 5ef3a3e492c6a89bc76b770d243fd8e72073b142 /PySide/phonon | |
| parent | 51cbe9d49e3a992f1d02dd97fe68e34fae6957ee (diff) | |
Implemented detection for VideoCaptureDevice on phonon module.
Fixes bug #355.
Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/phonon')
| -rw-r--r-- | PySide/phonon/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt index 5961a9e89..198ed6e25 100644 --- a/PySide/phonon/CMakeLists.txt +++ b/PySide/phonon/CMakeLists.txt @@ -3,7 +3,7 @@ project(phonon) # workaround for a cmake bug under MacOSX, it finds phonon but not the include path if (NOT QT_PHONON_INCLUDE_DIR AND CMAKE_HOST_APPLE) set(QT_PHONON_INCLUDE_DIR "${QT_LIBRARY_DIR}/phonon.framework/Headers") -endif() +endif () set(phonon_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_abstractaudiooutput_wrapper.cpp @@ -43,6 +43,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumeslider_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_wrapper.cpp ) + +check_qt_class("phonon" "VideoCaptureDevice" phonon_SRC "Phonon" "ObjectDescription") + set(phonon_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${phonon_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}") set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index 4c700bc37..ef05c2665 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -158,8 +158,12 @@ <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="fromIndex(int)" remove="all"/> </value-type> - - <value-type name="AudioCaptureDevice"> + <value-type name="AudioCaptureDevice"> + <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> + <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> + <modify-function signature="fromIndex(int)" remove="all"/> + </value-type> + <value-type name="VideoCaptureDevice"> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="fromIndex(int)" remove="all"/> |