From 560aa609be8b3f4d05e3df050cfa4feb39d060f1 Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Tue, 11 May 2010 11:11:39 +0300
Subject: Spectrum Analyzer demo Symbian fix

Fixes compilation and deployment issue when compiling the
app from root directory.

Reviewed-by: Gareth Stockwell
---
 demos/spectrum/spectrum.pro | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro
index 86a7583..04bbdee 100644
--- a/demos/spectrum/spectrum.pro
+++ b/demos/spectrum/spectrum.pro
@@ -1,3 +1,4 @@
+load(data_caging_paths)
 include(spectrum.pri)
 
 TEMPLATE = subdirs
@@ -21,19 +22,16 @@ symbian {
     # UID for the SIS file
     TARGET.UID3 = 0xA000E3FA
 
-    epoc32_dir = $${EPOCROOT}epoc32
-    release_dir = $${epoc32_dir}/release/$(PLATFORM)/$(TARGET)
-
-    bin.sources     = $${release_dir}/spectrum.exe
+    bin.sources     = spectrum.exe
     !contains(DEFINES, DISABLE_FFT) {
-        bin.sources += $${release_dir}/fftreal.dll
+        bin.sources += fftreal.dll
     }
-    bin.path        = !:/sys/bin
-    rsc.sources     = $${epoc32_dir}/data/z/resource/apps/spectrum.rsc
-    rsc.path        = !:/resource/apps
-    mif.sources     = $${epoc32_dir}/data/z/resource/apps/spectrum.mif
-    mif.path        = !:/resource/apps
-    reg_rsc.sources = $${epoc32_dir}/data/z/private/10003a3f/import/apps/spectrum_reg.rsc
-    reg_rsc.path    = !:/private/10003a3f/import/apps
+    bin.path        = /sys/bin
+    rsc.sources     = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
+    rsc.path        = $$APP_RESOURCE_DIR
+    mif.sources     = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
+    mif.path        = $$APP_RESOURCE_DIR
+    reg_rsc.sources = $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
+    reg_rsc.path    = $$REG_RESOURCE_IMPORT_DIR
     DEPLOYMENT += bin rsc mif reg_rsc
 }
-- 
cgit v0.12


From b2a85acc6e17240ec6c8667f5ed3be26426ac57d Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 11 May 2010 09:34:08 +0100
Subject: Fixed typo in QAudioInput bufferSize documentation

Docs stated that the bufferSize was a value in milliseconds.
Corrected this to bytes.

Reviewed-by: trustme
---
 src/multimedia/audio/qaudioinput.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index c99e870..2fef962 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -300,7 +300,7 @@ void QAudioInput::resume()
 }
 
 /*!
-    Sets the audio buffer size to \a value milliseconds.
+    Sets the audio buffer size to \a value bytes.
 
     Note: This function can be called anytime before start(), calls to this
     are ignored after start(). It should not be assumed that the buffer size
@@ -315,7 +315,7 @@ void QAudioInput::setBufferSize(int value)
 }
 
 /*!
-    Returns the audio buffer size in milliseconds.
+    Returns the audio buffer size in bytes.
 
     If called before start(), returns platform default value.
     If called before start() but setBufferSize() was called prior, returns value set by setBufferSize().
-- 
cgit v0.12