Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/multimedia/audio/qaudiodevicefactory.cpp

    r651 r769  
    5959#include "qaudiooutput_alsa_p.h"
    6060#include "qaudioinput_alsa_p.h"
     61#elif defined(Q_OS_SYMBIAN)
     62#include "qaudiodeviceinfo_symbian_p.h"
     63#include "qaudiooutput_symbian_p.h"
     64#include "qaudioinput_symbian_p.h"
    6165#endif
    6266#endif
     
    129133    QList<QAudioDeviceInfo> devices;
    130134#ifndef QT_NO_AUDIO_BACKEND
    131 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     135#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    132136    foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode))
    133137        devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode);
     
    159163    }
    160164#ifndef QT_NO_AUDIO_BACKEND
    161 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     165#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    162166    return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput);
    163167#endif
     
    176180    }
    177181#ifndef QT_NO_AUDIO_BACKEND
    178 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     182#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    179183    return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput);
    180184#endif
     
    188192
    189193#ifndef QT_NO_AUDIO_BACKEND
    190 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     194#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    191195    if (realm == QLatin1String("builtin"))
    192196        return new QAudioDeviceInfoInternal(handle, mode);
     
    217221        return new QNullInputDevice();
    218222#ifndef QT_NO_AUDIO_BACKEND
    219 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     223#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    220224    if (deviceInfo.realm() == QLatin1String("builtin"))
    221225        return new QAudioInputPrivate(deviceInfo.handle(), format);
     
    236240        return new QNullOutputDevice();
    237241#ifndef QT_NO_AUDIO_BACKEND
    238 #if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
     242#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA) || defined(Q_OS_SYMBIAN))
    239243    if (deviceInfo.realm() == QLatin1String("builtin"))
    240244        return new QAudioOutputPrivate(deviceInfo.handle(), format);
Note: See TracChangeset for help on using the changeset viewer.