| 2016-08-05 |
Chris Cannam |
Minor tidy, + go back to opaque-only spectrogram as intended
spectrogram-minor-refactor
|
| 2016-08-05 |
Chris Cannam |
Restore illuminateLocalFeatures in spectrogram
spectrogram-minor-refactor
|
| 2016-08-04 |
Chris Cannam |
Reconnect double-click region select in spectrogram
spectrogram-minor-refactor
|
| 2016-08-04 |
Chris Cannam |
Restore phase display
spectrogram-minor-refactor
|
| 2016-08-04 |
Chris Cannam |
Re-implement dB^2 (log-power) spectrogram setting
spectrogram-minor-refactor
|
| 2016-08-03 |
Chris Cannam |
Re-enable (little-used) normalise-visible-range option in spectrogram layer
spectrogram-minor-refactor
|
| 2016-08-03 |
Chris Cannam |
Use a count of bins rather than min and max bins (because the name maxbin tells us nothing about whether the range is inclusive or not)
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
Another small tidy
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
Fix vertical zoom/scroll in colour 3d plot layer
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
Minor tidy
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
Sensible vertical scale and hybrid normalisation range in colour 3d plot
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
Minor tidy
spectrogram-minor-refactor
|
| 2016-08-02 |
Chris Cannam |
A threshold fix
spectrogram-minor-refactor
|
| 2016-08-01 |
Chris Cannam |
Float/double conversion fixes
spectrogram-minor-refactor
|
| 2016-08-01 |
Chris Cannam |
Fix threshold in spectrogram -- it wasn't working in the last release.
spectrogram-minor-refactor
|
| 2016-08-01 |
Chris Cannam |
Scale range matching
spectrogram-minor-refactor
|
| 2016-08-01 |
Chris Cannam |
Some notes on gain
spectrogram-minor-refactor
|
| 2016-07-22 |
Chris Cannam |
Some tidying
spectrogram-minor-refactor
|
| 2016-07-22 |
Chris Cannam |
Fixes and debug output for mag range calculations
spectrogram-minor-refactor
|
| 2016-07-22 |
Chris Cannam |
Wiring through the magnitude range updates
spectrogram-minor-refactor
|
| 2016-07-20 |
Chris Cannam |
Toward updating mag cache
spectrogram-minor-refactor
|
| 2016-07-20 |
Chris Cannam |
Inch toward using the mag cache (currently will crash with debug exception)
spectrogram-minor-refactor
|
| 2016-07-20 |
Chris Cannam |
Introduce ScrollableMagRangeCache, plus some tidying etc
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Fix translucent mode for spectrogram
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Wire up invertVertical
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Re-enable a couple more features
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Tidy
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Consts and willRenderOpaque
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Colourmap rotation (inelegantly)
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Subrepo update
spectrogram-minor-refactor
|
| 2016-07-19 |
Chris Cannam |
Make VerticalBinLayer an actual Layer (via SliceableLayer)
spectrogram-minor-refactor
|
| 2016-07-15 |
Chris Cannam |
Merge
spectrogram-minor-refactor
|
| 2016-07-15 |
Chris Cannam |
Update dataquay subrepo for 0.9.1
last_v2.5_on_default_branch
|
| 2016-07-18 |
Chris Cannam |
Start introducing translucent renderer
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Fix failure to reinitialise m_peakCache
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Remove almost all of the "old" paint logic from Colour3DPlotLayer
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Remove all of the "old" paint logic from SpectrogramLayer, even where it hasn't been completely replaced yet
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Convert ColourScaleType into an enum class
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Convert ColumnNormalization to an enum class, and separate out normalize-visible
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Turn BinDisplay and BinScale into enum classes
spectrogram-minor-refactor
|
| 2016-07-14 |
Chris Cannam |
Fix potential crash in Dense3dModelPeakCache owing to combination of wrong width calculation and wrong handling of width overrun
spectrogram-minor-refactor
|
| 2016-07-13 |
Chris Cannam |
Delete renderers
spectrogram-minor-refactor
|
| 2016-07-13 |
Chris Cannam |
Begin using renderer in colour 3d plot layer
spectrogram-minor-refactor
|
| 2016-07-13 |
Chris Cannam |
Create, but don't yet use, a renderer in the colour 3d plot layer
spectrogram-minor-refactor
|
| 2016-07-13 |
Chris Cannam |
Switch in "standard" colour scale, bin scale, normalisation -- not quite handled elegantly or correctly yet
spectrogram-minor-refactor
|
| 2016-07-11 |
Chris Cannam |
Minor build fix
spectrogram-minor-refactor
|
| 2016-07-11 |
Chris Cannam |
Introduce peak frequency rendering (basics of)
spectrogram-minor-refactor
|
| 2016-07-11 |
Chris Cannam |
Far more pragmatic update strategy
spectrogram-minor-refactor
|
| 2016-07-11 |
Chris Cannam |
Fix draw buffer sizing problem in scaled rendering
spectrogram-minor-refactor
|
| 2016-07-07 |
Chris Cannam |
Split out cache rendering functions and some fixes to calculations
spectrogram-minor-refactor
|
| 2016-07-07 |
Chris Cannam |
Colour scales (partly)
spectrogram-minor-refactor
|
| 2016-07-07 |
Chris Cannam |
Time-constrained rendering
spectrogram-minor-refactor
|
| 2016-07-05 |
Chris Cannam |
Cut over to using the renderer (though it's very incomplete) and fix some cache problems and pointer lifetime misunderstandings
spectrogram-minor-refactor
|
| 2016-07-05 |
Chris Cannam |
Start to introduce renderer objects
spectrogram-minor-refactor
|
| 2016-07-05 |
Chris Cannam |
One FFT model per spectrogram (again!) - but we do still need a magnitude range per view, as views could be showing different regions
spectrogram-minor-refactor
|
| 2016-07-02 |
Chris Cannam |
One FFT size method, no member for it
spectrogram-minor-refactor
|
| 2016-07-01 |
Chris Cannam |
Simplify the oversampling/zero-padding logic. FFT model selection no longer depends on the view.
spectrogram-minor-refactor
|
| 2016-07-01 |
Chris Cannam |
Add VerticalBinLayer to SpectrogramLayer
spectrogram-minor-refactor
|
| 2016-07-01 |
Chris Cannam |
Scale and copy
spectrogram-minor-refactor
|
| 2016-07-01 |
Chris Cannam |
Start introducing render code
spectrogram-minor-refactor
|
| 2016-07-01 |
Chris Cannam |
VerticalBinLayer for vertical mapping abstraction. Not totally sure about this
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
Comments
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
Minor adjustments
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
More filling in render & cache code
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
Move drawVisibleText to PaintAssistant
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
Move LayerGeometryProvider from view to layer
spectrogram-minor-refactor
|
| 2016-06-30 |
Chris Cannam |
Two functions, rather than one with a boolean arg
spectrogram-minor-refactor
|
| 2016-06-29 |
Chris Cannam |
Another tiny bit
spectrogram-minor-refactor
|
| 2016-06-29 |
Chris Cannam |
Pull out render timer
spectrogram-minor-refactor
|
| 2016-06-29 |
Chris Cannam |
More renderer stubbing
spectrogram-minor-refactor
|
| 2016-06-27 |
Chris Cannam |
Comments
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
Start stubbing Colour3DPlotRenderer
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
Use a params structure
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
ColourScale class, comments, naming
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
Comment
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
Comments
spectrogram-minor-refactor
|
| 2016-06-23 |
Chris Cannam |
Fix possible crash when scrolling to end
spectrogram-minor-refactor
|
| 2016-06-20 |
Chris Cannam |
Extend column logic to peak frequency display as well, and correct some scopes according to whether values are per source column or per target pixel
spectrogram-minor-refactor
|
| 2016-06-20 |
Chris Cannam |
Pull out column ops into ColumnOp
spectrogram-minor-refactor
|
| 2016-06-17 |
Chris Cannam |
A more sensible order for column operations
spectrogram-minor-refactor
|
| 2016-06-15 |
Chris Cannam |
Don't need these
spectrogram-minor-refactor
|
| 2016-06-15 |
Chris Cannam |
Replace old logic with calls to new functions; basic refactor part A done, the code now compiles again
spectrogram-minor-refactor
|
| 2016-06-15 |
Chris Cannam |
A couple more helper functions
spectrogram-minor-refactor
|
| 2016-06-13 |
Chris Cannam |
Mid-refactor to pull out the bulk of paintDrawBuffer into chunks
spectrogram-minor-refactor
|
| 2016-06-13 |
Chris Cannam |
Merge from default branch
spectrogram-minor-refactor
|
| 2016-06-13 |
Chris Cannam |
Subrepo update
3.0-integration
|
| 2016-05-26 |
Chris Cannam |
Don't paint if model has zero width
3.0-integration
|
| 2016-05-05 |
Chris Cannam |
Make archiver check & complain if the appropriate docs page returns a 404
3.0-integration
|
| 2016-05-04 |
Chris Cannam |
Subrepo update
3.0-integration
|
| 2016-05-03 |
Chris Cannam |
Win32 build fix
3.0-integration
|
| 2016-04-27 |
Chris Cannam |
Update Qt copyright note
3.0-integration
|
| 2016-04-27 |
Chris Cannam |
Version on this branch will be 3.0
3.0-integration
|
| 2016-04-27 |
Chris Cannam |
Deploy plugin checker helper; update deployment for current Qt
3.0-integration
|
| 2016-04-27 |
Chris Cannam |
OSX build fixes
3.0-integration
|
| 2016-04-22 |
Chris Cannam |
Update subrepos
3.0-integration
|
| 2016-04-20 |
Chris Cannam |
Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf
3.0-plus-imaf
|
| 2016-04-15 |
Chris Cannam |
Merge from branch pluginscan
3.0-integration
|
| 2016-04-15 |
Chris Cannam |
Check for plugin scan helper checker helper program in suitable directory, & tidy up warning messages somewhat
pluginscan
|
| 2016-04-14 |
Chris Cannam |
Update checker code layout
pluginscan
|
| 2016-04-14 |
Chris Cannam |
Make this warning a #pragma message, as we don't want it to make compilation fail with -Werror set
pluginscan
|
| 2016-04-14 |
Chris Cannam |
Make use of, and warn for, the plugin checker for all types of plugin. Haven't yet resolved the question of how to install and find it.
pluginscan
|
| 2016-04-14 |
Chris Cannam |
First cut running (but not yet using output of, or recovering from errors in) the plugin checker at startup
pluginscan
|
| 2016-03-18 |
Chris Cannam |
Remove Vamp SDK from dependency builds for Windows, as for OSX
3.0-integration
|
| 2016-03-18 |
Chris Cannam |
Start including Vamp SDK into main build, as we do with Sonic Annotator
3.0-integration
|
| 2016-03-04 |
Chris Cannam |
Update subrepo
|
| 2016-03-04 |
Chris Cannam |
Merge from default!
3.0-integration
|
| 2016-03-04 |
Chris Cannam |
Merge from default branch in subrepos
3.0-integration
|
| 2016-03-04 |
Chris Cannam |
Merge in subrepo
|
| 2016-03-02 |
Chris Cannam |
Merge in subrepo
3.0-integration
|
| 2016-02-09 |
Chris Cannam |
Make ViewProxy objects share the ids of their Views; fixes incorrect colour scale drawing
3.0-integration
|
| 2016-02-09 |
Chris Cannam |
Clumsily avoid segfault on pulse shutdown
3.0-integration
|
| 2016-02-04 |
Chris Cannam |
Update i18n files
3.0-integration
|
| 2016-02-04 |
Chris Cannam |
Merge from default branch
3.0-integration
|
| 2016-02-04 |
Chris Cannam |
Merge subrepos
3.0-integration
|
| 2016-02-04 |
Chris Cannam |
Merge from branch "spectrogram-minor-refactor"
3.0-integration
|
| 2016-02-03 |
Chris Cannam |
Truncate edges when about to paint beyond limits of cache
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Don't use partial paints when zoomed in far enough to have boundary alignment concerns. (But boundary calculations are still wrong, leading to a logic error exception.)
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Comment
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Timing tweaks to reduce the number of repaints
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Fix cache validity boundary condition
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
*Really* add overlooked file!
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Be a bit more flexible about which symbol to accept in resampler selection
spectrogram-minor-refactor
|
| 2016-02-02 |
Chris Cannam |
Revert last commit (wrong branch)
|
| 2016-02-02 |
Chris Cannam |
Add overlooked file!
|
| 2016-02-01 |
Chris Cannam |
Updated Czech localisation file from Pavel Fric
|
| 2016-01-30 |
Chris Cannam |
Update subrepo
|
| 2016-01-30 |
Chris Cannam |
Update acinclude files to look for qt5-qmake as well as qmake-qt5
|
| 2016-01-29 |
Chris Cannam |
Further fixes to the scrollable cache logic
spectrogram-minor-refactor
|
| 2016-01-29 |
Chris Cannam |
Start refactoring out the spectrogram image cache
spectrogram-minor-refactor
|
| 2016-01-27 |
Chris Cannam |
Subrepo update
spectrogram-minor-refactor
|
| 2016-01-27 |
Chris Cannam |
build fix
spectrogram-minor-refactor
|
| 2016-01-27 |
Chris Cannam |
OS/X updates
spectrogram-minor-refactor
|
| 2016-01-27 |
Chris Cannam |
Fix calculation of repaint area when we haven't scrolled but cache is not complete
spectrogram-minor-refactor
|
| 2016-01-26 |
Chris Cannam |
Start repainting from the middle -- but this is quite unreliable
spectrogram-minor-refactor
|
| 2016-01-26 |
Chris Cannam |
Fix return value from paintDrawBuffer in rightToLeft case; propagate timing change to PeakFrequencies version as well
spectrogram-minor-refactor
|
| 2016-01-26 |
Chris Cannam |
Draw right-to-left when adjoining an existing cache valid area on the right
spectrogram-minor-refactor
|
| 2016-01-25 |
Chris Cannam |
Make paint method do its own timing and abandon if it's taking too long (still needs some work on queueing correct repaints of the remainder)
spectrogram-minor-refactor
|
| 2016-01-25 |
Chris Cannam |
Rearrange cache update calculations so as to use the actual painted width returned by paint functions (though they only ever return the same width as requested, at this point)
spectrogram-minor-refactor
|
| 2016-01-22 |
Chris Cannam |
Avoid reusing a large paint width if the zoom level has changed (in case it has changed dramatically, as for example when the user hits the F key). Also some tidying and adjustment to timing stuff
3.0-integration
|
| 2016-01-22 |
Chris Cannam |
Tidy a bit
3.0-integration
|
| 2016-01-22 |
Chris Cannam |
Subrepos
3.0-integration
|
| 2016-01-22 |
Chris Cannam |
Convert 3d model column type from QVector to std::vector; replace another user of ResizeableBitset
3.0-integration
|
| 2016-01-22 |
Chris Cannam |
Subrepos
3.0-integration
|
| 2016-01-22 |
Chris Cannam |
Subrepos
3.0-integration
|
| 2016-01-21 |
Chris Cannam |
Merge
3.0-integration
|
| 2015-12-10 |
Chris Cannam |
Subrepo update
3.0-integration
|
| 2016-01-21 |
Chris Cannam |
Mutex fix in bqaudioio to avoid delay in seeking during playback
3.0-integration
|
| 2016-01-21 |
Chris Cannam |
Update translations
3.0-integration
|
| 2016-01-21 |
Chris Cannam |
Make colour 3d plot layer colour a preference as well
3.0-integration
|
| 2016-01-20 |
Chris Cannam |
Add default spectrogram colours to prefs
3.0-integration
|
| 2016-01-19 |
Chris Cannam |
Merge from branch colourschemes
3.0-integration
|
| 2016-01-19 |
Chris Cannam |
Tidy
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Rearrange colours, make some of them more attractive, give some of them nicer names
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Remove background mode, it no longer works properly
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Remove debug out
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Provide a sensible name for this colour scheme
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Merge from branch 3.0-integration
colourschemes
|
| 2016-01-19 |
Chris Cannam |
Merge from branch plugin-startup-test
3.0-integration
|
| 2016-01-19 |
Chris Cannam |
Show warning to the user when plugin population has problems
plugin-startup-test
|
| 2016-01-11 |
Chris Cannam |
Check for plugin loadability before trying to load in the main process (POSIX only so far)
plugin-startup-test
|
| 2016-01-08 |
Chris Cannam |
Pull out candidate list
plugin-startup-test
|
| 2015-12-02 |
Chris Cannam |
Experimentation with colour schemes and mappings
colourschemes
|
| 2015-12-02 |
Chris Cannam |
Update icons
3.0-integration
|
| 2015-11-18 |
Chris Cannam |
Merge from default branch
3.0-integration
|
| 2015-11-16 |
Chris Cannam |
If libjack0 is sought, install jackd instead (seems like a more common neutral dependency independent of jack version)
|
| 2015-11-16 |
Chris Cannam |
Ensure version is updated in control file
|
| 2015-10-23 |
Chris Cannam |
Added tag sv_v2.5_osx_deploy for changeset e206741df37d
|
| 2015-10-23 |
Chris Cannam |
Merge
sv_v2.5_osx_deploy
|
| 2015-10-23 |
Chris Cannam |
Deployment fixes. Qt on OSX now seems to depend on QtDBus, so copy that in, and also fail if anything is found to depend on an absent Qt framework.
|
| 2015-10-22 |
Chris Cannam |
Added tag sv_v2.5 for changeset 94253fa11318
|
| 2015-10-22 |
Chris Cannam |
Error only in debug build
sv_v2.5
|
| 2015-10-22 |
Chris Cannam |
Deployment fix
|
| 2015-10-22 |
Chris Cannam |
Build fix
|
| 2015-10-22 |
Chris Cannam |
Update CHANGELOG, back out ill-advised svgui feature
|
| 2015-10-20 |
Chris Cannam |
Merge from default branch
3.0-integration
|
| 2015-10-20 |
Chris Cannam |
Fix embarrassing failure to reload Note layers
|
| 2015-10-14 |
Chris Cannam |
Wakeup
3.0-integration
|
| 2015-10-14 |
Chris Cannam |
Remove debug
3.0-integration
|
| 2015-10-14 |
Chris Cannam |
PulseAudio lock fixes
3.0-integration
|
| 2015-10-14 |
Chris Cannam |
Update subrepos
3.0-integration
|
| 2015-10-12 |
Chris Cannam |
Merge from recording branch
3.0-integration
|
| 2015-09-22 |
Chris Cannam |
Fix suspending/resuming audio device; it wasn't suspending when playback reached the end, only when the user stopped explicitly
recording
|
| 2015-09-17 |
Chris Cannam |
Merge from branch "recording"
3.0-integration
|
| 2015-09-17 |
Chris Cannam |
Merge from branch "scalable-icons"
3.0-integration
|
| 2015-09-17 |
Chris Cannam |
Update icons
scalable-icons
|
| 2015-09-17 |
Chris Cannam |
Update subrepo
recording
|
| 2015-09-16 |
Chris Cannam |
Win32 build fixes
recording
|
| 2015-09-16 |
Chris Cannam |
Suspend/resume audio device when not in use to save battery (only implemented for PulseAudioIO so far)
recording
|
| 2015-09-16 |
Chris Cannam |
Recording message in status bar
recording
|
| 2015-09-15 |
Chris Cannam |
Add audio record mode (option to replace session) and support for browsing to record directory
recording
|
| 2015-08-20 |
Chris Cannam |
Check for audioIO as well as play target; + deployment bits
3.0-integration
|
| 2015-08-20 |
Chris Cannam |
Subrepo update
3.0-integration
|
| 2015-08-20 |
Chris Cannam |
Merge from branch recording
3.0-integration
|
| 2015-08-20 |
Chris Cannam |
Fix reloading session with recorded audio
recording
|
| 2015-08-19 |
Chris Cannam |
Toward resampling on output in bqaudioio
recording
|
| 2015-08-19 |
Chris Cannam |
New filename for each audio recording
recording
|
| 2015-08-19 |
Chris Cannam |
Make WritableWaveFileModel a true WaveFileModel (and ReadOnlyWaveFileModel the other sort of it). Enable recording from an empty session using that.
recording
|
| 2015-08-19 |
Chris Cannam |
Toward recording without something already loaded (needs more work though)
recording
|
| 2015-08-18 |
Chris Cannam |
OK, we can record -- sort of
recording
|
| 2015-08-18 |
Chris Cannam |
Basic recording stuff
recording
|
| 2015-08-18 |
Chris Cannam |
Start stubbing in audio record
recording
|
| 2015-08-17 |
Chris Cannam |
Pulse stream and client names
bqaudioio
|
| 2015-08-10 |
Chris Cannam |
Graft some fixes in subrepo
bqaudioio
|
| 2015-08-05 |
Chris Cannam |
Fix very long delay on seeking during playback (caused by Pulse driver using max length as block size)
3.0-integration
|
| 2015-08-05 |
Chris Cannam |
Avoid playing repeated buffer while re-seeking
3.0-integration
|
| 2015-08-04 |
Chris Cannam |
Merge from branch bqaudioio
3.0-integration
|
| 2015-08-04 |
Chris Cannam |
Merge
3.0-integration
|
| 2015-07-24 |
Chris Cannam |
Merge from default branch
3.0-integration
|
| 2015-08-04 |
Chris Cannam |
Add Range header
bqaudioio
|
| 2015-08-04 |
Chris Cannam |
Mutex fixes for PulseAudio
bqaudioio
|
| 2015-08-04 |
Chris Cannam |
Initial work toward switching to bqaudioio library (so as to get I/O, not just O)
bqaudioio
|
| 2015-08-04 |
Chris Cannam |
Necessary include
3.0-integration
|
| 2015-07-15 |
alo |
dataquay rollback
imaf_enc
|
| 2015-07-14 |
alo |
removed imaf sliders
imaf_enc
|
| 2015-07-13 |
Chris Cannam |
Make the play-speed dial settings much easier to understand and use (fixes #1328)
|
| 2015-07-07 |
Chris Cannam |
Merge from default branch
3.0-integration
|
| 2015-07-07 |
Chris Cannam |
Major fix to bug in handling of fuzzy column in CSV import (introduced since the last release) which meant that col 6 of a wide CSV would go missing completely!
|
| 2015-07-03 |
Chris Cannam |
Fix assignment of values to regions on import, in case where region model contains duplicate points
|
| 2015-07-01 |
Chris Cannam |
Merge
3.0-integration
|
| 2015-07-01 |
Chris Cannam |
Subrepo
3.0-integration
|
| 2015-07-01 |
Chris Cannam |
Merge from branch simple-fft-model
3.0-integration
|
| 2015-01-07 |
Chris Cannam |
Merge from default branch
simple-fft-model
|
| 2015-07-01 |
Chris Cannam |
Fix a number of warnings in the 32-bit build
|
| 2015-07-01 |
Chris Cannam |
Merge from branch simple-fft-model
3.0-integration
|
| 2015-07-01 |
Chris Cannam |
Merge from branch osx-retina
3.0-integration
|
| 2015-07-01 |
Chris Cannam |
Add new icons to resource file
osx-retina
|
| 2015-07-01 |
Chris Cannam |
A few new icons
osx-retina
|
| 2015-07-01 |
Chris Cannam |
Switch off debug again
simple-fft-model
|
| 2015-07-01 |
Chris Cannam |
Fill extent is not relevant in simple-fft-model code, as it's always the full extent
simple-fft-model
|
| 2015-06-30 |
Chris Cannam |
Fix dark point at highlight of LED button
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Render LED button direct to widget, making it look OK on retina screen
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Subrepos
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Merge
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Subrepo update
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Tighten spacing around sides of property box on OS/X
osx-retina
|
| 2015-06-30 |
Chris Cannam |
Merge
simple-fft-model
|
| 2015-06-30 |
Chris Cannam |
Build fix
simple-fft-model
|
| 2015-06-26 |
Chris Cannam |
Merge from branch normalize_hybrid_option
3.0-integration
|
| 2015-06-26 |
Chris Cannam |
Merge from branch osx-retina
3.0-integration
|
| 2015-06-26 |
Chris Cannam |
Merge from branch simple-fft-model
3.0-integration
|
| 2015-06-26 |
Chris Cannam |
Update subrepos for 3.0-integration
3.0-integration
|
| 2015-06-16 |
Chris Cannam |
Two-channel test
simple-fft-model
|
| 2015-06-16 |
Chris Cannam |
Fix a cache-related dumbitude
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Raise this maximum, so longer files can be shown in the overview pane
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Use in-memory cache for WAV files as well, if appropriate
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Smooth signal flow through from file to fft model
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Store temporary audio files in memory if we have plenty of it
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Tidy
simple-fft-model
|
| 2015-06-15 |
Chris Cannam |
Rework audio file reader API to prefer using std containers
simple-fft-model
|
| 2015-06-13 |
Chris Cannam |
Fix to fft cache
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
A small cache for source samples
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
Make a small cache of recently-used columns
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
Normalization function
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
Simplest naive FFTModel implementation (+ fill in tests)
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
Gut the old code, but don't replace it yet (so nothing will link yet)
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
More tests
simple-fft-model
|
| 2015-06-12 |
Chris Cannam |
Start making the FFT model tests into proper tests
|
| 2015-06-11 |
Chris Cannam |
Tidy
|
| 2015-06-10 |
Chris Cannam |
Tidy dense time-value model API a bit; add first simple unit test for FFT model
|
| 2015-06-10 |
Chris Cannam |
Remove some obsolete unused files
|
| 2015-06-10 |
Chris Cannam |
Merge from default branch
osx-retina
|
| 2015-06-10 |
Chris Cannam |
Update subrepo
|
| 2015-06-10 |
Chris Cannam |
Report error if transform fails (during operation, rather than at start as was already reported)
|
| 2015-06-04 |
Chris Cannam |
Update deployment script for QtSvg
osx-retina
|
| 2015-06-04 |
Chris Cannam |
Add forgotten zoom icon
osx-retina
|
| 2015-06-01 |
Chris Cannam |
Couple more icons
osx-retina
|
| 2015-06-01 |
Chris Cannam |
Update subrepos
osx-retina
|
| 2015-05-22 |
Chris Cannam |
Fix crash when importing wide CSV file
|
| 2015-05-22 |
Chris Cannam |
Add half-wave rectification option to Colour 3D Plot layer
|
| 2015-05-21 |
Chris Cannam |
minor debug thing
osx-retina
|
| 2015-05-21 |
Chris Cannam |
Fixes to font sizing in colour 3d plot layer (for #1221)
osx-retina
|
| 2015-05-21 |
Chris Cannam |
Merge in subrepo
|
| 2015-05-21 |
Chris Cannam |
Avoid going pop when setting play head to before time 0
|
| 2015-05-21 |
Chris Cannam |
Prevent selection being dragged beyond start/end of content
|
| 2015-05-21 |
Chris Cannam |
Box colour a darker grey by default (but also changeable now)
|
| 2015-05-15 |
Chris Cannam |
Fix #1222 CSV export of time-instants layer omits last point
|
| 2015-05-14 |
Chris Cannam |
Merge from branch scalable-icons
osx-retina
|
| 2015-05-14 |
Chris Cannam |
Merge from default branch
osx-retina
|
| 2015-05-14 |
Chris Cannam |
Fix #1220 Flexi-note layer appears in Layers menu
|
| 2015-05-14 |
Chris Cannam |
Handle case where plugin erroneously returns sample rate 0 for fixed-rate output
|
| 2015-05-13 |
Chris Cannam |
Icon update
scalable-icons
|
| 2015-05-12 |
Chris Cannam |
Fixes to, and tests for, RealTime-to-text methods
|
| 2015-05-12 |
Chris Cannam |
Display note name derived from value, when hovering over time-value feature if the scale unit is Hz
|
| 2015-05-12 |
Chris Cannam |
Copyright date
|
| 2015-05-12 |
Chris Cannam |
Address #1214, layer import produces wrong layer type. We needed a more principled approach to making sure the format gets updated properly and the dialog elements are consistent (basically separating making the dialog elements consistent from subsequently updating the format). This change should provide that, though there may be gotchas still.
|
| 2015-05-06 |
Chris Cannam |
Icons
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Simplistic play-selection
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Make play-pause bigger
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Rewind/ffwd shouldn't be available when nothing loaded
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Slightly improved text positioning
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Update splash, and a build fix
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Add splash screen code
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Fixes to scaling of splash screen
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Various fixes to scalable rendering
scalable-icons
|
| 2015-05-06 |
Chris Cannam |
Experiment with loading SVGs
scalable-icons
|
| 2015-04-29 |
Chris Cannam |
Make Retina layer rendering selectable in settings
osx-retina
|
| 2015-04-29 |
Chris Cannam |
Fix font size for painter when rendering scaled
osx-retina
|
| 2015-04-29 |
Chris Cannam |
Fix positioning of local feature illumination rectangle
osx-retina
|
| 2015-04-29 |
Chris Cannam |
Fix rendering of selections
osx-retina
|
| 2015-04-27 |
Chris Cannam |
Always render to a buffer, then from that to the widget
osx-retina
|
| 2015-04-20 |
Chris Cannam |
Painting off-cache means we shouldn't use proxy (we aren't scaling.. yet)
osx-retina
|
| 2015-04-20 |
Chris Cannam |
Some scaling & zoom bits
osx-retina
|
| 2015-04-20 |
Chris Cannam |
Update subrepos and config stuff
osx-retina
|
| 2015-04-20 |
Chris Cannam |
Allow layers to be loaded without models if their layer class explicitly says it's OK (otherwise default template won't load, as it has an empty waveform layer)
|
| 2015-04-20 |
Chris Cannam |
Don't set version from configure, track it in version.h instead. Next will be 2.5.
|
| 2015-04-20 |
Chris Cannam |
Merge from branch cxx11
|
| 2015-04-20 |
Chris Cannam |
Subrepo updates
|
| 2015-03-18 |
Chris Cannam |
Fix crash caused by using proxy (of unknown lifecycle) instead of view as cache key
osx-retina
|
| 2015-03-18 |
Chris Cannam |
Pass proxy to layer for painting
osx-retina
|
| 2015-03-17 |
Chris Cannam |
Many fixes for the previous stuff
osx-retina
|
| 2015-03-17 |
Chris Cannam |
Another small replacement
osx-retina
|
| 2015-03-17 |
Chris Cannam |
Subrepo
osx-retina
|
| 2015-03-11 |
Chris Cannam |
Experiment with querying paint rect separately from view rect
osx-retina
|
| 2015-03-11 |
Chris Cannam |
Subrepo state
cxx11
|
| 2015-03-11 |
Chris Cannam |
Start branch for retina hi-res rendering
osx-retina
|
| 2015-03-11 |
Chris Cannam |
Build fixes for OS/X
cxx11
|
| 2015-03-11 |
Chris Cannam |
Subrepo
cxx11
|
| 2015-03-11 |
Chris Cannam |
Subrepos
cxx11
|
| 2015-03-11 |
Chris Cannam |
Comments etc
cxx11
|
| 2015-03-10 |
Chris Cannam |
Merge
cxx11
|
| 2015-03-10 |
Chris Cannam |
Doh
cxx11
|
| 2015-03-10 |
Chris Cannam |
Subrepos
cxx11
|
| 2015-03-10 |
Chris Cannam |
Nothing of consequence
cxx11
|
| 2015-03-10 |
Chris Cannam |
More type fixes. We now build with -Wconversion, on this platform (64-bit Linux) at least.
cxx11
|
| 2015-03-10 |
Chris Cannam |
Further dedicated-types fixes
cxx11
|
| 2015-03-10 |
Chris Cannam |
More type fixes
cxx11
|
| 2015-03-10 |
Chris Cannam |
More type fixes, primarily in the spectrogram
cxx11
|
| 2015-03-09 |
Chris Cannam |
A few more fixes
cxx11
|
| 2015-03-09 |
Chris Cannam |
Working through the float/double and int/sv_frame_t fixes
cxx11
|
| 2015-03-09 |
Chris Cannam |
Move to using double rather than float for floating-point calculations (float only for storage); more build fixes
cxx11
|
| 2015-03-09 |
Chris Cannam |
More conversion fixes
cxx11
|
| 2015-03-04 |
Chris Cannam |
Now builds with current svcore; next, try it again with -Wconversion in svgui, svapp, and sonic-visualiser
cxx11
|
| 2015-03-03 |
Chris Cannam |
Merge from default branch
cxx11
|
| 2015-03-02 |
Chris Cannam |
Update subrepo
|
| 2015-03-02 |
Chris Cannam |
Specify UTF-8 encoding when writing XML formats -- the XML header always indicated UTF-8 but the QTextStream defaulted to local encoding which is generally not UTF-8 on Windows
|
| 2015-02-25 |
Chris Cannam |
Updates for win32 build - repackaging with Qt5.4 to fix failure to start up properly on 32-bit win8.1
2.4-stable
|
| 2015-02-26 |
Chris Cannam |
Update and merge
|
| 2015-02-26 |
Chris Cannam |
Debug reporting from FileSource
|
| 2015-02-24 |
Chris Cannam |
Enable ThreadSanitizer
datarace
|
| 2015-02-18 |
Chris Cannam |
Add option to toggle H:M:S time display (when off, just show seconds even when more than 60)
|
| 2015-02-13 |
Chris Cannam |
Update subrepos
|
| 2015-02-10 |
Chris Cannam |
Updates for next win32 build
|
| 2015-02-09 |
Chris Cannam |
Merge from default branch
cxx11
|
| 2015-01-16 |
Chris Cannam |
Fix arg in string
|
| 2014-12-15 |
Chris Cannam |
Tidy up layout and ranges for unit conversion dialog, highlight in red any out-of-range values
|
| 2014-12-09 |
Chris Cannam |
Start connecting up tempo bits
|
| 2014-12-09 |
Chris Cannam |
Update units when prefs change
|
| 2014-12-09 |
Chris Cannam |
Oops, included some unintended cruft
|
| 2014-12-09 |
Chris Cannam |
hz -> freq, and some layout rearrangement
|
| 2014-12-08 |
Chris Cannam |
Fixes to limits etc in unit converter
|
| 2014-12-04 |
Chris Cannam |
Quick hack at a multiplex option for transform input (see #1108)
|
| 2014-12-02 |
Chris Cannam |
Wire up note/octave stuff
|
| 2014-12-02 |
Chris Cannam |
Start adding piano note
|
| 2014-12-02 |
Chris Cannam |
Adding the unit converter code might have enhanced the previous commit a little
|
| 2014-12-01 |
Chris Cannam |
Start work on unit converter
|
| 2014-12-01 |
Chris Cannam |
Unit tests for StringBits::splitQuoted
|
| 2014-12-01 |
Chris Cannam |
If the first column of a CSV file has zero or one non-empty values in it, during the first 5 rows, then ignore it by default
|
| 2014-11-27 |
Chris Cannam |
Fix close-quote immediately before separator in StringBits::splitQuoted
|
| 2014-11-27 |
Chris Cannam |
Avoid completely smoothing out a curve if it alternates high/low, when zooming out far enough to use lines instead
|
| 2014-11-20 |
Chris Cannam |
Couple more RealTime tests
|
| 2014-11-19 |
Chris Cannam |
Subrepo state
|
| 2014-11-17 |
Chris Cannam |
CXX11 (-std=c++11) branch, to test build environments before making any code adaptations
cxx11
|
| 2014-11-10 |
Chris Cannam |
Discard wildly excessive wheel events
|
| 2014-10-03 |
Chris Cannam |
Handle variable columns by importing all of them (not just the minimum number)
|
| 2014-10-03 |
Chris Cannam |
Add milliseconds as CSV import timing option
|
| 2014-10-02 |
Chris Cannam |
Update version in wxs file
2.4-stable
|
| 2014-10-01 |
Chris Cannam |
Merge from branch 2.4-stable
|
| 2014-10-01 |
Chris Cannam |
Merge
2.4-stable
|
| 2014-10-01 |
Chris Cannam |
Added tag sv_v2.4.1 for changeset 2868d5abf1a3
2.4-stable
|
| 2014-10-01 |
Chris Cannam |
Update changelog
2.4-stable sv_v2.4.1
|
| 2014-10-01 |
Chris Cannam |
Version will be 2.4.1
2.4-stable
|
| 2014-10-01 |
Chris Cannam |
Subrepo update
2.4-stable
|
| 2014-09-29 |
Chris Cannam |
Merge from branch 2.4-stable
|
| 2014-09-29 |
Chris Cannam |
Correct some really stupid fixed-length string stuff, including a genuine stack overflow that causes a crash on OS/X for certain colour 3d plot data.
2.4-stable
|
| 2014-09-24 |
Chris Cannam |
Obsolete tag
2.4beta2
|
| 2014-09-24 |
Chris Cannam |
Merge
|
| 2014-09-11 |
Chris Cannam |
Update subrepo
|
| 2014-09-10 |
Chris Cannam |
Added tag sv_v2.4beta2 for changeset 4a7c62938a13
2.4beta2
|
| 2014-09-24 |
Chris Cannam |
Add a forgotten item to the changelog
|
| 2014-09-24 |
Chris Cannam |
Added tag sv_v2.4_linux_deploy for changeset 8215909b74d2
|
| 2014-09-24 |
Chris Cannam |
Deploy fixes
sv_v2.4_linux_deploy
|
| 2014-09-24 |
Chris Cannam |
Auto dependencies
|
| 2014-09-24 |
Chris Cannam |
Output for control file
|
| 2014-09-24 |
Chris Cannam |
Add deploy script
|
| 2014-09-24 |
Chris Cannam |
Debian skeleton stuff
|
| 2014-09-24 |
Chris Cannam |
Fixes to desktop file
|
| 2014-09-24 |
Chris Cannam |
Some install and packaging updates
|
| 2014-09-23 |
Chris Cannam |
Added tag sv_v2.4 for changeset cfbea29fae64
|
| 2014-09-23 |
Chris Cannam |
Added tag sv_v2.4beta2 for changeset 7b3aaa237e66
2.4beta2
|
| 2014-09-23 |
Chris Cannam |
This will be SV v2.4
sv_v2.4
|
| 2014-09-16 |
Chris Cannam |
Fix #1058 clicking row in Layer Edit dialog when colour 3d plot layer active jumps to wrong frame (was using sample rate where resolution intended)
|
| 2014-09-12 |
Chris Cannam |
Refuse to play if no sample rate available (fixes crash when playing after deleting only pane)
|
| 2014-09-12 |
Chris Cannam |
Don't print activity
|
| 2014-09-12 |
Chris Cannam |
Ignore cov-int directory
|
| 2014-09-12 |
Chris Cannam |
Experimentally add the hybrid normalisation as an option (not working well either in UI or implementation)
normalize_hybrid_option
|
| 2014-09-11 |
Chris Cannam |
Do not draw the model time extents if the top layer does not have time as its x axis (fixing #1057)
2.4beta2
|
| 2014-09-10 |
Chris Cannam |
Pull across beta bits from prior beta branch
2.4beta2 sv_v2.4beta2
|
| 2014-09-10 |
Chris Cannam |
Update README and CHANGELOG
|
| 2014-09-10 |
Chris Cannam |
If the old and new-style user resource prefixes return different results, move across resources from old to new to prime the new path first time we look it up
|
| 2014-09-09 |
Chris Cannam |
Use QStandardPaths::writableLocation(DataLocation) instead of synthesising path ourselves (hopefully fixing encoding difficulties on Windows)
|
| 2014-09-09 |
Chris Cannam |
Respond tidily to user cancellation during download, instead of going on to attempt to load the nonexistent file as a non-audio format
|
| 2014-09-09 |
Chris Cannam |
Use openPath instead of open() when opening local file or URL (for progress indicator). I think I didn't realise this distinction between the two functions, which formerly were both named open().
|
| 2014-09-03 |
Chris Cannam |
Avoid complaint about unused return value
|
| 2014-09-03 |
Chris Cannam |
Fix potential null pointer deref
|
| 2014-09-03 |
Chris Cannam |
Fix memory leak (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some uninitialised values (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Remove redundant code (sourceChannels must be at least 2 "because we offer pan") (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix dead code; fix previous fix to midi insertion logic
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix a couple of not-very-realistic potential null-pointer derefs (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Simplify some logic where loop was used with an unconditional "break" that meant it could only happen once (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some potential null-pointer derefs, and simplify some logic where loops were used with an unconditional "break" that meant they could only happen once (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some potential divide by zeros (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix minor resource leak (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Clarify some sneaky logic
|
| 2014-09-03 |
Chris Cannam |
Fix uninitialised variable (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix a couple of inadvertant integer divisions (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Remove redundant code (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix potential divide by zero
|
| 2014-09-03 |
Chris Cannam |
Clarify some sneaky logic
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some potential null derefs (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix memory leak
|
| 2014-09-03 |
Chris Cannam |
Fix various slightly dodgy derefs and the like (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Remove redundant code (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix very minor but erroneous non-float-arithmetic
|
| 2014-09-03 |
Chris Cannam |
clarify
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Back out last change (see subrepo commit log)
|
| 2014-09-03 |
Chris Cannam |
Fix to iterator invalidation (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
As coverity points out, MIDI_END_OF_EXCLUSIVE (0xF7) cannot result from masking with MIDI_MESSAGE_TYPE_MASK(0xF0). Not that it really matters here.
|
| 2014-09-03 |
Chris Cannam |
Fix return of empty string as bool value (from coverity scan, interesting the compiler doesn't mind)
|
| 2014-09-03 |
Chris Cannam |
Frame this condition more defensively (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix fallthrough in switch (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix something coverity reports as "copy-paste error" (actually it doesn't matter, but the fix reads better)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix accidental declaration of section as bool rather than int (definitely a bug but what did it cause? see #1051, we need units here) (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix some (probably benign) uninitialised members (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Fix one actual null pointer deref and a couple of potential ones, plus an uninitialised value (from coverity scan)
|
| 2014-09-03 |
Chris Cannam |
Return seems to work better than Enter here
|
