| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Daniel Teske
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change required a significant refactoring of the application,
including:
* Re-write WavFile class so that it inherits from QFile rather
than taking a QIODevice as an argument to its method calls.
* Modified Engine class so that its internal QByteArray buffer
(m_buffer) need not correspond to the entire clip. This was done
by introducing the m_bufferPosition variable, which indicates the
offset from the start of the clip to the start of the region of
the clip which is currently held in memory. For tone generation
and record/playback modes, the buffer does still map directly to
the whole clip, so m_bufferPosition is always zero. For file
playback, the WavFile instance is the QIODevice which is passed
to QAudioOutput; m_buffer is just the part of the file which is
currently in memory for spectrum analysis, level calculation and
waveform rendering.
* For file playback, introduced a second WavFile instance as a
member of the Engine class. This is because QFile::seek() is
called in order to read the part of the file currently required
for analysis. If the QAudioOutput implementation passes its
QIODevice across a thread boundary, this seeking causes playback
to jump around within the file rather than progressing smoothly
forward.
* Modified the audioLength utility function so that its return
value is always a multiple of the sample size.
In the process of making the above changes, a few other minor
modifications were made:
* Modify all internal APIs concerned with buffer offsets and lengths
to deal in bytes. Previously, some calls passed values in
microseconds and others in bytes, which was confusing.
* Remove write functionality from WavFile class, since it is not
used in this application.
Task-number: QTBUG-12936
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch ensures that the state of the application is not reset when:
- Any of the 'Play generated tone', 'Play file' or settings
dialogs are opened
- Any of the 'Play generated tone', 'Play file' or settings
dialogs are dismissed by pressing the Cancel button
- A new input or output device is selected via the settings
dialog, and that new device supports the data format which
is currently being used within the application
- The window function is changed via the settings dialog
Note that the application is still reset if a new input or output
device is selected via the settings dialog, and this device does not
support the current data format.
Task-number: QTBUG-12935
Task-number: QTBUG-14810
|
|
|
|
| |
QObjects with a parent cannot be moved to a different thread.
|
|\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed many spelling errors.
|
| | |
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts:
src/corelib/tools/qcryptographichash.cpp
src/opengl/qgl_p.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
- Grab length of audio data from Data chunk size
- Read from the device no greater than the audio Data chunk size
Task-number: QTBUG-13779
Reviewed-by: Andrew den Exter
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in
order for them to be correctly installed.
Task-number: QTBUG-11572
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rather than explicitly modifying LD_LIBRARY_PATH using a shell script
when the application is launched, the relative path from the
application binary to the FFT library is encoded in the application
using an --rpath flag.
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13940
Reviewed-by: Martin Pejcoch
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13483
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| | |
Task-number: QTBUG-12713
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This demo includes a 3rd party library which is licensed under
the LGPL. As such, the demo application may only link to the
library dynamically.
Task-number: QTBUG-12713
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in
order for them to be correctly installed.
Task-number: QTBUG-11572
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Rather than explicitly modifying LD_LIBRARY_PATH using a shell script
when the application is launched, the relative path from the
application binary to the FFT library is encoded in the application
using an --rpath flag.
Task-number: QTBUG-11756
Reviewed-by: Andy Shaw
|
| | |
|
| |
| |
| |
| | |
RevBy: Trust me
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
|
| |
| |
| |
| |
| |
| | |
Resolving UID clash with other example apps
Reviewed-by: Miikka Heikkinen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since plugin and import paths variables were moved to symbian.conf,
there were many unnecessary load(data_caging_paths) statements
left in applications.
Task-number: QTBUG-11619
Reviewed-by: Janne Koskinen
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Miikka Heikkinen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix location of QtMultimedia def files
Freeze 4.7 def files on top of 4.6.3
Update def files for 4.6.3
Add runtime_graphics_system flag to QApplicationPrivate.
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/bearer/symbian/qnetworksession_impl.h
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/kernel/qapplication_s60.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On systems where libs don't automagically go to the system dirs we need
to add the build dir for using the lib.
|
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10964
Reviewed-by: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On Symbian, spectrum.exe has UserEnvironment capability in order to
allow it to use QAudioInput. This means that the capabilities of
any DLL which it loads must include UserEnvironment. Prior to this
patch, fftreal.dll was built without any capabilities, causing
startup of the application to fail.
Although granting only UserEnvironment to fftreal.dll would fix the
bug, the usual pattern on Symbian OS is to grant 'all -tcb'
capabilities to DLLs. The capabilities with which the DLL actually
runs are inherited from its parent process.
Task-number: QTBUG-10964
Reviewed-by: Liang Qi
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10881
Reviewed-by: Liang Qi
|
| | |/
| |/|
| | |
| | |
| | | |
Reviewed-by: Jason McDonald
Task-number: QTBUG-10887
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits)
Dont crash when assigning the same input context twice.
Fixed a typo in variable name in qlocale data generator.
Fix for Norwegian and Korean languages on symbian.
Remove unused function in QDBusConnectionPrivate
Doc: Fixing bugs in HTML generator
Updating 4.7.0 change log.
Doc: Correcting style to class lists
qdoc: Improved class index page.
Added MSVC 2010 project files to .gitignore
Fix architecture detection on GNU/Hurd.
Revert "tst_bic: make it possible to test for cross-compilation"
fix typo in documentation
Improve Bearer Management related documentation in QNetworkAccessManager
Compile with QT_NO_ACTION.
Unbreak compilation outside Mac
QDBusAbstractInterface: don't set lastError outside the object's own thread
tst_bic: make it possible to test for cross-compilation
Remove Q_PACKED from QChar and QLocale::Data.
QDebug operator for QFlags
Removing unneeded qDebug statement.
...
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround
for QTBUG-5312, in order to allow 'make sis' to be executed from
the demos/spectrum directory. While this workaround is OK for SBSv2,
it causes a build failure when using SBSv1.
Task-number: QTBUG-10833
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10880
Reviewed-by: Thomas Zander
|
|/
|
|
|
| |
Task-number: QTBUG-10879
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
|
| |
Compiler was failing to disambiguate the following overloads:
pow(double, double)
pow(float, float)
Reviewed-by: mread
|
|
|
|
|
|
|
| |
Fixes compilation and deployment issue when compiling the
app from root directory.
Reviewed-by: Gareth Stockwell
|
|
|
|
|
|
|
|
| |
- Added /3rdparty/ to directory path for FFTReal code
- Added missing $QT_BEGIN_LICENSE$, $QT_END_LICENSE$
- Fixed incorrect license in app/wavfile.cpp
Reviewed-by: trustme
|
|
This application is a demo which uses the QtMultimedia APIs to
capture and play back PCM audio. While either recording or playback
is ongoing, the application performs real-time level and frequency
spectrum analysis.
Reviewed-by: Alessandro Portale
|