diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 01:10:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 01:10:05 (GMT) |
| commit | 5437ff48a0706b75aa4c71e8d77c3f9f8b9d92ae (patch) | |
| tree | c493878c32b462bd19b7304ca06b16c938cfbf64 | |
| parent | a50eed92125dc366163dc09164912eaf105d513f (diff) | |
| parent | 60f6dfc230cac169fa06969383a53fc433e9dc2b (diff) | |
| download | Qt-5437ff48a0706b75aa4c71e8d77c3f9f8b9d92ae.zip Qt-5437ff48a0706b75aa4c71e8d77c3f9f8b9d92ae.tar.gz Qt-5437ff48a0706b75aa4c71e8d77c3f9f8b9d92ae.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon QT7 backend; Don't release string after unsuccessful AudioDeviceGetProperty().
| -rw-r--r-- | src/3rdparty/phonon/qt7/audiodevice.mm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/qt7/audiodevice.mm b/src/3rdparty/phonon/qt7/audiodevice.mm index 6bec62d..3aae0ee4 100644 --- a/src/3rdparty/phonon/qt7/audiodevice.mm +++ b/src/3rdparty/phonon/qt7/audiodevice.mm @@ -149,7 +149,6 @@ QString AudioDevice::deviceSourceName(AudioDeviceID deviceID) size = sizeof(translation); err = AudioDeviceGetProperty(deviceID, 0, 0, kAudioDevicePropertyDataSourceNameForIDCFString, &size, &translation); if (err != noErr){ - CFRelease(cfName); return QString(); } QString name = PhononCFString::toQString(cfName); |