Commit 95690527 authored by Matthieu Gallien's avatar Matthieu Gallien 🎵

fix rebase

parent af2404c7
Pipeline #36064 passed with stage
in 20 minutes and 29 seconds
......@@ -62,18 +62,10 @@ class ELISALIB_EXPORT AudioWrapper : public QObject
READ seekable
NOTIFY seekableChanged)
<<<<<<< HEAD
=======
Q_PROPERTY(QAudio::Role audioRole
READ audioRole
WRITE setAudioRole
NOTIFY audioRoleChanged)
Q_PROPERTY(QList<QString> externalRenderers
READ externalRenderers
NOTIFY externalRenderersChanged)
>>>>>>> [WIP] starts to make the list of renderers available and use it to play music
public:
explicit AudioWrapper(QObject *parent = nullptr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment