diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-25 03:57:36 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-25 03:57:36 (GMT) |
commit | edb67f204302fff4f1e46676112931ea054deb88 (patch) | |
tree | 26c6c818d2bb9f1aed52b5107663ebdb3a5fcdce /src/3rdparty/phonon/gstreamer/devicemanager.h | |
parent | 490cd29001670b37204dcf5e24398073f610fabd (diff) | |
download | Qt-edb67f204302fff4f1e46676112931ea054deb88.zip Qt-edb67f204302fff4f1e46676112931ea054deb88.tar.gz Qt-edb67f204302fff4f1e46676112931ea054deb88.tar.bz2 |
Update Phonon GStreamer backend to 4.4.0.
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/devicemanager.h')
-rw-r--r-- | src/3rdparty/phonon/gstreamer/devicemanager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/devicemanager.h b/src/3rdparty/phonon/gstreamer/devicemanager.h index a5e8289..9c6aa8d 100644 --- a/src/3rdparty/phonon/gstreamer/devicemanager.h +++ b/src/3rdparty/phonon/gstreamer/devicemanager.h @@ -42,6 +42,7 @@ public : int id; QByteArray gstId; QByteArray description; + QString icon; }; class DeviceManager : public QObject { @@ -51,8 +52,10 @@ public: virtual ~DeviceManager(); const QList<AudioDevice> audioOutputDevices() const; GstPad *requestPad(int device) const; + int allocateDeviceId(); 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); AbstractRenderer *createVideoRenderer(VideoWidget *parent); @@ -68,6 +71,7 @@ private: bool canOpenDevice(GstElement *element) const; Backend *m_backend; QList <AudioDevice> m_audioDeviceList; + int m_audioDeviceCounter; QTimer m_devicePollTimer; QByteArray m_audioSink; QByteArray m_videoSinkWidget; |