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

List:       kde-commits
Subject:    KDE/kdelibs/phonon
From:       Allen Winter <winter () kde ! org>
Date:       2007-04-30 23:46:33
Message-ID: 1177976793.883296.7083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 659881 by winterz:

follow AudioHw -> AudioInterface change


 M  +13 -13    audiodevice.cpp  
 M  +4 -4      audiodevice.h  
 M  +2 -2      audiodevice_p.h  
 M  +5 -4      audiodeviceenumerator.cpp  


--- trunk/KDE/kdelibs/phonon/audiodevice.cpp #659880:659881
@@ -23,7 +23,7 @@
 #include "audiodeviceenumerator.h"
 #include "phononnamespace_p.h"
 #include <solid/device.h>
-#include <solid/audiohw.h>
+#include <solid/audiointerface.h>
 #include <kconfiggroup.h>
 
 namespace Phonon
@@ -36,25 +36,25 @@
 AudioDevice::AudioDevice(Solid::Device audioDevice, KSharedConfig::Ptr config)
     : d(new AudioDevicePrivate)
 {
-    Solid::AudioHw *audioHw = audioDevice.as<Solid::AudioHw>();
+    Solid::AudioInterface *audioHw = audioDevice.as<Solid::AudioInterface>();
     pDebug() << Q_FUNC_INFO << audioHw->driverHandles();
     d->udi = audioDevice.udi();
     d->cardName = audioHw->name();
     d->deviceIds = audioHw->driverHandles();
     switch (audioHw->soundcardType()) {
-    case Solid::AudioHw::InternalSoundcard:
+    case Solid::AudioInterface::InternalSoundcard:
         d->icon = QLatin1String("pci-card");
         break;
-    case Solid::AudioHw::UsbSoundcard:
+    case Solid::AudioInterface::UsbSoundcard:
         d->icon = QLatin1String("usb-device");
         break;
-    case Solid::AudioHw::FirewireSoundcard:
+    case Solid::AudioInterface::FirewireSoundcard:
         d->icon = QLatin1String("firewire-device");
         break;
-    case Solid::AudioHw::Headset:
+    case Solid::AudioInterface::Headset:
         d->icon = QLatin1String("headset");
         break;
-    case Solid::AudioHw::Modem:
+    case Solid::AudioInterface::Modem:
         d->icon = QLatin1String("modem");
         // should a modem be a valid device so that it's shown to the user?
         d->valid = false;
@@ -65,16 +65,16 @@
     d->valid = true;
 
     QString groupName;
-    Solid::AudioHw::AudioHwTypes deviceType = audioHw->deviceType();
-    if (deviceType == Solid::AudioHw::AudioInput) {
+    Solid::AudioInterface::AudioInterfaceTypes deviceType = audioHw->deviceType();
+    if (deviceType == Solid::AudioInterface::AudioInput) {
         d->captureDevice = true;
         groupName = QLatin1String("AudioCaptureDevice_");
     } else {
-        if (deviceType == Solid::AudioHw::AudioOutput) {
+        if (deviceType == Solid::AudioInterface::AudioOutput) {
             d->playbackDevice = true;
             groupName = QLatin1String("AudioOutputDevice_");
         } else {
-            Q_ASSERT(deviceType == (Solid::AudioHw::AudioOutput | \
Solid::AudioHw::AudioInput)); +            Q_ASSERT(deviceType == \
(Solid::AudioInterface::AudioOutput | Solid::AudioInterface::AudioInput));  \
d->captureDevice = true;  d->playbackDevice = true;
             groupName = QLatin1String("AudioIODevice_");
@@ -114,7 +114,7 @@
     d->index = deviceGroup.readEntry("index", d->index);
     d->cardName = deviceGroup.readEntry("cardName", d->cardName);
     d->icon = deviceGroup.readEntry("icon", d->icon);
-    d->driver = static_cast<Solid::AudioHw::AudioDriver>(deviceGroup.readEntry("driver", \
static_cast<int>(d->driver))); +    d->driver = \
static_cast<Solid::AudioInterface::AudioDriver>(deviceGroup.readEntry("driver", \
                static_cast<int>(d->driver)));
     d->captureDevice = deviceGroup.readEntry("captureDevice", d->captureDevice);
     d->playbackDevice = deviceGroup.readEntry("playbackDevice", d->playbackDevice);
     d->udi = deviceGroup.readEntry("udi", d->udi);
@@ -294,7 +294,7 @@
     return d->icon;
 }
 
-Solid::AudioHw::AudioDriver AudioDevice::driver() const
+Solid::AudioInterface::AudioDriver AudioDevice::driver() const
 {
     return d->driver;
 }
--- trunk/KDE/kdelibs/phonon/audiodevice.h #659880:659881
@@ -21,7 +21,7 @@
 #define PHONON_AUDIODEVICE_H
 
 #include "phonon_export.h"
-#include <solid/audiohw.h>
+#include <solid/audiointerface.h>
 #include <ksharedconfig.h>
 class QString;
 class QStringList;
@@ -29,7 +29,7 @@
 
 namespace Solid
 {
-    class AudioHw;
+    class AudioInterface;
 } // namespace Solid
 
 namespace Phonon
@@ -106,9 +106,9 @@
              * Retrieves the audio driver that should be used to access the device.
              *
              * @return the driver needed to access the device
-             * @see Solid::AudioHw::AudioDriver
+             * @see Solid::AudioInterface::AudioDriver
              */
-            Solid::AudioHw::AudioDriver driver() const;
+            Solid::AudioInterface::AudioDriver driver() const;
 
             /**
              * Unique index to identify the device.
--- trunk/KDE/kdelibs/phonon/audiodevice_p.h #659880:659881
@@ -31,7 +31,7 @@
     public:
         AudioDevicePrivate()
             : refCount(1),
-            driver(Solid::AudioHw::UnknownAudioDriver),
+            driver(Solid::AudioInterface::UnknownAudioDriver),
             index(-1),
             available(false),
             valid(false),
@@ -45,7 +45,7 @@
         QStringList deviceIds;
         QString icon;
         QString udi;
-        Solid::AudioHw::AudioDriver driver;
+        Solid::AudioInterface::AudioDriver driver;
         int index;
         bool available : 1;
         bool valid : 1;
--- trunk/KDE/kdelibs/phonon/audiodeviceenumerator.cpp #659880:659881
@@ -24,7 +24,7 @@
 #include <QDir>
 #include <solid/devicenotifier.h>
 #include <solid/device.h>
-#include <solid/audiohw.h>
+#include <solid/audiointerface.h>
 #include <kconfiggroup.h>
 
 namespace Phonon
@@ -78,7 +78,7 @@
     // ask Solid for the available audio hardware
     QSet<QString> alreadyFoundCards;
 
-    QList<Solid::Device> devices = Solid::Device::listFromQuery("AudioHw.deviceType  \
& 'AudioInput|AudioOutput'"); +    QList<Solid::Device> devices = \
Solid::Device::listFromQuery("AudioInterface.deviceType  & \
'AudioInput|AudioOutput'");  foreach (Solid::Device device, devices) {
         AudioDevice dev(device, config);
         if (dev.isValid()) {
@@ -124,8 +124,9 @@
 {
     pDebug() << Q_FUNC_INFO << udi;
     Solid::Device _device(udi);
-    Solid::AudioHw *audiohw = _device.as<Solid::AudioHw>();
-    if (audiohw && (audiohw->deviceType()  & (Solid::AudioHw::AudioInput | \
Solid::AudioHw::AudioOutput))) { +    Solid::AudioInterface *audiohw = \
_device.as<Solid::AudioInterface>(); +    if (audiohw && (audiohw->deviceType()  & \
(Solid::AudioInterface::AudioInput | +Solid::AudioInterface::AudioOutput))) {
         // an audio i/o device was plugged in
         AudioDevice dev(_device, config);
         if (dev.isValid()) {


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