summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-01-06 00:16:02 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-01-06 00:16:02 (GMT)
commitf124538ef4840c3d24b4c7e9e7221adb52bdee2c (patch)
tree22e96b25c3780fb849d4f833ef1e17331128dc36 /examples/multimedia
parenta4550c49e982aa0218ab7097b814678505f8482c (diff)
downloadQt-f124538ef4840c3d24b4c7e9e7221adb52bdee2c.zip
Qt-f124538ef4840c3d24b4c7e9e7221adb52bdee2c.tar.gz
Qt-f124538ef4840c3d24b4c7e9e7221adb52bdee2c.tar.bz2
Added setChannelCount() to QAudioFormat.
Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
Diffstat (limited to 'examples/multimedia')
-rw-r--r--examples/multimedia/audiodevices/audiodevices.cpp4
-rw-r--r--examples/multimedia/audioinput/audioinput.cpp2
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index e205e03..4f4a95f 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -172,7 +172,7 @@ void AudioTest::deviceChanged(int idx)
for(int i = 0; i < chz.size(); ++i)
channelsBox->addItem(QString("%1").arg(chz.at(i)));
if(chz.size())
- settings.setChannels(chz.at(0));
+ settings.setChannelCount(chz.at(0));
codecsBox->clear();
QStringList codecz = deviceInfo.supportedCodecs();
@@ -234,7 +234,7 @@ void AudioTest::freqChanged(int idx)
void AudioTest::channelChanged(int idx)
{
- settings.setChannels(channelsBox->itemText(idx).toInt());
+ settings.setChannelCount(channelsBox->itemText(idx).toInt());
}
void AudioTest::codecChanged(int idx)
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 75bddd6..e6ebe95 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -196,7 +196,7 @@ InputTest::InputTest()
pullMode = true;
format.setFrequency(8000);
- format.setChannels(1);
+ format.setChannelCount(1);
format.setSampleSize(16);
format.setSampleType(QAudioFormat::SignedInt);
format.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index b6047db..e822064 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -165,7 +165,7 @@ AudioTest::AudioTest()
gen->start();
settings.setFrequency(SYSTEM_FREQ);
- settings.setChannels(1);
+ settings.setChannelCount(1);
settings.setSampleSize(16);
settings.setCodec("audio/pcm");
settings.setByteOrder(QAudioFormat::LittleEndian);