3 files changed, 28 insertions, 16 deletions

diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 244840d..0c57f4d 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -103,10 +103,10 @@ int Generator::fillData(char *start, int frequency, int seconds)
 qint64 Generator::readData(char *data, qint64 maxlen)
 {
     int len = maxlen;
-    if(len > 16384)
+    if (len > 16384)
         len = 16384;
 
-    if(len < (SECONDS*SYSTEM_FREQ*2)-pos) {
+    if (len < (SECONDS*SYSTEM_FREQ*2)-pos) {
         // Normal
         memcpy(data,t+pos,len);
         pos+=len;
@@ -170,6 +170,18 @@ AudioTest::AudioTest()
     settings.setCodec("audio/pcm");
     settings.setByteOrder(QAudioFormat::LittleEndian);
     settings.setSampleType(QAudioFormat::SignedInt);
+
+    QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+    if (!info.isFormatSupported(settings)) {
+        qWarning()<<"default format not supported try to use nearest";
+        settings = info.nearestFormat(settings);
+    }
+
+    if(settings.sampleSize() != 16) {
+        qWarning()<<"audio device doesn't support 16 bit samples, example cannot run";
+        return;
+    }
+
     audioOutput = new QAudioOutput(settings,this);
     connect(audioOutput,SIGNAL(notify()),SLOT(status()));
     connect(audioOutput,SIGNAL(stateChanged(QAudio::State)),SLOT(state(QAudio::State)));
@@ -200,15 +212,15 @@ void AudioTest::deviceChanged(int idx)
 
 void AudioTest::status()
 {
-    qWarning()<<"byteFree = "<<audioOutput->bytesFree()<<" bytes, elapsedUSecs = "<<audioOutput->elapsedUSecs()<<", processedUSecs = "<<audioOutput->processedUSecs();
+    qWarning() << "byteFree = " << audioOutput->bytesFree() << " bytes, elapsedUSecs = " << audioOutput->elapsedUSecs() << ", processedUSecs = " << audioOutput->processedUSecs();
 }
 
 void AudioTest::writeMore()
 {
-    if(!audioOutput)
+    if (!audioOutput)
         return;
 
-    if(audioOutput->state() == QAudio::StoppedState)
+    if (audioOutput->state() == QAudio::StoppedState)
         return;
 
     int    l;
@@ -217,9 +229,9 @@ void AudioTest::writeMore()
     int chunks = audioOutput->bytesFree()/audioOutput->periodSize();
     while(chunks) {
        l = gen->read(buffer,audioOutput->periodSize());
-       if(l > 0)
+       if (l > 0)
            out = output->write(buffer,l);
-       if(l != audioOutput->periodSize())
+       if (l != audioOutput->periodSize())
 	   break;
        chunks--;
     }
@@ -247,24 +259,24 @@ void AudioTest::toggle()
 void AudioTest::togglePlay()
 {
     // toggle suspend/resume
-    if(audioOutput->state() == QAudio::SuspendedState) {
-        qWarning()<<"status: Suspended, resume()";
+    if (audioOutput->state() == QAudio::SuspendedState) {
+        qWarning() << "status: Suspended, resume()";
         audioOutput->resume();
         button2->setText("Click To Suspend");
     } else if (audioOutput->state() == QAudio::ActiveState) {
-        qWarning()<<"status: Active, suspend()";
+        qWarning() << "status: Active, suspend()";
         audioOutput->suspend();
         button2->setText("Click To Resume");
     } else if (audioOutput->state() == QAudio::StoppedState) {
-        qWarning()<<"status: Stopped, resume()";
+        qWarning() << "status: Stopped, resume()";
         audioOutput->resume();
         button2->setText("Click To Suspend");
     } else if (audioOutput->state() == QAudio::IdleState) {
-        qWarning()<<"status: IdleState";
+        qWarning() << "status: IdleState";
     }
 }
 
 void AudioTest::state(QAudio::State state)
 {
-    qWarning()<<" state="<<state;
+    qWarning() << " state=" << state;
 }
diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index 6c07a3a..372cf78 100644
--- a/examples/multimedia/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/multimedia/audiooutput/main.cpp b/examples/multimedia/audiooutput/main.cpp
index 79ec99e..b2b3a06 100644
--- a/examples/multimedia/audiooutput/main.cpp
+++ b/examples/multimedia/audiooutput/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **