From: Oswald Buddenhagen Date: Mon, 2 Sep 2013 14:59:34 +0000 (+0200) Subject: purge phonon config X-Git-Tag: accepted/tizen/20131212.181521~79^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eed5001957c5f928083e9b0f77a02d9322c2410d;p=platform%2Fupstream%2Fqttools.git purge phonon config Change-Id: If6d2d99b04345c29ff3c51616ff913771f3b8c11 Reviewed-by: Oswald Buddenhagen --- diff --git a/src/qtconfig/mainwindow.cpp b/src/qtconfig/mainwindow.cpp index fad0b67..a6ee1b9 100644 --- a/src/qtconfig/mainwindow.cpp +++ b/src/qtconfig/mainwindow.cpp @@ -67,13 +67,6 @@ #include -#ifndef QT_NO_GSTREAMER -#include -#endif -#ifdef HAVE_PHONON -#include -#endif - QT_BEGIN_NAMESPACE // from qapplication.cpp and qapplication_x11.cpp - These are NOT for @@ -146,14 +139,6 @@ static const char *printer_text = QT_TRANSLATE_NOOP("MainWindow", "Qt should search for embeddable font files. By default, the X " "server font path is used."); -static const char *phonon_text = QT_TRANSLATE_NOOP("MainWindow", -"

Phonon

" -"
" -"

Use this tab to configure the Phonon GStreamer multimedia backend. " -"

It is reccommended to leave all settings on \"Auto\" to let " -"Phonon determine your settings automatically."); - - QPalette::ColorGroup MainWindow::groupFromIndex(int item) { switch (item) { @@ -211,8 +196,6 @@ MainWindow::MainWindow() connect(ui->wheelScrollLinesSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified())); connect(ui->menuEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified())); connect(ui->comboEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified())); - connect(ui->audiosinkCombo, SIGNAL(activated(int)), SLOT(somethingModified())); - connect(ui->videomodeCombo, SIGNAL(activated(int)), SLOT(somethingModified())); connect(ui->toolTipEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified())); connect(ui->strutWidthSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified())); connect(ui->strutHeightSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified())); @@ -417,72 +400,6 @@ MainWindow::MainWindow() fontpaths = settings.value(QLatin1String("fontPath")).toStringList(); ui->fontpathListBox->insertItems(0, fontpaths); - ui->audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto")); - ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("Auto (default)")), - tr("Choose audio output automatically."), Qt::ToolTipRole); - ui->audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink")); - ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("aRts")), - tr("Experimental aRts support for GStreamer."), - Qt::ToolTipRole); -#ifdef HAVE_PHONON - ui->phononVersionLabel->setText(QLatin1String(Phonon::phononVersion())); -#endif -#ifndef QT_NO_GSTREAMER - if (gst_init_check(0, 0, 0)) { - gchar *versionString = gst_version_string(); - ui->gstVersionLabel->setText(QLatin1String(versionString)); - g_free(versionString); - GList *factoryList = gst_registry_get_feature_list(gst_registry_get_default(), - GST_TYPE_ELEMENT_FACTORY); - QString name, klass, description; - for (GList *iter = g_list_first(factoryList) ; iter != NULL ; iter = g_list_next(iter)) { - GstPluginFeature *feature = GST_PLUGIN_FEATURE(iter->data); - klass = QLatin1String(gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature))); - if (klass == QLatin1String("Sink/Audio")) { - name = QLatin1String(GST_PLUGIN_FEATURE_NAME(feature)); - if (name == QLatin1String("sfsink")) - continue; // useless to output audio to file when you cannot set the file path - else if (name == QLatin1String("autoaudiosink")) - continue; //This is used implicitly from the auto setting - GstElement *sink = gst_element_factory_make (qPrintable(name), NULL); - if (sink) { - description = QLatin1String(gst_element_factory_get_description(GST_ELEMENT_FACTORY(feature))); - ui->audiosinkCombo->addItem(name, name); - ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(name), description, - Qt::ToolTipRole); - gst_object_unref (sink); - } - } - } - g_list_free(factoryList); - } -#else - ui->phononTab->setEnabled(false); - ui->phononLabel->setText(tr("Phonon GStreamer backend not available.")); -#endif - - ui->videomodeCombo->addItem(tr("Auto (default)"), QLatin1String("Auto")); - ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Auto (default)")), - tr("Choose render method automatically"), Qt::ToolTipRole); -#ifdef Q_WS_X11 - ui->videomodeCombo->addItem(tr("X11"), QLatin1String("X11")); - ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("X11")), - tr("Use X11 Overlays"), Qt::ToolTipRole); -#endif -#ifndef QT_NO_OPENGL - ui->videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL")); - ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("OpenGL")), - tr("Use OpenGL if available"), Qt::ToolTipRole); -#endif - ui->videomodeCombo->addItem(tr("Software"), QLatin1String("Software")); - ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Software")), - tr("Use simple software rendering"), Qt::ToolTipRole); - - QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString(); - QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString(); - ui->audiosinkCombo->setCurrentIndex(ui->audiosinkCombo->findData(audioSink)); - ui->videomodeCombo->setCurrentIndex(ui->videomodeCombo->findData(videoMode)); - settings.endGroup(); // Qt ui->helpView->setText(tr(appearance_text)); @@ -569,13 +486,6 @@ void MainWindow::fileSave() settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethodCombo->currentText()); #endif - QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString(); - QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString(); - settings.setValue(QLatin1String("audiosink"), - ui->audiosinkCombo->itemData(ui->audiosinkCombo->currentIndex())); - settings.setValue(QLatin1String("videomode"), - ui->videomodeCombo->itemData(ui->videomodeCombo->currentIndex())); - QStringList effects; if (ui->effectsCheckBox->isChecked()) { effects << QLatin1String("general"); @@ -925,8 +835,6 @@ void MainWindow::pageChanged(int pageNumber) ui->helpView->setText(tr(font_text)); else if (page == ui->printerTab) ui->helpView->setText(tr(printer_text)); - else if (page == ui->phononTab) - ui->helpView->setText(tr(phonon_text)); } void MainWindow::closeEvent(QCloseEvent *e) diff --git a/src/qtconfig/mainwindow.ui b/src/qtconfig/mainwindow.ui index b1a6625..a36f534 100644 --- a/src/qtconfig/mainwindow.ui +++ b/src/qtconfig/mainwindow.ui @@ -1041,171 +1041,6 @@ - - - Phonon - - - - - - About Phonon - - - - - - Current Version: - - - - - - - Not available - - - - - - - Website: - - - - - - - <a href="http://phonon.kde.org">http://phonon.kde.org/</a> - - - true - - - - - - - - - - About GStreamer - - - - - - Current Version: - - - - - - - Not available - - - - - - - Website: - - - - - - - <a href="http://gstreamer.freedesktop.org/">http://gstreamer.freedesktop.org/</a> - - - true - - - - - - - - - - GStreamer backend settings - - - - - - Preferred audio sink: - - - audiosinkCombo - - - - - - - - - - Preferred render method: - - - videomodeCombo - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Note: changes to these settings may prevent applications from starting up correctly.</span></p></body></html> - - - Qt::RichText - - - false - - - true - - - 2 - - - - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - @@ -1347,8 +1182,6 @@ p, li { white-space: pre-wrap; } fontPathLineEdit browseFontPathButton addFontPathButton - audiosinkCombo - videomodeCombo diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro index 775a6b1..057e21b 100644 --- a/src/qtconfig/qtconfig.pro +++ b/src/qtconfig/qtconfig.pro @@ -1,12 +1,6 @@ CONFIG += x11 QT += gui-private widgets -contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER -contains(QT_CONFIG, phonon) { - QT += phonon - DEFINES += HAVE_PHONON -} SOURCES += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp HEADERS += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h