Changeset 846 for trunk/src/3rdparty/phonon/gstreamer/devicemanager.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/gstreamer/devicemanager.h (modified) (3 diffs)

trunk/src/3rdparty/phonon/gstreamer/devicemanager.h

@@ -43 +43 @@
     QByteArray gstId;
     QByteArray description;
+
 };
 
@@ -52 +53 @@
     const QList<AudioDevice> audioOutputDevices() const;
     GstPad *requestPad(int device) const;
+
     int deviceId(const QByteArray &gstId) const;
-    QByteArray deviceDescription(int id) const;
+    const QByteArray gstId(int id);
+    AudioDevice* audioDevice(int id);
     GstElement *createGNOMEAudioSink(Category category);
     GstElement *createAudioSink(Category category = NoCategory);
@@ -69 +72 @@
     Backend *m_backend;
     QList <AudioDevice> m_audioDeviceList;
+
     QTimer m_devicePollTimer;
     QByteArray m_audioSink;