diff --git a/kamoso/CMakeLists.txt b/kamoso/CMakeLists.txt index ba4665f6..d36ed777 100644 --- a/kamoso/CMakeLists.txt +++ b/kamoso/CMakeLists.txt @@ -4,7 +4,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(KDE4 REQUIRED) find_package(Kipi REQUIRED) -find_package(Phonon REQUIRED) find_package(GLIB2 REQUIRED) find_package(GStreamer 1.0.0) find_package(QtGStreamer 1.1.90 REQUIRED) diff --git a/kamoso/src/CMakeLists.txt b/kamoso/src/CMakeLists.txt index 31ad3b31..a3ead449 100644 --- a/kamoso/src/CMakeLists.txt +++ b/kamoso/src/CMakeLists.txt @@ -41,7 +41,9 @@ kde4_add_kcfg_files(kamoso_SRCS settings.kcfgc) add_executable(kamoso ${kamoso_SRCS}) target_link_libraries(kamoso ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} - ${KDE4_SOLID_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KUTILS_LIBS} ${KIPI_LIBRARIES} ${SolidControl} ${QTGSTREAMER_LIBRARY} ${QTGSTREAMER_UI_LIBRARY}) + ${KDE4_SOLID_LIBS} ${KDE4_KMEDIAPLAYER_LIBS} ${KDE4_KUTILS_LIBS} ${KIPI_LIBRARIES} + ${SolidControl} ${QTGSTREAMER_LIBRARY} ${QTGSTREAMER_UI_LIBRARY} +) install(TARGETS kamoso ${INSTALL_TARGETS_DEFAULT_ARGS}) install(PROGRAMS kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/kamoso/src/kamoso.cpp b/kamoso/src/kamoso.cpp index 0d39d0f0..40a7227c 100644 --- a/kamoso/src/kamoso.cpp +++ b/kamoso/src/kamoso.cpp @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -159,9 +159,7 @@ Kamoso::Kamoso(QWidget* parent) mainWidgetUi->thirdRow->addWidget(m_countdown); connect(m_countdown, SIGNAL(finished()), SLOT(takePhoto())); - const KUrl soundFile = KStandardDirs::locate("sound", "KDE-Im-User-Auth.ogg"); - player = Phonon::createPlayer(Phonon::NotificationCategory); - player->setCurrentSource(soundFile); + player = new KAudioPlayer(this); //TODO: find a better place to init this m_exponentialValue = 0; @@ -446,7 +444,8 @@ void Kamoso::takePhoto() m_webcam->takePhoto(photoPlace); if (Settings::photoSound()) { - player->play(); + const KUrl soundFile = KStandardDirs::locate("sound", "KDE-Im-User-Auth.ogg"); + player->load(soundFile); } } diff --git a/kamoso/src/kamoso.h b/kamoso/src/kamoso.h index e22037a4..aac9a0f7 100644 --- a/kamoso/src/kamoso.h +++ b/kamoso/src/kamoso.h @@ -21,27 +21,29 @@ #ifndef KAMOSO_H #define KAMOSO_H -#include -#include -#include -#include -#include - -class KDirModel; -class KamosoJobTracker; #include #include -class ShootMode; -class WhiteWidgetManager; -class WebcamWidget; -class WebcamRetriever; -class CountdownWidget; #include #include #include #include #include #include + +#include +#include +#include +#include +#include + +class KAudioPlayer; +class KDirModel; +class KamosoJobTracker; +class ShootMode; +class WhiteWidgetManager; +class WebcamWidget; +class WebcamRetriever; +class CountdownWidget; class ThumbnailView; class KFileItem; class WebcamWidget; @@ -49,7 +51,7 @@ class DeviceManager; class KamosoJob; class WebcamDialog; namespace Ui { class mainWidget; class webcamConfigWidget;} -namespace Phonon { class MediaObject; } + class Kamoso : public KMainWindow { Q_OBJECT @@ -113,7 +115,7 @@ Q_OBJECT WhiteWidgetManager *whiteWidgetManager; WebcamWidget *m_webcam; CountdownWidget *m_countdown; - Phonon::MediaObject *player; + KAudioPlayer *player; Ui::mainWidget *mainWidgetUi; Ui::webcamConfigWidget *pageWebcam; QWidget *mainWidget; diff --git a/kamoso/src/webcamwidget.cpp b/kamoso/src/webcamwidget.cpp index 8703bbe8..77ce3e26 100644 --- a/kamoso/src/webcamwidget.cpp +++ b/kamoso/src/webcamwidget.cpp @@ -35,10 +35,6 @@ #include #include #include -#include -#include -#include -#include #include #include @@ -361,22 +357,6 @@ void WebcamWidget::stopRecording(const KUrl &destUrl) d->m_recording = false; } -QByteArray WebcamWidget::phononCaptureDevice() -{ - const QList &m_modelData = Phonon::BackendCapabilities::availableAudioCaptureDevices(); - QVariant variantList = m_modelData.first().property("deviceAccessList"); - Phonon::DeviceAccessList accessList = variantList.value(); - - Phonon::DeviceAccessList::const_iterator i, iEnd=accessList.constEnd(); - for(i=accessList.constBegin(); i!=iEnd; ++i) { - if(i->first == "alsa" && !i->second.contains("phonon")) { - return i->second.toAscii(); - } - } - - return QByteArray(); -} - QByteArray WebcamWidget::basicPipe() { QByteArray pipe; diff --git a/kamoso/src/webcamwidget.h b/kamoso/src/webcamwidget.h index 3989b19b..10382575 100644 --- a/kamoso/src/webcamwidget.h +++ b/kamoso/src/webcamwidget.h @@ -22,16 +22,16 @@ #include #include - -class KJob; -class Device; -class KUrl; #include #include #include #include #include +class KJob; +class Device; +class KUrl; + class WebcamWidget : public QGst::Ui::VideoWidget { Q_OBJECT @@ -60,7 +60,6 @@ Q_SIGNALS: private: WebcamWidget(QWidget* parent); - QByteArray phononCaptureDevice(); QByteArray basicPipe(); void setDevice(const Device &device); float convertAdjustValue(int level);