Revert "Frequency to SampleRate and channels to channelCount."

This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320.

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

4 files changed, 33 insertions, 13 deletions

diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
index 0c91d5c..d3d81e6 100644
--- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
@@ -128,7 +128,7 @@ void tst_QAudioDeviceInfo::codecs()
 void tst_QAudioDeviceInfo::channels()
 {
     if(available) {
-        QList<int> avail = device->supportedChannelCounts();
+        QList<int> avail = device->supportedChannels();
         QVERIFY(avail.size() > 0);
     }
 }
@@ -160,7 +160,7 @@ void tst_QAudioDeviceInfo::sampleTypes()
 void tst_QAudioDeviceInfo::frequencies()
 {
     if(available) {
-        QList<int> avail = device->supportedSampleRates();
+        QList<int> avail = device->supportedFrequencies();
         QVERIFY(avail.size() > 0);
     }
 }
@@ -185,8 +185,8 @@ void tst_QAudioDeviceInfo::preferred()
 {
     if(available) {
         QAudioFormat format = device->preferredFormat();
-        QVERIFY(format.sampleRate() == 44100);
-        QVERIFY(format.channelCount() == 2);
+        QVERIFY(format.frequency() == 44100);
+        QVERIFY(format.channels() == 2);
     }
 }
 
@@ -194,9 +194,9 @@ void tst_QAudioDeviceInfo::nearest()
 {
     if(available) {
         QAudioFormat format1, format2;
-        format1.setSampleRate(8000);
+        format1.setFrequency(8000);
         format2 = device->nearestFormat(format1);
-        QVERIFY(format2.sampleRate() == 44100);
+        QVERIFY(format2.frequency() == 44100);
     }
 }
 
diff --git a/tests/auto/qaudioformat/tst_qaudioformat.cpp b/tests/auto/qaudioformat/tst_qaudioformat.cpp
index 1d3f313..b36af03 100644
--- a/tests/auto/qaudioformat/tst_qaudioformat.cpp
+++ b/tests/auto/qaudioformat/tst_qaudioformat.cpp
@@ -78,7 +78,11 @@ void tst_QAudioFormat::checkNull()
     QVERIFY(!audioFormat1.isValid());
 
     audioFormat0.setFrequency(44100);
+<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setChannels(2);
+=======
+    audioFormat0.setChannelCount(2);
+>>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setSampleSize(16);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setSampleType(QAudioFormat::SignedInt);
@@ -88,14 +92,18 @@ void tst_QAudioFormat::checkNull()
 void tst_QAudioFormat::checkFrequency()
 {
     QAudioFormat    audioFormat;
-    audioFormat.setSampleRate(44100);
-    QVERIFY(audioFormat.sampleRate() == 44100);
+    audioFormat.setFrequency(44100);
+    QVERIFY(audioFormat.frequency() == 44100);
 }
 
 void tst_QAudioFormat::checkChannels()
 {
     QAudioFormat    audioFormat;
+<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat.setChannels(2);
+=======
+    audioFormat.setChannelCount(2);
+>>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp
     QVERIFY(audioFormat.channels() == 2);
 }
 
@@ -138,14 +146,22 @@ void tst_QAudioFormat::checkEquality()
 
     // on filled formats
     audioFormat0.setFrequency(8000);
+<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setChannels(1);
+=======
+    audioFormat0.setChannelCount(1);
+>>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
     audioFormat0.setSampleType(QAudioFormat::UnSignedInt);
 
     audioFormat1.setFrequency(8000);
+<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat1.setChannels(1);
+=======
+    audioFormat1.setChannelCount(1);
+>>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat1.setSampleSize(8);
     audioFormat1.setCodec("audio/pcm");
     audioFormat1.setByteOrder(QAudioFormat::LittleEndian);
@@ -154,7 +170,7 @@ void tst_QAudioFormat::checkEquality()
     QVERIFY(audioFormat0 == audioFormat1);
     QVERIFY(!(audioFormat0 != audioFormat1));
 
-    audioFormat0.setSampleRate(44100);
+    audioFormat0.setFrequency(44100);
     QVERIFY(audioFormat0 != audioFormat1);
     QVERIFY(!(audioFormat0 == audioFormat1));
 }
@@ -165,7 +181,11 @@ void tst_QAudioFormat::checkAssignment()
     QAudioFormat    audioFormat1;
 
     audioFormat0.setFrequency(8000);
+<<<<<<< HEAD:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setChannels(1);
+=======
+    audioFormat0.setChannelCount(1);
+>>>>>>> 80d4a49... Frequency to SampleRate and channels to channelCount.:tests/auto/qaudioformat/tst_qaudioformat.cpp
     audioFormat0.setSampleSize(8);
     audioFormat0.setCodec("audio/pcm");
     audioFormat0.setByteOrder(QAudioFormat::LittleEndian);
diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp
index d17a12a..40b7fbb 100644
--- a/tests/auto/qaudioinput/tst_qaudioinput.cpp
+++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp
@@ -94,8 +94,8 @@ void tst_QAudioInput::settings()
         // Confirm the setting we added in the init function.
         QAudioFormat f = audio->format();
 
-        QVERIFY(format.channelCount() == f.channelCount());
-        QVERIFY(format.sampleRate() == f.sampleRate());
+        QVERIFY(format.channels() == f.channels());
+        QVERIFY(format.frequency() == f.frequency());
         QVERIFY(format.sampleSize() == f.sampleSize());
         QVERIFY(format.codec() == f.codec());
         QVERIFY(format.byteOrder() == f.byteOrder());
diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
index e1b73da..aeb2286 100644
--- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
+++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp
@@ -95,8 +95,8 @@ void tst_QAudioOutput::settings()
         // Confirm the setting we added in the init function.
         QAudioFormat f = audio->format();
 
-        QVERIFY(format.channelCount() == f.channelCount());
-        QVERIFY(format.sampleRate() == f.sampleRate());
+        QVERIFY(format.channels() == f.channels());
+        QVERIFY(format.frequency() == f.frequency());
         QVERIFY(format.sampleSize() == f.sampleSize());
         QVERIFY(format.codec() == f.codec());
         QVERIFY(format.byteOrder() == f.byteOrder());