[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon/five] phonon: Implement getter and setter for device in AudioOutput
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2014-01-18 19:23:23
Message-ID: E1W4bUJ-0007J4-9F () scm ! kde ! org
[Download RAW message or body]

Git commit e006697b87a510cdf8f1fd9afe2781fb1160e781 by Casian Andrei.
Committed on 18/01/2014 at 19:20.
Pushed by casianandrei into branch 'five'.

Implement getter and setter for device in AudioOutput

M  +4    -4    phonon/audiooutput.cpp
M  +2    -2    phonon/audiooutputinterface.h

http://commits.kde.org/phonon/e006697b87a510cdf8f1fd9afe2781fb1160e781

diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp
index 536fdb1..5775cd1 100644
--- a/phonon/audiooutput.cpp
+++ b/phonon/audiooutput.cpp
@@ -131,14 +131,14 @@ Category AudioOutput::category() const
 
 AudioOutputDevice AudioOutput::outputDevice() const
 {
-#warning no backing
-    return AudioOutputDevice();
+    P_D(const AudioOutput);
+    return d->interface->outputDevice();
 }
 
 bool AudioOutput::setOutputDevice(const AudioOutputDevice &newAudioOutputDevice)
 {
-#warning nop backing
-    return false;
+    P_D(AudioOutput);
+    return d->interface->setOutputDevice(newAudioOutputDevice);
 }
 
 void AudioOutputPrivate::setupBackendObject()
diff --git a/phonon/audiooutputinterface.h b/phonon/audiooutputinterface.h
index e641b12..d1e0ccb 100644
--- a/phonon/audiooutputinterface.h
+++ b/phonon/audiooutputinterface.h
@@ -36,8 +36,8 @@ public:
     virtual ~AudioOutputInterface() {}
     virtual qreal volume() const = 0;
     virtual void setVolume(qreal volume) = 0;
-    virtual int outputDevice() const = 0;
-    virtual bool setOutputDevice(const Phonon::AudioOutputDevice &) = 0;
+    virtual AudioOutputDevice outputDevice() const = 0;
+    virtual bool setOutputDevice(const AudioOutputDevice &) = 0;
 
 Q_SIGNALS:
     virtual void volumeChanged(qreal volume) = 0;
[prev in list] [next in list] [prev in thread] [next in thread]