FCL/sf/mw/qt: comparison src/3rdparty/phonon/gstreamer/backend.cpp

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 */
 #include "common.h"
 #include "backend.h"
 #include "audiooutput.h"
+#include "audiodataoutput.h"
 #include "audioeffect.h"
 #include "mediaobject.h"
 #include "videowidget.h"
 #include "devicemanager.h"
 #include "effectmanager.h"
 #include "message.h"
 #include "volumefadereffect.h"
 #include <gst/interfaces/propertyprobe.h>
+#include <phonon/pulsesupport.h>
 #include <QtCore/QSet>
 #include <QtCore/QVariant>
 #include <QtCore/QtPlugin>
 , m_deviceManager(0)
 , m_effectManager(0)
 , m_debugLevel(Warning)
 , m_isValid(false)
 {
+// Initialise PulseAudio support
+PulseSupport *pulse = PulseSupport::getInstance();
+pulse->enable();
+connect(pulse, SIGNAL(objectDescriptionChanged(ObjectDescriptionType)), SIGNAL(objectDescriptionChanged(ObjectDescriptionType)));
 // In order to support reloading, we only set the app name once...
 static bool first = true;
 if (first) {
 first = false;
 g_set_application_name(qApp->applicationName().toUtf8());
 }
 GError *err = 0;
 bool wasInit = gst_init_check(0, 0, &err);  //init gstreamer: must be called before any gst-related functions
 if (err)
 g_error_free(err);
 m_effectManager = new EffectManager(this);
 }
 Backend::~Backend()
 {
+delete m_effectManager;
+delete m_deviceManager;
+PulseSupport::shutdown();
 }
 gboolean Backend::busCall(GstBus *bus, GstMessage *msg, gpointer data)
 {
 Q_UNUSED(bus);
 switch (c) {
 case MediaObjectClass:
 return new MediaObject(this, parent);
-case AudioOutputClass: {
+case AudioOutputClass:
-AudioOutput *ao = new AudioOutput(this, parent);
+return new AudioOutput(this, parent);
-m_audioOutputs.append(ao);
-return ao;
-}
 #ifndef QT_NO_PHONON_EFFECT
 case EffectClass:
 return new AudioEffect(this, args[0].toInt(), parent);
 #endif //QT_NO_PHONON_EFFECT
 case AudioDataOutputClass:
-logMessage("createObject() : AudioDataOutput not implemented");
+return new AudioDataOutput(this, parent);
-break;
 #ifndef QT_NO_PHONON_VIDEO
 case VideoDataOutputClass:
 logMessage("createObject() : VideoDataOutput not implemented");
 break;
 GList* factoryList = gst_registry_get_feature_list(gst_registry_get_default (), GST_TYPE_ELEMENT_FACTORY);
 for (GList* iter = g_list_first(factoryList) ; iter != NULL ; iter = g_list_next(iter)) {
 GstPluginFeature *feature = GST_PLUGIN_FEATURE(iter->data);
 QString klass = gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature));
 if (klass == QLatin1String("Codec/Decoder") ||
 klass == QLatin1String("Codec/Decoder/Audio") ||
 klass == QLatin1String("Codec/Decoder/Video") ||
 klass == QLatin1String("Codec/Demuxer") ||
 klass == QLatin1String("Codec/Demuxer/Audio") ||
 klass == QLatin1String("Codec/Demuxer/Video") ||
 klass == QLatin1String("Codec/Parser") ||
 klass == QLatin1String("Codec/Parser/Audio") ||
 klass == QLatin1String("Codec/Parser/Video")) {
 const GList *static_templates;
 GstElementFactory *factory = GST_ELEMENT_FACTORY(feature);
 static_templates = gst_element_factory_get_static_pad_templates(factory);
 GstStaticPadTemplate *padTemplate = (GstStaticPadTemplate *) static_templates->data;
 if (padTemplate && padTemplate->direction == GST_PAD_SINK) {
 GstCaps *caps = gst_static_pad_template_get_caps (padTemplate);
 if (caps) {
-const GstStructure* capsStruct = gst_caps_get_structure (caps, 0);
+for (unsigned int struct_idx = 0; struct_idx < gst_caps_get_size (caps); struct_idx++) {
-QString mime = QString::fromUtf8(gst_structure_get_name (capsStruct));
-if (!availableMimeTypes.contains(mime))
+const GstStructure* capsStruct = gst_caps_get_structure (caps, struct_idx);
-availableMimeTypes.append(mime);
+QString mime = QString::fromUtf8(gst_structure_get_name (capsStruct));
+if (!availableMimeTypes.contains(mime))
+availableMimeTypes.append(mime);
+}
 }
 }
 }
 }
 }
 g_list_free(factoryList);
+if (availableMimeTypes.contains("audio/x-vorbis")
+&& availableMimeTypes.contains("application/x-ogm-audio")) {
+if (!availableMimeTypes.contains("audio/x-vorbis+ogg"))
+availableMimeTypes.append("audio/x-vorbis+ogg");
+if (!availableMimeTypes.contains("application/ogg"))  /* *.ogg */
+availableMimeTypes.append("application/ogg");
+if (!availableMimeTypes.contains("audio/ogg")) /* *.oga */
+availableMimeTypes.append("audio/ogg");
+}
 availableMimeTypes.sort();
 return availableMimeTypes;
 }
 /***
 if (!isValid())
 return ret;
 switch (type) {
 case Phonon::AudioOutputDeviceType: {
-QList<AudioDevice> audioDevices = deviceManager()->audioOutputDevices();
+AudioDevice* ad;
-foreach(const AudioDevice &device, audioDevices) {
+if ((ad = deviceManager()->audioDevice(index))) {
-if (device.id == index) {
+ret.insert("name", ad->gstId);
-ret.insert("name", device.gstId);
+ret.insert("description", ad->description);
-ret.insert("description", device.description);
+ret.insert("icon", ad->icon);
-ret.insert("icon", QLatin1String("audio-card"));
-break;
-}
 }
 }
 break;
 case Phonon::EffectType: {
 return m_effectManager;
 }
 /**
 * Returns a debuglevel that is determined by the
-* PHONON_GSTREAMER_DEBUG environment variable.
+* PHONON_GST_DEBUG environment variable.
 *
 *  Warning - important warnings
 *  Info    - general info
 *  Debug   - gives extra info
 */

changeset 30	5dc02b23752f
parent 3	41300fa6a67c