Revert "Added setChannelCount() to QAudioFormat."

This reverts commit f124538ef4840c3d24b4c7e9e7221adb52bdee2c.

Conflicts:

	examples/multimedia/audioinput/audioinput.cpp
	examples/multimedia/audiooutput/audiooutput.cpp
	src/multimedia/audio/qaudio_mac.cpp
	src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp
	src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
	src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
	src/multimedia/audio/qaudioformat.h
	src/multimedia/audio/qaudioinput.cpp
	src/multimedia/audio/qaudiooutput.cpp
	tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
	tests/auto/qaudioformat/tst_qaudioformat.cpp
	tests/auto/qaudioinput/tst_qaudioinput.cpp
	tests/auto/qaudiooutput/tst_qaudiooutput.cpp

3 files changed, 6 insertions, 6 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 6373d57..b0d472c 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -160,7 +160,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.setChannelCount(chz.at(0));
+        settings.setChannels(chz.at(0));
 
     codecsBox->clear();
     QStringList codecz = deviceInfo.supportedCodecs();
@@ -222,7 +222,7 @@ void AudioTest::freqChanged(int idx)
 
 void AudioTest::channelChanged(int idx)
 {
-    settings.setChannelCount(channelsBox->itemText(idx).toInt());
+    settings.setChannels(channelsBox->itemText(idx).toInt());
 }
 
 void AudioTest::codecChanged(int idx)
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 86650da..8cc9948 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -198,8 +198,8 @@ InputTest::InputTest()
 
     pullMode = true;
 
-    format.setSampleRate(8000);
-    format.setChannelCount(1);
+    format.setFrequency(8000);
+    format.setChannels(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 58dbbaf..0c57f4d 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -164,8 +164,8 @@ AudioTest::AudioTest()
 
     gen->start();
 
-    settings.setSampleRate(SYSTEM_FREQ);
-    settings.setChannelCount(1);
+    settings.setFrequency(SYSTEM_FREQ);
+    settings.setChannels(1);
     settings.setSampleSize(16);
     settings.setCodec("audio/pcm");
     settings.setByteOrder(QAudioFormat::LittleEndian);