Commit 06c8b9ba authored by Kai Uwe Broulik's avatar Kai Uwe Broulik 🍇

[Multimedia KCM] Kill PulseAudio device setup

It is redundant with plasma-pa

Differential Revision: https://phabricator.kde.org/D14340
parent 646bcc1d
# - Find libcanberra's libraries and headers.
# This module defines the following variables:
#
# CANBERRA_FOUND - true if libcanberra was found
# CANBERRA_LIBRARIES - libcanberra libraries to link against
# CANBERRA_INCLUDE_DIRS - include path for libcanberra
#
# Copyright (c) 2012 Raphael Kubo da Costa <rakuco@FreeBSD.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
find_package(PkgConfig)
pkg_check_modules(PC_CANBERRA libcanberra)
find_library(CANBERRA_LIBRARIES
NAMES canberra
HINTS ${PC_CANBERRA_LIBRARY_DIRS} ${PC_CANBERRA_LIBDIR}
)
find_path(CANBERRA_INCLUDE_DIRS
NAMES canberra.h
HINTS ${PC_CANBERRA_INCLUDE_DIRS} ${PC_CANBERRA_INCLUDEDIR}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Canberra REQUIRED_VARS CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS)
mark_as_advanced(CANBERRA_LIBRARIES CANBERRA_INCLUDE_DIRS)
[Desktop Entry]
Exec=kcmshell5 colors
Icon=preferences-desktop-color
Type=Service
X-KDE-ServiceTypes=KCModule
X-DocPath=kcontrol/colors/index.html
X-KDE-Library=kcm_colors
X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=color
X-KDE-Weight=60
Name=Colors
Name[af]=Kleure
Name[ar]=الألوان
Name[be]=Колеры
Name[be@latin]=Kolery
Name[bg]=Цветове
Name[bn]=রং
Name[bn_IN]=রং
Name[br]=Livioù
Name[bs]=Boje
Name[ca]=Colors
Name[ca@valencia]=Colors
Name[cs]=Barvy
Name[csb]=Farwë
Name[cy]=Lliwiau
Name[da]=Farver
Name[de]=Farben
Name[el]=Χρώματα
Name[en_GB]=Colours
Name[eo]=Koloroj
Name[es]=Colores
Name[et]=Värvid
Name[eu]=Koloreak
Name[fa]=رنگها
Name[fi]=Värit
Name[fr]=Couleurs
Name[fy]=Kleuren
Name[ga]=Dathanna
Name[gl]=Cores
Name[gu]=રંગો
Name[he]=צבעים
Name[hi]=रंग
Name[hne]=रंग
Name[hr]=Boje
Name[hsb]=Barby
Name[hu]=Színek
Name[ia]=Colores
Name[id]=Warna
Name[is]=Litir
Name[it]=Colori
Name[ja]=色
Name[ka]=ცვეტები
Name[kk]=Түстер
Name[km]=ពណ៌
Name[kn]=ಬಣ್ಣಗಳು
Name[ko]=색상
Name[ku]=Reng
Name[lt]=Spalvos
Name[lv]=Krāsas
Name[mai]=रँग
Name[mk]=Бои
Name[ml]=നിറങ്ങള്‍
Name[mr]=रंग
Name[ms]=Warna
Name[nb]=Farger
Name[nds]=Klören
Name[ne]=रङ
Name[nl]=Kleuren
Name[nn]=Fargar
Name[oc]=Colors
Name[or]=ରଙ୍ଗ
Name[pa]=ਰੰਗ
Name[pl]=Kolory
Name[pt]=Cores
Name[pt_BR]=Cores
Name[ro]=Culori
Name[ru]=Цвета
Name[se]=Ivnnit
Name[si]=වර්‍ණ
Name[sk]=Farby
Name[sl]=Barve
Name[sr]=Боје
Name[sr@ijekavian]=Боје
Name[sr@ijekavianlatin]=Boje
Name[sr@latin]=Boje
Name[sv]=Färger
Name[ta]=வண்ணங்கள்
Name[te]=రంగులు
Name[tg]=Рангҳо
Name[th]=สี
Name[tr]=Renkler
Name[ug]=رەڭلەر
Name[uk]=Кольори
Name[uz]=Ranglar
Name[uz@cyrillic]=Ранглар
Name[vi]=Màu sắc
Name[wa]=Coleurs
Name[xh]=Imibala
Name[x-test]=xxColorsxx
Name[zh_CN]=颜色
Name[zh_TW]=顏色
Comment=Application Color Scheme
Comment[ca]=Esquema de color de les aplicacions
Comment[ca@valencia]=Esquema de color de les aplicacions
Comment[cs]=Barevný motiv aplikací
Comment[da]=Farvetema til program
Comment[de]=Farbschema für Anwendungen
Comment[el]=Θέμα χρωμάτων εφαρμογής
Comment[en_GB]=Application Colour Scheme
Comment[es]=Esquema de color de las aplicaciones
Comment[eu]=Aplikazioen kolore-eskema
Comment[fi]=Ohjelmien väriteema
Comment[fr]=Thème de couleur des applications
Comment[gl]=Esquema de cores do aplicativo
Comment[he]=ערכות צבעים של יישומים
Comment[hu]=Alkalmazások színsémái
Comment[id]=Skema Warna Aplikasi
Comment[it]=Schema di colore delle applicazioni
Comment[ja]=アプリケーションカラースキーム
Comment[ko]=프로그램 색 배열
Comment[lt]=Programos spalvų derinys
Comment[nb]=Fargeoppsett for program
Comment[nl]=Toepassing Kleurenschema
Comment[nn]=Fargeoppsett for program
Comment[pa]=ਐਪਲੀਕੇਸ਼ਨ ਰੰਗ ਸਕੀਮ
Comment[pl]=Zestaw kolorów programów
Comment[pt]=Esquema de Cores da Aplicação
Comment[pt_BR]=Esquema de cores do aplicativo
Comment[ru]=Цветовая схема для приложений
Comment[sk]=Farebná schéma aplikácie
Comment[sl]=Barvna shema programov
Comment[sr]=Шема боја у програмима
Comment[sr@ijekavian]=Шема боја у програмима
Comment[sr@ijekavianlatin]=Šema boja u programima
Comment[sr@latin]=Šema boja u programima
Comment[sv]=Programmets färgschema
Comment[tr]=Uygulama Renk Şeması
Comment[uk]=Схема кольорів вікон програм
Comment[x-test]=xxApplication Color Schemexx
Comment[zh_CN]=应用程序配色方案
Comment[zh_TW]=應用程式色彩機制
X-KDE-Keywords=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme
X-KDE-Keywords[ar]=لون,ألوان,مخطّط,مخطط,تباين,ألوان الودجات,مخطّط ألوان,مخطط ألوان,نمط اللون,سمة اللون
X-KDE-Keywords[bs]=boje,boje,tema,kontrast,dodatak bojama,tema u boji,stil boja,tema boja
X-KDE-Keywords[ca]=colors,esquema,contrast,colors d'estris,Esquema de color,estil de color, tema de color
X-KDE-Keywords[ca@valencia]=colors,esquema,contrast,colors d'estris,Esquema de color,estil de color, tema de color
X-KDE-Keywords[da]=farver,tema,kontrast,widget-farver,farvetema,farvestil,farveskema
X-KDE-Keywords[de]=Farben,Schema,Kontrast,Farbschema,Elemente
X-KDE-Keywords[el]=χρώματα,χρώματα,σχήμα,αντίθεση,χρώματα γραφικών συστατικών,χρωματικό σχήμα,χρωματικό στιλ,θέμα χρώματος
X-KDE-Keywords[en_GB]=colours,scheme,contrast,Widget colours,Colour Scheme,colour style,colour theme
X-KDE-Keywords[es]=colores,esquema,contraste,colores de elementos gráficos,Esquema de color,estilo de color,tema de color
X-KDE-Keywords[et]=värv,värvid,skeem,kontrast,vidina värvid,värviskeem,värvistiil,värviteema
X-KDE-Keywords[eu]=kolore,koloreak,eskema,kontraste,trepetaren koloreak,kolore-eskema,kolore-estilo, kolorearen gai
X-KDE-Keywords[fi]=värit,teema,kontrasti,käyttöliittymäelementtien värit,elementtien värit,väriteema,värityyli
X-KDE-Keywords[fr]=couleurs, couleurs, schéma, contraste, couleur des composants graphiques, schéma de couleur, style de couleur, thème de couleur
X-KDE-Keywords[ga]=dathanna,scéim,codarsnacht,dathanna Giuirléidí,Scéim Datha,téama datha
X-KDE-Keywords[gl]=cores,esquema,contraste,cores do trebello,esquema de cores, tema de cores
X-KDE-Keywords[he]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,צבעים,ערכת נושא,צבע
X-KDE-Keywords[hu]=színek,színek,séma,kontraszt,Grafikai elemek színei,Színséma,színstílus,színtéma
X-KDE-Keywords[ia]=colores,colores,schema,contrasto,colores de Widget,Schema de Color,stilo de color, thema de color
X-KDE-Keywords[id]=warna,warna,skema,kontras,Widget warna,Skema Warna,gaya warna,tema warna
X-KDE-Keywords[it]=colori,schema,contrasto,colore degli oggetti,schema di colore,stile colore,tema colore
X-KDE-Keywords[kk]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme
X-KDE-Keywords[km]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme
X-KDE-Keywords[ko]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,색,색 배열,고대비
X-KDE-Keywords[mr]=रंग, रंग, योजना, कॉन्ट्रास्ट, विजेट रंग, रंगयोजना, रंगप्रकार, रंगशैली
X-KDE-Keywords[nb]=farger,oppsett,kontrast,elementfarger,fargeoppsett,fargestil,fargetema
X-KDE-Keywords[nds]=Klöör,Klören,Schema,Kontrast,Lüttprogramm-Klören,Klöörschema,Klöörstil,Klöörmuster
X-KDE-Keywords[nl]=colors,colours, kleuren,scheme,schema,contrast,Widget colors,Widgetkleuren,Color Scheme,kleurschema,kleurstijl,kleurthema
X-KDE-Keywords[nn]=fargar,oppsett,kontrast,elementfargar,fargeoppsett,fargestil,fargetema
X-KDE-Keywords[pa]=ਰੰਗ,ਸਕੀਮ,ਕਨਟਰਾਸਟ,ਵਿਜੈਟ ਰੰਗ,ਰੰਗ ਸਕੀ,ਰੰਗ ਸਟਾਈਲ,ਰੰਗ ਥੀਮ
X-KDE-Keywords[pl]=kolory,schemat,kontrast,kolory elementów interfejsu,zestaw kolorów,styl kolorów,motyw kolorów
X-KDE-Keywords[pt]=cores,esquema,contraste,cores dos elementos,esquema de cores,estilo de cores,tema de cores
X-KDE-Keywords[pt_BR]=cor,cores,esquema,contraste,Cores do widget,Esquema de cores,estilo de cores,tema de cores
X-KDE-Keywords[ru]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,цвет,цвета,схема,контраст,цвета виджета,цветовая схема,цветовой стиль,цветовая тема
X-KDE-Keywords[sk]=farba,farby,schéma,kontrast,farby widgetov,Farebná schéma,štýl farieb,téma farieb
X-KDE-Keywords[sl]=barve,shema,tema,kontrast,barve gradnikov,barvna shema,barvna tema,barvni slog
X-KDE-Keywords[sr]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,боје,шема,контраст,боје виџета,шема боја,стил боја,тема боја
X-KDE-Keywords[sr@ijekavian]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,боје,шема,контраст,боје виџета,шема боја,стил боја,тема боја
X-KDE-Keywords[sr@ijekavianlatin]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,boje,šema,kontrast,boje vidžeta,šema boja,stil boja,tema boja
X-KDE-Keywords[sr@latin]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,boje,šema,kontrast,boje vidžeta,šema boja,stil boja,tema boja
X-KDE-Keywords[sv]=färger,schema,kontrast,Komponentfärger,Färgschema,färgstil,färgtema
X-KDE-Keywords[tr]=renkler,renk,şema,karşıtlık,kontrast,Gereç renkleri,RenkŞeması,renk biçemi,renk teması,renk biçimi
X-KDE-Keywords[uk]=кольори,кольори,схема,контраст,кольори віджетів,схема кольорів,стиль кольорів,тема кольорів,colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme
X-KDE-Keywords[x-test]=xxcolorsxx,xxcoloursxx,xxschemexx,xxcontrastxx,xxWidget colorsxx,xxColor Schemexx,xxcolor stylexx,xxcolor themexx
X-KDE-Keywords[zh_CN]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme,颜色,配色方案,对比度,部件颜色,颜色方案,颜色风格,颜色主题
X-KDE-Keywords[zh_TW]=colors,colours,scheme,contrast,Widget colors,Color Scheme,color style,color theme
Categories=Qt;KDE;X-KDE-settings-looknfeel;
......@@ -5,26 +5,6 @@ add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_phonon\")
find_package(PulseAudio 0.9.16)
set_package_properties(PulseAudio PROPERTIES DESCRIPTION "PulseAudio Audio Server"
URL "http://www.pulseaudio.org/"
TYPE OPTIONAL
PURPOSE "libpulse is needed for audio setup GUI"
)
find_package(GLIB2)
set_package_properties(GLIB2 PROPERTIES DESCRIPTION "Low-level core library for data structure handling, portability wrappers, etc."
URL "http://www.gtk.org"
TYPE OPTIONAL
)
find_package(Canberra)
set_package_properties(Canberra PROPERTIES DESCRIPTION "Audio setup GUI"
PURPOSE "libcanberra is needed for audio setup GUI"
URL "http://0pointer.de/lennart/projects/libcanberra"
TYPE OPTIONAL
)
set(kcmphonon_SRCS main.cpp devicepreference.cpp backendselection.cpp)
ki18n_wrap_ui(kcmphonon_SRCS devicepreference.ui backendselection.ui)
set(kcmphonon_LIBS
......@@ -35,17 +15,6 @@ set(kcmphonon_LIBS
KF5::KIOWidgets
${PHONON_LIBRARY})
if(GLIB2_FOUND AND PULSEAUDIO_FOUND AND CANBERRA_FOUND)
add_definitions(-DHAVE_PULSEAUDIO)
set(kcmphonon_SRCS ${kcmphonon_SRCS} audiosetup.cpp testspeakerwidget.cpp)
ki18n_wrap_ui(kcmphonon_SRCS audiosetup.ui)
include_directories(${GLIB2_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${CANBERRA_INCLUDE_DIRS})
set(kcmphonon_LIBS ${kcmphonon_LIBS} ${GLIB2_LIBRARIES} ${PulseAudio_LIBRARIES} ${PulseAudio_MAINLOOP_LIBRARY} ${CANBERRA_LIBRARIES})
endif()
ecm_qt_declare_logging_category(kcmphonon_SRCS HEADER phonon_debug.h IDENTIFIER KCM_PHONON_LOG CATEGORY_NAME org.kde.kcm.phonon)
add_library(kcm_phonon MODULE ${kcmphonon_SRCS})
......
This diff is collapsed.
/* This file is part of the KDE project
Copyright (C) 2010 Colin Guthrie <cguthrie@mandriva.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef PHONON_AUDIOSETUP_H
#define PHONON_AUDIOSETUP_H
#include <canberra.h>
#include <pulse/pulseaudio.h>
#include "ui_audiosetup.h"
class QTimer;
struct pa_glib_mainloop;
typedef struct {
quint32 index;
QString name;
QString icon;
QMultiMap<quint32, QPair<QString, QString> > profiles;
QString activeProfile;
} cardInfo;
typedef struct {
quint32 index;
quint32 cardIndex;
QString name;
QString icon;
pa_channel_map channelMap;
QMap<quint32, QPair<QString, QString> > ports;
QString activePort;
} deviceInfo;
class AudioSetup : public QWidget, private Ui::AudioSetup
{
Q_OBJECT
public:
explicit AudioSetup(QWidget *parent = 0);
~AudioSetup();
void load();
void save();
void defaults();
uint32_t getCurrentSinkIndex();
void updateCard(const pa_card_info*);
void removeCard(uint32_t idx);
void updateSink(const pa_sink_info*);
void removeSink(uint32_t idx);
void updateSource(const pa_source_info*);
void removeSource(uint32_t idx);
void updateFromPulse();
void updateIndependantDevices();
void updateVUMeter(int vol);
public Q_SLOTS:
void cardChanged();
void profileChanged();
void deviceChanged();
void portChanged();
void reallyUpdateVUMeter();
bool connectToDaemon();
Q_SIGNALS:
void changed();
void ready();
private:
void _updatePlacementTester();
void _createMonitorStreamForSource(uint32_t);
QLabel *m_icon;
int m_OutstandingRequests;
ca_context* m_Canberra;
pa_stream* m_VUStream;
int m_VURealValue;
QTimer* m_VUTimer;
};
QDebug operator<<(QDebug dbg, const pa_context_state_t &state);
#endif // PHONON_AUDIOSETUP_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Colin Guthrie</author>
<class>AudioSetup</class>
<widget class="QWidget" name="AudioSetup">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>654</width>
<height>480</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="hardwareGroupBox">
<property name="title">
<string>Hardware</string>
</property>
<layout class="QGridLayout" name="_3">
<item row="3" column="1">
<widget class="KComboBox" name="profileBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="KComboBox" name="cardBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="profileLabel">
<property name="text">
<string>Profile</string>
</property>
<property name="buddy">
<cstring>profileBox</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="cardLabel">
<property name="text">
<string>Sound Card</string>
</property>
<property name="buddy">
<cstring>cardBox</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="deviceGroupBox">
<property name="title">
<string>Device Configuration</string>
</property>
<layout class="QGridLayout" name="_2">
<item row="0" column="1">
<widget class="KComboBox" name="deviceBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>Connector</string>
</property>
<property name="buddy">
<cstring>portBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KComboBox" name="portBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="deviceLabel">
<property name="text">
<string>Sound Device</string>
</property>
<property name="buddy">
<cstring>deviceBox</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="playbackOrCaptureStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="playbackPage">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="outputGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Speaker Placement and Testing</string>
</property>
<layout class="QVBoxLayout" name="_4">
<item>
<layout class="QGridLayout" name="placementGrid"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="capturePage">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QGroupBox" name="inputGroupBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>26</height>
</size>
</property>
<property name="title">
<string>Input Levels</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QProgressBar" name="inputLevels">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>10</height>
</size>
</property>
<property name="value">
<number>50</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
......@@ -26,9 +26,6 @@
#include <KPluginFactory>
#include <KLocalizedString>
#ifdef HAVE_PULSEAUDIO
# include "audiosetup.h"
#endif
#include "backendselection.h"
#include "devicepreference.h"
......@@ -64,12 +61,6 @@ PhononKcm::PhononKcm(QWidget *parent, const QVariantList &args)
connect(m_devicePreferenceWidget, SIGNAL(changed()), SLOT(changed()));
setButtons( KCModule::Default|KCModule::Apply|KCModule::Help );
#ifdef HAVE_PULSEAUDIO
m_speakerSetup = new AudioSetup(this);
m_speakerSetup->setVisible(false);
connect(m_speakerSetup, SIGNAL(ready()), SLOT(speakerSetupReady()));
#endif
}
void PhononKcm::load()
......@@ -90,13 +81,4 @@ void PhononKcm::defaults()
m_backendSelection->defaults();
}
#ifdef HAVE_PULSEAUDIO
void PhononKcm::speakerSetupReady()
{
m_tabs->insertTab(1, m_speakerSetup, i18n("Audio Hardware Setup"));
m_devicePreferenceWidget->pulseAudioEnabled();
connect(m_speakerSetup, SIGNAL(changed()), SLOT(changed()));
}
#endif
#include "main.moc"
......@@ -27,9 +27,6 @@ class DevicePreference;
}
class BackendSelection;
#ifdef HAVE_PULSEAUDIO
class AudioSetup;
#endif
class QTabWidget;
class PhononKcm : public KCModule
......@@ -42,18 +39,10 @@ public:
void save() override;
void defaults() override;
#ifdef HAVE_PULSEAUDIO
private Q_SLOTS:
void speakerSetupReady();
#endif
private:
QTabWidget* m_tabs;
Phonon::DevicePreference *m_devicePreferenceWidget;
BackendSelection *m_backendSelection;
#ifdef HAVE_PULSEAUDIO
AudioSetup *m_speakerSetup;
#endif
};
#endif // MAIN_H
/* This file is part of the KDE project
Copyright (C) 2010 Colin Guthrie <cguthrie@mandriva.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#include "testspeakerwidget.h"
#include <KLocalizedString>
#include "audiosetup.h"