[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Martin Tobias Holmedahl Sandsmark <sandsmark () samfundet ! no>
Date:       2010-09-10 10:32:45
Message-ID: 20100910103245.91779AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173744 by sandsmark:

Casian Andrei's GSoC work on the Phonon platform plugin

 M  +2 -1      CMakeLists.txt  
 M  +4 -4      kded-module/phononserver.cpp  
 M  +15 -6     libkaudiodevicelist/CMakeLists.txt  
 M  +0 -3      platform_kde/devicelisting.cpp  


--- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #1173743:1173744
@@ -14,7 +14,7 @@
 if(KDEBASE_DISABLE_MULTIMEDIA)
    message(STATUS "NOTICE: Multimedia support DISABLED (KDEBASE_DISABLE_MULTIMEDIA \
== ON)")  else(KDEBASE_DISABLE_MULTIMEDIA)
-   set(PHONON_MIN_VERSION "4.2.96")
+   set(PHONON_MIN_VERSION "4.4.3")
    macro_ensure_version("${PHONON_MIN_VERSION}" "${PHONON_VERSION}" \
_phonon_version_ok)  macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" \
"svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}" "STRONGLY \
RECOMMENDED: Required for playing audio and video throughout KDE")  
@@ -48,4 +48,5 @@
    add_subdirectory(platform_kde)
    macro_optional_add_subdirectory(tests)
    add_subdirectory(kcm)
+   #macro_optional_add_subdirectory(libkaudiodevicelist)
 endif(KDEBASE_DISABLE_MULTIMEDIA)
--- trunk/KDE/kdebase/runtime/phonon/kded-module/phononserver.cpp #1173743:1173744
@@ -62,8 +62,8 @@
     findDevices();
     connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(const QString &)), \
                SLOT(deviceAdded(const QString &)));
     connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceRemoved(const QString \
                &)), SLOT(deviceRemoved(const QString &)));
-    qRegisterMetaType<Phonon::DeviceAccessList>();
-    qRegisterMetaTypeStreamOperators<Phonon::DeviceAccessList>("Phonon::DeviceAccessList");
 +
+    Phonon::registerMetaTypes();
 }
 
 PhononServer::~PhononServer()
@@ -704,7 +704,7 @@
                 if (access.driver() == driverId) {
                     oldDeviceIds << deviceId;
                 }
-                deviceAccessList << QPair<QByteArray, QString>(driver, deviceId);
+                deviceAccessList << Phonon::DeviceAccess(driver, deviceId);
             }
         }
         properties.insert("deviceAccessList", \
QVariant::fromValue(deviceAccessList)); @@ -730,7 +730,7 @@
         foreach (const PS::AudioDeviceAccess &access, dev.accessList()) {
             const QByteArray &driver = nameForDriver(access.driver());
             foreach (const QString &deviceId, access.deviceIds()) {
-                deviceAccessList << QPair<QByteArray, QString>(driver, deviceId);
+                deviceAccessList << Phonon::DeviceAccess(driver, deviceId);
             }
         }
         properties.insert("deviceAccessList", \
                QVariant::fromValue(deviceAccessList));
--- trunk/KDE/kdebase/runtime/phonon/libkaudiodevicelist/CMakeLists.txt \
#1173743:1173744 @@ -4,20 +4,29 @@
     hardwaredatabase.cpp
 )
 
+set(KDE4_KAUDIODEVICELIST_LIBS
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_SOLID_LIBS}
+)
+
 if(ALSA_FOUND)
    qt4_add_resources(kaudiodevicelist_LIB_SRCS resources.qrc)
+    set(KDE4_KAUDIODEVICELIST_LIBS
+        ${KDE4_KAUDIODEVICELIST_LIBS}
+        ${ASOUND_LIBRARY}
+    )
 endif(ALSA_FOUND)
 
 kde4_add_library(kaudiodevicelist SHARED ${kaudiodevicelist_LIB_SRCS})
-target_link_libraries(${KDE4_KAUDIODEVICELIST_LIBS})
+target_link_libraries(kaudiodevicelist ${KDE4_KAUDIODEVICELIST_LIBS})
 
 set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION})  
 install(TARGETS kaudiodevicelist ${INSTALL_TARGETS_DEFAULT_ARGS})
-#install(FILES
-#        kaudiodevicelist_export.h
-#        audiodevice.h
-#        audiodeviceenumerator.h
-#        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
+install(FILES
+        kaudiodevicelist_export.h
+        audiodevice.h
+        audiodeviceenumerator.h
+        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
 
 install(FILES hardwaredatabase DESTINATION ${DATA_INSTALL_DIR}/libphonon)
--- trunk/KDE/kdebase/runtime/phonon/platform_kde/devicelisting.cpp #1173743:1173744
@@ -111,9 +111,6 @@
             QLatin1String("/modules/phononserver"),
             QLatin1String("org.kde.PhononServer"))
 {
-    qRegisterMetaType<Phonon::DeviceAccessList>();
-    qRegisterMetaTypeStreamOperators<Phonon::DeviceAccessList>("Phonon::DeviceAccessList");
                
-
     KSharedConfigPtr config;
     config = KSharedConfig::openConfig("phonon_platform_kde");
     installAlsaPhononDeviceHandle();


[prev in list] [next in list] [prev in thread] [next in thread]