[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:       2008-04-21 21:25:50
Message-ID: 1208813150.743832.28432.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799560 by mkretz:

some more cleanup: no need to link to libkaudiodevicelist anymore; remove dead code

 M  +1 -1      CMakeLists.txt  
 M  +0 -14     xineengine.cpp  
 M  +0 -1      xineengine.h  


--- trunk/KDE/kdebase/runtime/phonon/xine/CMakeLists.txt #799559:799560
@@ -43,7 +43,7 @@
 macro_log_feature(XCB_VIDEO "XCB" "XCB is needed for the video widget, libxine needs \
to be compiled with XCB" "http://xcb.freedesktop.org/")  
 kde4_add_plugin(phonon_xine ${phonon_xine_PART_SRCS})
-target_link_libraries(phonon_xine ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${XINE_LIBRARY} ${KDE4_KAUDIODEVICELIST_LIBS}) \
+target_link_libraries(phonon_xine ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${XINE_LIBRARY})  if(XCB_FOUND AND \
XINE_XCB_FOUND)  target_link_libraries(phonon_xine ${LIBXCB_LIBRARIES})
 endif(XCB_FOUND AND XINE_XCB_FOUND)
--- trunk/KDE/kdebase/runtime/phonon/xine/xineengine.cpp #799559:799560
@@ -322,20 +322,6 @@
         return QByteArray();
     }
 
-    QStringList XineEngine::alsaDevicesFor(int audioDevice)
-    {
-        XineEngine *that = self();
-        that->checkAudioOutputs();
-        for (int i = 0; i < that->m_audioOutputInfos.size(); ++i) {
-            if (that->m_audioOutputInfos[i].index == audioDevice) {
-                if (that->m_audioOutputInfos[i].driver == "alsa") { // only for ALSA
-                    //return that->m_audioOutputInfos[i].devices;
-                }
-            }
-        }
-        return QStringList();
-    }
-
     void XineEngine::addAudioOutput(int index, int initialPreference, const QString \
                &name, const QString &description,
             const QString &icon, const QByteArray &driver, bool isAdvanced)
     {
--- trunk/KDE/kdebase/runtime/phonon/xine/xineengine.h #799559:799560
@@ -75,7 +75,6 @@
         static QList<int> audioOutputIndexes();
         static QHash<QByteArray, QVariant> audioOutputProperties(int audioDevice);
         static QByteArray audioDriverFor(int audioDevice);
-        static QStringList alsaDevicesFor(int audioDevice);
         static xine_audio_port_t *nullPort();
         static xine_video_port_t *nullVideoPort();
 


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