diff options
| author | axis <qt-info@nokia.com> | 2011-04-01 11:21:36 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:06:04 +0200 |
| commit | 5092258ab0c2ffa00bb1e9af439d62839f4a7c5b (patch) | |
| tree | 7e9274e073af46cb855aa2b754c8be736939a9aa /src/3rdparty/phonon/gstreamer | |
| parent | 17003385789d06d91d1c8c40040edd1ca474fcd2 (diff) | |
Switched to more explicit signal/slot definitions (Q_SIGNALS/SLOTS).
This is required for public headers.
Diffstat (limited to 'src/3rdparty/phonon/gstreamer')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/audiodataoutput.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/devicemanager.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.h b/src/3rdparty/phonon/gstreamer/audiodataoutput.h index cd5ef49..9b868f0 100644 --- a/src/3rdparty/phonon/gstreamer/audiodataoutput.h +++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.h @@ -67,7 +67,7 @@ namespace Gstreamer void mediaNodeEvent(const MediaNodeEvent *event); - signals: + Q_SIGNALS: void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &data); void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<float> > &data); void endOfMedia(int remainingSamples); diff --git a/src/3rdparty/phonon/gstreamer/devicemanager.h b/src/3rdparty/phonon/gstreamer/devicemanager.h index 9c6aa8d..56ed63e 100644 --- a/src/3rdparty/phonon/gstreamer/devicemanager.h +++ b/src/3rdparty/phonon/gstreamer/devicemanager.h @@ -60,11 +60,11 @@ public: GstElement *createAudioSink(Category category = NoCategory); AbstractRenderer *createVideoRenderer(VideoWidget *parent); -signals: +Q_SIGNALS: void deviceAdded(int); void deviceRemoved(int); -public slots: +public Q_SLOTS: void updateDeviceList(); private: |