Changeset 651 for trunk/examples/multimedia/audiooutput

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• examples/multimedia/audiooutput/audiooutput.cpp (modified) (7 diffs)
• examples/multimedia/audiooutput/audiooutput.h (modified) (1 diff)
• examples/multimedia/audiooutput/main.cpp (modified) (1 diff)

trunk/examples/multimedia/audiooutput/audiooutput.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -104 +104 @@
 {
     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);
@@ -180 +180 @@
     if(settings.sampleSize() != 16) {
         qWarning()<<"audio device doesn't support 16 bit samples, example cannot run";
+
+
+
         return;
     }
@@ -213 +216 @@
 void AudioTest::status()
 {
-    qWarning()<<"byteFree = "<<audioOutput->bytesFree()<<" bytes, elapsedUSecs = "<<audioOutput->elapsedUSecs()<<", processedUSecs = "<<audioOutput->processedUSecs();
+    qWarning()audioOutput->processedUSecs();
 }
 
 void AudioTest::writeMore()
 {
-    if(!audioOutput)
+    if(!audioOutput)
         return;
 
-    if(audioOutput->state() == QAudio::StoppedState)
+    if(audioOutput->state() == QAudio::StoppedState)
         return;
 
@@ -230 +233 @@
     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--;
@@ -260 +263 @@
 {
     // 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";
     }
 }
@@ -279 +282 @@
 void AudioTest::state(QAudio::State state)
 {
-    qWarning()<<" state="<<state;
-}
+    qWarning()state;
+}

trunk/examples/multimedia/audiooutput/audiooutput.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/examples/multimedia/audiooutput/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])