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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-11-23 17:36:02
Message-ID: 1195839362.080358.12288.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 740613 by mkretz:

- mark PulseAudio as advanced device so that it won't be used accidentally (too many \
                bad reports)
- use QDBusConnection::ExportScriptableSlots instead of qt4_generate_dbus_interface + \
qt4_add_dbus_adaptor

 M  +0 -7      CMakeLists.txt  
 M  +4 -5      xineengine.cpp  
 M  +1 -1      xineengine.h  


--- trunk/KDE/kdebase/runtime/phonon/xine/CMakeLists.txt #740612:740613
@@ -42,13 +42,6 @@
 endif(XCB_FOUND AND XINE_XCB_FOUND)
 macro_log_feature(XCB_VIDEO "XCB" "XCB is needed for the video widget, libxine needs \
to be compiled with XCB" "http://xcb.freedesktop.org/")  
-macro(dbusadaptor _sources _header _parentClass)
-   GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
-   qt4_generate_dbus_interface(${_header} ${_basename}.xml)
-   qt4_add_dbus_adaptor(${_sources} ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml \
                ${_header} ${_parentClass})
-endmacro(dbusadaptor)
-
-dbusadaptor(phonon_xine_PART_SRCS xineengine_p.h Phonon::Xine::XineEnginePrivate)
 kde4_add_plugin(phonon_xine ${phonon_xine_PART_SRCS})
 target_link_libraries(phonon_xine ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} \
${KDE4_PHONON_LIBS} ${XINE_LIBRARY} ${KDE4_KAUDIODEVICELIST_LIBS})  if(XCB_FOUND AND \
                XINE_XCB_FOUND)
--- trunk/KDE/kdebase/runtime/phonon/xine/xineengine.cpp #740612:740613
@@ -35,7 +35,6 @@
 #include "backend.h"
 #include "events.h"
 #include "xinethread.h"
-#include <xineengine_padaptor.h>
 
 namespace Phonon
 {
@@ -45,8 +44,7 @@
     {
         signalTimer.setSingleShot(true);
         connect(&signalTimer, SIGNAL(timeout()), SLOT(emitAudioDeviceChange()));
-        new XineEnginePrivateAdaptor(this);
-        QDBusConnection::sessionBus().registerObject("/internal/PhononXine", this);
+        QDBusConnection::sessionBus().registerObject("/internal/PhononXine", this, \
QDBusConnection::ExportScriptableSlots);  }
 
     void XineEnginePrivate::emitAudioDeviceChange()
@@ -423,9 +421,10 @@
     }
 
     void XineEngine::addAudioOutput(int index, int initialPreference, const QString \
                &name, const QString &description,
-            const QString &icon, const QByteArray &driver, const QStringList \
&deviceIds, const QString &mixerDevice) +            const QString &icon, const \
QByteArray &driver, const QStringList &deviceIds, const QString &mixerDevice, bool \
isAdvanced)  {
         AudioOutputInfo info(index, initialPreference, name, description, icon, \
driver, deviceIds, mixerDevice); +        info.isAdvanced = isAdvanced;
         const int listIndex = m_audioOutputInfos.indexOf(info);
         if (listIndex == -1) {
             info.available = true;
@@ -538,7 +537,7 @@
                 } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
                     addAudioOutput(nextIndex++, 10, i18n("PulseAudio"),
                             xine_get_audio_driver_plugin_description(xine(), \
                outputPlugins[i]),
-                            /*icon name */"audio-backend-pulseaudio", \
outputPlugins[i], QStringList(), QString()); +                            /*icon name \
*/"audio-backend-pulseaudio", outputPlugins[i], QStringList(), QString(), true \
/*isAdvanced*/);  } else if (0 == strcmp(outputPlugins[i], "esd")) {
                     addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"),
                             xine_get_audio_driver_plugin_description(xine(), \
                outputPlugins[i]),
--- trunk/KDE/kdebase/runtime/phonon/xine/xineengine.h #740612:740613
@@ -96,7 +96,7 @@
         void addAudioOutput(const AudioDevice &dev, const QByteArray &driver);
         void addAudioOutput(int idx, int initialPreference, const QString &n,
                 const QString &desc, const QString &ic, const QByteArray &dr,
-                const QStringList &dev, const QString &mixerDevice);
+                const QStringList &dev, const QString &mixerDevice, bool isAdvanced \
= false);  xine_t *m_xine;
 
         struct AudioOutputInfo


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