# HG changeset patch # User mathieub # Date 1311619130 -3600 # Node ID b3b9cc8f546682c355bdf0f26dc8ebb8fd6f36e7 # Parent 0ef4943f55ae539ff68cf1eaedc70820bd6f9c2b# Parent d70890996156935f95ac358aacba2e7dca3be9ec Merge with the Kiosk branch diff -r d70890996156 -r b3b9cc8f5466 .hgignore --- a/.hgignore Tue Mar 22 14:29:38 2011 +0000 +++ b/.hgignore Mon Jul 25 19:38:50 2011 +0100 @@ -14,3 +14,10 @@ *~ *.orig *.rej +re:^autom4te\.cache/ +re:^qrc_sonic-visualiser\.cpp$ +re:^sonic-visualiser$ +re:^aclocal\.m4$ +re:^config\.log$ +re:^config\.pri$ +re:^config\.status$ diff -r d70890996156 -r b3b9cc8f5466 .hgtags --- a/.hgtags Tue Mar 22 14:29:38 2011 +0000 +++ b/.hgtags Mon Jul 25 19:38:50 2011 +0100 @@ -19,3 +19,5 @@ d936e3d77b959176550a700001f2b11bc89d1f37 sv1-v1.2pre3 e764bbf2b0904654a4816d94c09c0b66c426c6f5 last-cc-copyright fcd2315296280ea174e83f061c6508db15788ab1 sv1-1.0pre3 +5c2a18310c6e351ccf401c5bead78ddcccfecf18 sv_v1.8 +44741262c2e016f2e81e35c66b66a1a9969e9dd2 sv_v1.8_osx_deploy diff -r d70890996156 -r b3b9cc8f5466 CHANGELOG --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CHANGELOG Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,318 @@ + +Changes in Sonic Visualiser 1.8 since the previous release 1.7.2: + + - Sonic Visualiser now registers as a file type handler on OS/X, + providing better integration with the desktop generally (Dan Stowell) + + - There is a new function to toggle all Time Rulers at once (key #) + + - The CSV import dialog has been overhauled, allowing more flexible + selection of purpose for each column + + - Text overlays are now easier to read on dark backgrounds + + - Hidden layers are now ignored when exporting an image (Dan Stowell) + + - A crash when starting a new session or exiting the application + after loading a session with saved alignment data has been fixed + + - The duplication of right-button menu functions when multiple files + were loaded has been fixed + + - The layer-add menu functions now have shortcuts (Dan Stowell) + + - The codebase has been reorganised into libraries and a configure + step added. It should be easier to build and maintain on OS/X and + Linux than previously, although it won't make much difference on + Windows. + + - A Czech translation is now included (thanks to Pavel Fric). + +Changes in Sonic Visualiser 1.7.2 since the previous release 1.7.1: + + - The time-value layer now has an origin line and an option to + show derivatives (change from one point to the next) rather than + raw values + + - A static initialiser race has been fixed, possibly fixing an + occasional crash on startup in Windows + + - A crash when pressing Play straight after New Session has been + fixed + +Changes in Sonic Visualiser 1.7.1 since the previous release 1.7: + + - The RDF importer does a better job of assigning labels to layers, + layers to panes, and values to labelled regions + + - Interactive editing in the Text layer benefits from the same + improvements as made in 1.7 to Note and Region layers + + - The layer data editor window has a text search feature + + - The main window status bar now shows the last label to have passed + the playback position in the current layer, at the right end of the + status bar + + - The Russian translation has been updated (thanks Alexandre) + +Changes in Sonic Visualiser 1.7 since the previous release 1.6: + + - A new "Insert Item At Selection" function on the Edit menu + can be used to create Note and Region layer items whose time + extents correspond to the current selection(s) + + - Interactively editing points in the Note and Region layers + now works much more smoothly + + - SV can now import MIDI files that use SMPTE timecode for event + timing (importing MIDI files using with the more common + timebase-based timing was already supported) + + - Time values throughout the display may optionally be shown in + seconds and frames at various frame rates + + - A crash on exit in Windows has been fixed + + - A very unobtrusive user survey is now included + + - Various other bug fixes. + +Changes in Sonic Visualiser 1.6 since the previous release 1.5: + + - The Colour 3D Plot layer now supports logarithmic vertical + scale and linear interpolation options. + + - A new colour scheme (High Gain) has been added for spectrogram + and Colour 3D Plot, which improves readability for some data. + + - Further performance improvements have been made to Colour 3D + Plot. + + - Various other bug fixes. + +Changes in Sonic Visualiser 1.5 since the previous version 1.4: + + - You can now insert time instants, time values, and notes using + a MIDI device during playback. If a time value or note layer is + current it will be used for insertion (giving a value equal to + the pitch class, or the played note, respectively); otherwise an + existing or new time instants layer will be used just as it is + when inserting instants using the PC keyboard. Using a MIDI + device should give better timing than using the PC keyboard. + + - There is a new Activity Log window with a (purely informative) list + of events and user interactions that happen while SV is running. + + - The spectrogram has somewhat improved graphical scaling, and + this is now the default (being much faster than the 4x oversampled + method). The previous default is still available as a preference. + + - Visualisation of very dense colour plots (such as spectrograms + calculated by plugins) is substantially faster in this release. + + - Spectrogram display is now faster in many circumstances. + + - Alignment using the MATCH plugin is faster on OS/X than before. + + - SV will take into account RDF plugin descriptions, if available, + in order to make somewhat better decisions about display of plugin + outputs (for example, placing segmentation data into a layer with + segmentation plot type). + + - You can now switch layers by clicking on the spare area at the left + end of the pane that is also used for the current pane indicator. + + - The vertical black lines dividing segments in the time value + layer's segmentation plot style are now optional. + + - Several widget layout bugs on OS/X have been fixed. + + - Several serious crashing, deadlock, and data corruption bugs have + been fixed. + + +New features in Sonic Visualiser 1.4 since the previous version 1.3: + + - SV now has a Region layer type, used for display of features with + durations. It also supports Vamp v2.0 plugins that provide durations + for features. + + - Layer data can now be imported from RDF described using the Audio + Features Ontology, as well as from the existing text file types. SV + can also export annotation layer data to RDF/Turtle, although in a + somewhat simplistic manner at present. + + - You can search for transforms by text in the new "Find a Transform" + dialog. This searches both installed plugins, and plugins that have + not been installed but that have descriptions available on the + semantic web. + + - You can now zoom and scroll vertically in the time-value, note, + and colour 3d plot layers. + + - Sonic Visualiser can now load sessions from uncompressed XML files + as well as its own compressed-XML .sv format. Files with extension + .xml that contain suitable session data will be loaded as sessions. + Note that .xml extension files still do not show up in the default + file load filter. This is intentional, as there may be any kind of + data in them -- if you want to load uncompressed session files from + XML, you need to know you're doing it. + + - Several crashes and other bugs have been fixed. + +Changes in Sonic Visualiser 1.3 since the previous version 1.2: + + - There is a new spreadsheet-style data viewer and editor for + viewing and editing the data in some types of annotation layer. + + - Alignments are now saved to the session file. + + - The spectrogram layer is usually somewhat faster than it was. + + - You can now hold Shift while dragging to move an item, in order + to override the initial drag resistance introduced in 1.2. + + - The gross mis-labelling of time lines in the ruler has been fixed. + + - There is a new, somewhat provisional PulseAudio output driver. + + - Several other bug fixes. + +New features in Sonic Visualiser 1.2, since the previous version 1.0: + + - SV now supports time-alignment of multiple performances of a work + loaded at the same time. This option is enabled when the MATCH Vamp + plugin is installed. When alignment is switched on and more than one + audio file is open, SV will assume that all open files are + differently timed performances of the same work, and will calculate + time alignments for them. Playback will then play only a single file + at a time, and the playback cursors in other files will track at the + varying speeds to try to ensure that each is at the same point in the + underlying score. This enables effective comparison of several such + files, as well as a meaningful way to switch from one performance to + another during playback (ensuring that the switch happens at the + correct point in the performance being switched to). + + - There is a new Image layer, which can display images from the + local filesystem or retrieved via HTTP or FTP. + + - A new measurement tool has been added. With the measurement tool + selected, dragging in a pane draws a rectangle labelled with the + scale values for its start and end corners and its size. You can + have any number of measurements present at once; they are associated + with the top layer, their scale values depend on the scale for that + layer, and they are only shown when that layer is at the top and the + measurement tool is active. Measurements are saved and reloaded in + the session file. Drawing measurements can be undone and redone, and + a measurement can be deleted by hitting Del when highlighted. Note + that the measurement tool shows the scale values associated with the + pixel positions of the mouse when dragging, not any values associated + with actual features present in the audio or its analysis (e.g. the + values are not rounded to the nearest spectrogram bin). + + - You can double-click using the measurement tool in the spectrogram + to get an instant measurement rectangle for a feature. This is a + purely graphical feature that works by calculating the boundary of a + contiguous region of pixels "similar to" the one you double-clicked + on; it does not use audio analysis. Adjusting the gain and colour + scheme etc of the spectrogram will (by design) affect the + measurements obtained this way. + + - The spectrum can now optionally show frequency estimates of peaks + aligned with a piano keyboard along the horizontal axis (this needs + some refinement). + + - The harmonic cursor in the spectrogram has moved from the Select + tool to the Measurement tool. There is now a similar harmonic cursor + in the spectrum. Both of them show more information as text + alongside the cursor than previously. + + - There is a new Erase tool for erasing individual points from an + editable layer. + + - Several keyboard shortcuts have changed -- all of the Alt+key + shortcuts now either use Ctrl or a plain keypress with no modifier, + to avoid clashes with window manager shortcuts and to make them + easier to use and remember + + - The playback controls are now in a Playback menu as well as the + toolbar. + + - There is a new key and mouse control reference under Help (or press + F2). + + - You can double-click on a pane in navigate mode to jump to a time. + + - All of the single-colour layers (waveform, time values etc) now + allow you to define your own colours as well as using the built-in + set. The colour of a layer is now shown next to its name on the pane. + + - When you add a new single-colour layer it will use a default colour + that is not yet in use in another layer (if there is one). + + - Single-colour layers can now optionally have black backgrounds (with + a set of lighter colours in the default colour palette that use black + backgrounds by default). + + - There's a new Printer colour scheme in the spectrogram with only a + small number of grey shades. + + - Vertical zoom in a log-scaled spectrogram is much more intuitive; + it now leaves the point that was in the centre of the visible area in + the centre after zoom, instead of the point that was in the centre of + the linear range corresponding to the visible area. + + - You can now turn a colour 3d plot layer upside down by clicking the + Invert Vertical Scale button. + + - There's a new Layer Summary window which shows the panes and + layer data in a tree layout. This is very simplistic at the moment. + + - Each pane now has an [X] button at its top left, which removes that + pane when clicked. + + - There's a new Solo play mode toggle button; when active, only the + currently selected pane is played. This is also the default when + time alignment is in use. + + - Rewind/ffwd now stay confined to the selection if Play Selection is + enabled; also, the rewind and ffwd "one step" buttons are now enabled + even if there is no time instants layer for them to align to (they + align to the time ruler instead and so jump in steps of a size + dependent on the zoom level). + + - You can now export note layers to MIDI. + + - MIDI note velocity is partially supported. Note velocity is + retained when importing and exporting MIDI and is used in playback, + but it is not yet shown in the display and cannot yet be edited. + + - You can now drag-and-drop files (of whatever type) onto SV from + other programs such as file managers or web browsers. + + - mp3 files (and Ogg, but they aren't supported on Windows at the + moment) are now decoded in a background thread so you can see the + start of the track without waiting for the rest to decode. + + - Mac builds of SV can now load AAC/mp4 files and anything else + supported by QuickTime. + + - There is now an option to resample audio files on import if they + don't match the samplerate of the first file loaded. By default this + is switched off, as it affects the visible waveform. The default + behaviour is unchanged (play at the wrong rate). There is still no + option to handle multiple rates "correctly" (i.e. by resampling + on playback and showing the waveforms at different resolutions + according to each one's underlying rate) and there probably never + will be. + + - SV can now open .m3u playlist files, though it's a hazardous thing + to do as it simply loads all the files in the playlist at once. + + - SV now has various options for how to number tapped time instants + (bar/beat, plain counter, time in seconds, tempo etc). + + - The official builds use Qt 4.3, which fixes some nasty + bugs in the file dialog that the version 1.0 builds suffered from. + diff -r d70890996156 -r b3b9cc8f5466 INSTALL.txt --- a/INSTALL.txt Tue Mar 22 14:29:38 2011 +0000 +++ b/INSTALL.txt Mon Jul 25 19:38:50 2011 +0100 @@ -2,12 +2,7 @@ To compile from source ---------------------- -This file provides various instructions useful when compiling the SV -libraries from source, but it doesn't have a complete recipe for any -one platform -- there are too many variables. However, you can find a -recipe for one platform (Ubuntu Linux) in the file INSTALL.ubuntu. - -To build, run +To build on a Unix-like system, run $ ./configure && make @@ -24,7 +19,7 @@ REQUIRED Redland RDF libraries http://librdf.org/ Optional MAD mp3 decoder http://www.underbit.com/products/mad/ -Optional Oggz and fishsound http://www.annodex.net/software/libraries.html +Optional Oggz and fishsound http://xiph.org/oggz/ Optional liblo OSC library http://www.plugin.org.uk/liblo/ The Redland RDF libraries include the Raptor RDF parser library, diff -r d70890996156 -r b3b9cc8f5466 README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,113 @@ + +Sonic Visualiser +================ + +Sonic Visualiser is a program for viewing and analysing the contents +of music audio files. + +With Sonic Visualiser you can: + + * Load audio files in various formats (WAV/AIFF, plus Ogg and mp3 +if compiled in) and view their waveforms + + * Look at audio visualisations such as spectrogram views, with +interactive adjustment of display parameters + + * Annotate audio data by adding labelled time points and defining +segments, point values and curves + + * Run feature-extraction plugins to calculate annotations +automatically, using algorithms such as beat trackers, pitch +detectors and so on + + * Import annotation data from various text formats and MIDI files + + * Play back the original audio with synthesised annotations, taking +care to synchronise playback with the display position + + * Slow down and speed up playback and loop segments of interest, +including seamless looping of complex non-contiguous areas + + * Export annotations and audio selections to external files. + +Sonic Visualiser can also be controlled remotely using the Open Sound +Control (OSC) protocol (if support is compiled in). + + +Credits +------- + +Sonic Visualiser was developed at the Centre for Digital Music, +Queen Mary, University of London. + + http://www.elec.qmul.ac.uk/digitalmusic/ + +The main program is by Chris Cannam, with additional DSP and program +design work by Christian Landone. Thanks also to Craig Sapp for his +suggestions and useful feedback. + +Code copyright 2005-2007 Chris Cannam and copyright 2006-2011 Queen +Mary, University of London, except where indicated in the individual +source files. + +This work was partially funded by the European Commission through the +SIMAC project IST-FP6-507142 and the EASAIER project IST-FP6-033902. + +This work was partially funded by the Arts and Humanities Research +Council through its Research Centre for the History and Analysis of +Recorded Music (CHARM). + +This work was partially funded by the Engineering and Physical +Sciences Research Council through the OMRAS2 project EP/E017614/1. + +This work was partially funded by the Engineering and Physical +Sciences Research Council through the Musicology for the Masses +project EP/I001832/1. + +Sonic Visualiser is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. See the file COPYING included with +this distribution for more information. + +Sonic Visualiser may also make use of the following libraries: + + * Qt4 -- Copyright Nokia Corporation, distributed under the Lesser GPL + * JACK -- Copyright Paul Davis, Jack O'Quin et al, under the Lesser GPL + * PortAudio -- Copyright Ross Bencina, Phil Burk et al, BSD license + * Ogg decoder -- Copyright CSIRO Australia, BSD license + * MAD mp3 decoder -- Copyright Underbit Technologies Inc, GPL + * libsamplerate -- Copyright Erik de Castro Lopo, GPL + * libsndfile -- Copyright Erik de Castro Lopo, LGPL + * FFTW3 -- Copyright Matteo Frigo and MIT, GPL + * Rubber Band -- Copyright Chris Cannam, GPL + * Vamp plugin SDK -- Copyright Chris Cannam, BSD license + * LADSPA plugin SDK -- Copyright Richard Furse et al, LGPL + * Redland RDF libraries -- Copyright Dave Beckett and the University of Bristol, LGPL/Apache license + * RtMIDI -- Copyright Gary P. Scavone, BSD license + * liblo OSC library -- Copyright Steve Harris, GPL + +(Some distributions of Sonic Visualiser may have one or more of these +libraries statically linked.) Many thanks to their authors. + +Sonic Visualiser can also use QuickTime for audio file import on OS/X. +For licensing reasons, you may not distribute binaries of Sonic +Visualiser with QuickTime support included for any platform that does +not include QuickTime as part of the platform itself (see section 3 of +version 2 of the GNU General Public License). + + +Compiling Sonic Visualiser +-------------------------- + +If you are planning to compile Sonic Visualiser from source code, +please read the file INSTALL.txt. + + +More information +---------------- + +For more information about Sonic Visualiser, please go to + + http://www.sonicvisualiser.org/ + diff -r d70890996156 -r b3b9cc8f5466 README.OSC --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.OSC Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,262 @@ + +OSC control of Sonic Visualiser +=============================== + +Sonic Visualiser can be controlled remotely using the Open Sound +Control protocol. This facility requires Steve Harris's liblo (Lite +OSC) library to have been available when Sonic Visualiser was built. + +Sonic Visualiser opens a single OSC port on startup. The URL of this +port is printed to standard output on startup, or can be read from the +About box on the Help menu. + +OSC commands accepted by Sonic Visualiser take the form: + + ://:/ [ ...] + +For example, "osc.udp://localhost:12654/play 2.0" will play the +current session from time 2.0 seconds. + +Methods that manipulate panes or layers act on the currently selected +pane or layer. Use the setcurrent method to choose the right target +for subsequent such methods. + +There is a small program sv/osc/sv-osc-send.c that sends an OSC method +and arguments to a given URL, and a small shell script sv/osc/sv-command +that provides a basic command shell for Sonic Visualiser. + + +OSC methods available +===================== + +Main window methods +------------------- + + /open + + Open a new file (of type determined by Sonic Visualiser). + If it is an audio file, use it to replace the existing main + audio file (if any). + + /openadditional + + Open a new file. If it is an audio file, open it in a new + pane in addition to the existing audio file (if any). + + /recent + /last + + Open the 'th most recent file from the Recent Files menu, + counting from 1 for the most recent file opened. "last" is a + synonym for "recent 1". + + /save + + Save the current session in as an SV session file. + This action will try to fail rather than overwrite an existing + file, but you probably shouldn't rely on that. + + /export + + Export the (first) selected area of the main audio file + (or all of it, if there is no selection) in , as a + WAV file. This action will try to fail rather than overwrite + an existing file, but you probably shouldn't rely on that. + + /jump + /jump end + /jump selection + + Jump the playback position to time (in seconds); or to + the end of the file; or to the start of the current selection. + + /play + /play + /play selection + + Start playback. If a time is given, start from that time + in seconds. If the word "selection" is given instead, play + the current selection. + + /stop + + Stop playback. + + /loop on + /loop off + + Switch playback loop mode on or off. + + /select + /select all + /select none + + Select the region from times to in seconds; or select + the whole file; or clear the selection. If there is a layer + selected that can be used as a snap guide for the selection, then + the selection will be snapped to it (in the same manner as when + making selections interactively). + + /addselect + + Make an additional selection (leaving any existing selection + in place) from times to in seconds. + + /undo + /redo + + Undo the last editing operation; redo the last undone operation. + Note that most of the classic editing operations (copy and paste + etc) are not controllable via OSC, but undo may still be useful + because Sonic Visualiser considers actions such as adding a pane + to be undoable editing operations as well. + + /add + /add + + Add a new pane containing a layer of the given type, based on + the main audio file. If no is specified, use all + available channels. Useful s are: + + waveform + spectrogram + spectrum + timeruler + + The following s are less useful, because they create + empty layers which there is currently no OSC support for editing: + + timeinstants + timevalues + notes + text + colour3dplot + + /set + /set pane + /set layer + + Set a main window control; a property of the current pane; or a + property of the current layer. + + Accepted main window s are: + + gain + whose values are linear multipliers (i.e. 1.0 == unity gain). + + speedup + takes a value of a percentage increase in playback + speed, so 0 is the default playback speed, 100 sets double + the default speed, and -100 sets half the default speed + (yes, I know, it's nonsense, sorry). + + overlays + controls the verbosity level of the text overlays on + each pane, from 0 (everything off) to 2 (everything on). + + zoomwheels + controls whether the zoom wheels are displayed (1) or not (0). + + propertyboxes + controls whether the property boxes are displayed (1) or not (0). + + For pane and layer properties, the control name is the displayed + name of the given property (though you may use "-" or "_" in place + of any spaces in the name if it's easier for you). The value may + be the displayed value or underlying integer for the property. + + Some examples: + + /set pane Global-Scroll off + /set pane Follow_Playback Scroll + /set layer Colour Blue + /set layer Scale-Units dB + /set layer Frequency-Scale Log + + Note that while you can use "-" or "_" in place of spaces in the + property name, you cannot currently do so in the value text. If + this is a problem for you, you might be able to set the value + as an integer instead (all layer properties can be set this way). + + /setcurrent + /setcurrent + + Make the given (a number counting from 1 for the topmost + pane) and optionally the given on that pane (a number + counting from 1 for the "frontmost" layer) the current pane and + layer for subsequent pane and layer operations. + + /delete pane + /delete layer + + Delete the current pane or layer. + + /zoom + /zoom in + /zoom out + /zoom default + + Zoom to a given zoom , given in audio sample frames per + pixel; or zoom in or out one step from the current level; or + return to the default zoom level. This method acts on the + current pane (it only affects all panes if set to Global Zoom, + which is the default). + + /zoomvertical + /zoomvertical in + /zoomvertical out + /zoomvertical default + + Change the vertical zoom and origin so as to show the value + range from to in the vertical scale; or zoom in or + out vertically; or return to the default vertical zoom level. + The effect of this method is heavily dependent on the current + layer. + + /transform + + Transform the current main audio file using the named transform. + Transforms are named according to the scheme + + type:source:plugin:output + + For example, the percussion onset detector from the Vamp example + plugin set can be invoked via + + /transform vamp:vamp-example-plugins:percussiononsets:onsets + + If the output is omitted, the first is used. Note that you + need to use the plugin and output name, not description: in + this case "percussiononsets" rather than "Simple Percussion + Onset Detector". + + There is not yet any way to run a transform via OSC on any but + the main audio file, nor with any but its default parameters, + processing block/step size, or channel selection. + + /resize + /resize pane + + Resize the main window to width and height (if the + window system permits); resize the current pane to height + if possible (!!! not yet working). + + /quit + + Exit the program abruptly without saving. + +Handy things still missing from the OSC interface include: + + * the ability to run transforms with non-default parameters or + starting from different source models + * the ability to add layers to a pane (without transform) + * the ability to add panes (and layers) showing any but the + main model + * the ability to set play parameters on a layer/model and show/hide it + * the ability to set the vertical zoom range (vital for spectrogram) + * the ability to import and export layers + * a working pane resize + * quick shortcuts to Melodic Range Spectrogram, Peak Frequency Spectrogram + * the ability to rename a layer + + diff -r d70890996156 -r b3b9cc8f5466 acinclude.m4 --- a/acinclude.m4 Tue Mar 22 14:29:38 2011 +0000 +++ b/acinclude.m4 Mon Jul 25 19:38:50 2011 +0100 @@ -8,10 +8,16 @@ SV_MODULE_FUNC=$5 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') SV_MODULE_FAILED=1 +if test -n "$$1_LIBS" ; then + AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) + CXXFLAGS="$CXXFLAGS $$1_CFLAGS" + LIBS="$LIBS $$1_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) fi if test -n "$SV_MODULE_FAILED"; then @@ -31,10 +37,16 @@ SV_MODULE_FUNC=$5 SV_MODULE_HAVE=HAVE_$(echo $1 | tr '[a-z]' '[A-Z]') SV_MODULE_FAILED=1 +if test -n "$$1_LIBS" ; then + AC_MSG_NOTICE([User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE]) + CXXFLAGS="$CXXFLAGS $$1_CFLAGS" + LIBS="$LIBS $$1_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])]) fi if test -n "$SV_MODULE_FAILED"; then diff -r d70890996156 -r b3b9cc8f5466 configure --- a/configure Tue Mar 22 14:29:38 2011 +0000 +++ b/configure Mon Jul 25 19:38:50 2011 +0100 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Sonic Visualiser 1.8. +# Generated by GNU Autoconf 2.67 for Sonic Visualiser 1.9-hg. # # Report bugs to . # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -319,7 +319,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -359,19 +359,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -533,7 +533,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='Sonic Visualiser' PACKAGE_TARNAME='sonic-visualiser' -PACKAGE_VERSION='1.8' -PACKAGE_STRING='Sonic Visualiser 1.8' +PACKAGE_VERSION='1.9-hg' +PACKAGE_STRING='Sonic Visualiser 1.9-hg' PACKAGE_BUGREPORT='cannam@all-day-breakfast.com' PACKAGE_URL='' @@ -646,6 +646,8 @@ bz2_LIBS bz2_CFLAGS QMAKE +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG EGREP GREP @@ -720,6 +722,8 @@ CCC CXXCPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR bz2_CFLAGS bz2_LIBS fftw3_CFLAGS @@ -822,8 +826,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -868,7 +873,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -894,7 +899,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1098,7 +1103,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1114,7 +1119,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1144,8 +1149,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1153,7 +1158,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1171,13 +1176,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1200,7 +1205,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1214,8 +1219,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1230,9 +1235,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1271,11 +1276,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1301,7 +1306,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Sonic Visualiser 1.8 to adapt to many kinds of systems. +\`configure' configures Sonic Visualiser 1.9-hg to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1320,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1363,7 +1368,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Sonic Visualiser 1.8:";; + short | recursive ) echo "Configuration of Sonic Visualiser 1.9-hg:";; esac cat <<\_ACEOF @@ -1385,6 +1390,10 @@ CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path bz2_CFLAGS C compiler flags for bz2, overriding pkg-config bz2_LIBS linker flags for bz2, overriding pkg-config fftw3_CFLAGS @@ -1514,10 +1523,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Sonic Visualiser configure 1.8 -generated by GNU Autoconf 2.65 - -Copyright (C) 2009 Free Software Foundation, Inc. +Sonic Visualiser configure 1.9-hg +generated by GNU Autoconf 2.67 + +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1625,7 +1634,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : @@ -1691,10 +1700,10 @@ ac_fn_cxx_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1730,7 +1739,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1753,17 +1762,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ------------------------------------------- ## +( $as_echo "## ------------------------------------------- ## ## Report this to cannam@all-day-breakfast.com ## -## ------------------------------------------- ## -_ASBOX +## ------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1785,7 +1792,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1856,8 +1863,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Sonic Visualiser $as_me 1.8, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by Sonic Visualiser $as_me 1.9-hg, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -1967,11 +1974,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2005,11 +2010,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2022,11 +2025,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2040,11 +2041,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2099,7 +2098,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2114,7 +2118,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2190,7 +2198,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2214,6 +2222,13 @@ # piddling about. USER_CXXFLAGS="$CXXFLAGS" +# If the user supplied CFLAGS but not CXXFLAGS, use CFLAGS instead +if test x"$USER_CXXFLAGS" = x; then + if test x"$CFLAGS" != x; then + USER_CXXFLAGS="$CFLAGS" + fi +fi + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2521,8 +2536,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2636,9 +2651,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2680,8 +2694,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2738,9 +2752,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -2791,8 +2805,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3271,16 +3285,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3467,7 +3487,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3483,11 +3503,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -3526,7 +3546,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3542,18 +3562,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=cpp @@ -3614,7 +3634,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -3680,7 +3700,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -3813,6 +3833,10 @@ + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -3925,7 +3949,6 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi - fi @@ -4127,7 +4150,7 @@ fi if test x$QMAKE = x ; then - as_fn_error " + as_fn_error $? " Failed to find the required qmake-qt4 or qmake program. Please ensure you have the necessary Qt4 development files installed, and if necessary set QTDIR to the location of your Qt4 installation. @@ -4215,8 +4238,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4234,20 +4256,26 @@ SV_MODULE_FUNC=BZ2_bzReadOpen SV_MODULE_HAVE=HAVE_$(echo bz2 | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$bz2_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $bz2_CFLAGS" + LIBS="$LIBS $bz2_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bz2" >&5 $as_echo_n "checking for bz2... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$bz2_CFLAGS"; then - pkg_cv_bz2_CFLAGS="$bz2_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$bz2_CFLAGS"; then + pkg_cv_bz2_CFLAGS="$bz2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4257,15 +4285,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$bz2_LIBS"; then - pkg_cv_bz2_LIBS="$bz2_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$bz2_LIBS"; then + pkg_cv_bz2_LIBS="$bz2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4275,14 +4301,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4290,18 +4317,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - bz2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + bz2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - bz2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + bz2_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$bz2_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -4315,11 +4342,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -4327,7 +4353,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4362,11 +4388,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -4380,20 +4405,26 @@ SV_MODULE_FUNC=fftw_execute SV_MODULE_HAVE=HAVE_$(echo fftw3 | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$fftw3_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $fftw3_CFLAGS" + LIBS="$LIBS $fftw3_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5 $as_echo_n "checking for fftw3... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$fftw3_CFLAGS"; then - pkg_cv_fftw3_CFLAGS="$fftw3_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$fftw3_CFLAGS"; then + pkg_cv_fftw3_CFLAGS="$fftw3_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4403,15 +4434,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$fftw3_LIBS"; then - pkg_cv_fftw3_LIBS="$fftw3_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$fftw3_LIBS"; then + pkg_cv_fftw3_LIBS="$fftw3_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4421,14 +4450,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4436,18 +4466,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - fftw3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fftw3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - fftw3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fftw3_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$fftw3_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -4461,11 +4491,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -4473,7 +4502,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4508,11 +4537,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -4526,20 +4554,26 @@ SV_MODULE_FUNC=fftwf_execute SV_MODULE_HAVE=HAVE_$(echo fftw3f | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$fftw3f_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $fftw3f_CFLAGS" + LIBS="$LIBS $fftw3f_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3f" >&5 $as_echo_n "checking for fftw3f... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$fftw3f_CFLAGS"; then - pkg_cv_fftw3f_CFLAGS="$fftw3f_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$fftw3f_CFLAGS"; then + pkg_cv_fftw3f_CFLAGS="$fftw3f_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4549,15 +4583,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$fftw3f_LIBS"; then - pkg_cv_fftw3f_LIBS="$fftw3f_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$fftw3f_LIBS"; then + pkg_cv_fftw3f_LIBS="$fftw3f_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4567,14 +4599,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4582,18 +4615,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - fftw3f_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fftw3f_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - fftw3f_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fftw3f_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$fftw3f_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -4607,11 +4640,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -4619,7 +4651,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4654,11 +4686,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -4672,20 +4703,26 @@ SV_MODULE_FUNC=sf_open SV_MODULE_HAVE=HAVE_$(echo sndfile | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$sndfile_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $sndfile_CFLAGS" + LIBS="$LIBS $sndfile_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sndfile" >&5 $as_echo_n "checking for sndfile... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$sndfile_CFLAGS"; then - pkg_cv_sndfile_CFLAGS="$sndfile_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$sndfile_CFLAGS"; then + pkg_cv_sndfile_CFLAGS="$sndfile_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4695,15 +4732,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$sndfile_LIBS"; then - pkg_cv_sndfile_LIBS="$sndfile_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$sndfile_LIBS"; then + pkg_cv_sndfile_LIBS="$sndfile_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4713,14 +4748,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4728,18 +4764,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - sndfile_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + sndfile_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - sndfile_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + sndfile_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$sndfile_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -4753,11 +4789,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -4765,7 +4800,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4800,11 +4835,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -4818,20 +4852,26 @@ SV_MODULE_FUNC=src_new SV_MODULE_HAVE=HAVE_$(echo samplerate | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$samplerate_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $samplerate_CFLAGS" + LIBS="$LIBS $samplerate_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5 $as_echo_n "checking for samplerate... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$samplerate_CFLAGS"; then - pkg_cv_samplerate_CFLAGS="$samplerate_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$samplerate_CFLAGS"; then + pkg_cv_samplerate_CFLAGS="$samplerate_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4841,15 +4881,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$samplerate_LIBS"; then - pkg_cv_samplerate_LIBS="$samplerate_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$samplerate_LIBS"; then + pkg_cv_samplerate_LIBS="$samplerate_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4859,14 +4897,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -4874,18 +4913,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - samplerate_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + samplerate_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - samplerate_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + samplerate_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$samplerate_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -4899,11 +4938,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -4911,7 +4949,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4946,11 +4984,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -4964,20 +5001,26 @@ SV_MODULE_FUNC= SV_MODULE_HAVE=HAVE_$(echo vamp | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$vamp_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $vamp_CFLAGS" + LIBS="$LIBS $vamp_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vamp" >&5 $as_echo_n "checking for vamp... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$vamp_CFLAGS"; then - pkg_cv_vamp_CFLAGS="$vamp_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$vamp_CFLAGS"; then + pkg_cv_vamp_CFLAGS="$vamp_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -4987,15 +5030,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$vamp_LIBS"; then - pkg_cv_vamp_LIBS="$vamp_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$vamp_LIBS"; then + pkg_cv_vamp_LIBS="$vamp_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5005,14 +5046,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5020,18 +5062,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - vamp_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + vamp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - vamp_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + vamp_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$vamp_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5045,11 +5087,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5057,7 +5098,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5092,11 +5133,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5110,20 +5150,26 @@ SV_MODULE_FUNC= SV_MODULE_HAVE=HAVE_$(echo vamphostsdk | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$vamphostsdk_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $vamphostsdk_CFLAGS" + LIBS="$LIBS $vamphostsdk_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vamphostsdk" >&5 $as_echo_n "checking for vamphostsdk... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$vamphostsdk_CFLAGS"; then - pkg_cv_vamphostsdk_CFLAGS="$vamphostsdk_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$vamphostsdk_CFLAGS"; then + pkg_cv_vamphostsdk_CFLAGS="$vamphostsdk_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5133,15 +5179,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$vamphostsdk_LIBS"; then - pkg_cv_vamphostsdk_LIBS="$vamphostsdk_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$vamphostsdk_LIBS"; then + pkg_cv_vamphostsdk_LIBS="$vamphostsdk_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5151,14 +5195,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5166,18 +5211,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - vamphostsdk_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + vamphostsdk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - vamphostsdk_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + vamphostsdk_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$vamphostsdk_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5191,11 +5236,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5203,7 +5247,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5238,11 +5282,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5256,20 +5299,26 @@ SV_MODULE_FUNC=rubberband_new SV_MODULE_HAVE=HAVE_$(echo rubberband | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$rubberband_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $rubberband_CFLAGS" + LIBS="$LIBS $rubberband_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rubberband" >&5 $as_echo_n "checking for rubberband... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$rubberband_CFLAGS"; then - pkg_cv_rubberband_CFLAGS="$rubberband_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$rubberband_CFLAGS"; then + pkg_cv_rubberband_CFLAGS="$rubberband_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5279,15 +5328,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$rubberband_LIBS"; then - pkg_cv_rubberband_LIBS="$rubberband_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$rubberband_LIBS"; then + pkg_cv_rubberband_LIBS="$rubberband_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5297,14 +5344,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5312,18 +5360,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - rubberband_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + rubberband_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - rubberband_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + rubberband_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$rubberband_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5337,11 +5385,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5349,7 +5396,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5384,11 +5431,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5402,20 +5448,26 @@ SV_MODULE_FUNC=raptor_start_parse SV_MODULE_HAVE=HAVE_$(echo raptor | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$raptor_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $raptor_CFLAGS" + LIBS="$LIBS $raptor_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for raptor" >&5 $as_echo_n "checking for raptor... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$raptor_CFLAGS"; then - pkg_cv_raptor_CFLAGS="$raptor_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$raptor_CFLAGS"; then + pkg_cv_raptor_CFLAGS="$raptor_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5425,15 +5477,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$raptor_LIBS"; then - pkg_cv_raptor_LIBS="$raptor_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$raptor_LIBS"; then + pkg_cv_raptor_LIBS="$raptor_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5443,14 +5493,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5458,18 +5509,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - raptor_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + raptor_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - raptor_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + raptor_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$raptor_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5483,11 +5534,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5495,7 +5545,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5530,11 +5580,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5548,20 +5597,26 @@ SV_MODULE_FUNC=rasqal_new_world SV_MODULE_HAVE=HAVE_$(echo rasqal | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$rasqal_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $rasqal_CFLAGS" + LIBS="$LIBS $rasqal_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rasqal" >&5 $as_echo_n "checking for rasqal... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$rasqal_CFLAGS"; then - pkg_cv_rasqal_CFLAGS="$rasqal_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$rasqal_CFLAGS"; then + pkg_cv_rasqal_CFLAGS="$rasqal_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5571,15 +5626,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$rasqal_LIBS"; then - pkg_cv_rasqal_LIBS="$rasqal_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$rasqal_LIBS"; then + pkg_cv_rasqal_LIBS="$rasqal_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5589,14 +5642,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5604,18 +5658,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - rasqal_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + rasqal_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - rasqal_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + rasqal_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$rasqal_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5629,11 +5683,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5641,7 +5694,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5676,11 +5729,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5694,20 +5746,26 @@ SV_MODULE_FUNC=librdf_new_world SV_MODULE_HAVE=HAVE_$(echo redland | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$redland_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $redland_CFLAGS" + LIBS="$LIBS $redland_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland" >&5 $as_echo_n "checking for redland... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$redland_CFLAGS"; then - pkg_cv_redland_CFLAGS="$redland_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$redland_CFLAGS"; then + pkg_cv_redland_CFLAGS="$redland_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5717,15 +5775,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$redland_LIBS"; then - pkg_cv_redland_LIBS="$redland_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$redland_LIBS"; then + pkg_cv_redland_LIBS="$redland_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5735,14 +5791,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5750,18 +5807,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - redland_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + redland_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - redland_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + redland_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$redland_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5775,11 +5832,10 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE" else - as_fn_error "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find header $SV_MODULE_HEADER for required module $SV_MODULE_MODULE" "$LINENO" 5 fi @@ -5787,7 +5843,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5822,11 +5878,10 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else - as_fn_error "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 + as_fn_error $? "Failed to find library $SV_MODULE_LIB for required module $SV_MODULE_MODULE" "$LINENO" 5 fi fi @@ -5841,20 +5896,26 @@ SV_MODULE_FUNC=lo_address_new SV_MODULE_HAVE=HAVE_$(echo liblo | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$liblo_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $liblo_CFLAGS" + LIBS="$LIBS $liblo_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5 $as_echo_n "checking for liblo... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$liblo_CFLAGS"; then - pkg_cv_liblo_CFLAGS="$liblo_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$liblo_CFLAGS"; then + pkg_cv_liblo_CFLAGS="$liblo_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5864,15 +5925,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$liblo_LIBS"; then - pkg_cv_liblo_LIBS="$liblo_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$liblo_LIBS"; then + pkg_cv_liblo_LIBS="$liblo_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -5882,14 +5941,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -5897,18 +5957,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - liblo_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + liblo_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - liblo_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + liblo_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$liblo_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -5922,8 +5982,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -5936,7 +5995,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5971,8 +6030,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -5991,20 +6049,26 @@ SV_MODULE_FUNC=Pa_IsFormatSupported SV_MODULE_HAVE=HAVE_$(echo portaudio_2_0 | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$portaudio_2_0_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $portaudio_2_0_CFLAGS" + LIBS="$LIBS $portaudio_2_0_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio_2_0" >&5 $as_echo_n "checking for portaudio_2_0... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$portaudio_2_0_CFLAGS"; then - pkg_cv_portaudio_2_0_CFLAGS="$portaudio_2_0_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$portaudio_2_0_CFLAGS"; then + pkg_cv_portaudio_2_0_CFLAGS="$portaudio_2_0_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6014,15 +6078,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$portaudio_2_0_LIBS"; then - pkg_cv_portaudio_2_0_LIBS="$portaudio_2_0_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$portaudio_2_0_LIBS"; then + pkg_cv_portaudio_2_0_LIBS="$portaudio_2_0_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6032,14 +6094,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6047,18 +6110,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + portaudio_2_0_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$portaudio_2_0_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6072,8 +6135,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6086,7 +6148,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6121,8 +6183,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6141,20 +6202,26 @@ SV_MODULE_FUNC=jack_client_open SV_MODULE_HAVE=HAVE_$(echo JACK | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$JACK_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $JACK_CFLAGS" + LIBS="$LIBS $JACK_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5 $as_echo_n "checking for JACK... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$JACK_CFLAGS"; then - pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$JACK_CFLAGS"; then + pkg_cv_JACK_CFLAGS="$JACK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6164,15 +6231,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$JACK_LIBS"; then - pkg_cv_JACK_LIBS="$JACK_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$JACK_LIBS"; then + pkg_cv_JACK_LIBS="$JACK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6182,14 +6247,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6197,18 +6263,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$JACK_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6222,8 +6288,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6236,7 +6301,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6271,8 +6336,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6291,20 +6355,26 @@ SV_MODULE_FUNC=pa_stream_new SV_MODULE_HAVE=HAVE_$(echo libpulse | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$libpulse_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS" + LIBS="$LIBS $libpulse_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpulse" >&5 $as_echo_n "checking for libpulse... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$libpulse_CFLAGS"; then - pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$libpulse_CFLAGS"; then + pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6314,15 +6384,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$libpulse_LIBS"; then - pkg_cv_libpulse_LIBS="$libpulse_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$libpulse_LIBS"; then + pkg_cv_libpulse_LIBS="$libpulse_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6332,14 +6400,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6347,18 +6416,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libpulse_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + libpulse_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - libpulse_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + libpulse_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libpulse_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6372,8 +6441,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6386,7 +6454,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6421,8 +6489,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6441,20 +6508,26 @@ SV_MODULE_FUNC=lrdf_init SV_MODULE_HAVE=HAVE_$(echo lrdf | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$lrdf_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS" + LIBS="$LIBS $lrdf_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrdf" >&5 $as_echo_n "checking for lrdf... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$lrdf_CFLAGS"; then - pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$lrdf_CFLAGS"; then + pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6464,15 +6537,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$lrdf_LIBS"; then - pkg_cv_lrdf_LIBS="$lrdf_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$lrdf_LIBS"; then + pkg_cv_lrdf_LIBS="$lrdf_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6482,14 +6553,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6497,18 +6569,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - lrdf_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + lrdf_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - lrdf_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + lrdf_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$lrdf_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6522,8 +6594,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6536,7 +6607,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6571,8 +6642,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6591,20 +6661,26 @@ SV_MODULE_FUNC=oggz_run SV_MODULE_HAVE=HAVE_$(echo oggz | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$oggz_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $oggz_CFLAGS" + LIBS="$LIBS $oggz_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oggz" >&5 $as_echo_n "checking for oggz... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$oggz_CFLAGS"; then - pkg_cv_oggz_CFLAGS="$oggz_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$oggz_CFLAGS"; then + pkg_cv_oggz_CFLAGS="$oggz_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6614,15 +6690,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$oggz_LIBS"; then - pkg_cv_oggz_LIBS="$oggz_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$oggz_LIBS"; then + pkg_cv_oggz_LIBS="$oggz_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6632,14 +6706,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6647,18 +6722,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - oggz_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + oggz_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - oggz_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + oggz_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$oggz_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6672,8 +6747,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6686,7 +6760,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6721,8 +6795,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6741,20 +6814,26 @@ SV_MODULE_FUNC=fish_sound_new SV_MODULE_HAVE=HAVE_$(echo fishsound | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$fishsound_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS" + LIBS="$LIBS $fishsound_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fishsound" >&5 $as_echo_n "checking for fishsound... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$fishsound_CFLAGS"; then - pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$fishsound_CFLAGS"; then + pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6764,15 +6843,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$fishsound_LIBS"; then - pkg_cv_fishsound_LIBS="$fishsound_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$fishsound_LIBS"; then + pkg_cv_fishsound_LIBS="$fishsound_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6782,14 +6859,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6797,18 +6875,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - fishsound_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fishsound_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - fishsound_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + fishsound_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$fishsound_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6822,8 +6900,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6836,7 +6913,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -6871,8 +6948,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -6891,20 +6967,26 @@ SV_MODULE_FUNC=mad_decoder_init SV_MODULE_HAVE=HAVE_$(echo mad | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$mad_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $mad_CFLAGS" + LIBS="$LIBS $mad_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad" >&5 $as_echo_n "checking for mad... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$mad_CFLAGS"; then - pkg_cv_mad_CFLAGS="$mad_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$mad_CFLAGS"; then + pkg_cv_mad_CFLAGS="$mad_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6914,15 +6996,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$mad_LIBS"; then - pkg_cv_mad_LIBS="$mad_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$mad_LIBS"; then + pkg_cv_mad_LIBS="$mad_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -6932,14 +7012,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6947,18 +7028,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - mad_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + mad_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$mad_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -6972,8 +7053,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -6986,7 +7066,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7021,8 +7101,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -7041,20 +7120,26 @@ SV_MODULE_FUNC=id3_tag_new SV_MODULE_HAVE=HAVE_$(echo id3tag | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 +if test -n "$id3tag_LIBS" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5 +$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;} + CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS" + LIBS="$LIBS $id3tag_LIBS" + SV_MODULE_FAILED="" +fi if test -z "$SV_MODULE_VERSION_TEST" ; then SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE fi -if test -n "$PKG_CONFIG"; then +if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3tag" >&5 $as_echo_n "checking for id3tag... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$id3tag_CFLAGS"; then - pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$id3tag_CFLAGS"; then + pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -7064,15 +7149,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$id3tag_LIBS"; then - pkg_cv_id3tag_LIBS="$id3tag_LIBS" - else - if test -n "$PKG_CONFIG" && \ + else + pkg_failed=untried +fi +if test -n "$id3tag_LIBS"; then + pkg_cv_id3tag_LIBS="$id3tag_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5 ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5 ac_status=$? @@ -7082,14 +7165,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -7097,18 +7181,18 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - id3tag_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + id3tag_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` else - id3tag_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$SV_MODULE_VERSION_TEST"` + id3tag_PKG_ERRORS=`$PKG_CONFIG --print-errors "$SV_MODULE_VERSION_TEST" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$id3tag_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5 $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;} else @@ -7122,8 +7206,7 @@ if test -n "$SV_MODULE_FAILED"; then as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED="" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5 @@ -7136,7 +7219,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5 $as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7171,8 +7254,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="$LIBS -l$SV_MODULE_LIB" else { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5 @@ -7324,6 +7406,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -7485,19 +7568,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -7693,7 +7776,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -7746,8 +7829,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Sonic Visualiser $as_me 1.8, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by Sonic Visualiser $as_me 1.9-hg, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7799,11 +7882,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Sonic Visualiser config.status 1.8 -configured by $0, generated by GNU Autoconf 2.65, +Sonic Visualiser config.status 1.9-hg +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -7820,11 +7903,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -7846,6 +7934,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -7856,7 +7945,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -7907,7 +7996,7 @@ case $ac_config_target in "config.pri") CONFIG_FILES="$CONFIG_FILES config.pri" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -7943,7 +8032,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -7960,7 +8049,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -7974,18 +8063,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8074,20 +8163,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -8105,7 +8202,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -8133,7 +8230,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -8160,7 +8257,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -8297,22 +8394,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -8327,7 +8424,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -8348,7 +8445,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -8476,6 +8573,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -8637,19 +8735,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -8845,7 +8943,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -8898,8 +8996,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Sonic Visualiser $as_me 1.8, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by Sonic Visualiser $as_me 1.9-hg, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8951,11 +9049,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Sonic Visualiser config.status 1.8 -configured by $0, generated by GNU Autoconf 2.65, +Sonic Visualiser config.status 1.9-hg +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8972,11 +9070,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -8998,6 +9101,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -9008,7 +9112,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -9060,7 +9164,7 @@ "config.pri") CONFIG_FILES="$CONFIG_FILES config.pri" ;; "version.h") CONFIG_FILES="$CONFIG_FILES version.h" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -9096,7 +9200,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -9113,7 +9217,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -9127,18 +9231,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9227,20 +9331,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -9258,7 +9370,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9286,7 +9398,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9313,7 +9425,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9450,22 +9562,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -9480,7 +9592,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -9501,7 +9613,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -9510,7 +9622,7 @@ if ! $QMAKE -r; then - as_fn_error "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5 + as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: diff -r d70890996156 -r b3b9cc8f5466 configure.ac --- a/configure.ac Tue Mar 22 14:29:38 2011 +0000 +++ b/configure.ac Mon Jul 25 19:38:50 2011 +0100 @@ -1,5 +1,5 @@ -AC_INIT([Sonic Visualiser], 1.8, cannam@all-day-breakfast.com) +AC_INIT([Sonic Visualiser], 1.9-hg, cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(main/main.cpp) @@ -11,6 +11,13 @@ # piddling about. USER_CXXFLAGS="$CXXFLAGS" +# If the user supplied CFLAGS but not CXXFLAGS, use CFLAGS instead +if test x"$USER_CXXFLAGS" = x; then + if test x"$CFLAGS" != x; then + USER_CXXFLAGS="$CFLAGS" + fi +fi + AC_LANG_CPLUSPLUS AC_PROG_CC diff -r d70890996156 -r b3b9cc8f5466 deploy/osx/Info.plist --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/osx/Info.plist Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,141 @@ + + + + + CFBundlePackageType + APPL + CFBundleName + Sonic Visualiser + CFBundleExecutable + Sonic Visualiser + CFBundleIconFile + sv-macicon.icns + CFBundleIdentifier + org.sonicvisualiser.SonicVisualiser + CFBundleShortVersionString + SV_VERSION + CFBundleDocumentTypes + + + + CFBundleTypeExtensions + + sv + + + CFBundleTypeMIMETypes + + application/x-sonic-visualiser-session + + CFBundleTypeName + Sonic Visualiser Session + CFBundleTypeOSTypes + + **** + + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSIsAppleDefaultForType + + + + + + CFBundleTypeExtensions + + mp3 + + CFBundleTypeMIMETypes + + audio/mpeg + + CFBundleTypeName + MP3 Audio + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSHandlerRank + Alternate + + + CFBundleTypeExtensions + + ogg + oga + + CFBundleTypeMIMETypes + + audio/ogg + + CFBundleTypeName + Ogg Vorbis Audio + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSHandlerRank + Alternate + + + CFBundleTypeExtensions + + wav + + CFBundleTypeMIMETypes + + audio/x-wav + + CFBundleTypeName + Wave Audio + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSHandlerRank + Alternate + + + CFBundleTypeExtensions + + aif + aiff + + CFBundleTypeMIMETypes + + audio/x-aiff + + CFBundleTypeName + AIFF Audio + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSHandlerRank + Alternate + + + CFBundleTypeExtensions + + flac + + CFBundleTypeMIMETypes + + audio/flac + + CFBundleTypeName + FLAC Audio + CFBundleTypeRole + Viewer + LSIsAppleDefaultForType + + LSHandlerRank + Alternate + + + + diff -r d70890996156 -r b3b9cc8f5466 deploy/osx/deploy.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/osx/deploy.sh Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,55 @@ +#!/bin/bash + +# Execute this from the top-level directory of the project (the one +# that contains the .app bundle). Supply the name of the .app bundle +# as argument (the target will use $app.app regardless, but we need +# to know the source) + +source="$1" +dmg="$2" +if [ -z "$source" ] || [ ! -d "$source" ] || [ -z "$dmg" ]; then + echo "Usage: $0 " + echo " e.g. $0 MyApplication.app MyApplication" + echo " Version number and .dmg will be appended automatically," + echo " but the .app name must include .app" + exit 2 +fi +app=`basename "$source" .app` + +version=`perl -p -e 's/^[^"]*"([^"]*)".*$/$1/' version.h` +case "$version" in + [0-9].[0-9]) bundleVersion="$version".0 ;; + [0-9].[0-9].[0-9]) bundleVersion="$version" ;; + *) echo "Error: Version $version is neither two- nor three-part number" ;; +esac + +echo +echo "Making target tree." + +volume="$app"-"$version" +target="$volume"/"$app".app +dmg="$dmg"-"$version".dmg + +mkdir "$volume" || exit 1 + +ln -s /Applications "$volume"/Applications +cp README README.OSC COPYING CHANGELOG "$volume/" +cp -rp "$source" "$target" + +echo "Done" + +echo "Writing version $bundleVersion in to bundle." +echo "(This should be a three-part number: major.minor.point)" + +perl -p -e "s/SV_VERSION/$bundleVersion/" deploy/osx/Info.plist \ + > "$target"/Contents/Info.plist + +echo "Done: check $target/Contents/Info.plist for sanity please" + +echo +echo "Making dmg..." + +hdiutil create -srcfolder "$volume" "$dmg" -volname "$volume" && + rm -r "$volume" + +echo "Done" diff -r d70890996156 -r b3b9cc8f5466 deploy/osx/paths.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/osx/paths.sh Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,36 @@ +#!/bin/bash + +app="$1" +if [ -z "$app" ]; then + echo "Usage: $0 " + echo "Provide appname without the .app extension, please" + exit 2 +fi + +echo +echo "I expect you to have already copied QtCore, QtNetwork, QtGui and QtXml to " +echo "$app.app/Contents/Frameworks -- expect errors to follow if they're missing" +echo + +echo "Fixing up loader paths in binaries..." + +install_name_tool -id QtCore "$app.app/Contents/Frameworks/QtCore" +install_name_tool -id QtGui "$app.app/Contents/Frameworks/QtGui" +install_name_tool -id QtNetwork "$app.app/Contents/Frameworks/QtNetwork" +install_name_tool -id QtXml "$app.app/Contents/Frameworks/QtXml" + +for fwk in QtCore QtGui QtNetwork QtXml; do + find "$app.app" -type f -print | while read x; do + current=$(otool -L "$x" | grep "$fwk" | grep ramework | awk '{ print $1; }') + [ -z "$current" ] && continue + echo "$x has $current" + relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \ + -e 's,[^/]*/,../,g' -e 's,/[^/]*$,/Frameworks/'"$fwk"',' ) + echo "replacing with relative path $relative" + install_name_tool -change "$current" "@loader_path/$relative" "$x" + done +done + +echo "Done: be sure to run the app and see that it works!" + + diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_cs_CZ.qm Binary file i18n/sonic-visualiser_cs_CZ.qm has changed diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_cs_CZ.ts --- a/i18n/sonic-visualiser_cs_CZ.ts Tue Mar 22 14:29:38 2011 +0000 +++ b/i18n/sonic-visualiser_cs_CZ.ts Mon Jul 25 19:38:50 2011 +0100 @@ -4,17 +4,17 @@ ActivityLog - + Activity Log Zápis činnosti - + <p>Activity Log lists your interactions and other events within %1.</p> <p>Zápis činností uvádí vaši spolupráci a další události uvnitř %1.</p> - + %1: %2 %1: %2 @@ -22,7 +22,7 @@ AddLayerCommand - + Add %1 Layer Přidat %1 vrstvu @@ -30,7 +30,7 @@ AggregateWaveModel - + Aggregate Wave Úhrnná vlna @@ -38,7 +38,7 @@ AlignmentModel - + Alignment Zarovnání @@ -46,17 +46,17 @@ AudioCallbackPlaySource - + Play from %1 Přehrát od %1 - + Stop at %1 Zastavit na %1 - + Change time-stretch factor to %1 Změnit násobek roztažení času na %1 @@ -64,39 +64,39 @@ AudioDial - + %1: %2%3 %1: %2%3 - + %2%3 %2%3 - + New value for %1, from %2 to %3 %4: Nová hodnota pro %1, od %2 do %3 %4: - + New value for %1, from %2 to %3: Nová hodnota pro %1, od %2 do %3: - + Enter a new value from %1 to %2 %3: Zadejte novou hodnotu od %1, do %2 %3: - - + + Enter a new value from %1 to %2: Zadejte novou hodnotu od %1 do %2: - - + + Enter new value Zadat novou hodnotu @@ -104,27 +104,27 @@ AudioTargetFactory - + (auto) (auto) - + JACK Audio Connection Kit Spojovací sada pro zvuk JACK - + PulseAudio Server Server PulseAudio - + Core Audio Device Jaderné zvukové zařízení - + Default Soundcard Device Výchozí zařízení zvukové karty @@ -132,72 +132,72 @@ BZipFileDevice - + File is already open Soubor je již otevřen - + Append mode not supported Režim připojení není podporován - + File access mode not specified Režim přístupu k souborům není zadán - + Read and write modes both specified Režimy pro čtení a zápis jsou zadány - + Failed to open file for writing Otevření souboru pro zápis se nezdařilo - + Failed to open bzip2 stream for writing Otevření proudu bzip2 pro zápis se nezdařilo - + Failed to open file for reading Otevření souboru pro čtení se nezdařilo - + Failed to open bzip2 stream for reading Otevření proudu bzip2 pro čtení se nezdařilo - + Internal error (open for neither read nor write) Vnitřní chyba (otevření ani pro čtení, ani pro zápis) - + File not open Soubor neotevřen - + bzip2 stream write close error Chyba závěru zápisu proudu bzip2 - + bzip2 stream read close error Chyba závěru čtení proudu bzip2 - + Internal error (close for neither read nor write) Vnitřní chyba (závěr ani pro čtení, ani pro zápis) - + bzip2 stream read error Chyba čtení proudu bzip2 @@ -205,7 +205,7 @@ BundleCommand - + %1 (%n change(s)) %1 (jedna změna) @@ -217,7 +217,7 @@ CSVFileWriter - + Failed to open file %1 for writing Otevření souboru %1 pro zápis se nezdařilo @@ -225,7 +225,7 @@ CSVFormatDialog - + Select Data Format Vybrat datový formát @@ -266,71 +266,76 @@ Data (řádky po sobě následují v čase) - + Please select the correct data format for this file. - - - - + Vyberte, prosím, správný datový formát pro tento soubor. + + + <ignore> - - - - + <nevšímat si> + + + Time - Čas - - - + Čas + + + End time - - - - + Koncový čas + + + Duration - Doba trvání - - - + Doba trvání + + + Value - Hodnota - - - + Hodnota + + + Label - Štítek - - - + Štítek + + + Timing is specified: - - - - + Čas je zadán: + + + Explicitly, in seconds - - - - + Otevřeně, v sekundách + + + Explicitly, in audio sample frames - - - - + Otevřeně, ve zvukových vzorkovacích snímcích + + + Implicitly: rows are equally spaced in time - - - - + Skrytě: řádky jsou pravidelně rozloženy v čase + + + Audio sample rate (Hz): Vzorkovací kmitočet zvuku (Hz): - + Frame increment between rows: Nárůst snímků mezi řádky: + + Data will be displayed in a %1 layer. + + + Example data from file: @@ -340,91 +345,91 @@ Colour3DPlotLayer - - + + Colour Barva - - + + Scale Stupnice - + Normalize Columns Normalizovat sloupce - + Normalize Visible Area Normalizovat viditelnou oblast - + Invert Vertical Scale Obrátit svislou stupnici - + Gain Zesílení signálu - + Always Opaque Vždý neprůhledná - + Smooth Jemná - + Bin Scale Stupnice koše - + Bins Koše - - + + Linear Čárový - - + + Log Zápis - + +/-1 +/-1 - + Absolute Naprostý - + <unknown> <neznámý> - + dB dB - + Time: %1 - %2 Bin: %3 Value: %4 @@ -436,68 +441,68 @@ ColourMapper - - + + <unknown> <neznámý> - + Default Výchozí - + White on Black Bílá na černé - + Black on White Černá na bílé - + Red on Blue Červená na modré - + Yellow on Black Žlutá na černé - + Blue on Black Modrá na černé - + Sunset Západ slunce - + Fruit Salad Ovocný salát - + Banded Pruhovaný - + Highlight Zvýraznění - + Printer Tiskárna - + High Gain Zesílení výšek @@ -505,68 +510,68 @@ CommandHistory - - - + + + &Undo &Zpět - + Ctrl+Z Ctrl+Z - + Undo the last editing operation Poslední krok úprav vrátit zpět - - - + + + Re&do &Znovu - + Ctrl+Shift+Z Ctrl+Shift+Z - + Redo the last operation that was undone Opakovat poslední krok úprav, který byl vrácen zpět - + Undo %1 Zpět %1 - + Redo %1 Znovu %1 - + Nothing to undo Neexistuje nic, co by se dalo vrátit zpět - + Nothing to redo Neexistuje nic, u čeho by šlo zrušit vrácení zpět - - + + &Undo %1 &Zpět %1 - - + + Re&do %1 &Znovu %1 @@ -574,7 +579,7 @@ Dense3DModelPeakCache - + Dense 3-D Peak Cache Vyrovnávací paměť hustého trojrozměrného vrcholu @@ -582,34 +587,38 @@ DenseThreeDimensionalModel + Dense 3-D - Hustý trojrozměrný - - + Hustý trojrozměrný + + + Time - Čas - - + Čas + + + Frame - Snímek + Snímek DenseTimeValueModel + Dense Time-Value - Hustá hodnota času + Hustá hodnota času Document - + Set main model to %1 Nastavit hlavní model na %1 - + Clear main model Smazat hlavní model @@ -617,19 +626,20 @@ EditableDenseThreeDimensionalModel + Editable Dense 3-D - Upravovatelný hustý trojrozměrný + Upravovatelný hustý trojrozměrný FFTModel - + FFT FFT - + %1 Hz %1 Hz @@ -637,22 +647,22 @@ Fader - + Enter new fader level Zadat novou úroveň prolínače - + New fader level, from %1 to %2 dBFS: Nová úroveň prolínače, od %1 do %2 dBFS: - + Level: Off Úroveň: Vypnuto - + Level: %1%2.%3%4 dB Úroveň: %1%2.%3%4 dB @@ -660,48 +670,48 @@ FeatureExtractionModelTransformer - + No factory available for feature extraction plugin id "%1" (unknown plugin type, or internal error?) Není dostupný žádný závod pro ID přídavného modulu vytažení funkce "%1" (neznámý typ přídavného modulu, nebo vnitřní chyba?) - + Input model for feature extraction plugin "%1" is of wrong type (internal error?) Vstupní model pro přídavný modul vytažení funkce "%1" je chybného typu (vnitřní chyba?) - + Failed to instantiate plugin "%1" Přídavný modul "%1" se nepodařilo doložit příkladem - + Cannot provide enough channels to feature extraction plugin "%1" (plugin min is %2, max %3; input model has %4) Nelze poskytnout dostatek kanálů pro přídavný modul vytažení funkce "%1" (minimum pro přídavný modul je %2, maximum pro přídavný modul je %3; vstupní model has %4) - - + + Failed to initialise feature extraction plugin "%1" Přídavný modul vytažení funkce se nepodařilo spustit "%1" - + Feature extraction plugin "%1" rejected the given step and block sizes (%2 and %3); using plugin defaults (%4 and %5) instead Přídavný modul vytažení funkce "%1" odmítl daný krok a velikosti bloků (%2 a %3); používají se výchozí nastavení přídavného modulu (%4 a %5) - + Transform was configured for version %1 of plugin "%2", but the plugin being used is version %3 Proměna byla nastavena pro verzi %1 přídavného modulu "%2", ale používaný přídavný modul je ve verzi %3 - + Plugin "%1" has no outputs Přídavný modul "%1" nemá žádné výstupy - + Plugin "%1" has no output named "%2" Přídavný modul "%1" nemá žádný výstup pojmenovaný jako "%2" @@ -709,49 +719,49 @@ FileSource - - - + + + Unsupported scheme in URL Nepodporované schéma v adrese (URL) - + Downloading %1... Stahuje se %1... - + Failed to connect to FTP server Připojení k FTP serveru se nezdařilo - + Login failed Přihlášení se nezdařilo - + Failed to change to correct directory Změna na správný adresář se nepodařila - + FTP download aborted FTP stahování zrušeno - + Download cancelled Stahování zrušeno - + Failed to create local file %1 Vytvoření místního souboru %1 se nezdařilo - + File contains no data! Soubor neobsahuje žádné údaje! @@ -759,7 +769,7 @@ I - + Edit Data Upravit data @@ -767,52 +777,52 @@ ImageDialog - + Image Obrázek - + Label: Štítek: - + File or URL: Soubor nebo adresa (URL): - + Browse... Procházet... - + Preview Náhled - + Unsupported scheme in URL Nepodporované schéma v adrese (URL) - + The URL scheme "%1" is not supported Schéma adresy (URL) "%1" není podporována - + Opening image URL... Otevírá se adresa obrázku (URL)... - + File download failed Stažení souboru se nezdařilo - + Failed to download URL "%1": %2 Nepodařilo se stáhnout adresu (URL) "%1": %2 @@ -820,58 +830,58 @@ ImageLayer - + In progress Probíhá - - + + Select image Vybrat obrázek - + Move Image Přesunout obrázek - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selection Smazat výběr - + Re-align pasted items? Zarovnat vložené položky znovu? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit - + New Point Nový bod - + Opening image URL... Otevírá se adresa obrázku (URL)... @@ -879,38 +889,38 @@ ImageModel - - + + Image Obrázek - + Edit Image Upravit obrázek - + Time Čas - + Frame Snímek - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -918,25 +928,25 @@ InteractiveFileFinder - - + + Select file Vybrat soubor - - + + All files (*.*) Všechny soubory (*.*) - - + + Select a session file Vybrat soubor se sezením - + Sonic Visualiser session files (*.sv) RDF files (%1) All files (*.*) @@ -945,14 +955,14 @@ Všechny soubory (*.*) - + Audio files (%1) All files (*.*) Zvukové soubory (%1) Všechny soubory (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -971,7 +981,7 @@ Všechny soubory (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -988,7 +998,7 @@ Všechny soubory (*.*) - + All supported files (*.sv %1 %2) Sonic Visualiser session files (*.sv) Audio files (%2) @@ -1001,14 +1011,14 @@ Všechny soubory (*.*) - + Image files (%1) All files (*.*) Obrázkové soubory (%1) Všechny soubory (*.*) - + All supported files (*.sv %1 %2 %3) Sonic Visualiser session files (*.sv) Audio files (%1) @@ -1023,81 +1033,81 @@ Všechny soubory (*.*) - + File does not exist Soubor neexistuje - + <b>File not found</b><p>File "%1" does not exist <b>Soubor nenalezen</b><p>Soubor "%1" neexistuje - + File is not readable Soubor není čitelný - + <b>File is not readable</b><p>File "%1" can not be read <b>Soubor není čitelný</b><p>Soubor "%1" nelze přečíst - - + + Directory selected Adresář vybrán - - + + <b>Directory selected</b><p>File "%1" is a directory <b>Soubor vybrán</b><p>Soubor "%1" je adresář - + Non-file selected Vybrán ne-soubor - + <b>Not a file</b><p>Path "%1" is not a file <b>Není soubor</b><p>Cesta "%1" není soubor - + File is empty Soubor je prázdný - + <b>File is empty</b><p>File "%1" is empty <b>Soubor je prázdný</b><p>Soubor "%1" je prázdný - + Sonic Visualiser session files (*.sv) All files (*.*) Soubory se sezením programu Sonic Visualiser (*.sv) Všechny soubory (*.*) - - - - + + + + Select a file to export to Vybrat soubor, do kterého se má provést vyvedení - + WAV audio files (*.wav) All files (*.*) Zvukové soubory WAV (*.wav) Všechny soubory (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1112,7 +1122,7 @@ Všechny soubory (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1125,75 +1135,75 @@ Všechny soubory (*.*) - + Portable Network Graphics files (*.png) All files (*.*) Soubory PNG (Portable Network Graphics) (*.png) Všechny soubory (*.*) - + File exists Soubor již existuje - + <b>File exists</b><p>The file "%1" already exists. Do you want to overwrite it? <b>Soubor existuje</b><p>Soubor "%1" již existuje. Chcete jej přepsat? - + <b>File not found</b><p>Audio file "%1" could not be opened. Do you want to locate it? <b>Soubor nenalezen</b><p>Zvukový soubor "%1" se nepodařilo otevřít. Chcete jej najít? - + <b>File not found</b><p>File "%1" could not be opened. Do you want to locate it? <b>Soubor nenalezen</b><p>Soubor "%1" se nepodařilo otevřít. Chcete jej najít? - + Failed to open file Soubor se nepodařilo otevřít - + Locate file... Najít soubor... - + Use URL... Použít adresu (URL)... - + Cancel Zrušit - + Use URL Použít adresu (URL) - + Please enter the URL to use for this file: Zadejte, prosím, adresu (URL), která se má použít pro tento soubor: - + Failed to open location Umístění se nepodařilo otevřít - + <b>Failed to open location</b><p>URL "%1" could not be opened <b>Umístění se nepodařilo otevřít</b><p>Adresu (URL) "%1" se nepodařilo otevřít @@ -1201,65 +1211,65 @@ ItemEditDialog - + Timing Načasování - + Time: Čas: - - + + frames snímky - - + + sec sek - - + + usec usek - + Duration: Doba trvání: - + Properties Vlastnosti - + Value: Hodnota: - + Text: Text: - + OK OK - + Reset Nastavit znovu - + Cancel Zrušit @@ -1267,23 +1277,23 @@ KeyReference - - + + & & - + <i>or</i>&nbsp;<b>%1</b> <i>nebo</i>&nbsp;<b>%1</b> - + </b>&nbsp;(%1)<b> </b>&nbsp;(%1)<b> - + Sonic Visualiser: Key and Mouse Reference Sonic Visualiser: Odkaz na klávesy a myš @@ -1291,17 +1301,17 @@ LabelCounterInputDialog - + Set Counters Nastavit počítadla - + Fine counter (beats): Citlivé počítadlo (doby): - + Coarse counter (bars): Hrubé počítadlo (doby): @@ -1309,77 +1319,77 @@ Labeller - + No numbering Žádné číslování - + Simple counter Jednoduché počítadlo - + Cyclical counter Cyklické počítadlo - + Cyclical two-level counter (bar/beat) Cyklické dvouúrovňové počítadlo (takt/doba) - + Audio sample frame number Číslo snímku zvukového vzorku - + Time in seconds Čas v sekundách - + Duration to the following item Doba trvání po následující položku - + Tempo (bpm) based on duration to following item Tempo (počet úderů za minutu; úzm: bpm) založené na době trvání po následující položku - + Duration since the previous item Doba trvání od předchozí položky - + Tempo (bpm) based on duration since previous item Tempo (počet úderů za minutu; úzm: bpm) založené na době trvání od předchozí položky - + Same as the nearest previous item Stejné jako nejbližší předchozí položka - + Value extracted from the item's label (where possible) Hodnota vytažená ze štítku u položky (kde je to možné) - + %1.%2 %1 %2 - + %1 %1 - + Label Points Body štítků @@ -1387,81 +1397,81 @@ Layer - + Waveform Časový průběh vlny - - - + + + Spectrogram Spektrogram - + Ruler Pravítko - + Time Instants Okamžiky času - + Time Values Hodnoty času - + Notes Noty - + Regions Oblasti - + Text Text - + Images Obrázky - + Colour 3D Plot Barevný trojrozměrný nákres - + Spectrum Spektrum - + Time Slice Kus času - + Layer Vrstva - + Make Measurement - Udělat měření - - - + Udělat měření + + + Delete Measurement - Smazat měření + Smazat měření @@ -1481,17 +1491,17 @@ LayerTreeDialog - + Layer Summary Přehled vrstev - + Audio Data Sources Zdroje zvukových dat - + Panes and Layers Tabulky a vrstvy @@ -1499,22 +1509,22 @@ LayerTreeModel - + Layer Vrstva - + Shown Ukázaná - + Played Přehrávaná - + Model Model @@ -1522,27 +1532,27 @@ MIDIFileImportDialog - + Merge all tracks Sloučit všechny stopy - + Merge all non-percussion tracks Sloučit všechny stopy, které nejsou bicích - + Select track or tracks to import Vybrat stopu nebo stopy pro zavedení - + <b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import: <b>Vybrat stopu pro zavedení</b><p> Tento soubor můžete zavést jen jako jednu poznámkovou vrstvu, ale soubor obsahuje více než jednu stopu, nebo noty na více než jednom kanálu.<p>Vyberte, prosím, stopu nebo sloučené stopy, jež si přejete zavést: - + Error in MIDI file import Chyba při zavádění souboru MIDI @@ -1550,89 +1560,89 @@ MIDIFileReader - + Wrong length for long data in MIDI stream (%1, should be %2) Chybná délka pro dlouhá data v proudu MIDI (%1, mělo by být %2) - + Wrong length for int data in MIDI stream (%1, should be %2) Chybná délka pro vnitřní data v proudu MIDI (%1, mělo by být %2) - + getMIDIByte called but no MIDI file open Voláno getMIDIByte (získat byt MIDI), ale neotevřen žádný soubor MIDI - - + + End of MIDI file encountered while reading Při čtení byl dosažen konec souboru MIDI - + Attempt to get more bytes than expected on Track Pokus o získání více bytů ze stopy, než bylo očekáváno - - + + Attempt to read past MIDI file end Pokus o čtení po konci souboru MIDI - + getMIDIBytes called but no MIDI file open Voláno getMIDIBytes (získat byty MIDI), ale neotevřen žádný soubor MIDI - + Attempt to get more bytes than available on Track (%1, only have %2) Pokus o získání více bytů, než je na stopě dostupných (%1, má pouze %2) - + getNumberFromMIDIBytes called but no MIDI file open Voláno getNumberFromMIDIBytes (získat z bytů MIDI číslo), ale neotevřen žádný soubor MIDI - + skipToNextTrack called but no MIDI file open Voláno skipToNextTrack (skočit na další skladbuI), ale neotevřen žádný soubor MIDI - + Invalid event code %1 found Nalezen neplatný kód události %1 - + Running status used for first event in track Pro první událost ve stopě byl použit provozní stav ('Running') - + MIDI file "%1" has no notes in any track Soubor MIDI "%1" nemá noty v žádné stopě - + - uses GM percussion channel - používá kanál bicích GM - + Track %1 (%2)%3 Stopa %1 (%2)%3 - + Track %1 (untitled)%3 Stopa %1 (bez názvu)%3 - + %1 - vel %2 %1 - vel %2 @@ -1640,7 +1650,7 @@ MIDIInput - + Input Vstup @@ -1648,7 +1658,7 @@ MP3FileReader - + Decoding %1... Dekóduje se %1... @@ -1656,1682 +1666,1712 @@ MainWindow - - + + Sonic Visualiser Sonic Visualiser - Znázorňovač zvuku - + Black Černá - + Red Červená - + Blue Modrá - - - + + + Green Zelená - + Purple Purpurová - + Orange Oranžová - + White Bílá - + Bright Red Světlečervená - + Bright Blue Světlemodrá - - - + + + Bright Green Světlezelená - + Bright Purple Světlepurpurová - + Bright Orange Světleoranžová - + Playback Speedup Zvýšení rychlosti přehrávání - - - + + + &Layer &Vrstva - - + + &Transform &Proměna - + &File &Soubor - + File Toolbar Nástrojový pruh pro soubor - + File and Session Management Správa souborů a sezení - + &New Session &Nové sezení - + Ctrl+N Ctrl+N - + Abandon the current Sonic Visualiser session and start a new one Opustit nynější sezení programu Sonic Visualiser a spustit nové - + &Open Session... &Otevřít sezení... - + Ctrl+O Ctrl+O - + Open a previously saved Sonic Visualiser session file Otevřít soubor s dříve uloženým sezením programu Sonic Visualiser - + &Open... &Otevřít... - + Open a session file, audio file, or layer Otevřít soubor se sezením, zvukový soubor, nebo vrstvu - + &Save Session &Uložit sezení - + Ctrl+S Ctrl+S - + Save the current session into a Sonic Visualiser session file Uložit nynější sezení do souboru se sezením programu Sonic Visualiser - + Save Session &As... Uložit sezení &jako... - + Ctrl+Shift+S Ctrl+Shift+S - + Save the current session into a new Sonic Visualiser session file Uložit nynější sezení do nového souboru se sezením programu Sonic Visualiser - + &Import Audio File... &Zavést zvukový soubor... - + Ctrl+I Ctrl+I - + Import an existing audio file Zavést stávající zvukový soubor - + Import Secondary Audio File... Zavést vedlejší zvukový soubor... - + Ctrl+Shift+I Ctrl+Shift+I - + Import an extra audio file as a separate layer Zavést další zvukový soubor jako oddělenou vrstvu - + &Export Audio File... &Vyvést zvukový soubor... - + Export selection as an audio file Vyvést výběr jako zvukový soubor - + Import Annotation &Layer... Zavést poznámkovou &vrstvu... - + Ctrl+L Ctrl+L - + Import layer data from an existing file Zavést data vrstvy ze stávajícího souboru - + Export Annotation Layer... Vyvést poznámkovou vrstvu... - + Export layer data to a file Vyvést data vrstvy do souboru - + Export Image File... Vyvést obrázkový soubor... - + Export a single pane to an image file Vyvést každou jednu tabulku do obrázkového souboru - + Open Lo&cation... Otevřít &umístění... - + Ctrl+Shift+O Ctrl+Shift+O - + Open or import a file from a remote URL Otevřít nebo zavést soubor ze vzdálené adresy (URL) - + &Recent Files &Naposledy otevřené soubory - + &Preferences... &Nastavení... - + Adjust the application preferences Upravit nastavení programu - + &Quit &Ukončit - + Ctrl+Q Ctrl+Q - + Exit Sonic Visualiser Ukončit Sonic Visualiser - + &Edit &Úpravy - + Editing Úpravy - + Cu&t Vyj&mout - + Ctrl+X Ctrl+X - + Cut the selection from the current layer to the clipboard Vyjmout výběr z nynější vrstvy do schránky - + &Copy &Kopírovat - + Ctrl+C Ctrl+C - + Copy the selection from the current layer to the clipboard Kopírovat výběr z nynější vrstvy do schránky - + &Paste V&ložit - + Ctrl+V Ctrl+V - + Paste from the clipboard to the current layer Vložit ze schránky do nynější vrstvy - - + + Paste at Playback Position + Vložit v poloze přehrávání + + + + Ctrl+Shift+V + Ctrl+Shift+V + + + + Paste from the clipboard to the current layer, placing the first item at the playback position + Vložit ze schránky do nynější vrstvy, první položka se umístí v poloze přehrávání + + + + &Delete Selected Items &Smazat vybrané položky - + Del Smazat (Delete) - - + + Delete items in current selection from the current layer Smazat položky v nynějším výběru z nynější vrstvy - + Selection Výběr - + Select &All Vybrat &vše - + Ctrl+A Ctrl+A - + Select the whole duration of the current session Vybrat celou dobu trvání nynějšího sezení - + Select &Visible Range Vybrat &viditelný rozsah - + Ctrl+Shift+A Ctrl+Shift+A - + Select the time range corresponding to the current window width Vybrat časový rozsah odpovídající šířce nynějšího okna - + Select to &Start Vybrat po &začátek - + Shift+Left Shift+šipka vlevo - + Select from the start of the session to the current playback position Vybrat od začátku sezení po nynější polohu přehrávání - + Select to &End Vybrat do &konce - + Shift+Right Shift+šipka vpravo - + Select from the current playback position to the end of the session Vybrat od nynější polohy přehrávání po konec sezení - + C&lear Selection Vyprázd&nit výběr - + Esc Esc - + Clear the selection Vyprázdnit výběr - + Tapping Time Instants Zaklepání okamžiků času - + &Insert Instant at Playback Position &Vložit okamžik v poloze přehrávání - + Enter Enter - + Insert a new time instant at the current playback position, in a new layer if necessary Vložit nový časový okamžik v nynější poloze přehrávání, v nové vrstvě, pokud je třeba - + ; ; - + Insert Instants at Selection &Boundaries Vložit okamžiky na &hranicích výběru - + Shift+Enter Shift+Enter - + Insert new time instants at the start and end of the current selected regions, in a new layer if necessary Vložit nové časové okamžiky na začátku a na konci nyní vybraných oblastí, v nové vrstvě, pokud je třeba - + Insert Item at Selection Vložit položku u výběru - + Ctrl+Shift+Enter Ctrl+Shift+Enter - + Insert a new note or region item corresponding to the current selection Vložit novou položku noty nebo oblasti odpovídající nynějšímu výběru - + Number New Instants with Číslovat nové okamžiky s - + Cycle size Obíhat velikost - + Set Numbering Counters... Nastavit číslovací počítadla... - + Set the counters used for counter-based labelling Nastavit počítadla používaná pro štítkování založené na počítadlech - + Renumber Selected Instants Přečíslovat vybrané okamžiky - + Renumber the selected instants using the current labelling scheme Přečíslovat vybrané okamžiky za použití nynějšího štítkovacího plánu - + Panning and Navigation Najíždění a navádění - + &View &Pohled - + Scroll &Left Projíždět &doleva - + Left Vlevo - + Scroll the current pane to the left Projíždět nynější tabulkou vlevo - + Scroll &Right Projíždět do&prava - + Right Vpravo - + Scroll the current pane to the right Projíždět nynější tabulkou vpravo - + &Jump Left &Skočit vlevo - + Ctrl+Left Ctrl+šipka vlevo - + Scroll the current pane a big step to the left Projíždět nynější tabulkou velkým skokem vlevo - + J&ump Right S&kočit vpravo - + Ctrl+Right - + Scroll the current pane a big step to the right Projíždět nynější tabulkou velkým skokem vpravo - + Peek Left Letmo prohlédnout vlevo - + Alt+Left Alt+šipka vlevo - + Scroll the current pane to the left without moving the playback cursor or other panes Projíždět nynější tabulkou vlevo bez pohybu ukazatelem přehrávání nebo jinými tabulkami - + Peek Right Letmo prohlédnout vpravo - + Alt+Right Alt+šipka vpravo - + Scroll the current pane to the right without moving the playback cursor or other panes Projíždět nynější tabulkou vpravo bez pohybu ukazatelem přehrávání nebo jinými tabulkami - + Zoom Zvětšení - + Zoom &In &Přiblížit - + Up Zvýšit - + Increase the zoom level Zvýšit úroveň zvětšení - + Zoom &Out &Oddálit - + Down Snížit - + Decrease the zoom level Snížit úroveň zvětšení - + Restore &Default Zoom Obnovit &výchozí zvětšení - + Restore the zoom level to the default Obnovit úroveň zvětšení na výchozí - + Zoom to &Fit &Přizpůsobit oknu - + F P - + Zoom to show the whole file Ukázat celý soubor - + Display Features Funkce zobrazení - + Show &No Overlays &Neukazovat žádná překrytí - + 0 0 - + Hide centre indicator, frame times, layer names and scale Skrýt středový ukazatel, časy snímků, názvy vrstev a stupnici - + Show &Minimal Overlays Ukázat nej&menší překrytí - + 9 9 - + Show centre indicator only Ukázat pouze středový ukazatel - + Show &Standard Overlays Ukázat ob&vyklá překrytí - + 8 8 - + Show centre indicator, frame times and scale Ukázat středový ukazatel, časy snímků a stupnici - + Show &All Overlays Ukázat &všechna překrytí - + 7 7 - + Show all texts and scale Ukázat všechny texty a stupnici - + + Show All Time Rulers + Ukázat všechna časová pravítka + + + + # + # + + + + Show or hide all time rulers + Ukázat nebo skrýt všechna časová pravítka + + + Show &Zoom Wheels Ukázat kolečka pro &zvětšování - + Z Z - + Show thumbwheels for zooming horizontally and vertically Ukázat ovládací kolečko pro vodorovné a svislé zvětšování - + Show Property Bo&xes Ukázat &okénka vlastností - + X X - + Show the layer property boxes at the side of the main window Ukázat okénka vlastností vrstev po straně hlavního okna - + Show Status &Bar Ukázat st&avový řádek - + Show context help information in the status bar at the bottom of the window Ukázat související nápovědu ve stavovém řádku okna dole - + Show La&yer Summary Ukázat přehled &vrstev - + Y Y - + Open a window displaying the hierarchy of panes and layers in this session Otevřít okno zobrazující pořadí tabulek a vrstev v tomto sezení - + Show Acti&vity Log Ukázat zápis čin&nosti - + Open a window listing interactions and other events Otevřít okno uvádějící výměnu informací a další události - + &Pane &Tabulka - + Managing Panes and Layers Správa tabulek a vrstev - + Add &New Pane Přidat &novou tabulku - + N N - + Add a new pane containing only a time ruler Přidat novou tabulku obsahující pouze časové pravítko - + Add New %1 Layer Přidat novou %1 vrstvu - + Add a new empty layer of type %1 Přidat novou prázdnou vrstvu typu %1 - + T T - + Add &Waveform Přidat &časový průběh vlny - + W W - + Add a new pane showing a waveform view Přidat novou tabulku ukazující pohled na časový průběh vlny - + Shift+W - - - - + Shift+W + + + Add a new layer showing a waveform view Přidat novou vrstvu ukazující pohled na časový průběh vlny - + Add Spectro&gram Přidat spektro&gram - + G G - + Add a new pane showing a spectrogram Přidat novou tabulku ukazující spektrogram - + Shift+G - - - - + Shift+G + + + Add a new layer showing a spectrogram Přidat novou vrstvu ukazující spektrogram - + Add &Melodic Range Spectrogram Přidat spektrogram &melodického rozsahu - + M M - + Add a new pane showing a spectrogram set up for an overview of note pitches Přidat novou tabulku ukazující spektrogram nastavený na přehled výšek not - + Shift+M - - - - + Shift+M + + + Add a new layer showing a spectrogram set up for an overview of note pitches Přidat novou vrstvu ukazující spektrogram nastavený na přehled výšek not - + Add Pea&k Frequency Spectrogram Přidat spektrogram nejvyššího &kmitočtu - + K K - + Add a new pane showing a spectrogram set up for tracking frequencies Přidat novou tabulku ukazující spektrogram nastavený na sledování kmitočtů - + Shift+K - - - - + Shift+K + + + Add a new layer showing a spectrogram set up for tracking frequencies Přidat novou vrstvu ukazující spektrogram nastavený na sledování kmitočtů - + Add Spectr&um Přidat spektr&um - + U U - + Add a new pane showing a frequency spectrum Přidat novou tabulku ukazující kmitočtové spektrum - + Shift+U - - - - + Shift+U + + + Add a new layer showing a frequency spectrum Přidat novou vrstvu ukazující kmitočtové spektrum - + &All Channels Mixed &Všechny kanály smíchány - + &All Channels &Všechny kanály - + Channel &%1 Kanál &%1 - + %1: %2 %1: %2 - + Switch to Previous Pane Přepnout na předchozí tabulku - + [ [ - + Make the next pane up in the pane stack current Udělat další tabulku směrem nahoru v zásobníku tabulek současnou - + Switch to Next Pane Přepnout na další tabulku - + ] ] - + Make the next pane down in the pane stack current Udělat další tabulku směrem dolů v zásobníku tabulek současnou - + &Delete Pane &Smazat tabulku - + Ctrl+Shift+D Ctrl+Shift+D - + Delete the currently active pane Smazat nyní činnou tabulku - + Add &Time Ruler Přidat ča&sové pravítko - + Add a new layer showing a time ruler Přidat novou vrstvu ukazující časové pravítko - + Add &Existing Layer Přidat &stávající vrstvu - + Add S&lice of Layer Přidat k&us vrstvy - + &Rename Layer... &Přejmenovat vrstvu... - + R R - + Rename the currently active layer Přejmenovat nyní činnou vrstvu - + Edit Layer Data Upravit data vrstvy - + E E - + Edit the currently active layer as a data grid Upravit nyní činnou vrstvu jako datovou mřížku - + &Delete Layer &Smazat vrstvu - + Ctrl+D Ctrl+D - + Delete the currently active layer Smazat nyní činnou vrstvu - + &Recent Transforms &Poslední proměny - + %1 by Category %1 podle skupiny - - + + Unclassified Bez zařazení - + %1 by Plugin Name %1 podle názvu přídavného modulu - + %1 by Maker %1 podle tvůrce - - + + Unknown Neznámý - - + + [\(<].*$ [\(<].*$ - - + + %1... %1... - + Find a Transform... Najít proměnu... - + Search for a transform from the installed plugins, by name or description Hledat proměnu z nainstalovaných přídavných modulů, podle názvu nebo popisu - + Ctrl+M Ctrl+M - + &Help &Nápověda - + Help Nápověda - + &Help Reference Odkaz na &nápovědu - + F1 F1 - + Open the Sonic Visualiser reference manual Otevřít odbornou příručku k programu Sonic Visualiser - + &Key and Mouse Reference Odkaz na &klávesy a myš - + F2 F2 - + Open a window showing the keystrokes you can use in Sonic Visualiser Otevřít okno ukazující klávesové zkratky, které lze použít v programu Sonic Visualiser - + Sonic Visualiser on the &Web Sonic Visualiser na &internetu - + Open the Sonic Visualiser website Otevřít internetové stránky programu Sonic Visualiser - + &About Sonic Visualiser &O programu Sonic Visualiser - + Show information about Sonic Visualiser Ukázat informace o programu Sonic Visualiser - + Ctrl+R Ctrl+R - + Re-open Otevřít znovu - + Re-open the current or most recently opened file Otevřít znovu nynější nebo naposledy otevřený soubor - + Ctrl+T Ctrl+T - + Repeat Transform Opakovat proměnu - + Re-select the most recently run transform Vybrat znovu naposledy provedenou proměnu - + Playback and Transport Controls Ovládání přehrávání a přesunu - + Play&back &Přehrávání - + Playback Přehrávání - + Playback Toolbar Nástrojový pruh pro přehrávání - + Rewind to Start Přetočit na začátek - + Home Home - + Rewind to the start Přetočit na začátek - - - + + + Rewind Přetočit zpět - + PgUp PgUp - + Rewind to the previous time instant or time ruler notch Přetočit k předchozímu okamžiku v čase nebo místu časového pravítka - + Rewind to Similar Point Přetočit k podobnému bodu - + Shift+PgUp Shift+PgUp - + Rewind to the previous similarly valued time instant Přetočit k předchozímu podobně ohodnocenému okamžiku v čase - + Play / Pause Přehrát/Pozastavit - + Space Mezerník - + Start or stop playback from the current position Spustit nebo zastavit přehrávání od nynější polohy - - + + Fast Forward Rychle vpřed - + PgDown PgDown - + Fast-forward to the next time instant or time ruler notch Rychle vpřed k dalšímu okamžiku v čase nebo místu časového pravítka - + Fast Forward to Similar Point Rychle vpřed k podobnému bodu - + Shift+PgDown Shift+PgDown - + Fast-forward to the next similarly valued time instant Rychle vpřed k dalšímu podobně ohodnocenému okamžiku v čase - + Fast Forward to End Přetáčet rychle na konec - + End Konec - + Fast-forward to the end Přetáčet rychle na konec - + Play Mode Toolbar Nástrojový pruh pro režim hry - + Constrain Playback to Selection Omezit přehrávání na výběr - + s s - + Constrain playback to the selected regions Omezit přehrávání na vybrané oblasti - + Loop Playback Udělat z přehrávání smyčku - + l l - + Loop playback Udělat z přehrávaného smyčku - + Solo Current Pane Nynější tabulka samostatně - + o o - + Solo the current pane during playback Nynější tabulka samostatně během přehrávání - + Align File Timelines Zarovnat časové přímky souborů - + Treat multiple audio files as versions of the same work, and align their timelines S více zvukovými soubory zacházet jako s verzemi téže práce a zarovnat jejich časové přímky - + Speed Up Zrychlit - + Ctrl+PgUp Ctrl+PgUp - + Time-stretch playback to speed it up without changing pitch Přehrávání roztažení času kvůli jeho zrychlení bez změny výšky - + Slow Down Zpomalit - + Ctrl+PgDown Ctrl+PgDown - + Time-stretch playback to slow it down without changing pitch Přehrávání roztažení času kvůli jeho zpomalení bez změny výšky - + Restore Normal Speed Obnovit obyčejnou rychlost - + Ctrl+Home Ctrl+Home - + Restore non-time-stretched playback Obnovit nečasově roztažené přehrávání - + Edit Toolbar Nástrojový pruh pro úpravy - + Tool Selection Výběr nástroje - + Tools Toolbar Nástrojový pruh s nástroji - - + + Navigate Navádět - + 1 1 - + Select Vybrat - + 2 2 - + Select ranges Vybrat rozsah - + Edit Upravit - + 3 3 - + Edit items in layer Upravit položky ve vrstvě - + Draw Nakreslit - + 4 4 - + Draw new items in layer Nakreslit položky ve vrstvě - + Erase Vymazat - + 5 5 - + Erase items from layer Vymazat položky z vrstvy - + Measure Změřit - + 6 6 - + Make measurements in layer Udělat měření ve vrstvě - + &Delete Current Measurement &Smazat nynější měření - + Delete the measurement currently under the mouse pointer Smazat měření, které je nyní pod ukazovátkem myši - + Fast Forward to Next Instant Rychle vpřed k dalšímu okamžiku - + Fast forward to the next time instant in the current layer Rychle vpřed k dalšímu okamžiku v čase v nynější vrstvě - + Rewind to Previous Instant Přetočit k předchozímu okamžiku - + Rewind to the previous time instant in the current layer Přetočit k předchozímu okamžiku v čase v nynější vrstvě - + Fast Forward to Next Point Rychle vpřed k dalšímu bodu - + Fast forward to the next point in the current layer Rychle vpřed k dalšímu bodu v nynější vrstvě - + Rewind to Previous Point Přetočit k předchozímu bodu - + Rewind to the previous point in the current layer Přetočit k předchozímu bodu v nynější vrstvě - + Fast forward Rychle vpřed - + No audio file loaded. Nebyl nahrán žádný zvukový soubor. - + %1Hz (resampling to %2Hz) %1Hz (převzorkování na %2Hz) - - - - - - - + + + + + + + Failed to open file Soubor se nepodařilo otevřít - - + + <b>File open failed</b><p>Audio file "%1" could not be opened <b>Soubor se nepodařilo otevřít</b><p>Zvukový soubor "%1" se nepodařilo otevřít @@ -3344,609 +3384,609 @@ %1. %2 - + Select audio file to export Vybrat zvukový soubor pro vyvedení - + Which audio file do you want to export from? Ze kterého zvukového souboru chcete provést vyvedení? - + Export the selected region only Vyvést pouze vybranou oblast - - + + Export the whole audio file Vyvést celý zvukový soubor - - - + + + Select region to export Vybrat oblast, která se má vyvést - + Which region from the original audio file do you want to export? Kterou oblast z původního zvukového souboru chcete vyvést? - + Export the selected regions into a single audio file Vyvést vybrané oblasti do jednoho zvukového souboru - + Export the selected regions into separate files Vyvést vybrané oblasti do oddělených souborů - + Multiple regions of the original audio file are selected. What do you want to export? Je vybráno více oblastí původního zvukového souboru. Co chcete vyvést? - + Fragment file %1 already exists, aborting Zlomkový soubor %1 již existuje. Přerušuje se - + Export multiple audio files Vyvést více zvukových souborů - + Export audio to "%1" Vyvést zvuk do "%1" - - + + Failed to write file Soubor se nepodařilo zapsat - + <b>File open failed</b><p>Layer file %1 could not be opened. <b>Soubor se nepodařilo otevřít</b><p>Soubor s vrstvou "%1" se nepodařilo otevřít. - - - - - + + + + + <b>Audio required</b><p>Unable to load layer data from "%1" without an audio file.<br>Please load at least one audio file before importing annotations. <b>Vyžadován zvuk</b><p>Data s vrstvou nelze z "%1" nahrát bez zvukového souboru.<br>Před zavedením poznámek nahrajte, prosím, alespoň jeden zvukový soubor. - + http://www.sonicvisualiser.org/doc/reference/%1/en/ http://www.sonicvisualiser.org/doc/reference/%1/en/ - + Newer version available Je dostupná novější verze - + <h3>Newer version available</h3><p>You are using version %1 of Sonic Visualiser, but version %3 is now available.</p><p>Please see the <a href="http://sonicvisualiser.org/">Sonic Visualiser website</a> for more information.</p> <h3>Je dostupná novější verze</h3><p>Používáte verzi %1 programu Sonic Visualiser, ale nyní je dostupná verze %3.</p><p>Podívejte se, prosím, na stránky <a href="http://sonicvisualiser.org/">projektu Sonic Visualiser</a>, abyste získal více informací.</p> - + Failed to open file %1 for writing Otevření souboru %1 pro zápis se nezdařilo - + Can't export non-note layers to MIDI Ne-notové vrstvy nelze do MIDI vyvést - + Export layer to "%1" Vyvést vrstvu do "%1" - + Export the whole pane (%1x%2 pixels) Vyvést celou tabulku (%1x%2 pixelů) - + Export the visible area only (%1x%2 pixels) Vyvést pouze viditelnou oblast (%1x%2 pixelů) - + Export the selection extent (%1x%2 pixels) Vyvést plochu výběru (%1x%2 pixelů) - + Export the selection extent Vyvést plochu výběru - + Which region of the current pane do you want to export as an image? Kterou oblast nynější tabulky chcete vyvést jako obrázek? - + Note: the whole pane is too wide to be exported as a single image. Poznámka: celá tabulka je příliš široká na to, aby mohla být vyvedena jako jeden obrázek. - + Failed to save image file Soubor s obrázkem se nepodařilo uložit - + Failed to save image file %1 Soubor s obrázkem %1 se nepodařilo uložit - + <b>File open failed</b><p>Session file "%1" could not be opened <b>Soubor se nepodařilo otevřít</b><p>Soubor se sezením "%1" se nepodařilo otevřít - + <b>File open failed</b><p>File "%1" could not be opened <b>Soubor se nepodařilo otevřít</b><p>Soubor "%1" se nepodařilo otevřít - + Open Location Otevřít umístění - + Please enter the URL of the location to open: Zadejte, prosím adresu (URL) umístění, které se má otevřít: - - - - + + + + Failed to open location Umístění se nepodařilo otevřít - + <b>Open failed</b><p>URL "%1" could not be opened <b>Otevření se nezdařilo</b><p>Adresu (URL) "%1" se nepodařilo otevřít - + <b>Open failed</b><p>File or URL "%1" could not be opened <b>Otevření se nezdařilo</b><p>Soubor nebo adresu (URL) "%1" se nepodařilo otevřít - - + + Failed to open dropped URL Upuštěnou adresu (URL) se nepodařilo otevřít - + <b>Open failed</b><p>Dropped URL "%1" could not be opened <b>Otevření se nezdařilo</b><p>Upuštěnou adresu (URL) "%1" se nepodařilo otevřít - + Export image to "%1" Vyvést obrázek do "%1" - + Session modified Sezení bylo upraveno - + <b>Session modified</b><p>The current session has been modified.<br>Do you want to save it? <b>Sezení bylo upraveno</b><p>Nynější sezení bylo upraveno.<br>Chcete je uložit? - + Close the current session and create a new one Zavřít nynější sezení a vytvořit nové - + Add this data to the current session Přidat tato data do nynějšího sezení - + Select target for import Vybrat cíl pro zavedení - + <b>Select a target for import</b><p>This RDF document refers to one or more audio files.<br>You already have an audio waveform loaded.<br>What would you like to do with the new data? <b>Vybrat cíl pro zavedení</b><p> Tento dokument RDF odkazuje na jeden nebo více zvukových souborů.<p>Již jste nahrál jeden zvukový časový průběh vlny.<br>Co chcete udělat s novými daty? - - + + Failed to save file Soubor se nepodařilo uložit - - + + <b>Save failed</b><p>Session file "%1" could not be saved. <b>Uložení se nezdařilo</b><p>Soubor se sezením "%1" se nepodařilo uložit. - + Sonic Visualiser: %1 Sonic Visualiser: %1 - + Save session as "%1" Uložit sezení jako "%1" - + Rename Layer Přejmenovat vrstvu - + New name for this layer: Nový název pro tuto vrstvu: - + Playback speed: Normal Rychlost přehrávání: Obvyklá - + Playback speed: %1%2% Rychlost přehrávání: %1%2% - + Selection: %1 to %2 (duration %3) Výběr: %1 až %2 (doba trvání %3) - + Visible: %1 to %2 (duration %3) Viditelný: %1 až %2 (doba trvání %3) - + Sample rate mismatch Nesoulad ve vzorkovacím kmitočtu - + <b>Wrong sample rate</b><p>The sample rate of this audio file (%1 Hz) does not match the current playback rate (%2 Hz).<p>The file will play at the wrong speed and pitch.<p>Change the <i>Resample mismatching files on import</i> option under <i>File</i> -> <i>Preferences</i> if you want to alter this behaviour. <b>Špatný vzorkovací kmitočet</b><p>Vzorkovací kmitočet tohoto zvukového souboru (%1 Hz) neodpovídá nynější rychlosti přehrávání (%2 Hz).<p>Soubor bude přehráván se špatnou rychlostí a výškou.<p>Změňte volbu <i>Převzorkovat neodpovídající soubory při zavedení</i>, která je v nabídce <i>Soubor</i> -> <i>Nastavení</i>, pokud toto chování chcete změnit. - - + + Audio processing overload Přetížení zpracování zvuku - + <b>Overloaded</b><p>Audio effects plugin auditioning has been disabled due to a processing overload. <b>Přetíženo</b><p>Poslech přídavných modulů zvukových efektů byl zakázán kvůli přetížení při zpracování. - + <b>Overloaded</b><p>Audio playback speed processing has been reduced to a single channel, due to a processing overload. <b>Přetíženo</b><p>Zpracování rychlosti přehrávání zvuku bylo omezeno na jeden kanál kvůli přetížení při zpracování. - + Add Point Přidat bod - + Reset Counters Nastavit znovu počítadla - - + + Failed to generate layer Vrstvu se nepodařilo vytvořit - + <b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform "%1" failed:<p>%2 <b>Vytvoření vrstvy se nezdařilo</b><p>Nepodařilo se vytvořit odvozenou vrstvu.<p>Proměna vrstvy "%1" se nezdařila:<p>%2 - + <b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform "%1" failed.<p>No error information is available. <b>Vytvoření vrstvy se nezdařilo</b><p>Nepodařilo se vytvořit odvozenou vrstvu.<p>Proměna vrstvy "%1" se nezdařila.<p>Nejsou dostupné žádné informace o chybě. - - + + Warning Varování - - + + Failed to regenerate layer Vrstvu se nepodařilo vytvořit znovu - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed:<p>%3 <b>Vytvoření vrstvy se nezdařilo</b><p>Nepodařilo se znovu vytvořit odvozenou vrstvu "%1" za použití nového datového modelu jako vstupu.<p>Proměna vrstvy "%2" se nezdařila:<p>%3 - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed.<p>No error information is available. <b>Vytvoření vrstvy se nezdařilo</b><p>Nepodařilo se znovu vytvořit odvozenou vrstvu "%1" za použití nového datového modelu jako vstupu.<p>Proměna vrstvy "%2" se nezdařila.<p>Nejsou dostupné žádné informace o chybě. - + <b>Warning when regenerating layer</b><p>When regenerating the derived layer "%1" using new data model as input:<p>%2 <b>Varování při znovuvytváření vrstvy</b><p>Při znovuvytváření odvozené vrstvy "%1" za použití nového datového modelu jako vstupu:<p>%2 - + Failed to calculate alignment Zarovnání se spočítat nepodařilo - + <b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform "%1":<p>%2 <b>Spočítání zarovnání se nezdařilo</b><p>Zarovnání zvuku se spočítat s pomocí "%1" nepodařilo:<p>%2 - + Adjust the master playback level Přizpůsobit hlavní úroveň přehrávání - + Adjust the master playback speed Přizpůsobit hlavní rychlost přehrávání - + http://www.sonicvisualiser.org/ http://www.sonicvisualiser.org/ - + Release %1 : Revision %2 Vydání %1: Revize %2 - + Release %1 Vydání %1 - + Unreleased : Revision %1 Nevydáno: Revize %1 - + <h3>About Sonic Visualiser</h3> <h3>O programu Sonic Visualiser</h3> - + <p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> <p>Sonic Visualiser je programem určeným pro prohlížení a zkoumání zvukových dat, pro významový hudební rozbor a připojování poznámek.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> - + <p><small>%1 : %2 configuration</small></p> <p><small>%1 : %2 nastavení</small></p> - + Debug Ladit - + Release Vydání - + With Qt v%1 &copy; Nokia Corporation S Qt v%1 &copy; Nokia Corporation - + <br>With JACK audio output library v%1 &copy; Paul Davis and Jack O'Quin <br>Se zvukovou výstupní knihovnou JACK v%1 &copy; Paul Davis a Jack O'Quin - + <br>With JACK audio output library &copy; Paul Davis and Jack O'Quin <br>Se zvukovou výstupní knihovnou JACK &copy; Paul Davis a Jack O'Quin - + <br>With PortAudio audio output library &copy; Ross Bencina and Phil Burk <br>Se zvukovou výstupní knihovnou PortAudio &copy; Ross Bencina a Phil Burk - + <br>With PulseAudio audio output library v%1 &copy; Lennart Poettering and Pierre Ossman <br>Se zvukovou výstupní knihovnou PulseAudio v%1 &copy; Lennart Poettering a Pierre Ossman - + <br>With PulseAudio audio output library &copy; Lennart Poettering and Pierre Ossman <br>Se zvukovou výstupní knihovnou PulseAudio &copy; Lennart Poettering a Pierre Ossman - + <br>With Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia <br>S dekodérem souborů Ogg (oggz v%1, fishsound v%2) &copy; CSIRO Australia - + <br>With Ogg file decoder &copy; CSIRO Australia <br>S dekodérem souborů Ogg &copy; CSIRO Australia - + <br>With MAD mp3 decoder v%1 &copy; Underbit Technologies Inc <br>S dekodérem souborů mp3 MAD v%1 &copy; Underbit Technologies Inc - + <br>With MAD mp3 decoder &copy; Underbit Technologies Inc <br>S dekodérem souborů mp3 MAD &copy; Underbit Technologies Inc - + <br>With libsamplerate v%1 &copy; Erik de Castro Lopo <br>S libsamplerate v%1 &copy; Erik de Castro Lopo - + <br>With libsamplerate &copy; Erik de Castro Lopo <br>S libsamplerate &copy; Erik de Castro Lopo - + <br>With libsndfile v%1 &copy; Erik de Castro Lopo <br>S libsndfile v%1 &copy; Erik de Castro Lopo - + <br>With libsndfile &copy; Erik de Castro Lopo <br>S libsndfile &copy; Erik de Castro Lopo - + <br>With FFTW3 v%1 &copy; Matteo Frigo and MIT <br>S FFTW3 v%1 &copy; Matteo Frigo and MIT - + <br>With FFTW3 &copy; Matteo Frigo and MIT <br>S FFTW3 &copy; Matteo Frigo and MIT - + <br>With Rubber Band v%1 &copy; Chris Cannam <br>S Gumičkou (Rubber Band) v%1 &copy; Chris Cannam - + <br>With Rubber Band &copy; Chris Cannam <br>S Gumičkou (Rubber Band) &copy; Chris Cannam - + <br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam <br>S podporou pro přídavné moduly Vamp (API v%1, host SDK v%2) &copy; Chris Cannam - + <br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld <br>S podporou pro přídavné moduly LADSPA (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld - + <br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton <br>S podporou pro přídavné moduly DSSI (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton - + <br>With Raptor RDF parser v%1 &copy; Dave Beckett and the University of Bristol <br>Se syntaktickým analyzátorem RDF Raptor v%1 &copy; Dave Beckett a the University of Bristol - + <br>With Raptor RDF parser &copy; Dave Beckett and the University of Bristol <br>Se syntaktickým analyzátorem RDF Raptor &copy; Dave Beckett a the University of Bristol - + <br>With Rasqal RDF query engine v%1 &copy; Dave Beckett and the University of Bristol <br>Se strojem na dotazy RDF Rasqal v%1 &copy; Dave Beckett a the University of Bristol - + <br>With Rasqal RDF query engine &copy; Dave Beckett and the University of Bristol <br>Se strojem na dotazy RDF Rasqal &copy; Dave Beckett a the University of Bristol - + <br>With Redland RDF datastore v%1 &copy; Dave Beckett and the University of Bristol <br>S datovým skladištěm RDF Redland v%1 &copy; Dave Beckett a the University of Bristol - + <br>With Redland RDF datastore &copy; Dave Beckett and the University of Bristol <br>S datovým skladištěm RDF Redland &copy; Dave Beckett a the University of Bristol - + <br>With RtMidi &copy; Gary P. Scavone <br>S RtMidi &copy; Gary P. Scavone - + <br>With liblo Lite OSC library v%1 &copy; Steve Harris <br>S knihovnou liblo Lite OSC v%1 &copy; Steve Harris - + <br>With liblo Lite OSC library &copy; Steve Harris <br>S knihovnou liblo Lite OSC &copy; Steve Harris - + </small><p><small>The OSC URL for this instance is: "%1" </small><p><small>Adresa (URL) OSC pro tuto instanci je: "%1" - + With S - + Using Za použití - + About Sonic Visualiser O programu Sonic Visualiser @@ -3959,194 +3999,194 @@ MainWindowBase - + %1 (modified) %1 (upraveno) - + (modified) (upraveno) - + Cut Vyjmout - + Paste Vložit - - - - + + + + Add Point Přidat bod - + Add Point at %1 s Přidat bod v %1 s - + Add Item at %1 s Přidat položku v %1 s - + Opening file or URL... Otevírá se soubor nebo adresa (URL)... - + Replace the existing main waveform Nahradit stávající hlavní tvar vlny - + Load this file into a new waveform pane Nahrát tento soubor do nové tabulky s tvarem vlny - + Select target for import Vybrat cíl pro zavedení - - - + + + %1: %2 %1: %2 - + %1: %2 [%3] %1: %2 [%3] - - + + Import "%1" Zavést "%1" - + Opening playlist... Otevírá se seznam skladeb... - - + + Importing from RDF... Zavádí se z RDF... - + Opening session... Otevírá se sezení... - + <b>Select a target for import</b><p>You already have an audio waveform loaded.<br>What would you like to do with the new audio file? <b>Vybrat cíl pro zavedení</b><p>Již máte nahrán jeden zvukový časový průběh vlny.<br>Co chcete udělat s novým zvukovým souborem? - + Import audio file "%1" Zavést zvukový soubor "%1" - + Import layer XML file "%1" Zavést soubor XML vrstvy "%1" - + Import MIDI file "%1" Zavést soubor MIDI "%1" - + SV XML file read error: %1 Chyba při čtení souboru XML SV: %1 - + Import session file "%1" Zavést soubor se sezením "%1" - - + + Failed to import RDF Nepodařilo se zavést RDF - + <b>Failed to import RDF</b><p>Importing data from RDF document at "%1" failed: %2</p> <b>Nepodařilo se zavést RDF</b><p>Zavedení dat z dokumentu RDF na "%1" se nepodařilo: %2</p> - + <b>Failed to import RDF</b><p>No suitable data models found for import from RDF document at "%1"</p> <b>Nepodařilo se zavést RDF</b><p>Nebyly nalezeny žádné vhodné datové modely pro zavedení dat z dokumentu RDF na "%1"</p> - + Import RDF document "%1" Zavést dokument RDF "%1" - - + + Couldn't open audio device Nepodařilo se otevřít zvukové zařízení - + <b>No audio available</b><p>Could not open an audio device for playback.<p>Automatic audio device detection failed. Audio playback will not be available during this session.</p> <b>Žádný zvuk není dostupný</b><p> Zvukové zařízení se nepodařilo otevřít pro přehrávání.<p>Automatické určení zvukového zařízení se nezdařilo. Přehrávání zvuku během tohoto sezení nebude dostupné.</p> - + <b>No audio available</b><p>Failed to open your preferred audio device ("%1").<p>Audio playback will not be available during this session.</p> <b>Žádný zvuk není dostupný</b><p> Vámi upřednostňované zvukové zařízení se nepodařilo otevřít ("%1").<p>Přehrávání zvuku během tohoto sezení nebude dostupné.</p> - + Failed to write file Soubor se nepodařilo zapsat - + <b>Save failed</b><p>Failed to write to file "%1": %2 <b>Uložení se nezdařilo</b><p>Nepodařilo se zapsat do souboru "%1": %2 - + Add Pane - Přidat tabulku - - - + Přidat tabulku + + + Remove Pane - Odstranit tabulku - - - - + Odstranit tabulku + + + + Delete Pane Smazat tabulku - + Playing: %1 of %2 (%3 remaining) Přehrává se: %1 z %2 (%3 zůstává) @@ -4168,100 +4208,100 @@ ModelDataTableDialog - + Data Editor Editor dat - + Playback Toolbar Nástrojový pruh pro přehrávání - + Play Mode Toolbar Nástrojový pruh pro režim hry - + Track Playback Přehrávání stopy - + Toggle tracking of playback position Přepnout sledování polohy přehrávání - + Edit Toolbar Nástrojový pruh pro úpravy - + Insert New Item Vložit novou položku - + Insert Vložit - + Insert a new item Vložit novou položku - + Delete Selected Items Smazat vybrané položky - + Delete Smazat - + Delete the selected item or items Smazat vybranou položku nebo položky - + Data in Layer Data ve vrstvě - + Find: - Hledat: - - - + Hledat: + + + - + ModelMetadataModel - + Type Typ - + Name Název - + Maker Tvůrce - + Source Zdroj @@ -4269,12 +4309,12 @@ ModelTransformerFactory - + %1 <%2> %1 <%2> - + %1: %2 %1: %2 @@ -4282,75 +4322,75 @@ NoteLayer - - - + + + New Point Nový bod - + Vertical Scale Svislá stupnice - + Scale Units Jednotky stupnice - + Scale Stupnice - + Auto-Align Automatické zarovnání - + Linear Přímočaré - + Log Zápis - + MIDI Notes Noty MIDI - + In progress Probíhá - - + + No local points Žádné místní body - + %1 (%2, %3 Hz) %1 (%2, %3 Hz) - + %1 Hz (%2, %3) %1 Hz (%2, %3) - + %1 %2 %1 %2 - + Time: %1 Pitch: %2 Duration: %3 @@ -4361,7 +4401,7 @@ Žádný štítek - + Time: %1 Pitch: %2 Duration: %3 @@ -4372,68 +4412,68 @@ Štítek: %4 - + Draw Point Nakreslit bod - + Erase Point Vymazat bod - + Drag Point Táhnout bod - - + + Edit Point Upravit bod - + Relocate Point Přemístit bod - + Change Point Value Změnit hodnotu bodu - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selected Points Smazat vybrané body - + Re-align pasted items? Zarovnat vložené položky znovu? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit - + Record Note Nahrát notu @@ -4441,47 +4481,47 @@ NoteModel - + Note Nota - + Time Čas - + Frame Snímek - + Pitch Výška tónu - + Duration Doba trvání - + Level Úroveň - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -4489,7 +4529,7 @@ OggVorbisFileReader - + Decoding %1... Dekóduje se %1... @@ -4497,12 +4537,12 @@ Overview - + Overview Přehled - + Click and drag to navigate; double-click to jump Klepněte a táhněte pro navádění; dvakrát klepněte pro skok @@ -4510,444 +4550,450 @@ Pane - + Horizontal Zoom Vodorovné zvětšení - + Vertical Zoom Svislé zvětšení - + Reset zoom to default Nastavit zvětšení znovu na výchozí - + Some lengthy prefix: Příliš dlouhá předpona: - + Reference Odkaz - - + + Unaligned Nezarovnáno - + Aligning: %1% Zarovnání: %1% - + Aligned Zarovnáno - + %1 - %2 %1 - %2 - + + + +%1 + +%1 + + + (R) (R) - + (X) (X) - + %1 / %2Hz%3 %1 / %2Hz%3 - - + + Zoom Zvětšení - + Zoom In Přiblížit - + Wheel Up Kolečko nahoru - + Zoom Out Oddálit - + Wheel Down Kolečko dolů - + General Pane Mouse Actions Činnosti prováděné myší obecně v tabulce - + Wheel Kolečko - + Zoom in or out in time axis Přiblížit nebo oddálit na časové ose - + Scroll Projíždět - + Ctrl+Wheel Ctrl+kolečko - + Scroll rapidly left or right in time axis Projíždět rychle vlevo nebo vpravo na časové ose - + Zoom Vertically Přiblížit/Oddálit svisle - + Shift+Wheel Shift+kolečko - + Zoom in or out in the vertical axis Přiblížit nebo oddálit na svislé ose - + Scroll Vertically Projíždět svisle - + Alt+Wheel Alt+kolečko - + Scroll up or down in the vertical axis Projíždět nahoru nebo dolů na svislé ose - - + + Navigate Navádět - + Middle Prostřední - + Click middle button and drag to navigate with any tool Klepněte prostředním tlačítkem a táhněte pro vedení s jakýmkoli nástrojem - - + + Relocate Přemístit - + Double-Click Middle Dvakrát klepněte prostředním - + Double-click middle button to relocate with any tool Dvakrát klepněte prostředním pro přemístění s jakýmkoli nástrojem - + Menu Nabídka - + Right Pravé - + Show pane context menu Ukázat nabídku související s tabulkou - + Navigate Tool Mouse Actions Činnosti nástroje pro navádění prováděné myší - - - - - + + + + + Left Levé - + Click left button and drag to move around Klepněte levým tlačítkem a táhněte pro přesouvání se - - + + Zoom to Area Přiblížit oblast - - - + + + Shift+Left Shift+šipka vlevo - - + + Shift-click left button and drag to zoom to a rectangular area Shift-klepněte levým tlačítkem a táhněte pro přiblížení obdélníkové oblasti - - - - + + + + Double-Click Left Dvakrát klepněte levým - + Double-click left button to jump to clicked location Dvakrát klepněte levým tlačítkem pro skok na klepnuté místo - - + + Edit Upravit - - + + Double-click left button on an item to edit it Dvakrát klepněte levým tlačítkem na položce pro její upravení - + Select Tool Mouse Actions Činnosti nástroje výběru prováděné myší - + Select Vybrat - + Click left button and drag to select region; drag region edge to resize Klepněte levým tlačítkem a táhněte pro výběr oblasti; táhněte za okraj oblasti pro změnu její velikosti - + Multi Select Vícenásobný výběr - + Ctrl+Left Ctrl+šipka vlevo - + Ctrl-click left button and drag to select an additional region Ctrl-klepněte levým tlačítkem a táhněte pro výběr další oblasti - + Fine Select Citlivý výběr - + Shift-click left button and drag to select without snapping to items or grid Shift-klepněte levým tlačítkem a táhněte pro výběr bez zapadávání k položkám nebo mřížce - + Edit Tool Mouse Actions Činnosti nástroje úprav prováděné myší - + Move Posunout - + Click left button on an item or selected region and drag to move Klepněte levým tlačítkem na položku nebo vybranou oblast a táhněte pro její přesun - + Draw Tool Mouse Actions Činnosti nástroje kreslení prováděné myší - + Draw Nakreslit - + Click left button and drag to create new item Klepněte levým tlačítkem a táhněte pro vytvoření nové položky - + Measure Tool Mouse Actions Činnosti nástroje měření prováděné myší - + Measure Area Oblast měření - + Click left button and drag to measure a rectangular area Klepněte levým tlačítkem a táhněte pro změření obdélníkové oblasti - + Measure Item Položka měření - + Click left button and drag to measure extents of an item or shape Klepněte levým tlačítkem a táhněte pro změření rozsahu položky nebo tvaru - + Enter new range Zadejte nový rozsah - + New vertical display range, from %1 to %2 %4: Nový rozsah svislého zobrazení, od %1 do %2 %4: - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Click and drag to navigate Klepněte a táhněte pro navádění - + Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate Klepněte a táhněte pro výběr rozsahu; držte klávesu Shift, abyste se vyhnul zapadávání k položkám; držte klávesu Ctrl pro provedení vícenásobného výběru; klepněte prostředním tlačítkem a táhněte pro navádění - + Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate Klepněte a táhněte pro výběr rozsahu; držte klávesu Ctrl pro provedení vícenásobného výběru; klepněte prostředním tlačítkem a táhněte pro navádění - + Click and drag to move the selection boundary Klepněte levým tlačítkem a táhněte pro přesun hranice výběru - + Click and drag to select a range; hold Shift to avoid snapping to items; middle-click to navigate Klepněte a táhněte pro výběr rozsahu; držte klávesu Shift, abyste se vyhnul zapadávání k položkám; klepněte prostředním tlačítkem a táhněte pro navádění - + Click and drag to select a range; middle-click and drag to navigate Klepněte a táhněte pro výběr rozsahu; klepněte prostředním tlačítkem a táhněte pro navádění - + Click to add a new item in the active layer Klepněte pro přidání nové položky do činné vrstvy - + Click to erase an item from the active layer Klepněte pro vymazání položky z činné vrstvy - + Click and drag an item in the active layer to move it; hold Shift to override initial resistance Klepněte a táhněte položku v činné vrstvě pro její přesun; držte klávesu Shift pro potlačení počátečního odporu - + Click and drag to move all items in the selected range Klepněte a táhněte pro přesun všech položek ve vybraném rozsahu - + Click and drag to adjust the visible range of the vertical scale Klepněte a táhněte pro přizpůsobení viditelného rozsahu svislé stupnice - + Click and drag to adjust the vertical zoom level Klepněte a táhněte pro přizpůsobení úrovně svislého zvětšení - + Click and drag to adjust the horizontal zoom level Klepněte a táhněte pro přizpůsobení úrovně vodorovného zvětšení - + Reset horizontal and vertical zoom levels to their defaults Nastavit znovu úrovně vodorovného a svislého zvětšení na jejich výchozí hodnoty @@ -4955,34 +5001,34 @@ PlayParameterRepository - + Adjust Playback Parameters - Upravit parametry přehrávání - - - + Upravit parametry přehrávání + + + Change Playback Mute State - Změnit stav ztlumení přehrávání - - - + Změnit stav ztlumení přehrávání + + + Change Playback Gain - Změnit zesílení přehrávání - - - + Změnit zesílení přehrávání + + + Change Playback Pan - Změnit vyvážení přehrávání - - - + Změnit vyvážení přehrávání + + + Change Playback Plugin - Změnit přídavný modul přehrávání - - - + Změnit přídavný modul přehrávání + + + Configure Playback Plugin - Nastavit přídavný modul přehrávání + Nastavit přídavný modul přehrávání @@ -5015,12 +5061,12 @@ PluginParameterBox - + This plugin has no adjustable parameters. Tento přídavný modul nemá žádné upravitelné parametry. - + Program Program @@ -5028,84 +5074,84 @@ PluginParameterDialog - - + + Plugin Parameters Parametry přídavného modulu - + Name: Název: - + Version: Verze: - + Maker: Tvůrce: - + Copyright: Autorské právo: - + Output: Výstup: - + Input Material Vstupní materiál - + Restrict to selection extents Omezit na rozsah výběru - + Channels Kanály - + Processing Zpracování - - + + Advanced >> Pokročilé >> - + Channel mismatch Nesoulad v kanálu - + This plugin requires at least %1 input channels, but only %2 %3 available. The plugin probably will not work correctly. Tento přídavný modul vyžaduje alespoň %1 vstupních kanálů, ale dostupné jsou pouze %2 %3. Přídavný modul pravděpodobně nebude pracovat správně. - + are jsou - + is je - + This plugin accepts no more than %1 input channels, but %2 are available. Only the first %3 will be used. @@ -5114,7 +5160,7 @@ - + This plugin only has a single channel input, but the source has %1 channels. Tento přídavný modul má jednokanálový vstup, @@ -5122,37 +5168,37 @@ - + Use mean of source channels Použít průměr ze zdrojových kanálů - + Use channel %1 only Použít pouze kanál %1 - + Window size: Velikost okna: - + Audio frames per block: Snímků zvuku na blok: - + Window increment: Přírůstek okna: - + Window shape: Podoba okna: - + Advanced << Pokročilé << @@ -5160,214 +5206,214 @@ Preferences - + Spectrogram y-axis interpolation: Interpolace osy y spektrogramu: - + Spectrogram x-axis interpolation: Interpolace osy x spektrogramu: - + Frequency of concert A Kmitočet koncertního A - + Property box layout Rozvržení okénka vlastností - + Spectral analysis window shape Podoba okna pro rozbor spektra - + Playback resampler type Typ převzorkování přehrávání - + Omit temporaries from Recent Files menu Vynechat dočasné z nabídky naposledy otevřených souborů - + Resample mismatching files on import Převzorkovat neodpovídající soubory při zavedení - + Location for cache file directory Umístění adresáře s vyrovnávací pamětí - + Background colour preference Upřednostňovaná barva pozadí - + Time display format Formát zobrazení času - + Font size for text overlays Velikost písma pro překrytí textem - + Show splash screen on startup Ukázat úvodní obrazovku při spuštění - + Show boxes for all panes Ukázat okénka pro všechny tabulky - + Show box for current pane only Ukázat okénko pouze pro nynější tabulku - + Rectangular Obdélníková - + Triangular Trojúhelníková - + Hamming Hamming - + Hann Hann - + Blackman Blackman - + Gaussian Gauss - + Parzen Parzen - + Nuttall Nuttall - + Blackman-Harris Blackman-Harris - + Fastest Nejrychlejší - + Standard Obvyklé - + Highest quality Nejvyšší kvalita - - + + None Žádná - - + + Linear interpolation Přímočará interpolace - + 4 x Oversampling 4 x převzorkování - + 4 x Oversampling with interpolation 4 x převzorkování s interpolací - + Follow desktop theme Držet se námětu plochy - + Dark background Tmavé pozadí - + Light background Světlé pozadí - + Standard (to millisecond) Obvyklý (na milisekundy) - + High resolution (to microsecond) Vysoké rozlišení (na mikrosekundy) - + 24 FPS 24 snímků za sekundu (FPS) - + 25 FPS 25 snímků za sekundu (FPS) - + 30 FPS 30 snímků za sekundu (FPS) - + 50 FPS 50 snímků za sekundu (FPS) - + 60 FPS 60 snímků za sekundu (FPS) - + Preferences Nastavení @@ -5464,7 +5510,7 @@ ProgressDialog - + Cancel Zrušit @@ -5472,78 +5518,78 @@ PropertyBox - + Show Ukázat - + Play Přehrát - + Playback Gain Zesílení přehrávání - + dB dB - - + + Playback Pan / Balance Vyvážení přehrávání/rovnováha - + Add New Colour... Přidat novou barvu... - + Name New Colour Pojmenovat novou barvu - + Enter a name for the new colour: Zadejte název pro novou barvu: - + Prefer black background for this colour Upřednostňovat černé pozadí pro tuto barvu - + (current value: %1%2) (nynější hodnota: %1%2) - + (current value: %1) (nynější hodnota: %1) - + Toggle Visibility of %1 Přepnout viditelnost %1 - + Toggle Playback of %1 Přepnout přehrávání %1 - + Toggle %1 property of %2 Přepnout %1 vlastnost %2 - + Adjust %1 property of %2%3 Upravit %1 vlastnost %2%3 @@ -5551,39 +5597,39 @@ PropertyContainer - + yes Ano - + on Zapnuto - + true Pravdivý - + no Ne - + off Vypnuto - + false Nepravdivý - + Set %1 Property - Nastavit %1 vlastnost + Nastavit %1 vlastnost @@ -5596,12 +5642,12 @@ PropertyStack - + Change Layer Visibility Změnit viditelnost vrstvy - + Click to change the current active layer Klepněte pro změnu nynější činné vrstvy @@ -5609,7 +5655,7 @@ QApplication - + Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. @@ -5636,7 +5682,7 @@ - + Sonic Visualiser Sonic Visualiser - Znázorňovač zvuku @@ -5671,22 +5717,22 @@ QFile - - - + + + File "%1" does not exist Soubor "%1" neexistuje - - - + + + Failed to open file "%1" Soubor "%1" se nepodařilo otevřít - - + + File or URL "%1" could not be retrieved Soubor nebo adresu (URL) "%1" se nepodařilo získat @@ -5694,18 +5740,18 @@ QMessageBox - - + + Failed to open file Soubor se nepodařilo otevřít - + File or URL "%1" could not be opened Soubor nebo adresu (URL) "%1" se nepodařilo otevřít - + <b>Audio required</b><p>Please load at least one audio file before importing annotation data <b>Vyžadován zvuk</b><p>Před zavedením dat s poznámkami nahrajte, prosím, alespoň jeden zvukový soubor @@ -5713,7 +5759,7 @@ QuickTimeFileReader - + Decoding %1... Dekóduje se %1... @@ -5721,17 +5767,17 @@ RDFImporter - + Importing audio referenced in RDF... Zavádí se zvuk odkazovaný v RDF... - + Importing dense signal data from RDF... Zavádí se signálová data s vysokou hustotou z RDF... - + Importing event data from RDF... Zavádí se data událostí z RDF... @@ -5739,7 +5785,7 @@ RangeInputDialog - + to do @@ -5747,86 +5793,87 @@ RangeSummarisableTimeValueModel + Range-Summarisable Time-Value - Rozsahově shrnutelná časová hodnota + Rozsahově shrnutelná časová hodnota RegionLayer - - + + New Region Nová oblast - + Vertical Scale Svislá stupnice - + Scale Units Jednotky stupnice - + Plot Type Typ nákresu - + Scale Stupnice - + Bars Úsečky - + Segmentation Rozčlenění - + Auto-Align Automatické zarovnání - + Equal Spaced Vyrovnaně rozložené - + Linear Přímočarý - + Log Zápis - + In progress Probíhá - - + + No local points Žádné místní body - + %1 %2 %1 %2 - + Time: %1 Value: %2 Duration: %3 @@ -5837,7 +5884,7 @@ Žádný štítek - + Time: %1 Value: %2 Duration: %3 @@ -5848,63 +5895,63 @@ Štítek: %4 - + Draw Region Nakreslit oblast - + Erase Region Vymazat oblast - + Drag Region Táhnout oblast - - + + Edit Region Upravit oblast - + Relocate Region Přemístit oblast - + Change Point Value Změnit hodnotu bodu - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selected Points Smazat vybrané body - + Re-align pasted items? Zarovnat vložené položky znovu? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit @@ -5912,42 +5959,42 @@ RegionModel - + Region Oblast - + Time Čas - + Frame Rámeček - + Value Hodnota - + Duration Doba trvání - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -5955,7 +6002,7 @@ RemoveLayerCommand - + Delete %1 Layer Smazat %1 vrstvu @@ -5963,7 +6010,7 @@ ResamplingWavFileReader - + Resampling %1... Převzorkovává se %1... @@ -5971,13 +6018,13 @@ SVFileReader - - + + (derived model in SV-XML) (odvozený model v SV-XML) - + Opening file or URL... Otevírá se soubor nebo adresa (URL)... @@ -5985,12 +6032,12 @@ SingleColourLayer - + Colour Barva - + <unknown> <neznámý> @@ -5998,13 +6045,13 @@ SliceLayer - - + + %1 - %2 %1 - %2 - + Time: %1 - %2 Range: %3 samples (%4) Bin: %5 @@ -6015,140 +6062,140 @@ %6 hodnota: %7 - + First První - - + + Mean Průměr - - + + Peak Vrchol - + Time: %1 - %2 Range: %3 samples (%4) Čas: %1 - %2 Rozsah: %3 vzorky (%4) - + 0dB 0dB - + -Inf -Inf - + x10 x10 - + Plot Type Typ nákresu - - + + Scale Stupnice - + Normalize Normalizovat - + Threshold Práh - + Gain Zesílení - + Sampling Mode Režim vzorkování - - + + Linear Přímočarý - + Meter Měřič - + Rev Log Rev Log - - + + dB dB - + Any Jakýkoli - + Bin Scale Stupnice koše - + Bins Koše - - + + Log Zápis - + Absolute Naprostý - + Lines Čáry - + Steps Kroky - + Blocks Bloky - + Colours Barvy @@ -6156,8 +6203,9 @@ SparseModel + Sparse - Řídký + Řídký Add Point @@ -6172,47 +6220,74 @@ Opatřit bod znovu štítkem + Edit Data - Upravit data - - + Upravit data + + + Insert Data Point - Vložit datový bod - - + Vložit datový bod + + + Delete Data Point - Smazat datový bod + Smazat datový bod + + + + SparseModel::AddPointCommand + + + Add Point + Přidat bod + + + + SparseModel::DeletePointCommand + + + Delete Point + Smazat bod + + + + SparseModel::RelabelCommand + + + Re-Label Point + Opatřit bod znovu štítkem SparseOneDimensionalModel - + Sparse 1-D Řídký 1-D - + Time Čas - + Frame Snímek - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -6220,37 +6295,37 @@ SparseTimeValueModel - + Sparse Time-Value Řídká hodnota času - + Time Čas - + Frame Snímek - + Value Hodnota - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -6258,330 +6333,331 @@ SparseValueModel + Sparse Value - Řídká hodnota + Řídká hodnota SpectrogramLayer - - + + Colour Barva - + Colour Scale Stupnice barev - + Window Size Velikost okna - + Window Overlap Překrytí okna - + Normalize Columns Normalizovat sloupce - + Normalize Visible Area Normalizovat viditelnou oblast - + Bin Display Zobrazení koše - + Threshold Práh - + Gain Zesílení - + Colour Rotation Otáčení barev - + Min Frequency Nejmenší kmitočet - + Max Frequency Největší kmitočet - + Frequency Scale Kmitočtová stupnice - + Smoothing Vyhlazování - + Bins Koše - + Window Okno - + Scale Stupnice - - + + Linear Přímočarý - + Meter Měřič - + dBV^2 dBV^2 - + dBV dBV - + Phase Fáze - - + + None Žádná - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - + No min Žádné minimum - + 10 Hz - + 20 Hz - + 40 Hz - + 100 Hz - + 250 Hz - - + + 500 Hz - - + + 1 KHz - - + + 4 KHz - + 10 KHz - + 1.5 KHz - + 2 KHz - + 6 KHz - + 8 KHz - + 12 KHz - + 16 KHz - + No max Žádné maximum - + Log Zápis - + All Bins Všechny koše - + Peak Bins Koše vrcholů - + Frequencies Kmitočty - + <unknown> <neznámý> - - + + dB dB - + FFT cache failed FFT vyrovnávací paměť selhala - + Failed to create the FFT model for this spectrogram. There may be insufficient memory or disc space to continue. Nepodařilo se vytvořit model FFT pro tento spektrogram. Důvodem pro to může být nedostatek paměti, nebo nedostatek místa na disku. - + Peak Frequency: %1 - %2 Hz Nejvyšší kmitočet: %1 - %2 Hz - + Peak Frequency: %1 Hz Nejvyšší kmitočet: %1 Hz - + Peak Pitch: %3 - %4 Nejvyšší výška: %3 - %4 - + Peak Pitch: %2 Nejvyšší výška: %2 - + Time: %1 - %2 Čas: %1 - %2 - + Time: %1 Čas: %1 - + %1Bin Frequency: %2 - %3 Hz %4Bin Pitch: %5 - %6 @@ -6590,7 +6666,7 @@ - + %1Bin Frequency: %2 Hz %3Bin Pitch: %4 @@ -6599,42 +6675,42 @@ - - + + -Inf -Inf - + dB: %1 - %2 dB: %1 - %2 - + dB: %1 dB: %1 - + Phase: %1 - %2 Fáze: %1 - %2 - + Phase: %1 Fáze: %1 - + 43Hz - + %1Hz %1Hz @@ -6642,22 +6718,22 @@ SpectrumLayer - + Window Size Velikost okna - + Window Overlap Překrytí okna - + Show Peak Frequencies Ukázat nejvyšší kmitočty - + Window Okno @@ -6666,70 +6742,70 @@ Typ nákresu - + Bins - Koše - - - + Koše + + + None Žádný - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - - - + + + %1 - %2 %1 - %2 - + %1 - %2 Hz - + %1 Hz %1 Hz - - + + -Inf -Inf - + %1 %1 - + %1 Bin: %2 (%3) %4 value: %5 @@ -6740,22 +6816,22 @@ dB: %6 - + First První - + Mean Průměr - + Peak Vrchol - + %1 Bin: %2 (%3) Value: %4 @@ -6769,7 +6845,7 @@ SubdividingMenu - + %1 - %2 %1 - %2 @@ -6790,24 +6866,24 @@ TextLayer - - + + Empty Label Prázdný štítek - - + + <no text> <žádný text> - + In progress Probíhá - + Time: %1 Height: %2 Label: %3 @@ -6816,74 +6892,74 @@ Štítek: %3 - - + + Enter label Zadat štítek - - + + Please enter a new label: Zadejte, prosím, nový štítek: - + Erase Point Vymazat bod - + Drag Label Táhnout štítek - + Move Label Přesunout štítek - + Move Label Horizontally Přesunout štítek vodorovně - + Move Label Vertically Přesunout štítek svisle - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selection Smazat výběr - + Re-align pasted items? Zarovnat vložené položky znovu? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit - + New Point Nový bod @@ -6891,37 +6967,37 @@ TextModel - + Text Text - + Time Čas - + Frame Snímek - + Height Výška - + Label Štítek - + Unknown Neznámý - + Edit Data Upravit data @@ -6929,39 +7005,39 @@ Thumbwheel - + %1: %2%3 %1: %2%3 - + %2%3 %2%3 - + New value for %1, from %2 to %3 %4: Nová hodnota pro %1, od %2 do %3 %4: - + New value for %1, from %2 to %3: Nová hodnota pro %1, od %2 do %3: - + Enter a new value from %1 to %2 %3: Zadejte novou hodnotu od %1do %2 %3: - - + + Enter a new value from %1 to %2: Zadejte novou hodnotu od %1 do %2: - - + + Enter new value Zadat novou hodnotu @@ -6969,107 +7045,107 @@ TimeInstantLayer - - + + New Point Nový bod - + Plot Type Typ nákresu - + Instants Okamžiky - + Segmentation Rozčlenění - + In progress Probíhá - + No local points Žádné místní body - + Time: %1 No label Čas: %1 Žádný štítek - + Time: %1 Label: %2 Čas: %1 Štítek: %2 - + Draw Point Nakreslit bod - + Add Point at %1 s Přidat bod v %1 s - + Erase Point Vymazat bod - + Drag Point Nakreslit bod - + Move Point to %1 s Přesunout bod na %1 s - + Edit Point Upravit bod - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selection Smazat výběr - + Re-align pasted instants? Zarovnat vložené položky znovu? - + The instants you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Okamžiky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit @@ -7077,105 +7153,105 @@ TimeValueLayer - - - + + + New Point Nový bod - - + + Plot Type Typ nákresu - + Vertical Scale Svislá stupnice - + Scale Units Jednotky stupnice - + Draw Segment Division Lines Kreslit čáry rozdělující části - + Show Derivative - - - - + Ukázat odvozeninu + + + Scale Stupnice - + Points Body - + Stems Stopky - + Connected Points Spojené body - + Lines Čáry - + Curve Křivka - + Segmentation Rozčlenění - + Auto-Align Automatické zarovnání - + Linear Přímočaré - + Log Zápis - + +/-1 v - + In progress Probíhá - + No local points Žádné místní body - + Time: %1 Value: %2%3 No label @@ -7184,7 +7260,7 @@ Žádný štítek - + Time: %1 Value: %2%3 Label: %4 @@ -7193,97 +7269,97 @@ Štítek: %4 - + Draw Point Nakreslit bod - + Erase Point Vymazat bod - + Drag Point Táhnout bod - - + + Edit Point Upravit bod - + Relocate Point Přemístit bod - + Change Point Value Změnit hodnotu bodu - + Drag Selection Táhnout výběr - + Resize Selection Změnit velikost výběru - + Delete Selected Points Smazat vybrané body - + Re-align pasted items? Zarovnat vložené položky znovu? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? Položky, které vkládáte, přišly z vrstvy s odlišným zdrojovým materiálem, než má tento. Chcete je zarovnat znovu v čase, aby se hodily ke zdrojovému materiálu pro tuto vrstvu? - + Paste Vložit - + The items you are pasting do not have values. What values do you want to use for these items? Položky, které vkládáte, nemají hodnoty. Jaké hodnoty chcete pro tyto položky použít? - + Some of the items you are pasting do not have values. What values do you want to use for these items? Některé z položek, které vkládáte, nemají hodnoty. Jaké hodnoty chcete pro tyto položky použít? - + Zero for all items Nula pro všechny položky - + Choose value calculation Vybrat výpočet hodnoty - + Select cycle size Vybrat velikost cyklu - + Cycle size: Velikost cyklu: @@ -7291,27 +7367,27 @@ TipDialog - + Tip of the Day Rada na tento den - + Show tip on startup Ukázat radu při spuštění - + << Previous << Předchozí - + Next >> Další >> - + Close Zavřít @@ -7319,136 +7395,136 @@ TransformFactory - + [\(<].*$ [\(<].*$ - - + + <unknown maker> <neznámý tvůrce> - - + + Extract features using "%1" plugin (from %2) Vytáhnout funkce pomocí "%1" přídavného modulu (z %2) - - + + Extract features using "%1" output of "%2" plugin (from %3) Vytáhnout funkce pomocí "%1" výstupu "%2" přídavného modulu (z %3) - - + + %1 using "%2" plugin (from %3) %1 používá "%2" přídavný modul (z %3) - - + + %1 using "%2" output of "%3" plugin (from %4) %1 používá "%2" výstup "%3" přídavného modulu (z %4) - + Analysis Rozbor - + Generator Tvůrce - - + + Other Jiný - - + + %1: %2 %1: %2 - + %1: Output %2 %1: Výstup %2 - + Extract "%1" data output from "%2" effect plugin (from %3) Vytáhnout "%1" datový výstup z "%2" efektového přídavného modulu (z %3) - + Extract data output %1 from "%2" effect plugin (from %3) Vytáhnout datový výstup %1 z "%2" efektového přídavného modulu (z %3) - + Effects Data Efektová data - + Effects Efekty - + Transform audio signal with "%1" effect plugin (from %2) Proměnit zvukový signál s "%1" efektovým přídavným modulem (z %2) - + Generate audio signal using "%1" plugin (from %2) Vytvořit zvukový signál za použití "%1" efektového přídavného modulu (z %2) - - + + Plugin type Druh přídavného modulu - - + + Category Skupina - - + + System Identifier Systémový identifikátor - - + + Name Název - - + + Description Popis - - + + Maker Tvůrce - - + + Units jednotky @@ -7456,64 +7532,64 @@ TransformFinder - + Find a Transform Najít proměnu - + Find: Hledat: - + <br>&nbsp;&nbsp;No results found <br>&nbsp;&nbsp;Nebyly nalezeny žádné výsledky - - + + Up Nahoru - - + + Down Dolů - + <p>Type some text into the search box to search the descriptions of:<ul><li>All currently installed <a href="http://www.vamp-plugins.org/">Vamp</a> audio feature extraction plugins</li><li>All currently installed <a href="http://www.ladspa.org/">LADSPA</a> audio effects plugins</li><li>Vamp plugins that are not currently installed but that have descriptions published via the semantic web</li></ul> <p>Napište do okénka pro hledání nějaký text pro hledání popisů:<ul><li>Všech nyní nainstalovaných <a href="http://www.vamp-plugins.org/">Vamp</a> zvukových funkčních vytahovacích přídavných modulů</li><li>Všech nyní nainstalovaných <a href="http://www.ladspa.org/">LADSPA</a> zvukových efektových přídavných modulů</li><li>Vamp přídavných modulů, které nyní nainstalovány nejsou, ale mají svůj popis zvěřejněný prostřednictvím významového internetu</li></ul> - + <b>Unable to retrieve published descriptions from network!</b> <b>Zveřejněné popisy se ze sítě získat nepodařilo!</b> - + <b>No plugins are currently installed!</b> <b>Nyní nejsou nainstalovány žádné přídavné moduly!</b> - + <p>%1<br>Perhaps the network connection is down, services are responding too slowly, or a processing problem has occurred.<br>Only the descriptions of installed plugins will be searched. <p>%1<br>Je možné, že síťové spojení vypadlo, služby odpovídají příliš pomalu, nebo se vyskytly potíže se zpracováním.<br>Budou se prohledávat pouze popisy nainstalovaných přídavných modulů. - + <p>%1<br>Only the published descriptions of Vamp feature extraction plugins will be searched. <p>%1<br>Budou se prohledávat pouze zveřejněné popisy funkčních vytahovacích přídavných modulů Vamp. - + <p>%1<br>%2<br>Perhaps the network connection is down, or services are responding too slowly.<br>No search results will be available. <p>%1<br>%2<br>Je možné, že síťové spojení vypadlo, nebo služby odpovídají příliš pomalu.<br>Nebudou dostupné žádné výsledky hledání. - + Found %n description(s) containing <b>%1</b>, showing the first %2 only Nalezen jeden popis obsahující <b>%1</b>, ukazují se pouze první %2 @@ -7522,7 +7598,7 @@ - + Found %n description(s) containing <b>%1</b> Nalezen jeden popis obsahující <b>%1</b> @@ -7531,54 +7607,54 @@ - + <i> (not installed)</i> <i> (nenainstalován)</i> - + %1%2<br><small> %1%2<br><small> - - + + </small> </small> - + <b>%1</b>%2<br> <b>%1</b>%2<br> - - + + <small>%1</small> <small>%1</small> - + <small> </small> - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Plugin type: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Typ přídavného modulu: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Category: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Skupina: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; System identifier: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Systémový identifikátor: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; More information: <a href="%1">%1</a> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Více informací naleznete na stránkách: <a href="%1">%1</a> @@ -7586,58 +7662,58 @@ View - + Global Scroll Celkové projíždění - + Global Zoom Celkové přibližování a oddalování - + Follow Playback Sledovat přehrávání - + Scroll Projíždět - + Page Strana - + Off Vypnuto - + <unknown> <neznámý> - + Alignment Zarovnání - + Waiting for layers to be ready... Čeká se na vrstvy, až budou připraveny... - - + + Cancel Zrušit - + Rendering image... Dělá se obrázek... @@ -7645,97 +7721,97 @@ ViewManager - + Clear Selection - Vyprázdnit výběr - - - + Vyprázdnit výběr + + + Select Multiple Regions - Vybrat více oblastí - - - + Vybrat více oblastí + + + Select Region - Vybrat oblast - - - + Vybrat oblast + + + Enter Navigate mode Vstoupit do režimu navádění - + Enter Select mode Vstoupit do režimu výběru - + Enter Edit mode Vstoupit do režimu úprav - + Enter Draw mode Vstoupit do režimu kreslení - + Enter Erase mode Vstoupit do režimu mazání - + Enter Measure mode Vstoupit do režimu měření - + Switch on Loop mode Zapnout režim smyčky - + Switch off Loop mode Vypnout režim smyčky - + Switch on Play Selection mode Zapnout režim přehrávání vybrané oblasti - + Switch off Play Selection mode Vypnout režim přehrávání vybrané oblasti - + Switch on Play Solo mode Zapnout režim samostatného přehrávání - + Switch off Play Solo mode Vypnout režim samostatného přehrávání - + Switch on Alignment mode Zapnout režim zarovnávání - + Switch off Alignment mode Vypnout režim zarovnávání - + Scroll to %1 Projíždět k %1 - + Zoom to %n sample(s) per pixel Zvětšení na jeden vzorek na pixel @@ -7744,7 +7820,7 @@ - + Change overlay level Změnit úroveň překrytí @@ -7767,7 +7843,7 @@ WaveFileModel - + Wave File Soubor Wave @@ -7775,112 +7851,112 @@ WaveformLayer - - + + Scale Stupnice - + Gain Zesílení - + Normalize Visible Area Normalizovat viditelnou oblast - + Channels Kanály - + Linear Přímočarý - + Meter Měřič - - + + dB dB - + Separate Rozdělit - + Mean Průměr - + Butterfly Rozříznout a roztáhnout - + Time: %1 - %2 Čas: %1 - %2 - + Time: %1 Čas: %1 - + Level: Úroveň: - + Left: Levý: - + Right: Pravý: - + Channel %1 Kanál %1 - + %1 %2 - %3 (%4 dB peak) %1 %2 - %3 (%4 dB nejvyšší) - + %1 %2 (%3 dB peak) %1 %2 (%3 dB nejvyšší) - - - + + + 0dB 0dB - - - + + + -Inf -Inf @@ -7888,12 +7964,12 @@ WindowShapePreview - + V / time V/čas - + dB / freq dB/kmitočet @@ -7901,7 +7977,7 @@ WritableWaveFileModel - + Writable Wave File Zapisovatelný soubor Wave diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_en_GB.ts --- a/i18n/sonic-visualiser_en_GB.ts Tue Mar 22 14:29:38 2011 +0000 +++ b/i18n/sonic-visualiser_en_GB.ts Mon Jul 25 19:38:50 2011 +0100 @@ -4,17 +4,17 @@ ActivityLog - + Activity Log - + <p>Activity Log lists your interactions and other events within %1.</p> - + %1: %2 @@ -22,7 +22,7 @@ AddLayerCommand - + Add %1 Layer @@ -30,7 +30,7 @@ AggregateWaveModel - + Aggregate Wave @@ -38,7 +38,7 @@ AlignmentModel - + Alignment @@ -46,17 +46,17 @@ AudioCallbackPlaySource - + Play from %1 - + Stop at %1 - + Change time-stretch factor to %1 @@ -64,39 +64,39 @@ AudioDial - + %1: %2%3 - + %2%3 - + New value for %1, from %2 to %3 %4: - + New value for %1, from %2 to %3: - + Enter a new value from %1 to %2 %3: - - + + Enter a new value from %1 to %2: - - + + Enter new value @@ -104,27 +104,27 @@ AudioTargetFactory - + (auto) - + JACK Audio Connection Kit - + PulseAudio Server - + Core Audio Device - + Default Soundcard Device @@ -132,72 +132,72 @@ BZipFileDevice - + File is already open - + Append mode not supported - + File access mode not specified - + Read and write modes both specified - + Failed to open file for writing - + Failed to open bzip2 stream for writing - + Failed to open file for reading - + Failed to open bzip2 stream for reading - + Internal error (open for neither read nor write) - + File not open - + bzip2 stream write close error - + bzip2 stream read close error - + Internal error (close for neither read nor write) - + bzip2 stream read error @@ -205,7 +205,7 @@ BundleCommand - + %1 (%n change(s)) %1 (%n change) @@ -216,7 +216,7 @@ CSVFileWriter - + Failed to open file %1 for writing @@ -224,160 +224,169 @@ CSVFormatDialog - + Select Data Format - - <b>Select Data Format</b><p>Please select the correct data format for this file. - - - - - Each row specifies: - - - - - A point in time - - - - - A value at a time - - - - - A set of values - - - - - The first column contains: - - - - - Time, in seconds - - - - - Time, in audio sample frames - - - - - Data (rows are consecutive in time) - - - - + + Please select the correct data format for this file. + + + + + <ignore> + + + + + Time + + + + + End time + + + + + Duration + + + + + Value + + + + + Label + + + + + Timing is specified: + + + + + Explicitly, in seconds + + + + + Explicitly, in audio sample frames + + + + + Implicitly: rows are equally spaced in time + + + + Audio sample rate (Hz): - + Frame increment between rows: - - -Example data from file: + + Data will be displayed in a %1 layer. Colour3DPlotLayer - - + + Colour - - + + Scale - + Normalize Columns - + Normalize Visible Area - + Invert Vertical Scale - + Gain - + Always Opaque - + Smooth - + Bin Scale - + Bins - - + + Linear - - + + Log - + +/-1 - + Absolute - + <unknown> - + dB - + Time: %1 - %2 Bin: %3 Value: %4 @@ -387,68 +396,68 @@ ColourMapper - - + + <unknown> - + Default - + White on Black - + Black on White - + Red on Blue - + Yellow on Black - + Blue on Black - + Sunset - + Fruit Salad - + Banded - + Highlight - + Printer - + High Gain @@ -456,68 +465,68 @@ CommandHistory - - - + + + &Undo - + Ctrl+Z - + Undo the last editing operation - - - + + + Re&do - + Ctrl+Shift+Z - + Redo the last operation that was undone - + Undo %1 - + Redo %1 - + Nothing to undo - + Nothing to redo - - + + &Undo %1 - - + + Re&do %1 @@ -525,7 +534,7 @@ Dense3DModelPeakCache - + Dense 3-D Peak Cache @@ -533,17 +542,17 @@ DenseThreeDimensionalModel - + Dense 3-D - + Time - + Frame @@ -551,7 +560,7 @@ DenseTimeValueModel - + Dense Time-Value @@ -559,12 +568,12 @@ Document - + Set main model to %1 - + Clear main model @@ -572,7 +581,7 @@ EditableDenseThreeDimensionalModel - + Editable Dense 3-D @@ -580,12 +589,12 @@ FFTModel - + FFT - + %1 Hz @@ -593,22 +602,22 @@ Fader - + Enter new fader level - + New fader level, from %1 to %2 dBFS: - + Level: Off - + Level: %1%2.%3%4 dB @@ -616,48 +625,48 @@ FeatureExtractionModelTransformer - + No factory available for feature extraction plugin id "%1" (unknown plugin type, or internal error?) - + Input model for feature extraction plugin "%1" is of wrong type (internal error?) - + Failed to instantiate plugin "%1" - + Cannot provide enough channels to feature extraction plugin "%1" (plugin min is %2, max %3; input model has %4) - - + + Failed to initialise feature extraction plugin "%1" - + Feature extraction plugin "%1" rejected the given step and block sizes (%2 and %3); using plugin defaults (%4 and %5) instead - + Transform was configured for version %1 of plugin "%2", but the plugin being used is version %3 - + Plugin "%1" has no outputs - + Plugin "%1" has no output named "%2" @@ -665,49 +674,49 @@ FileSource - - - + + + Unsupported scheme in URL - + Downloading %1... - + Failed to connect to FTP server - + Login failed - + Failed to change to correct directory - + FTP download aborted - + Download cancelled - + Failed to create local file %1 - + File contains no data! @@ -715,7 +724,7 @@ I - + Edit Data @@ -723,52 +732,52 @@ ImageDialog - + Image - + Label: - + File or URL: - + Browse... - + Preview - + Unsupported scheme in URL - + The URL scheme "%1" is not supported - + Opening image URL... - + File download failed - + Failed to download URL "%1": %2 @@ -776,58 +785,58 @@ ImageLayer - + In progress - - + + Select image - + Move Image - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + New Point - + Opening image URL... @@ -835,38 +844,38 @@ ImageModel - - + + Image - + Edit Image - + Time - + Frame - + Label - + Unknown - + Edit Data @@ -874,38 +883,38 @@ InteractiveFileFinder - - + + Select file - - + + All files (*.*) - - + + Select a session file - + Sonic Visualiser session files (*.sv) RDF files (%1) All files (*.*) - + Audio files (%1) All files (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -917,7 +926,7 @@ - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -928,7 +937,7 @@ - + All supported files (*.sv %1 %2) Sonic Visualiser session files (*.sv) Audio files (%2) @@ -937,13 +946,13 @@ - + Image files (%1) All files (*.*) - + All supported files (*.sv %1 %2 %3) Sonic Visualiser session files (*.sv) Audio files (%1) @@ -953,79 +962,79 @@ - + File does not exist - + <b>File not found</b><p>File "%1" does not exist - + File is not readable - + <b>File is not readable</b><p>File "%1" can not be read - - + + Directory selected - - + + <b>Directory selected</b><p>File "%1" is a directory - + Non-file selected - + <b>Not a file</b><p>Path "%1" is not a file - + File is empty - + <b>File is empty</b><p>File "%1" is empty - + Sonic Visualiser session files (*.sv) All files (*.*) - - - - + + + + Select a file to export to - + WAV audio files (*.wav) All files (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1035,7 +1044,7 @@ - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1044,71 +1053,71 @@ - + Portable Network Graphics files (*.png) All files (*.*) - + File exists - + <b>File exists</b><p>The file "%1" already exists. Do you want to overwrite it? - + <b>File not found</b><p>Audio file "%1" could not be opened. Do you want to locate it? - + <b>File not found</b><p>File "%1" could not be opened. Do you want to locate it? - + Failed to open file - + Locate file... - + Use URL... - + Cancel - + Use URL - + Please enter the URL to use for this file: - + Failed to open location - + <b>Failed to open location</b><p>URL "%1" could not be opened @@ -1116,65 +1125,65 @@ ItemEditDialog - + Timing - + Time: - - + + frames - - + + sec - - + + usec - + Duration: - + Properties - + Value: - + Text: - + OK - + Reset - + Cancel @@ -1182,23 +1191,23 @@ KeyReference - - + + & - + <i>or</i>&nbsp;<b>%1</b> - + </b>&nbsp;(%1)<b> - + Sonic Visualiser: Key and Mouse Reference @@ -1206,17 +1215,17 @@ LabelCounterInputDialog - + Set Counters - + Fine counter (beats): - + Coarse counter (bars): @@ -1224,77 +1233,77 @@ Labeller - + No numbering - + Simple counter - + Cyclical counter - + Cyclical two-level counter (bar/beat) - + Audio sample frame number - + Time in seconds - + Duration to the following item - + Tempo (bpm) based on duration to following item - + Duration since the previous item - + Tempo (bpm) based on duration since previous item - + Same as the nearest previous item - + Value extracted from the item's label (where possible) - + %1.%2 - + %1 - + Label Points @@ -1302,85 +1311,79 @@ Layer - + Waveform - - - + + + Spectrogram - + Ruler - + Time Instants - + Time Values - + Notes - + Regions - + Text - + Images - + Colour 3D Plot - + Spectrum - + Time Slice - + Layer - - - Layer::AddMeasurementRectCommand - - + + Make Measurement - - - Layer::DeleteMeasurementRectCommand - - + + Delete Measurement @@ -1388,17 +1391,17 @@ LayerTreeDialog - + Layer Summary - + Audio Data Sources - + Panes and Layers @@ -1406,22 +1409,22 @@ LayerTreeModel - + Layer - + Shown - + Played - + Model @@ -1429,27 +1432,27 @@ MIDIFileImportDialog - + Merge all tracks - + Merge all non-percussion tracks - + Select track or tracks to import - + <b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import: - + Error in MIDI file import @@ -1457,89 +1460,89 @@ MIDIFileReader - + Wrong length for long data in MIDI stream (%1, should be %2) - + Wrong length for int data in MIDI stream (%1, should be %2) - + getMIDIByte called but no MIDI file open - - + + End of MIDI file encountered while reading - + Attempt to get more bytes than expected on Track - - + + Attempt to read past MIDI file end - + getMIDIBytes called but no MIDI file open - + Attempt to get more bytes than available on Track (%1, only have %2) - + getNumberFromMIDIBytes called but no MIDI file open - + skipToNextTrack called but no MIDI file open - + Invalid event code %1 found - + Running status used for first event in track - + MIDI file "%1" has no notes in any track - + - uses GM percussion channel - + Track %1 (%2)%3 - + Track %1 (untitled)%3 - + %1 - vel %2 @@ -1547,7 +1550,7 @@ MIDIInput - + Input @@ -1555,7 +1558,7 @@ MP3FileReader - + Decoding %1... @@ -1563,2271 +1566,2317 @@ MainWindow - - + + Sonic Visualiser - + Black - + Red - + Blue - - - + + + Green - + Purple - + Orange - + White - + Bright Red - + Bright Blue - - - + + + Bright Green - + Bright Purple - + Bright Orange - + Playback Speedup - - + + + &Layer - - + + &Transform - + &File - + File Toolbar - + File and Session Management - + &New Session - + Ctrl+N - + Abandon the current Sonic Visualiser session and start a new one - + &Open Session... - + Ctrl+O - + Open a previously saved Sonic Visualiser session file - + &Open... - + Open a session file, audio file, or layer - + &Save Session - + Ctrl+S - + Save the current session into a Sonic Visualiser session file - + Save Session &As... - + Ctrl+Shift+S - + Save the current session into a new Sonic Visualiser session file - + &Import Audio File... - + Ctrl+I - + Import an existing audio file - + Import Secondary Audio File... - + Ctrl+Shift+I - + Import an extra audio file as a separate layer - + &Export Audio File... - + Export selection as an audio file - + Import Annotation &Layer... - + Ctrl+L - + Import layer data from an existing file - + Export Annotation Layer... - + Export layer data to a file - + Export Image File... - + Export a single pane to an image file - + Open Lo&cation... - + Ctrl+Shift+O - + Open or import a file from a remote URL - + &Recent Files - + &Preferences... - + Adjust the application preferences - + &Quit - + Ctrl+Q - + Exit Sonic Visualiser - + &Edit - + Editing - + Cu&t - + Ctrl+X - + Cut the selection from the current layer to the clipboard - + &Copy - + Ctrl+C - + Copy the selection from the current layer to the clipboard - + &Paste - + Ctrl+V - + Paste from the clipboard to the current layer - - + + Paste at Playback Position + + + + + Ctrl+Shift+V + + + + + Paste from the clipboard to the current layer, placing the first item at the playback position + + + + + &Delete Selected Items - + Del - - + + Delete items in current selection from the current layer - + Selection - + Select &All - + Ctrl+A - + Select the whole duration of the current session - + Select &Visible Range - + Ctrl+Shift+A - + Select the time range corresponding to the current window width - + Select to &Start - + Shift+Left - + Select from the start of the session to the current playback position - + Select to &End - + Shift+Right - + Select from the current playback position to the end of the session - + C&lear Selection - + Esc - + Clear the selection - + Tapping Time Instants - + &Insert Instant at Playback Position - + Enter - + Insert a new time instant at the current playback position, in a new layer if necessary - + ; - + Insert Instants at Selection &Boundaries - + Shift+Enter - + Insert new time instants at the start and end of the current selected regions, in a new layer if necessary - + Insert Item at Selection - + Ctrl+Shift+Enter - + Insert a new note or region item corresponding to the current selection - + Number New Instants with - + Cycle size - + Set Numbering Counters... - + Set the counters used for counter-based labelling - + Renumber Selected Instants - + Renumber the selected instants using the current labelling scheme - + Panning and Navigation - + &View - + Scroll &Left - + Left - + Scroll the current pane to the left - + Scroll &Right - + Right - + Scroll the current pane to the right - + &Jump Left - + Ctrl+Left - + Scroll the current pane a big step to the left - + J&ump Right - + Ctrl+Right - + Scroll the current pane a big step to the right - + Peek Left - + Alt+Left - + Scroll the current pane to the left without moving the playback cursor or other panes - + Peek Right - + Alt+Right - + Scroll the current pane to the right without moving the playback cursor or other panes - + Zoom - + Zoom &In - + Up - + Increase the zoom level - + Zoom &Out - + Down - + Decrease the zoom level - + Restore &Default Zoom - + Restore the zoom level to the default - + Zoom to &Fit - + F - + Zoom to show the whole file - + Display Features - + Show &No Overlays - + 0 - + Hide centre indicator, frame times, layer names and scale - + Show &Minimal Overlays - + 9 - + Show centre indicator only - + Show &Standard Overlays - + 8 - + Show centre indicator, frame times and scale - + Show &All Overlays - + 7 - + Show all texts and scale - + + Show All Time Rulers + + + + + # + + + + + Show or hide all time rulers + + + + Show &Zoom Wheels - + Z - + Show thumbwheels for zooming horizontally and vertically - + Show Property Bo&xes - + X - + Show the layer property boxes at the side of the main window - + Show Status &Bar - + Show context help information in the status bar at the bottom of the window - + Show La&yer Summary - + Y - + Open a window displaying the hierarchy of panes and layers in this session - + Show Acti&vity Log - + Open a window listing interactions and other events - + &Pane - + Managing Panes and Layers - + Add &New Pane - + N - + Add a new pane containing only a time ruler - + Add New %1 Layer - + Add a new empty layer of type %1 - + T - + Add &Waveform - + W - + Add a new pane showing a waveform view - + + Shift+W + + + + Add a new layer showing a waveform view - + Add Spectro&gram - + G - + Add a new pane showing a spectrogram - + + Shift+G + + + + Add a new layer showing a spectrogram - + Add &Melodic Range Spectrogram - + M - + Add a new pane showing a spectrogram set up for an overview of note pitches - + + Shift+M + + + + Add a new layer showing a spectrogram set up for an overview of note pitches - + Add Pea&k Frequency Spectrogram - + K - + Add a new pane showing a spectrogram set up for tracking frequencies - + + Shift+K + + + + Add a new layer showing a spectrogram set up for tracking frequencies - + Add Spectr&um - + U - + Add a new pane showing a frequency spectrum - + + Shift+U + + + + Add a new layer showing a frequency spectrum - + &All Channels Mixed - + &All Channels - + Channel &%1 - + %1: %2 - + Switch to Previous Pane - + [ - + Make the next pane up in the pane stack current - + Switch to Next Pane - + ] - + Make the next pane down in the pane stack current - + &Delete Pane - + Ctrl+Shift+D - + Delete the currently active pane - + Add &Time Ruler - + Add a new layer showing a time ruler - + Add &Existing Layer - + Add S&lice of Layer - + &Rename Layer... - + R - + Rename the currently active layer - + Edit Layer Data - + E - + Edit the currently active layer as a data grid - + &Delete Layer - + Ctrl+D - + Delete the currently active layer - + &Recent Transforms - + %1 by Category - - + + Unclassified - + %1 by Plugin Name - + %1 by Maker - - + + Unknown - - + + [\(<].*$ - - + + %1... - + Find a Transform... - + Search for a transform from the installed plugins, by name or description - + Ctrl+M - + &Help - + Help - + &Help Reference - + F1 - + Open the Sonic Visualiser reference manual - + &Key and Mouse Reference - + F2 - + Open a window showing the keystrokes you can use in Sonic Visualiser - + Sonic Visualiser on the &Web - + Open the Sonic Visualiser website - + &About Sonic Visualiser - + Show information about Sonic Visualiser - + Ctrl+R - + Re-open - + Re-open the current or most recently opened file - + Ctrl+T - + Repeat Transform - + Re-select the most recently run transform - + Playback and Transport Controls - + Play&back - + Playback - + Playback Toolbar - + Rewind to Start - + Home - + Rewind to the start - - - + + + Rewind - + PgUp - + Rewind to the previous time instant or time ruler notch - + Rewind to Similar Point - + Shift+PgUp - + Rewind to the previous similarly valued time instant - + Play / Pause - + Space - + Start or stop playback from the current position - - + + Fast Forward - + PgDown - + Fast-forward to the next time instant or time ruler notch - + Fast Forward to Similar Point - + Shift+PgDown - + Fast-forward to the next similarly valued time instant - + Fast Forward to End - + End - + Fast-forward to the end - + Play Mode Toolbar - + Constrain Playback to Selection - + s - + Constrain playback to the selected regions - + Loop Playback - + l - + Loop playback - + Solo Current Pane - + o - + Solo the current pane during playback - + Align File Timelines - + Treat multiple audio files as versions of the same work, and align their timelines - + Speed Up - + Ctrl+PgUp - + Time-stretch playback to speed it up without changing pitch - + Slow Down - + Ctrl+PgDown - + Time-stretch playback to slow it down without changing pitch - + Restore Normal Speed - + Ctrl+Home - + Restore non-time-stretched playback - + Edit Toolbar - + Tool Selection - + Tools Toolbar - - + + Navigate - + 1 - + Select - + 2 - + Select ranges - + Edit - + 3 - + Edit items in layer - + Draw - + 4 - + Draw new items in layer - + Erase - + 5 - + Erase items from layer - + Measure - + 6 - + Make measurements in layer - + &Delete Current Measurement - + Delete the measurement currently under the mouse pointer - + Fast Forward to Next Instant - + Fast forward to the next time instant in the current layer - + Rewind to Previous Instant - + Rewind to the previous time instant in the current layer - + Fast Forward to Next Point - + Fast forward to the next point in the current layer - + Rewind to Previous Point - + Rewind to the previous point in the current layer - + Fast forward - + No audio file loaded. - + %1Hz (resampling to %2Hz) - - - - - - - + + + + + + + Failed to open file - - + + <b>File open failed</b><p>Audio file "%1" could not be opened - - 1. %2 - - - - - %1. %2 - - - - + Select audio file to export - + Which audio file do you want to export from? - + Export the selected region only - - + + Export the whole audio file - - - + + + Select region to export - + Which region from the original audio file do you want to export? - + Export the selected regions into a single audio file - + Export the selected regions into separate files - + Multiple regions of the original audio file are selected. What do you want to export? - + Fragment file %1 already exists, aborting - + Export multiple audio files - + Export audio to "%1" - - + + Failed to write file - + <b>File open failed</b><p>Layer file %1 could not be opened. - - - - - + + + + + <b>Audio required</b><p>Unable to load layer data from "%1" without an audio file.<br>Please load at least one audio file before importing annotations. - + http://www.sonicvisualiser.org/doc/reference/%1/en/ - + Newer version available - + <h3>Newer version available</h3><p>You are using version %1 of Sonic Visualiser, but version %3 is now available.</p><p>Please see the <a href="http://sonicvisualiser.org/">Sonic Visualiser website</a> for more information.</p> - + Failed to open file %1 for writing - + Can't export non-note layers to MIDI - + Export layer to "%1" - + Export the whole pane (%1x%2 pixels) - + Export the visible area only (%1x%2 pixels) - + Export the selection extent (%1x%2 pixels) - + Export the selection extent - + Which region of the current pane do you want to export as an image? - + Note: the whole pane is too wide to be exported as a single image. - + Failed to save image file - + Failed to save image file %1 - + <b>File open failed</b><p>Session file "%1" could not be opened - + <b>File open failed</b><p>File "%1" could not be opened - + Open Location - + Please enter the URL of the location to open: - - - - + + + + Failed to open location - + <b>Open failed</b><p>URL "%1" could not be opened - + <b>Open failed</b><p>File or URL "%1" could not be opened - - + + Failed to open dropped URL - + <b>Open failed</b><p>Dropped URL "%1" could not be opened - + Export image to "%1" - + Session modified - + <b>Session modified</b><p>The current session has been modified.<br>Do you want to save it? - + Close the current session and create a new one - + Add this data to the current session - + Select target for import - + <b>Select a target for import</b><p>This RDF document refers to one or more audio files.<br>You already have an audio waveform loaded.<br>What would you like to do with the new data? - - + + Failed to save file - - + + <b>Save failed</b><p>Session file "%1" could not be saved. - + Sonic Visualiser: %1 - + Save session as "%1" - + Rename Layer - + New name for this layer: - + Playback speed: Normal - + Playback speed: %1%2% - + Selection: %1 to %2 (duration %3) - + Visible: %1 to %2 (duration %3) - + Sample rate mismatch - + <b>Wrong sample rate</b><p>The sample rate of this audio file (%1 Hz) does not match the current playback rate (%2 Hz).<p>The file will play at the wrong speed and pitch.<p>Change the <i>Resample mismatching files on import</i> option under <i>File</i> -> <i>Preferences</i> if you want to alter this behaviour. - - + + Audio processing overload - + <b>Overloaded</b><p>Audio effects plugin auditioning has been disabled due to a processing overload. - + <b>Overloaded</b><p>Audio playback speed processing has been reduced to a single channel, due to a processing overload. - + Add Point - + Reset Counters - - + + Failed to generate layer - + <b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform "%1" failed:<p>%2 - + <b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform "%1" failed.<p>No error information is available. - - + + Warning - - + + Failed to regenerate layer - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed:<p>%3 - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed.<p>No error information is available. - + <b>Warning when regenerating layer</b><p>When regenerating the derived layer "%1" using new data model as input:<p>%2 - + Failed to calculate alignment - + <b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform "%1":<p>%2 - + Adjust the master playback level - + Adjust the master playback speed - + http://www.sonicvisualiser.org/ - + Release %1 : Revision %2 - + Release %1 - + Unreleased : Revision %1 - + <h3>About Sonic Visualiser</h3> - + <p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> - + <p><small>%1 : %2 configuration</small></p> - + Debug - + Release - + With Qt v%1 &copy; Nokia Corporation - + <br>With JACK audio output library v%1 &copy; Paul Davis and Jack O'Quin - + <br>With JACK audio output library &copy; Paul Davis and Jack O'Quin - + <br>With PortAudio audio output library &copy; Ross Bencina and Phil Burk - + <br>With PulseAudio audio output library v%1 &copy; Lennart Poettering and Pierre Ossman - + <br>With PulseAudio audio output library &copy; Lennart Poettering and Pierre Ossman - + <br>With Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia - + <br>With Ogg file decoder &copy; CSIRO Australia - + <br>With MAD mp3 decoder v%1 &copy; Underbit Technologies Inc - + <br>With MAD mp3 decoder &copy; Underbit Technologies Inc - + <br>With libsamplerate v%1 &copy; Erik de Castro Lopo - + <br>With libsamplerate &copy; Erik de Castro Lopo - + <br>With libsndfile v%1 &copy; Erik de Castro Lopo - + <br>With libsndfile &copy; Erik de Castro Lopo - + <br>With FFTW3 v%1 &copy; Matteo Frigo and MIT - + <br>With FFTW3 &copy; Matteo Frigo and MIT - + <br>With Rubber Band v%1 &copy; Chris Cannam - + <br>With Rubber Band &copy; Chris Cannam - + <br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam - + <br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld - + <br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton - + <br>With Raptor RDF parser v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Raptor RDF parser &copy; Dave Beckett and the University of Bristol - + <br>With Rasqal RDF query engine v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Rasqal RDF query engine &copy; Dave Beckett and the University of Bristol - + <br>With Redland RDF datastore v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Redland RDF datastore &copy; Dave Beckett and the University of Bristol - + <br>With RtMidi &copy; Gary P. Scavone - + <br>With liblo Lite OSC library v%1 &copy; Steve Harris - + <br>With liblo Lite OSC library &copy; Steve Harris - + </small><p><small>The OSC URL for this instance is: "%1" - + With - + Using - + About Sonic Visualiser @@ -3840,290 +3889,294 @@ MainWindowBase - + %1 (modified) - + (modified) - + Cut - + Paste - - - - + + + + Add Point - + Add Point at %1 s - + Add Item at %1 s - + Opening file or URL... - + Replace the existing main waveform - + Load this file into a new waveform pane - + Select target for import - - - + + + %1: %2 - + %1: %2 [%3] - - + + Import "%1" - + Opening playlist... - - + + Importing from RDF... - + Opening session... - + <b>Select a target for import</b><p>You already have an audio waveform loaded.<br>What would you like to do with the new audio file? - + Import audio file "%1" - + Import layer XML file "%1" - + Import MIDI file "%1" - + SV XML file read error: %1 - + Import session file "%1" - - + + Failed to import RDF - + <b>Failed to import RDF</b><p>Importing data from RDF document at "%1" failed: %2</p> - + <b>Failed to import RDF</b><p>No suitable data models found for import from RDF document at "%1"</p> - + Import RDF document "%1" - - + + Couldn't open audio device - + <b>No audio available</b><p>Could not open an audio device for playback.<p>Automatic audio device detection failed. Audio playback will not be available during this session.</p> - + <b>No audio available</b><p>Failed to open your preferred audio device ("%1").<p>Audio playback will not be available during this session.</p> - + Failed to write file - + <b>Save failed</b><p>Failed to write to file "%1": %2 - - + + Add Pane + + + + + Remove Pane + + + + + Delete Pane - + Playing: %1 of %2 (%3 remaining) - MainWindowBase::AddPaneCommand - - - Add Pane - - - - - MainWindowBase::RemovePaneCommand - - - Remove Pane - - - - ModelDataTableDialog - + Data Editor - + Playback Toolbar - + Play Mode Toolbar - + Track Playback - + Toggle tracking of playback position - + Edit Toolbar - + Insert New Item - + Insert - + Insert a new item - + Delete Selected Items - + Delete - + Delete the selected item or items - + Data in Layer + + + Find: + + + + + + + ModelMetadataModel - + Type - + Name - + Maker - + Source @@ -4131,12 +4184,12 @@ ModelTransformerFactory - + %1 <%2> - + %1: %2 @@ -4144,75 +4197,75 @@ NoteLayer - - - + + + New Point - + Vertical Scale - + Scale Units - + Scale - + Auto-Align - + Linear - + Log - + MIDI Notes - + In progress - - + + No local points - + %1 (%2, %3 Hz) - + %1 Hz (%2, %3) - + %1 %2 - + Time: %1 Pitch: %2 Duration: %3 @@ -4220,7 +4273,7 @@ - + Time: %1 Pitch: %2 Duration: %3 @@ -4228,68 +4281,68 @@ - + Draw Point - + Erase Point - + Drag Point - - + + Edit Point - + Relocate Point - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + Record Note @@ -4297,47 +4350,47 @@ NoteModel - + Note - + Time - + Frame - + Pitch - + Duration - + Level - + Label - + Unknown - + Edit Data @@ -4345,7 +4398,7 @@ OggVorbisFileReader - + Decoding %1... @@ -4353,12 +4406,12 @@ Overview - + Overview - + Click and drag to navigate; double-click to jump @@ -4366,477 +4419,483 @@ Pane - + Horizontal Zoom - + Vertical Zoom - + Reset zoom to default - + Some lengthy prefix: - + Reference - - + + Unaligned - + Aligning: %1% - + Aligned - + %1 - %2 - + + + +%1 + + + + (R) - + (X) - + %1 / %2Hz%3 - - + + Zoom - + Zoom In - + Wheel Up - + Zoom Out - + Wheel Down - + General Pane Mouse Actions - + Wheel - + Zoom in or out in time axis - + Scroll - + Ctrl+Wheel - + Scroll rapidly left or right in time axis - + Zoom Vertically - + Shift+Wheel - + Zoom in or out in the vertical axis - + Scroll Vertically - + Alt+Wheel - + Scroll up or down in the vertical axis - - + + Navigate - + Middle - + Click middle button and drag to navigate with any tool - - + + Relocate - + Double-Click Middle - + Double-click middle button to relocate with any tool - + Menu - + Right - + Show pane context menu - + Navigate Tool Mouse Actions - - - - - + + + + + Left - + Click left button and drag to move around - - + + Zoom to Area - - - + + + Shift+Left - - + + Shift-click left button and drag to zoom to a rectangular area - - - - + + + + Double-Click Left - + Double-click left button to jump to clicked location - - + + Edit - - + + Double-click left button on an item to edit it - + Select Tool Mouse Actions - + Select - + Click left button and drag to select region; drag region edge to resize - + Multi Select - + Ctrl+Left - + Ctrl-click left button and drag to select an additional region - + Fine Select - + Shift-click left button and drag to select without snapping to items or grid - + Edit Tool Mouse Actions - + Move - + Click left button on an item or selected region and drag to move - + Draw Tool Mouse Actions - + Draw - + Click left button and drag to create new item - + Measure Tool Mouse Actions - + Measure Area - + Click left button and drag to measure a rectangular area - + Measure Item - + Click left button and drag to measure extents of an item or shape - + Enter new range - + New vertical display range, from %1 to %2 %4: - + Drag Selection - + Resize Selection - + Click and drag to navigate - + Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate - + Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate - + Click and drag to move the selection boundary - + Click and drag to select a range; hold Shift to avoid snapping to items; middle-click to navigate - + Click and drag to select a range; middle-click and drag to navigate - + Click to add a new item in the active layer - + Click to erase an item from the active layer - + Click and drag an item in the active layer to move it; hold Shift to override initial resistance - + Click and drag to move all items in the selected range - + Click and drag to adjust the visible range of the vertical scale - + Click and drag to adjust the vertical zoom level - + Click and drag to adjust the horizontal zoom level - + Reset horizontal and vertical zoom levels to their defaults - PlayParameterRepository::EditCommand - - + PlayParameterRepository + + Adjust Playback Parameters - + Change Playback Mute State - + Change Playback Gain - + Change Playback Pan - + Change Playback Plugin - + Configure Playback Plugin @@ -4844,12 +4903,12 @@ PluginParameterBox - + This plugin has no adjustable parameters. - + Program @@ -4857,127 +4916,127 @@ PluginParameterDialog - - + + Plugin Parameters - + Name: - + Version: - + Maker: - + Copyright: - + Output: - + Input Material - + Restrict to selection extents - + Channels - + Processing - - + + Advanced >> - + Channel mismatch - + This plugin requires at least %1 input channels, but only %2 %3 available. The plugin probably will not work correctly. - + are - + is - + This plugin accepts no more than %1 input channels, but %2 are available. Only the first %3 will be used. - + This plugin only has a single channel input, but the source has %1 channels. - + Use mean of source channels - + Use channel %1 only - + Window size: - + Audio frames per block: - + Window increment: - + Window shape: - + Advanced << @@ -4985,214 +5044,214 @@ Preferences - + Spectrogram y-axis interpolation: - + Spectrogram x-axis interpolation: - + Frequency of concert A - + Property box layout - + Spectral analysis window shape - + Playback resampler type - + Omit temporaries from Recent Files menu - + Resample mismatching files on import - + Location for cache file directory - + Background colour preference - + Time display format - + Font size for text overlays - + Show splash screen on startup - + Show boxes for all panes - + Show box for current pane only - + Rectangular - + Triangular - + Hamming - + Hann - + Blackman - + Gaussian - + Parzen - + Nuttall - + Blackman-Harris - + Fastest - + Standard - + Highest quality - - + + None - - + + Linear interpolation - + 4 x Oversampling - + 4 x Oversampling with interpolation - + Follow desktop theme - + Dark background - + Light background - + Standard (to millisecond) - + High resolution (to microsecond) - + 24 FPS - + 25 FPS - + 30 FPS - + 50 FPS - + 60 FPS - + Preferences @@ -5288,7 +5347,7 @@ ProgressDialog - + Cancel @@ -5296,78 +5355,78 @@ PropertyBox - + Show - + Play - + Playback Gain - + dB - - + + Playback Pan / Balance - + Add New Colour... - + Name New Colour - + Enter a name for the new colour: - + Prefer black background for this colour - + (current value: %1%2) - + (current value: %1) - + Toggle Visibility of %1 - + Toggle Playback of %1 - + Toggle %1 property of %2 - + Adjust %1 property of %2%3 @@ -5375,40 +5434,37 @@ PropertyContainer - + yes - + on - + true - + no - + off - + false - - - PropertyContainer::SetPropertyCommand - - + + Set %1 Property @@ -5416,12 +5472,12 @@ PropertyStack - + Change Layer Visibility - + Click to change the current active layer @@ -5429,7 +5485,7 @@ QApplication - + Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. @@ -5445,7 +5501,7 @@ - + Sonic Visualiser @@ -5480,22 +5536,22 @@ QFile - - - + + + File "%1" does not exist - - - + + + Failed to open file "%1" - - + + File or URL "%1" could not be retrieved @@ -5503,18 +5559,18 @@ QMessageBox - - + + Failed to open file - + File or URL "%1" could not be opened - + <b>Audio required</b><p>Please load at least one audio file before importing annotation data @@ -5522,7 +5578,7 @@ QuickTimeFileReader - + Decoding %1... @@ -5530,17 +5586,17 @@ RDFImporter - + Importing audio referenced in RDF... - + Importing dense signal data from RDF... - + Importing event data from RDF... @@ -5548,7 +5604,7 @@ RangeInputDialog - + to @@ -5556,7 +5612,7 @@ RangeSummarisableTimeValueModel - + Range-Summarisable Time-Value @@ -5564,79 +5620,79 @@ RegionLayer - - + + New Region - + Vertical Scale - + Scale Units - + Plot Type - + Scale - + Bars - + Segmentation - + Auto-Align - + Equal Spaced - + Linear - + Log - + In progress - - + + No local points - + %1 %2 - + Time: %1 Value: %2 Duration: %3 @@ -5644,7 +5700,7 @@ - + Time: %1 Value: %2 Duration: %3 @@ -5652,63 +5708,63 @@ - + Draw Region - + Erase Region - + Drag Region - - + + Edit Region - + Relocate Region - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste @@ -5716,42 +5772,42 @@ RegionModel - + Region - + Time - + Frame - + Value - + Duration - + Label - + Unknown - + Edit Data @@ -5759,7 +5815,7 @@ RemoveLayerCommand - + Delete %1 Layer @@ -5767,7 +5823,7 @@ ResamplingWavFileReader - + Resampling %1... @@ -5775,13 +5831,13 @@ SVFileReader - - + + (derived model in SV-XML) - + Opening file or URL... @@ -5789,12 +5845,12 @@ SingleColourLayer - + Colour - + <unknown> @@ -5802,13 +5858,13 @@ SliceLayer - - + + %1 - %2 - + Time: %1 - %2 Range: %3 samples (%4) Bin: %5 @@ -5816,139 +5872,139 @@ - + First - - + + Mean - - + + Peak - + Time: %1 - %2 Range: %3 samples (%4) - + 0dB - + -Inf - + x10 - + Plot Type - - + + Scale - + Normalize - + Threshold - + Gain - + Sampling Mode - - + + Linear - + Meter - + Rev Log - - + + dB - + Any - + Bin Scale - + Bins - - + + Log - + Absolute - + Lines - + Steps - + Blocks - + Colours @@ -5956,70 +6012,79 @@ SparseModel - + Sparse - + + Edit Data + + + + + Insert Data Point + + + + + Delete Data Point + + + + + SparseModel::AddPointCommand + + Add Point - - + + + SparseModel::DeletePointCommand + + Delete Point - - + + + SparseModel::RelabelCommand + + Re-Label Point - - - Edit Data - - - - - Insert Data Point - - - - - Delete Data Point - - SparseOneDimensionalModel - + Sparse 1-D - + Time - + Frame - + Label - + Unknown - + Edit Data @@ -6027,37 +6092,37 @@ SparseTimeValueModel - + Sparse Time-Value - + Time - + Frame - + Value - + Label - + Unknown - + Edit Data @@ -6065,7 +6130,7 @@ SparseValueModel - + Sparse Value @@ -6073,363 +6138,363 @@ SpectrogramLayer - - + + Colour - + Colour Scale - + Window Size - + Window Overlap - + Normalize Columns - + Normalize Visible Area - + Bin Display - + Threshold - + Gain - + Colour Rotation - + Min Frequency - + Max Frequency - + Frequency Scale - + Smoothing - + Bins - + Window - + Scale - - + + Linear - + Meter - + dBV^2 - + dBV - + Phase - - + + None - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - + No min - + 10 Hz - + 20 Hz - + 40 Hz - + 100 Hz - + 250 Hz - - + + 500 Hz - - + + 1 KHz - - + + 4 KHz - + 10 KHz - + 1.5 KHz - + 2 KHz - + 6 KHz - + 8 KHz - + 12 KHz - + 16 KHz - + No max - + Log - + All Bins - + Peak Bins - + Frequencies - + <unknown> - - + + dB - + FFT cache failed - + Failed to create the FFT model for this spectrogram. There may be insufficient memory or disc space to continue. - + Peak Frequency: %1 - %2 Hz - + Peak Frequency: %1 Hz - + Peak Pitch: %3 - %4 - + Peak Pitch: %2 - + Time: %1 - %2 - + Time: %1 - + %1Bin Frequency: %2 - %3 Hz %4Bin Pitch: %5 - %6 - + %1Bin Frequency: %2 Hz %3Bin Pitch: %4 - - + + -Inf - + dB: %1 - %2 - + dB: %1 - + Phase: %1 - %2 - + Phase: %1 - + 43Hz - + %1Hz @@ -6437,90 +6502,90 @@ SpectrumLayer - + Window Size - + Window Overlap - + Show Peak Frequencies - + Window - - Plot Type - - - - + + Bins + + + + None - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - - - + + + %1 - %2 - + %1 - %2 Hz - + %1 Hz - - + + -Inf - + %1 - + %1 Bin: %2 (%3) %4 value: %5 @@ -6528,22 +6593,22 @@ - + First - + Mean - + Peak - + %1 Bin: %2 (%3) Value: %4 @@ -6554,7 +6619,7 @@ SubdividingMenu - + %1 - %2 @@ -6575,98 +6640,98 @@ TextLayer - - + + Empty Label - - + + <no text> - + In progress - + Time: %1 Height: %2 Label: %3 - - + + Enter label - - + + Please enter a new label: - + Erase Point - + Drag Label - + Move Label - + Move Label Horizontally - + Move Label Vertically - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + New Point @@ -6674,37 +6739,37 @@ TextModel - + Text - + Time - + Frame - + Height - + Label - + Unknown - + Edit Data @@ -6712,39 +6777,39 @@ Thumbwheel - + %1: %2%3 - + %2%3 - + New value for %1, from %2 to %3 %4: - + New value for %1, from %2 to %3: - + Enter a new value from %1 to %2 %3: - - + + Enter a new value from %1 to %2: - - + + Enter new value @@ -6752,105 +6817,105 @@ TimeInstantLayer - - + + New Point - + Plot Type - + Instants - + Segmentation - + In progress - + No local points - + Time: %1 No label - + Time: %1 Label: %2 - + Draw Point - + Add Point at %1 s - + Erase Point - + Drag Point - + Move Point to %1 s - + Edit Point - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted instants? - + The instants you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste @@ -6858,202 +6923,207 @@ TimeValueLayer - - - + + + New Point - - + + Plot Type - + Vertical Scale - + Scale Units - + Draw Segment Division Lines - + + Show Derivative + + + + Scale - + Points - + Stems - + Connected Points - + Lines - + Curve - + Segmentation - + Auto-Align - + Linear - + Log - + +/-1 - + In progress - + No local points - + Time: %1 Value: %2%3 No label - + Time: %1 Value: %2%3 Label: %4 - + Draw Point - + Erase Point - + Drag Point - - + + Edit Point - + Relocate Point - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + The items you are pasting do not have values. What values do you want to use for these items? - + Some of the items you are pasting do not have values. What values do you want to use for these items? - + Zero for all items - + Choose value calculation - + Select cycle size - + Cycle size: @@ -7061,27 +7131,27 @@ TipDialog - + Tip of the Day - + Show tip on startup - + << Previous - + Next >> - + Close @@ -7089,136 +7159,136 @@ TransformFactory - + [\(<].*$ - - + + <unknown maker> - - + + Extract features using "%1" plugin (from %2) - - + + Extract features using "%1" output of "%2" plugin (from %3) - - + + %1 using "%2" plugin (from %3) - - + + %1 using "%2" output of "%3" plugin (from %4) - + Analysis - + Generator - - + + Other - - + + %1: %2 - + %1: Output %2 - + Extract "%1" data output from "%2" effect plugin (from %3) - + Extract data output %1 from "%2" effect plugin (from %3) - + Effects Data - + Effects - + Transform audio signal with "%1" effect plugin (from %2) - + Generate audio signal using "%1" plugin (from %2) - - + + Plugin type - - + + Category - - + + System Identifier - - + + Name - - + + Description - - + + Maker - - + + Units @@ -7226,64 +7296,64 @@ TransformFinder - + Find a Transform - + Find: - + <br>&nbsp;&nbsp;No results found - - + + Up - - + + Down - + <p>Type some text into the search box to search the descriptions of:<ul><li>All currently installed <a href="http://www.vamp-plugins.org/">Vamp</a> audio feature extraction plugins</li><li>All currently installed <a href="http://www.ladspa.org/">LADSPA</a> audio effects plugins</li><li>Vamp plugins that are not currently installed but that have descriptions published via the semantic web</li></ul> - + <b>Unable to retrieve published descriptions from network!</b> - + <b>No plugins are currently installed!</b> - + <p>%1<br>Perhaps the network connection is down, services are responding too slowly, or a processing problem has occurred.<br>Only the descriptions of installed plugins will be searched. - + <p>%1<br>Only the published descriptions of Vamp feature extraction plugins will be searched. - + <p>%1<br>%2<br>Perhaps the network connection is down, or services are responding too slowly.<br>No search results will be available. - + Found %n description(s) containing <b>%1</b>, showing the first %2 only Found %n description containing <b>%1</b>, showing the first %2 only @@ -7291,7 +7361,7 @@ - + Found %n description(s) containing <b>%1</b> Found %n description containing <b>%1</b> @@ -7299,54 +7369,54 @@ - + <i> (not installed)</i> - + %1%2<br><small> - - + + </small> - + <b>%1</b>%2<br> - - + + <small>%1</small> - + <small> - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Plugin type: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Category: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; System identifier: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; More information: <a href="%1">%1</a> @@ -7354,58 +7424,58 @@ View - + Global Scroll - + Global Zoom - + Follow Playback - + Scroll - + Page - + Off - + <unknown> - + Alignment - + Waiting for layers to be ready... - - + + Cancel - + Rendering image... @@ -7413,82 +7483,97 @@ ViewManager - + + Clear Selection + + + + + Select Multiple Regions + + + + + Select Region + + + + Enter Navigate mode - + Enter Select mode - + Enter Edit mode - + Enter Draw mode - + Enter Erase mode - + Enter Measure mode - + Switch on Loop mode - + Switch off Loop mode - + Switch on Play Selection mode - + Switch off Play Selection mode - + Switch on Play Solo mode - + Switch off Play Solo mode - + Switch on Alignment mode - + Switch off Alignment mode - + Scroll to %1 - + Zoom to %n sample(s) per pixel @@ -7496,33 +7581,15 @@ - + Change overlay level - ViewManager::SetSelectionCommand - - - Clear Selection - - - - - Select Multiple Regions - - - - - Select Region - - - - WaveFileModel - + Wave File @@ -7530,110 +7597,110 @@ WaveformLayer - - + + Scale - + Gain - + Normalize Visible Area - + Channels - + Linear - + Meter - - + + dB - + Separate - + Mean - + Butterfly - + Time: %1 - %2 - + Time: %1 - + Level: - + Left: - + Right: - + Channel %1 - + %1 %2 - %3 (%4 dB peak) - + %1 %2 (%3 dB peak) - - - + + + 0dB - - - + + + -Inf @@ -7641,12 +7708,12 @@ WindowShapePreview - + V / time - + dB / freq @@ -7654,7 +7721,7 @@ WritableWaveFileModel - + Writable Wave File diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_en_US.ts --- a/i18n/sonic-visualiser_en_US.ts Tue Mar 22 14:29:38 2011 +0000 +++ b/i18n/sonic-visualiser_en_US.ts Mon Jul 25 19:38:50 2011 +0100 @@ -4,17 +4,17 @@ ActivityLog - + Activity Log - + <p>Activity Log lists your interactions and other events within %1.</p> - + %1: %2 @@ -22,7 +22,7 @@ AddLayerCommand - + Add %1 Layer @@ -30,7 +30,7 @@ AggregateWaveModel - + Aggregate Wave @@ -38,7 +38,7 @@ AlignmentModel - + Alignment @@ -46,17 +46,17 @@ AudioCallbackPlaySource - + Play from %1 - + Stop at %1 - + Change time-stretch factor to %1 @@ -64,39 +64,39 @@ AudioDial - + %1: %2%3 - + %2%3 - + New value for %1, from %2 to %3 %4: - + New value for %1, from %2 to %3: - + Enter a new value from %1 to %2 %3: - - + + Enter a new value from %1 to %2: - - + + Enter new value @@ -104,27 +104,27 @@ AudioTargetFactory - + (auto) - + JACK Audio Connection Kit - + PulseAudio Server - + Core Audio Device - + Default Soundcard Device @@ -132,72 +132,72 @@ BZipFileDevice - + File is already open - + Append mode not supported - + File access mode not specified - + Read and write modes both specified - + Failed to open file for writing - + Failed to open bzip2 stream for writing - + Failed to open file for reading - + Failed to open bzip2 stream for reading - + Internal error (open for neither read nor write) - + File not open - + bzip2 stream write close error - + bzip2 stream read close error - + Internal error (close for neither read nor write) - + bzip2 stream read error @@ -205,7 +205,7 @@ BundleCommand - + %1 (%n change(s)) %1 (%n change) @@ -216,7 +216,7 @@ CSVFileWriter - + Failed to open file %1 for writing @@ -224,160 +224,169 @@ CSVFormatDialog - + Select Data Format - - <b>Select Data Format</b><p>Please select the correct data format for this file. - - - - - Each row specifies: - - - - - A point in time - - - - - A value at a time - - - - - A set of values - - - - - The first column contains: - - - - - Time, in seconds - - - - - Time, in audio sample frames - - - - - Data (rows are consecutive in time) - - - - + + Please select the correct data format for this file. + + + + + <ignore> + + + + + Time + + + + + End time + + + + + Duration + + + + + Value + + + + + Label + + + + + Timing is specified: + + + + + Explicitly, in seconds + + + + + Explicitly, in audio sample frames + + + + + Implicitly: rows are equally spaced in time + + + + Audio sample rate (Hz): - + Frame increment between rows: - - -Example data from file: + + Data will be displayed in a %1 layer. Colour3DPlotLayer - - + + Colour - - + + Scale - + Normalize Columns - + Normalize Visible Area - + Invert Vertical Scale - + Gain - + Always Opaque - + Smooth - + Bin Scale - + Bins - - + + Linear - - + + Log - + +/-1 - + Absolute - + <unknown> - + dB - + Time: %1 - %2 Bin: %3 Value: %4 @@ -387,68 +396,68 @@ ColourMapper - - + + <unknown> - + Default - + White on Black - + Black on White - + Red on Blue - + Yellow on Black - + Blue on Black - + Sunset - + Fruit Salad - + Banded - + Highlight - + Printer - + High Gain @@ -456,68 +465,68 @@ CommandHistory - - - + + + &Undo - + Ctrl+Z - + Undo the last editing operation - - - + + + Re&do - + Ctrl+Shift+Z - + Redo the last operation that was undone - + Undo %1 - + Redo %1 - + Nothing to undo - + Nothing to redo - - + + &Undo %1 - - + + Re&do %1 @@ -525,7 +534,7 @@ Dense3DModelPeakCache - + Dense 3-D Peak Cache @@ -533,17 +542,17 @@ DenseThreeDimensionalModel - + Dense 3-D - + Time - + Frame @@ -551,7 +560,7 @@ DenseTimeValueModel - + Dense Time-Value @@ -559,12 +568,12 @@ Document - + Set main model to %1 - + Clear main model @@ -572,7 +581,7 @@ EditableDenseThreeDimensionalModel - + Editable Dense 3-D @@ -580,12 +589,12 @@ FFTModel - + FFT - + %1 Hz @@ -593,22 +602,22 @@ Fader - + Enter new fader level - + New fader level, from %1 to %2 dBFS: - + Level: Off - + Level: %1%2.%3%4 dB @@ -616,48 +625,48 @@ FeatureExtractionModelTransformer - + No factory available for feature extraction plugin id "%1" (unknown plugin type, or internal error?) - + Input model for feature extraction plugin "%1" is of wrong type (internal error?) - + Failed to instantiate plugin "%1" - + Cannot provide enough channels to feature extraction plugin "%1" (plugin min is %2, max %3; input model has %4) - - + + Failed to initialise feature extraction plugin "%1" - + Feature extraction plugin "%1" rejected the given step and block sizes (%2 and %3); using plugin defaults (%4 and %5) instead - + Transform was configured for version %1 of plugin "%2", but the plugin being used is version %3 - + Plugin "%1" has no outputs - + Plugin "%1" has no output named "%2" @@ -665,49 +674,49 @@ FileSource - - - + + + Unsupported scheme in URL - + Downloading %1... - + Failed to connect to FTP server - + Login failed - + Failed to change to correct directory - + FTP download aborted - + Download cancelled - + Failed to create local file %1 - + File contains no data! @@ -715,7 +724,7 @@ I - + Edit Data @@ -723,52 +732,52 @@ ImageDialog - + Image - + Label: - + File or URL: - + Browse... - + Preview - + Unsupported scheme in URL - + The URL scheme "%1" is not supported - + Opening image URL... - + File download failed - + Failed to download URL "%1": %2 @@ -776,58 +785,58 @@ ImageLayer - + In progress - - + + Select image - + Move Image - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + New Point - + Opening image URL... @@ -835,38 +844,38 @@ ImageModel - - + + Image - + Edit Image - + Time - + Frame - + Label - + Unknown - + Edit Data @@ -874,38 +883,38 @@ InteractiveFileFinder - - + + Select file - - + + All files (*.*) - - + + Select a session file - + Sonic Visualiser session files (*.sv) RDF files (%1) All files (*.*) - + Audio files (%1) All files (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -917,7 +926,7 @@ - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -928,7 +937,7 @@ - + All supported files (*.sv %1 %2) Sonic Visualiser session files (*.sv) Audio files (%2) @@ -937,13 +946,13 @@ - + Image files (%1) All files (*.*) - + All supported files (*.sv %1 %2 %3) Sonic Visualiser session files (*.sv) Audio files (%1) @@ -953,79 +962,79 @@ - + File does not exist - + <b>File not found</b><p>File "%1" does not exist - + File is not readable - + <b>File is not readable</b><p>File "%1" can not be read - - + + Directory selected - - + + <b>Directory selected</b><p>File "%1" is a directory - + Non-file selected - + <b>Not a file</b><p>Path "%1" is not a file - + File is empty - + <b>File is empty</b><p>File "%1" is empty - + Sonic Visualiser session files (*.sv) All files (*.*) - - - - + + + + Select a file to export to - + WAV audio files (*.wav) All files (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1035,7 +1044,7 @@ - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1044,71 +1053,71 @@ - + Portable Network Graphics files (*.png) All files (*.*) - + File exists - + <b>File exists</b><p>The file "%1" already exists. Do you want to overwrite it? - + <b>File not found</b><p>Audio file "%1" could not be opened. Do you want to locate it? - + <b>File not found</b><p>File "%1" could not be opened. Do you want to locate it? - + Failed to open file - + Locate file... - + Use URL... - + Cancel - + Use URL - + Please enter the URL to use for this file: - + Failed to open location - + <b>Failed to open location</b><p>URL "%1" could not be opened @@ -1116,65 +1125,65 @@ ItemEditDialog - + Timing - + Time: - - + + frames - - + + sec - - + + usec - + Duration: - + Properties - + Value: - + Text: - + OK - + Reset - + Cancel @@ -1182,23 +1191,23 @@ KeyReference - - + + & - + <i>or</i>&nbsp;<b>%1</b> - + </b>&nbsp;(%1)<b> - + Sonic Visualiser: Key and Mouse Reference @@ -1206,17 +1215,17 @@ LabelCounterInputDialog - + Set Counters - + Fine counter (beats): - + Coarse counter (bars): Coarse counter (measures): @@ -1224,77 +1233,77 @@ Labeller - + No numbering - + Simple counter - + Cyclical counter - + Cyclical two-level counter (bar/beat) Cyclical two-level counter (measure/beat) - + Audio sample frame number - + Time in seconds - + Duration to the following item - + Tempo (bpm) based on duration to following item - + Duration since the previous item - + Tempo (bpm) based on duration since previous item - + Same as the nearest previous item - + Value extracted from the item's label (where possible) - + %1.%2 - + %1 - + Label Points @@ -1302,85 +1311,79 @@ Layer - + Waveform - - - + + + Spectrogram - + Ruler - + Time Instants - + Time Values - + Notes - + Regions - + Text - + Images - + Colour 3D Plot - + Spectrum - + Time Slice - + Layer - - - Layer::AddMeasurementRectCommand - - + + Make Measurement - - - Layer::DeleteMeasurementRectCommand - - + + Delete Measurement @@ -1388,17 +1391,17 @@ LayerTreeDialog - + Layer Summary - + Audio Data Sources - + Panes and Layers @@ -1406,22 +1409,22 @@ LayerTreeModel - + Layer - + Shown - + Played - + Model @@ -1429,27 +1432,27 @@ MIDIFileImportDialog - + Merge all tracks - + Merge all non-percussion tracks - + Select track or tracks to import - + <b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import: - + Error in MIDI file import @@ -1457,89 +1460,89 @@ MIDIFileReader - + Wrong length for long data in MIDI stream (%1, should be %2) - + Wrong length for int data in MIDI stream (%1, should be %2) - + getMIDIByte called but no MIDI file open - - + + End of MIDI file encountered while reading - + Attempt to get more bytes than expected on Track - - + + Attempt to read past MIDI file end - + getMIDIBytes called but no MIDI file open - + Attempt to get more bytes than available on Track (%1, only have %2) - + getNumberFromMIDIBytes called but no MIDI file open - + skipToNextTrack called but no MIDI file open - + Invalid event code %1 found - + Running status used for first event in track - + MIDI file "%1" has no notes in any track - + - uses GM percussion channel - + Track %1 (%2)%3 - + Track %1 (untitled)%3 - + %1 - vel %2 @@ -1547,7 +1550,7 @@ MIDIInput - + Input @@ -1555,7 +1558,7 @@ MP3FileReader - + Decoding %1... @@ -1563,2271 +1566,2317 @@ MainWindow - - + + Sonic Visualiser - + Black - + Red - + Blue - - - + + + Green - + Purple - + Orange - + White - + Bright Red - + Bright Blue - - - + + + Bright Green - + Bright Purple - + Bright Orange - + Playback Speedup - - + + + &Layer - - + + &Transform - + &File - + File Toolbar - + File and Session Management - + &New Session - + Ctrl+N - + Abandon the current Sonic Visualiser session and start a new one - + &Open Session... - + Ctrl+O - + Open a previously saved Sonic Visualiser session file - + &Open... - + Open a session file, audio file, or layer - + &Save Session - + Ctrl+S - + Save the current session into a Sonic Visualiser session file - + Save Session &As... - + Ctrl+Shift+S - + Save the current session into a new Sonic Visualiser session file - + &Import Audio File... - + Ctrl+I - + Import an existing audio file - + Import Secondary Audio File... - + Ctrl+Shift+I - + Import an extra audio file as a separate layer - + &Export Audio File... - + Export selection as an audio file - + Import Annotation &Layer... - + Ctrl+L - + Import layer data from an existing file - + Export Annotation Layer... - + Export layer data to a file - + Export Image File... - + Export a single pane to an image file - + Open Lo&cation... - + Ctrl+Shift+O - + Open or import a file from a remote URL - + &Recent Files - + &Preferences... - + Adjust the application preferences - + &Quit - + Ctrl+Q - + Exit Sonic Visualiser - + &Edit - + Editing - + Cu&t - + Ctrl+X - + Cut the selection from the current layer to the clipboard - + &Copy - + Ctrl+C - + Copy the selection from the current layer to the clipboard - + &Paste - + Ctrl+V - + Paste from the clipboard to the current layer - - + + Paste at Playback Position + + + + + Ctrl+Shift+V + + + + + Paste from the clipboard to the current layer, placing the first item at the playback position + + + + + &Delete Selected Items - + Del - - + + Delete items in current selection from the current layer - + Selection - + Select &All - + Ctrl+A - + Select the whole duration of the current session - + Select &Visible Range - + Ctrl+Shift+A - + Select the time range corresponding to the current window width - + Select to &Start - + Shift+Left - + Select from the start of the session to the current playback position - + Select to &End - + Shift+Right - + Select from the current playback position to the end of the session - + C&lear Selection - + Esc - + Clear the selection - + Tapping Time Instants - + &Insert Instant at Playback Position - + Enter - + Insert a new time instant at the current playback position, in a new layer if necessary - + ; - + Insert Instants at Selection &Boundaries - + Shift+Enter - + Insert new time instants at the start and end of the current selected regions, in a new layer if necessary - + Insert Item at Selection - + Ctrl+Shift+Enter - + Insert a new note or region item corresponding to the current selection - + Number New Instants with - + Cycle size - + Set Numbering Counters... - + Set the counters used for counter-based labelling - + Renumber Selected Instants - + Renumber the selected instants using the current labelling scheme - + Panning and Navigation - + &View - + Scroll &Left - + Left - + Scroll the current pane to the left - + Scroll &Right - + Right - + Scroll the current pane to the right - + &Jump Left - + Ctrl+Left - + Scroll the current pane a big step to the left - + J&ump Right - + Ctrl+Right - + Scroll the current pane a big step to the right - + Peek Left - + Alt+Left - + Scroll the current pane to the left without moving the playback cursor or other panes - + Peek Right - + Alt+Right - + Scroll the current pane to the right without moving the playback cursor or other panes - + Zoom - + Zoom &In - + Up - + Increase the zoom level - + Zoom &Out - + Down - + Decrease the zoom level - + Restore &Default Zoom - + Restore the zoom level to the default - + Zoom to &Fit - + F - + Zoom to show the whole file - + Display Features - + Show &No Overlays - + 0 - + Hide centre indicator, frame times, layer names and scale Hide center indicator, frame times, layer names and scale - + Show &Minimal Overlays - + 9 - + Show centre indicator only Show center indicator only - + Show &Standard Overlays - + 8 - + Show centre indicator, frame times and scale Show center indicator, frame times and scale - + Show &All Overlays - + 7 - + Show all texts and scale - + + Show All Time Rulers + + + + + # + + + + + Show or hide all time rulers + + + + Show &Zoom Wheels - + Z - + Show thumbwheels for zooming horizontally and vertically - + Show Property Bo&xes - + X - + Show the layer property boxes at the side of the main window - + Show Status &Bar - + Show context help information in the status bar at the bottom of the window - + Show La&yer Summary - + Y - + Open a window displaying the hierarchy of panes and layers in this session - + Show Acti&vity Log - + Open a window listing interactions and other events - + &Pane - + Managing Panes and Layers - + Add &New Pane - + N - + Add a new pane containing only a time ruler - + Add New %1 Layer - + Add a new empty layer of type %1 - + T - + Add &Waveform - + W - + Add a new pane showing a waveform view - + + Shift+W + + + + Add a new layer showing a waveform view - + Add Spectro&gram - + G - + Add a new pane showing a spectrogram - + + Shift+G + + + + Add a new layer showing a spectrogram - + Add &Melodic Range Spectrogram - + M - + Add a new pane showing a spectrogram set up for an overview of note pitches - + + Shift+M + + + + Add a new layer showing a spectrogram set up for an overview of note pitches - + Add Pea&k Frequency Spectrogram - + K - + Add a new pane showing a spectrogram set up for tracking frequencies - + + Shift+K + + + + Add a new layer showing a spectrogram set up for tracking frequencies - + Add Spectr&um - + U - + Add a new pane showing a frequency spectrum - + + Shift+U + + + + Add a new layer showing a frequency spectrum - + &All Channels Mixed - + &All Channels - + Channel &%1 - + %1: %2 - + Switch to Previous Pane - + [ - + Make the next pane up in the pane stack current - + Switch to Next Pane - + ] - + Make the next pane down in the pane stack current - + &Delete Pane - + Ctrl+Shift+D - + Delete the currently active pane - + Add &Time Ruler - + Add a new layer showing a time ruler - + Add &Existing Layer - + Add S&lice of Layer - + &Rename Layer... - + R - + Rename the currently active layer - + Edit Layer Data - + E - + Edit the currently active layer as a data grid - + &Delete Layer - + Ctrl+D - + Delete the currently active layer - + &Recent Transforms - + %1 by Category - - + + Unclassified - + %1 by Plugin Name - + %1 by Maker - - + + Unknown - - + + [\(<].*$ - - + + %1... - + Find a Transform... - + Search for a transform from the installed plugins, by name or description - + Ctrl+M - + &Help - + Help - + &Help Reference - + F1 - + Open the Sonic Visualiser reference manual - + &Key and Mouse Reference - + F2 - + Open a window showing the keystrokes you can use in Sonic Visualiser - + Sonic Visualiser on the &Web - + Open the Sonic Visualiser website - + &About Sonic Visualiser - + Show information about Sonic Visualiser - + Ctrl+R - + Re-open - + Re-open the current or most recently opened file - + Ctrl+T - + Repeat Transform - + Re-select the most recently run transform - + Playback and Transport Controls - + Play&back - + Playback - + Playback Toolbar - + Rewind to Start - + Home - + Rewind to the start - - - + + + Rewind - + PgUp - + Rewind to the previous time instant or time ruler notch - + Rewind to Similar Point - + Shift+PgUp - + Rewind to the previous similarly valued time instant - + Play / Pause - + Space - + Start or stop playback from the current position - - + + Fast Forward - + PgDown - + Fast-forward to the next time instant or time ruler notch - + Fast Forward to Similar Point - + Shift+PgDown - + Fast-forward to the next similarly valued time instant - + Fast Forward to End - + End - + Fast-forward to the end - + Play Mode Toolbar - + Constrain Playback to Selection - + s - + Constrain playback to the selected regions - + Loop Playback - + l - + Loop playback - + Solo Current Pane - + o - + Solo the current pane during playback - + Align File Timelines - + Treat multiple audio files as versions of the same work, and align their timelines - + Speed Up - + Ctrl+PgUp - + Time-stretch playback to speed it up without changing pitch - + Slow Down - + Ctrl+PgDown - + Time-stretch playback to slow it down without changing pitch - + Restore Normal Speed - + Ctrl+Home - + Restore non-time-stretched playback - + Edit Toolbar - + Tool Selection - + Tools Toolbar - - + + Navigate - + 1 - + Select - + 2 - + Select ranges - + Edit - + 3 - + Edit items in layer - + Draw - + 4 - + Draw new items in layer - + Erase - + 5 - + Erase items from layer - + Measure - + 6 - + Make measurements in layer - + &Delete Current Measurement - + Delete the measurement currently under the mouse pointer - + Fast Forward to Next Instant - + Fast forward to the next time instant in the current layer - + Rewind to Previous Instant - + Rewind to the previous time instant in the current layer - + Fast Forward to Next Point - + Fast forward to the next point in the current layer - + Rewind to Previous Point - + Rewind to the previous point in the current layer - + Fast forward - + No audio file loaded. - + %1Hz (resampling to %2Hz) - - - - - - - + + + + + + + Failed to open file - - + + <b>File open failed</b><p>Audio file "%1" could not be opened - - 1. %2 - - - - - %1. %2 - - - - + Select audio file to export - + Which audio file do you want to export from? - + Export the selected region only - - + + Export the whole audio file - - - + + + Select region to export - + Which region from the original audio file do you want to export? - + Export the selected regions into a single audio file - + Export the selected regions into separate files - + Multiple regions of the original audio file are selected. What do you want to export? - + Fragment file %1 already exists, aborting - + Export multiple audio files - + Export audio to "%1" - - + + Failed to write file - + <b>File open failed</b><p>Layer file %1 could not be opened. - - - - - + + + + + <b>Audio required</b><p>Unable to load layer data from "%1" without an audio file.<br>Please load at least one audio file before importing annotations. - + http://www.sonicvisualiser.org/doc/reference/%1/en/ - + Newer version available - + <h3>Newer version available</h3><p>You are using version %1 of Sonic Visualiser, but version %3 is now available.</p><p>Please see the <a href="http://sonicvisualiser.org/">Sonic Visualiser website</a> for more information.</p> - + Failed to open file %1 for writing - + Can't export non-note layers to MIDI - + Export layer to "%1" - + Export the whole pane (%1x%2 pixels) - + Export the visible area only (%1x%2 pixels) - + Export the selection extent (%1x%2 pixels) - + Export the selection extent - + Which region of the current pane do you want to export as an image? - + Note: the whole pane is too wide to be exported as a single image. - + Failed to save image file - + Failed to save image file %1 - + <b>File open failed</b><p>Session file "%1" could not be opened - + <b>File open failed</b><p>File "%1" could not be opened - + Open Location - + Please enter the URL of the location to open: - - - - + + + + Failed to open location - + <b>Open failed</b><p>URL "%1" could not be opened - + <b>Open failed</b><p>File or URL "%1" could not be opened - - + + Failed to open dropped URL - + <b>Open failed</b><p>Dropped URL "%1" could not be opened - + Export image to "%1" - + Session modified - + <b>Session modified</b><p>The current session has been modified.<br>Do you want to save it? - + Close the current session and create a new one - + Add this data to the current session - + Select target for import - + <b>Select a target for import</b><p>This RDF document refers to one or more audio files.<br>You already have an audio waveform loaded.<br>What would you like to do with the new data? - - + + Failed to save file - - + + <b>Save failed</b><p>Session file "%1" could not be saved. - + Sonic Visualiser: %1 - + Save session as "%1" - + Rename Layer - + New name for this layer: - + Playback speed: Normal - + Playback speed: %1%2% - + Selection: %1 to %2 (duration %3) - + Visible: %1 to %2 (duration %3) - + Sample rate mismatch - + <b>Wrong sample rate</b><p>The sample rate of this audio file (%1 Hz) does not match the current playback rate (%2 Hz).<p>The file will play at the wrong speed and pitch.<p>Change the <i>Resample mismatching files on import</i> option under <i>File</i> -> <i>Preferences</i> if you want to alter this behaviour. - - + + Audio processing overload - + <b>Overloaded</b><p>Audio effects plugin auditioning has been disabled due to a processing overload. - + <b>Overloaded</b><p>Audio playback speed processing has been reduced to a single channel, due to a processing overload. - + Add Point - + Reset Counters - - + + Failed to generate layer - + <b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform "%1" failed:<p>%2 - + <b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform "%1" failed.<p>No error information is available. - - + + Warning - - + + Failed to regenerate layer - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed:<p>%3 - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed.<p>No error information is available. - + <b>Warning when regenerating layer</b><p>When regenerating the derived layer "%1" using new data model as input:<p>%2 - + Failed to calculate alignment - + <b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform "%1":<p>%2 - + Adjust the master playback level - + Adjust the master playback speed - + http://www.sonicvisualiser.org/ - + Release %1 : Revision %2 - + Release %1 - + Unreleased : Revision %1 - + <h3>About Sonic Visualiser</h3> - + <p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> - + <p><small>%1 : %2 configuration</small></p> - + Debug - + Release - + With Qt v%1 &copy; Nokia Corporation - + <br>With JACK audio output library v%1 &copy; Paul Davis and Jack O'Quin - + <br>With JACK audio output library &copy; Paul Davis and Jack O'Quin - + <br>With PortAudio audio output library &copy; Ross Bencina and Phil Burk - + <br>With PulseAudio audio output library v%1 &copy; Lennart Poettering and Pierre Ossman - + <br>With PulseAudio audio output library &copy; Lennart Poettering and Pierre Ossman - + <br>With Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia - + <br>With Ogg file decoder &copy; CSIRO Australia - + <br>With MAD mp3 decoder v%1 &copy; Underbit Technologies Inc - + <br>With MAD mp3 decoder &copy; Underbit Technologies Inc - + <br>With libsamplerate v%1 &copy; Erik de Castro Lopo - + <br>With libsamplerate &copy; Erik de Castro Lopo - + <br>With libsndfile v%1 &copy; Erik de Castro Lopo - + <br>With libsndfile &copy; Erik de Castro Lopo - + <br>With FFTW3 v%1 &copy; Matteo Frigo and MIT - + <br>With FFTW3 &copy; Matteo Frigo and MIT - + <br>With Rubber Band v%1 &copy; Chris Cannam - + <br>With Rubber Band &copy; Chris Cannam - + <br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam - + <br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld - + <br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton - + <br>With Raptor RDF parser v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Raptor RDF parser &copy; Dave Beckett and the University of Bristol - + <br>With Rasqal RDF query engine v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Rasqal RDF query engine &copy; Dave Beckett and the University of Bristol - + <br>With Redland RDF datastore v%1 &copy; Dave Beckett and the University of Bristol - + <br>With Redland RDF datastore &copy; Dave Beckett and the University of Bristol - + <br>With RtMidi &copy; Gary P. Scavone - + <br>With liblo Lite OSC library v%1 &copy; Steve Harris - + <br>With liblo Lite OSC library &copy; Steve Harris - + </small><p><small>The OSC URL for this instance is: "%1" - + With - + Using - + About Sonic Visualiser @@ -3840,290 +3889,294 @@ MainWindowBase - + %1 (modified) - + (modified) - + Cut - + Paste - - - - + + + + Add Point - + Add Point at %1 s - + Add Item at %1 s - + Opening file or URL... - + Replace the existing main waveform - + Load this file into a new waveform pane - + Select target for import - - - + + + %1: %2 - + %1: %2 [%3] - - + + Import "%1" - + Opening playlist... - - + + Importing from RDF... - + Opening session... - + <b>Select a target for import</b><p>You already have an audio waveform loaded.<br>What would you like to do with the new audio file? - + Import audio file "%1" - + Import layer XML file "%1" - + Import MIDI file "%1" - + SV XML file read error: %1 - + Import session file "%1" - - + + Failed to import RDF - + <b>Failed to import RDF</b><p>Importing data from RDF document at "%1" failed: %2</p> - + <b>Failed to import RDF</b><p>No suitable data models found for import from RDF document at "%1"</p> - + Import RDF document "%1" - - + + Couldn't open audio device - + <b>No audio available</b><p>Could not open an audio device for playback.<p>Automatic audio device detection failed. Audio playback will not be available during this session.</p> - + <b>No audio available</b><p>Failed to open your preferred audio device ("%1").<p>Audio playback will not be available during this session.</p> - + Failed to write file - + <b>Save failed</b><p>Failed to write to file "%1": %2 - - + + Add Pane + + + + + Remove Pane + + + + + Delete Pane - + Playing: %1 of %2 (%3 remaining) - MainWindowBase::AddPaneCommand - - - Add Pane - - - - - MainWindowBase::RemovePaneCommand - - - Remove Pane - - - - ModelDataTableDialog - + Data Editor - + Playback Toolbar - + Play Mode Toolbar - + Track Playback - + Toggle tracking of playback position - + Edit Toolbar - + Insert New Item - + Insert - + Insert a new item - + Delete Selected Items - + Delete - + Delete the selected item or items - + Data in Layer + + + Find: + + + + + + + ModelMetadataModel - + Type - + Name - + Maker - + Source @@ -4131,12 +4184,12 @@ ModelTransformerFactory - + %1 <%2> - + %1: %2 @@ -4144,75 +4197,75 @@ NoteLayer - - - + + + New Point - + Vertical Scale - + Scale Units - + Scale - + Auto-Align - + Linear - + Log - + MIDI Notes - + In progress - - + + No local points - + %1 (%2, %3 Hz) - + %1 Hz (%2, %3) - + %1 %2 - + Time: %1 Pitch: %2 Duration: %3 @@ -4220,7 +4273,7 @@ - + Time: %1 Pitch: %2 Duration: %3 @@ -4228,68 +4281,68 @@ - + Draw Point - + Erase Point - + Drag Point - - + + Edit Point - + Relocate Point - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + Record Note @@ -4297,47 +4350,47 @@ NoteModel - + Note - + Time - + Frame - + Pitch - + Duration - + Level - + Label - + Unknown - + Edit Data @@ -4345,7 +4398,7 @@ OggVorbisFileReader - + Decoding %1... @@ -4353,12 +4406,12 @@ Overview - + Overview - + Click and drag to navigate; double-click to jump @@ -4366,477 +4419,483 @@ Pane - + Horizontal Zoom - + Vertical Zoom - + Reset zoom to default - + Some lengthy prefix: - + Reference - - + + Unaligned - + Aligning: %1% - + Aligned - + %1 - %2 - + + + +%1 + + + + (R) - + (X) - + %1 / %2Hz%3 - - + + Zoom - + Zoom In - + Wheel Up - + Zoom Out - + Wheel Down - + General Pane Mouse Actions - + Wheel - + Zoom in or out in time axis - + Scroll - + Ctrl+Wheel - + Scroll rapidly left or right in time axis - + Zoom Vertically - + Shift+Wheel - + Zoom in or out in the vertical axis - + Scroll Vertically - + Alt+Wheel - + Scroll up or down in the vertical axis - - + + Navigate - + Middle - + Click middle button and drag to navigate with any tool - - + + Relocate - + Double-Click Middle - + Double-click middle button to relocate with any tool - + Menu - + Right - + Show pane context menu - + Navigate Tool Mouse Actions - - - - - + + + + + Left - + Click left button and drag to move around - - + + Zoom to Area - - - + + + Shift+Left - - + + Shift-click left button and drag to zoom to a rectangular area - - - - + + + + Double-Click Left - + Double-click left button to jump to clicked location - - + + Edit - - + + Double-click left button on an item to edit it - + Select Tool Mouse Actions - + Select - + Click left button and drag to select region; drag region edge to resize - + Multi Select - + Ctrl+Left - + Ctrl-click left button and drag to select an additional region - + Fine Select - + Shift-click left button and drag to select without snapping to items or grid - + Edit Tool Mouse Actions - + Move - + Click left button on an item or selected region and drag to move - + Draw Tool Mouse Actions - + Draw - + Click left button and drag to create new item - + Measure Tool Mouse Actions - + Measure Area - + Click left button and drag to measure a rectangular area - + Measure Item - + Click left button and drag to measure extents of an item or shape - + Enter new range - + New vertical display range, from %1 to %2 %4: - + Drag Selection - + Resize Selection - + Click and drag to navigate - + Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate - + Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate - + Click and drag to move the selection boundary - + Click and drag to select a range; hold Shift to avoid snapping to items; middle-click to navigate - + Click and drag to select a range; middle-click and drag to navigate - + Click to add a new item in the active layer - + Click to erase an item from the active layer - + Click and drag an item in the active layer to move it; hold Shift to override initial resistance - + Click and drag to move all items in the selected range - + Click and drag to adjust the visible range of the vertical scale - + Click and drag to adjust the vertical zoom level - + Click and drag to adjust the horizontal zoom level - + Reset horizontal and vertical zoom levels to their defaults - PlayParameterRepository::EditCommand - - + PlayParameterRepository + + Adjust Playback Parameters - + Change Playback Mute State - + Change Playback Gain - + Change Playback Pan - + Change Playback Plugin - + Configure Playback Plugin @@ -4844,12 +4903,12 @@ PluginParameterBox - + This plugin has no adjustable parameters. - + Program @@ -4857,127 +4916,127 @@ PluginParameterDialog - - + + Plugin Parameters - + Name: - + Version: - + Maker: - + Copyright: - + Output: - + Input Material - + Restrict to selection extents - + Channels - + Processing - - + + Advanced >> - + Channel mismatch - + This plugin requires at least %1 input channels, but only %2 %3 available. The plugin probably will not work correctly. - + are - + is - + This plugin accepts no more than %1 input channels, but %2 are available. Only the first %3 will be used. - + This plugin only has a single channel input, but the source has %1 channels. - + Use mean of source channels - + Use channel %1 only - + Window size: - + Audio frames per block: - + Window increment: - + Window shape: - + Advanced << @@ -4985,214 +5044,214 @@ Preferences - + Spectrogram y-axis interpolation: - + Spectrogram x-axis interpolation: - + Frequency of concert A - + Property box layout - + Spectral analysis window shape - + Playback resampler type - + Omit temporaries from Recent Files menu - + Resample mismatching files on import - + Location for cache file directory - + Background colour preference - + Time display format - + Font size for text overlays - + Show splash screen on startup - + Show boxes for all panes - + Show box for current pane only - + Rectangular - + Triangular - + Hamming - + Hann - + Blackman - + Gaussian - + Parzen - + Nuttall - + Blackman-Harris - + Fastest - + Standard - + Highest quality - - + + None - - + + Linear interpolation - + 4 x Oversampling - + 4 x Oversampling with interpolation - + Follow desktop theme - + Dark background - + Light background - + Standard (to millisecond) - + High resolution (to microsecond) - + 24 FPS - + 25 FPS - + 30 FPS - + 50 FPS - + 60 FPS - + Preferences @@ -5288,7 +5347,7 @@ ProgressDialog - + Cancel @@ -5296,78 +5355,78 @@ PropertyBox - + Show - + Play - + Playback Gain - + dB - - + + Playback Pan / Balance - + Add New Colour... - + Name New Colour - + Enter a name for the new colour: - + Prefer black background for this colour - + (current value: %1%2) - + (current value: %1) - + Toggle Visibility of %1 - + Toggle Playback of %1 - + Toggle %1 property of %2 - + Adjust %1 property of %2%3 @@ -5375,40 +5434,37 @@ PropertyContainer - + yes - + on - + true - + no - + off - + false - - - PropertyContainer::SetPropertyCommand - - + + Set %1 Property @@ -5416,12 +5472,12 @@ PropertyStack - + Change Layer Visibility - + Click to change the current active layer @@ -5429,7 +5485,7 @@ QApplication - + Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. @@ -5445,7 +5501,7 @@ - + Sonic Visualiser @@ -5453,22 +5509,22 @@ QFile - - - + + + File "%1" does not exist - - - + + + Failed to open file "%1" - - + + File or URL "%1" could not be retrieved @@ -5476,18 +5532,18 @@ QMessageBox - - + + Failed to open file - + File or URL "%1" could not be opened - + <b>Audio required</b><p>Please load at least one audio file before importing annotation data @@ -5495,7 +5551,7 @@ QuickTimeFileReader - + Decoding %1... @@ -5503,17 +5559,17 @@ RDFImporter - + Importing audio referenced in RDF... - + Importing dense signal data from RDF... - + Importing event data from RDF... @@ -5521,7 +5577,7 @@ RangeInputDialog - + to @@ -5529,7 +5585,7 @@ RangeSummarisableTimeValueModel - + Range-Summarisable Time-Value @@ -5537,79 +5593,79 @@ RegionLayer - - + + New Region - + Vertical Scale - + Scale Units - + Plot Type - + Scale - + Bars - + Segmentation - + Auto-Align - + Equal Spaced - + Linear - + Log - + In progress - - + + No local points - + %1 %2 - + Time: %1 Value: %2 Duration: %3 @@ -5617,7 +5673,7 @@ - + Time: %1 Value: %2 Duration: %3 @@ -5625,63 +5681,63 @@ - + Draw Region - + Erase Region - + Drag Region - - + + Edit Region - + Relocate Region - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste @@ -5689,42 +5745,42 @@ RegionModel - + Region - + Time - + Frame - + Value - + Duration - + Label - + Unknown - + Edit Data @@ -5732,7 +5788,7 @@ RemoveLayerCommand - + Delete %1 Layer @@ -5740,7 +5796,7 @@ ResamplingWavFileReader - + Resampling %1... @@ -5748,13 +5804,13 @@ SVFileReader - - + + (derived model in SV-XML) - + Opening file or URL... @@ -5762,12 +5818,12 @@ SingleColourLayer - + Colour - + <unknown> @@ -5775,13 +5831,13 @@ SliceLayer - - + + %1 - %2 - + Time: %1 - %2 Range: %3 samples (%4) Bin: %5 @@ -5789,139 +5845,139 @@ - + First - - + + Mean - - + + Peak - + Time: %1 - %2 Range: %3 samples (%4) - + 0dB - + -Inf - + x10 - + Plot Type - - + + Scale - + Normalize - + Threshold - + Gain - + Sampling Mode - - + + Linear - + Meter - + Rev Log - - + + dB - + Any - + Bin Scale - + Bins - - + + Log - + Absolute - + Lines - + Steps - + Blocks - + Colours @@ -5929,70 +5985,79 @@ SparseModel - + Sparse - + + Edit Data + + + + + Insert Data Point + + + + + Delete Data Point + + + + + SparseModel::AddPointCommand + + Add Point - - + + + SparseModel::DeletePointCommand + + Delete Point - - + + + SparseModel::RelabelCommand + + Re-Label Point - - - Edit Data - - - - - Insert Data Point - - - - - Delete Data Point - - SparseOneDimensionalModel - + Sparse 1-D - + Time - + Frame - + Label - + Unknown - + Edit Data @@ -6000,37 +6065,37 @@ SparseTimeValueModel - + Sparse Time-Value - + Time - + Frame - + Value - + Label - + Unknown - + Edit Data @@ -6038,7 +6103,7 @@ SparseValueModel - + Sparse Value @@ -6046,363 +6111,363 @@ SpectrogramLayer - - + + Colour - + Colour Scale - + Window Size - + Window Overlap - + Normalize Columns - + Normalize Visible Area - + Bin Display - + Threshold - + Gain - + Colour Rotation - + Min Frequency - + Max Frequency - + Frequency Scale - + Smoothing - + Bins - + Window - + Scale - - + + Linear - + Meter - + dBV^2 - + dBV - + Phase - - + + None - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - + No min - + 10 Hz - + 20 Hz - + 40 Hz - + 100 Hz - + 250 Hz - - + + 500 Hz - - + + 1 KHz - - + + 4 KHz - + 10 KHz - + 1.5 KHz - + 2 KHz - + 6 KHz - + 8 KHz - + 12 KHz - + 16 KHz - + No max - + Log - + All Bins - + Peak Bins - + Frequencies - + <unknown> - - + + dB - + FFT cache failed - + Failed to create the FFT model for this spectrogram. There may be insufficient memory or disc space to continue. - + Peak Frequency: %1 - %2 Hz - + Peak Frequency: %1 Hz - + Peak Pitch: %3 - %4 - + Peak Pitch: %2 - + Time: %1 - %2 - + Time: %1 - + %1Bin Frequency: %2 - %3 Hz %4Bin Pitch: %5 - %6 - + %1Bin Frequency: %2 Hz %3Bin Pitch: %4 - - + + -Inf - + dB: %1 - %2 - + dB: %1 - + Phase: %1 - %2 - + Phase: %1 - + 43Hz - + %1Hz @@ -6410,90 +6475,90 @@ SpectrumLayer - + Window Size - + Window Overlap - + Show Peak Frequencies - + Window - - Plot Type - - - - + + Bins + + + + None - + 25 % - + 50 % - + 75 % - + 87.5 % - + 93.75 % - - - + + + %1 - %2 - + %1 - %2 Hz - + %1 Hz - - + + -Inf - + %1 - + %1 Bin: %2 (%3) %4 value: %5 @@ -6501,22 +6566,22 @@ - + First - + Mean - + Peak - + %1 Bin: %2 (%3) Value: %4 @@ -6527,7 +6592,7 @@ SubdividingMenu - + %1 - %2 @@ -6548,98 +6613,98 @@ TextLayer - - + + Empty Label - - + + <no text> - + In progress - + Time: %1 Height: %2 Label: %3 - - + + Enter label - - + + Please enter a new label: - + Erase Point - + Drag Label - + Move Label - + Move Label Horizontally - + Move Label Vertically - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + New Point @@ -6647,37 +6712,37 @@ TextModel - + Text - + Time - + Frame - + Height - + Label - + Unknown - + Edit Data @@ -6685,39 +6750,39 @@ Thumbwheel - + %1: %2%3 - + %2%3 - + New value for %1, from %2 to %3 %4: - + New value for %1, from %2 to %3: - + Enter a new value from %1 to %2 %3: - - + + Enter a new value from %1 to %2: - - + + Enter new value @@ -6725,105 +6790,105 @@ TimeInstantLayer - - + + New Point - + Plot Type - + Instants - + Segmentation - + In progress - + No local points - + Time: %1 No label - + Time: %1 Label: %2 - + Draw Point - + Add Point at %1 s - + Erase Point - + Drag Point - + Move Point to %1 s - + Edit Point - + Drag Selection - + Resize Selection - + Delete Selection - + Re-align pasted instants? - + The instants you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste @@ -6831,202 +6896,207 @@ TimeValueLayer - - - + + + New Point - - + + Plot Type - + Vertical Scale - + Scale Units - + Draw Segment Division Lines - + + Show Derivative + + + + Scale - + Points - + Stems - + Connected Points - + Lines - + Curve - + Segmentation - + Auto-Align - + Linear - + Log - + +/-1 - + In progress - + No local points - + Time: %1 Value: %2%3 No label - + Time: %1 Value: %2%3 Label: %4 - + Draw Point - + Erase Point - + Drag Point - - + + Edit Point - + Relocate Point - + Change Point Value - + Drag Selection - + Resize Selection - + Delete Selected Points - + Re-align pasted items? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste - + The items you are pasting do not have values. What values do you want to use for these items? - + Some of the items you are pasting do not have values. What values do you want to use for these items? - + Zero for all items - + Choose value calculation - + Select cycle size - + Cycle size: @@ -7034,27 +7104,27 @@ TipDialog - + Tip of the Day - + Show tip on startup - + << Previous - + Next >> - + Close @@ -7062,136 +7132,136 @@ TransformFactory - + [\(<].*$ - - + + <unknown maker> - - + + Extract features using "%1" plugin (from %2) - - + + Extract features using "%1" output of "%2" plugin (from %3) - - + + %1 using "%2" plugin (from %3) - - + + %1 using "%2" output of "%3" plugin (from %4) - + Analysis - + Generator - - + + Other - - + + %1: %2 - + %1: Output %2 - + Extract "%1" data output from "%2" effect plugin (from %3) - + Extract data output %1 from "%2" effect plugin (from %3) - + Effects Data - + Effects - + Transform audio signal with "%1" effect plugin (from %2) - + Generate audio signal using "%1" plugin (from %2) - - + + Plugin type - - + + Category - - + + System Identifier - - + + Name - - + + Description - - + + Maker - - + + Units @@ -7199,64 +7269,64 @@ TransformFinder - + Find a Transform - + Find: - + <br>&nbsp;&nbsp;No results found - - + + Up - - + + Down - + <p>Type some text into the search box to search the descriptions of:<ul><li>All currently installed <a href="http://www.vamp-plugins.org/">Vamp</a> audio feature extraction plugins</li><li>All currently installed <a href="http://www.ladspa.org/">LADSPA</a> audio effects plugins</li><li>Vamp plugins that are not currently installed but that have descriptions published via the semantic web</li></ul> - + <b>Unable to retrieve published descriptions from network!</b> - + <b>No plugins are currently installed!</b> - + <p>%1<br>Perhaps the network connection is down, services are responding too slowly, or a processing problem has occurred.<br>Only the descriptions of installed plugins will be searched. - + <p>%1<br>Only the published descriptions of Vamp feature extraction plugins will be searched. - + <p>%1<br>%2<br>Perhaps the network connection is down, or services are responding too slowly.<br>No search results will be available. - + Found %n description(s) containing <b>%1</b>, showing the first %2 only Found %n description containing <b>%1</b>, showing the first %2 only @@ -7264,7 +7334,7 @@ - + Found %n description(s) containing <b>%1</b> Found %n description containing <b>%1</b> @@ -7272,54 +7342,54 @@ - + <i> (not installed)</i> - + %1%2<br><small> - - + + </small> - + <b>%1</b>%2<br> - - + + <small>%1</small> - + <small> - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Plugin type: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Category: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; System identifier: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; More information: <a href="%1">%1</a> @@ -7327,58 +7397,58 @@ View - + Global Scroll - + Global Zoom - + Follow Playback - + Scroll - + Page - + Off - + <unknown> - + Alignment - + Waiting for layers to be ready... - - + + Cancel - + Rendering image... @@ -7386,82 +7456,97 @@ ViewManager - + + Clear Selection + + + + + Select Multiple Regions + + + + + Select Region + + + + Enter Navigate mode - + Enter Select mode - + Enter Edit mode - + Enter Draw mode - + Enter Erase mode - + Enter Measure mode - + Switch on Loop mode - + Switch off Loop mode - + Switch on Play Selection mode - + Switch off Play Selection mode - + Switch on Play Solo mode - + Switch off Play Solo mode - + Switch on Alignment mode - + Switch off Alignment mode - + Scroll to %1 - + Zoom to %n sample(s) per pixel @@ -7469,33 +7554,15 @@ - + Change overlay level - ViewManager::SetSelectionCommand - - - Clear Selection - - - - - Select Multiple Regions - - - - - Select Region - - - - WaveFileModel - + Wave File @@ -7503,110 +7570,110 @@ WaveformLayer - - + + Scale - + Gain - + Normalize Visible Area - + Channels - + Linear - + Meter - - + + dB - + Separate - + Mean - + Butterfly - + Time: %1 - %2 - + Time: %1 - + Level: - + Left: - + Right: - + Channel %1 - + %1 %2 - %3 (%4 dB peak) - + %1 %2 (%3 dB peak) - - - + + + 0dB - - - + + + -Inf @@ -7614,12 +7681,12 @@ WindowShapePreview - + V / time - + dB / freq @@ -7627,7 +7694,7 @@ WritableWaveFileModel - + Writable Wave File diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_ru.qm Binary file i18n/sonic-visualiser_ru.qm has changed diff -r d70890996156 -r b3b9cc8f5466 i18n/sonic-visualiser_ru.ts --- a/i18n/sonic-visualiser_ru.ts Tue Mar 22 14:29:38 2011 +0000 +++ b/i18n/sonic-visualiser_ru.ts Mon Jul 25 19:38:50 2011 +0100 @@ -1,21 +1,20 @@ - ActivityLog - + Activity Log Журнал изменений - + <p>Activity Log lists your interactions and other events within %1.</p> <p>Список всех предпринятых вами действий с %1.</p> - + %1: %2 %1: %2 @@ -23,7 +22,7 @@ AddLayerCommand - + Add %1 Layer Добавить слой %1 @@ -31,7 +30,7 @@ AggregateWaveModel - + Aggregate Wave @@ -39,7 +38,7 @@ AlignmentModel - + Alignment Выравнивание @@ -47,17 +46,17 @@ AudioCallbackPlaySource - + Play from %1 Воспроизведение от %1 - + Stop at %1 Остановка в позиции %1 - + Change time-stretch factor to %1 Смена коэффициента растяжения во времени на %1 @@ -65,39 +64,39 @@ AudioDial - - + + Enter new value Введите новое значение - + %1: %2%3 %1: %2%3 - + %2%3 %2%3 - + New value for %1, from %2 to %3 %4: Новое значение для «%1», от %2 до %3 %4: - + New value for %1, from %2 to %3: Новое значение для «%1», от %2 до %3: - + Enter a new value from %1 to %2 %3: Введите новое значение от %1 до %2 %3: - - + + Enter a new value from %1 to %2: Введите новое значение от %1 до %2: @@ -105,27 +104,27 @@ AudioTargetFactory - + (auto) (авто) - + JACK Audio Connection Kit Ограничить воспроизведение выделением - + PulseAudio Server Сервер PulseAudio - + Core Audio Device Устройство Core Audio - + Default Soundcard Device Звуковая карта по умолчанию @@ -133,72 +132,72 @@ BZipFileDevice - + File is already open Этот файл уже открыт - + Append mode not supported Режим добавления в конец не поддерживается - + File access mode not specified Способ доступа к файлам не указан - + Read and write modes both specified Режимы чтения и записи определены - + Failed to open file for writing Не удалось открыть файл для записи - + Failed to open bzip2 stream for writing Не удалось открыть поток bzip2 для записи - + Failed to open file for reading Не удалось открыть файл для чтения - + Failed to open bzip2 stream for reading Не удалось открыть поток bzip2 для чтения - + Internal error (open for neither read nor write) Внутренняя ошибка (не открывается ни на чтение, ни на запись) - + File not open Файл не открыт - + bzip2 stream write close error Ошибка закрытия записи в поток bzip2 - + bzip2 stream read close error Ошибка закрытия чтения потока bzip2 - + Internal error (close for neither read nor write) Внутренняя ошибка (не закрывается ни чтение, ни запись) - + bzip2 stream read error Ошибка чтения потока bzip2 @@ -206,7 +205,7 @@ BundleCommand - + %1 (%n change(s)) %1 (%n изменение) @@ -218,7 +217,7 @@ CSVFileWriter - + Failed to open file %1 for writing Не удалось открыть файл %1 для записи @@ -226,77 +225,127 @@ CSVFormatDialog - + Select Data Format Выберите формат данных - Each row specifies: - Каждая строка определяет: - - - + Каждая строка определяет: + + A point in time - Точку во времени - - - + Точку во времени + + A value at a time - Значение во точке времени - - - + Значение во точке времени + + A set of values - Серию значений - - - + Серию значений + + The first column contains: - Первый столбец содержит: - - - + Первый столбец содержит: + + Time, in seconds - Время, в секундах - - - + Время, в секундах + + Time, in audio sample frames - Время, в выборках звуковых сэмплов - - - + Время, в выборках звуковых сэмплов + + Data (rows are consecutive in time) - Данные (строки последовательны во времени) - - - + Данные (строки последовательны во времени) + + + + Please select the correct data format for this file. + + + + + <ignore> + + + + + Time + Время + + + + End time + + + + + Duration + Длительность + + + + Value + Значение + + + + Label + Метка + + + + Timing is specified: + + + + + Explicitly, in seconds + + + + + Explicitly, in audio sample frames + + + + + Implicitly: rows are equally spaced in time + + + + Audio sample rate (Hz): Частота сэмплирования звука (Гц): - + Frame increment between rows: - + + Data will be displayed in a %1 layer. + + + Example data from file: - + Пример данных из файла: - <b>Select Data Format</b><p>Please select the correct data format for this file. - <b>Выберите формат данных</b><p>Выберите правильный формат данных для этого файла. + <b>Выберите формат данных</b><p>Выберите правильный формат данных для этого файла. Colour3DPlotLayer - + Time: %1 - %2 Bin: %3 Value: %4 @@ -305,86 +354,86 @@ Значение: %4 - - + + Linear Линейный - + <unknown> <неизвестно> - - + + Colour Цвет - - + + Scale Масштаб - + Normalize Columns Нормализовать столбцы - + Normalize Visible Area Нормализовать видимую область - - + + Log Логарифмический - + +/-1 ±1 - + Invert Vertical Scale Инвертировать масштаб по вертикали - + Always Opaque Всегда непрозрачно - + Absolute - - - - + Абсолютный + + + Gain Усиление - + Smooth - + Bin Scale - + Bins Бины - + dB Дб @@ -392,68 +441,68 @@ ColourMapper - - + + <unknown> <неизвестно> - + Default По умолчанию - + White on Black Белое на чёрном - + Black on White Чёрное на белом - + Red on Blue Красное на синем - + Yellow on Black Жёлтое на чёрном - + Blue on Black Синее на чёрном - + Sunset Закат - + Fruit Salad Фруктовый салат - + Banded В полоску - + Highlight Подсветка - + Printer Принтер - + High Gain @@ -461,68 +510,68 @@ CommandHistory - - - + + + &Undo &Отменить - + Ctrl+Z Ctrl+Z - - - + + + Re&do Ве&рнуть - + Ctrl+Shift+Z Ctrl+Shift+Z - + Nothing to undo Нет отменяемых действий - + Nothing to redo Нет повторяемых действий - - + + &Undo %1 &Отменить действие «%1» - - + + Re&do %1 Повто&рить действие «%1» - + Undo the last editing operation Отменить последнее действие правки - + Redo the last operation that was undone Повторить последнее действие правки - + Undo %1 Отмена действия «%1» - + Redo %1 Повтор действия «%1» @@ -530,7 +579,7 @@ Dense3DModelPeakCache - + Dense 3-D Peak Cache @@ -538,17 +587,17 @@ DenseThreeDimensionalModel - + Dense 3-D - + Time Время - + Frame Выборка @@ -556,7 +605,7 @@ DenseTimeValueModel - + Dense Time-Value @@ -564,20 +613,20 @@ Document - + Set main model to %1 Сделать %1 основной моделью - + Clear main model - + Очистить основную модель EditableDenseThreeDimensionalModel - + Editable Dense 3-D @@ -585,12 +634,12 @@ FFTModel - + %1 Hz %1 Гц - + FFT FFT @@ -598,22 +647,22 @@ Fader - + Level: Off Уровень: выкл - + Level: %1%2.%3%4 dB Уровень: %1%2.%3%4 Дб - + Enter new fader level Ввведите новый уровень фейдера - + New fader level, from %1 to %2 dBFS: Новый уровень фейдера, от %1 до %2 dBFS: @@ -621,48 +670,48 @@ FeatureExtractionModelTransformer - + No factory available for feature extraction plugin id "%1" (unknown plugin type, or internal error?) - + Input model for feature extraction plugin "%1" is of wrong type (internal error?) - + Failed to instantiate plugin "%1" - + Cannot provide enough channels to feature extraction plugin "%1" (plugin min is %2, max %3; input model has %4) - - + + Failed to initialise feature extraction plugin "%1" - + Feature extraction plugin "%1" rejected the given step and block sizes (%2 and %3); using plugin defaults (%4 and %5) instead - + Transform was configured for version %1 of plugin "%2", but the plugin being used is version %3 - + Plugin "%1" has no outputs У расширения "%1" нет выходов - + Plugin "%1" has no output named "%2" У расширения "%1" нет выхода с названием "%2" @@ -670,49 +719,49 @@ FileSource - - - + + + Unsupported scheme in URL Неподдерживаемая схема URL - + Downloading %1... Скачивается %1... - + Failed to connect to FTP server Не удалось соединиться с FTP-сервером - + Login failed Не удалось авторизоваться - + Failed to change to correct directory Не удалось поменять на корректный каталог - + FTP download aborted Скачивание с FTP-сервера прервано - + Download cancelled Скачивание отменено - + Failed to create local file %1 Не удалось создать локальный файл %1 - + File contains no data! Файл не содержит данных! @@ -720,7 +769,7 @@ I - + Edit Data Изменить данные @@ -728,52 +777,52 @@ ImageDialog - + Image Изображение - + Label: Метка: - + File or URL: Файл или URL: - + Browse... Просмотр... - + Preview Предпросмотр - + Unsupported scheme in URL Неподдерживаемая схема URL - + The URL scheme "%1" is not supported Схема URL "%1" не поддерживается - + Opening image URL... Открывается изображение по URL... - + File download failed Не удалось скачать файл - + Failed to download URL "%1": %2 Не удалось скачать URL "%1": %2 @@ -781,58 +830,58 @@ ImageLayer - + In progress В процессе - - + + Select image Выбрать изображение - + Move Image Переместить изображение - + Drag Selection Перетащить выделение - + Resize Selection Изменить размер выделения - + Delete Selection Удалите выделение - + Re-align pasted items? Заново выровнять вставленные объекты? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste Вставить - + New Point Новая точка - + Opening image URL... Открывается изображение по URL... @@ -840,38 +889,38 @@ ImageModel - - + + Image Изображение - + Edit Image Изменить изображение - + Time Время - + Frame Выборка - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -879,25 +928,25 @@ InteractiveFileFinder - - + + Select file Выберите файл - - + + All files (*.*) Все файлы (*.*) - - + + Select a session file Выберите файл сеанса - + Sonic Visualiser session files (*.sv) RDF files (%1) All files (*.*) @@ -906,14 +955,14 @@ Все файлы (*.*) - + Audio files (%1) All files (*.*) Звуковые файлы (%1) Все файлы (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -932,7 +981,7 @@ Все файлы (*.*) - + All supported files (%1 %2) Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) @@ -949,7 +998,7 @@ Все файлы (*.*) - + All supported files (*.sv %1 %2) Sonic Visualiser session files (*.sv) Audio files (%2) @@ -962,14 +1011,14 @@ Все файлы (*.*) - + Image files (%1) All files (*.*) Файлы изображений (%1) Все файлы (*.*) - + All supported files (*.sv %1 %2 %3) Sonic Visualiser session files (*.sv) Audio files (%1) @@ -984,81 +1033,81 @@ Все файлы (*.*) - + File does not exist Файл не существует - + <b>File not found</b><p>File "%1" does not exist <b>Файл не найден</b><p>Файл "%1" не существует - + File is not readable Файл нечитаем - + <b>File is not readable</b><p>File "%1" can not be read <b>Файл нечитаем</b><p>Файл "%1" не может быть прочитан - - + + Directory selected Выбран каталог - - + + <b>Directory selected</b><p>File "%1" is a directory <b>Выбран каталог</b><p>Файл "%1" является каталогом - + Non-file selected Выбран не файл - + <b>Not a file</b><p>Path "%1" is not a file <b>Это не файл</b><p>Путь "%1" не является файлом - + File is empty Файл пуст - + <b>File is empty</b><p>File "%1" is empty <b>Пустой файл</b><p>Файл "%1" пуст - + Sonic Visualiser session files (*.sv) All files (*.*) Файлы сеансов Sonic Visualiser (*.sv) Все файлы (*.*) - - - - + + + + Select a file to export to Выберите файл, в который экспортировать - + WAV audio files (*.wav) All files (*.*) Звуковые файлы WAV (*.wav) Все файлы (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1073,7 +1122,7 @@ Все файлы (*.*) - + Sonic Visualiser Layer XML files (*.svl) Comma-separated data files (*.csv) RDF/Turtle files (%1) @@ -1086,75 +1135,75 @@ Все файлы (*.*) - + Portable Network Graphics files (*.png) All files (*.*) Файлы Portable Network Graphics (*.png) Все файлы (*.*) - + File exists Такой файл уже существует - + <b>File exists</b><p>The file "%1" already exists. Do you want to overwrite it? <b>Файл существует</b>Файл "%1" уже существует. Вы хотите перезаписать его? - + <b>File not found</b><p>Audio file "%1" could not be opened. Do you want to locate it? <b>Файл не найден</b><p>Не удалось открыть звуковой файл "%1". Вы хотите указать его программе? - + <b>File not found</b><p>File "%1" could not be opened. Do you want to locate it? <b>Файл не найден</b><p>Не удалось открыть файл "%1". Вы хотите указать его программе? - + Failed to open file Не удалось открыть файл - + Locate file... Указать файл... - + Use URL... Использовать URL... - + Cancel Отменить - + Use URL Использовать URL - + Please enter the URL to use for this file: Укажите URL, который будет использоваться для этого файла: - + Failed to open location Не удалось открыть местоположение - + <b>Failed to open location</b><p>URL "%1" could not be opened <b>Не удалось открыть местоположение</b><p>Не удалось открыть URL "%1". @@ -1162,65 +1211,65 @@ ItemEditDialog - + Timing Тайминг - + Time: Время: - - + + frames выборок - - + + sec с - - + + usec мс - + Duration: Длительность: - + Properties Свойства - + Value: Значение: - + Text: Текст: - + OK ОК - + Reset Сбросить - + Cancel Отменить @@ -1228,23 +1277,23 @@ KeyReference - - + + & & - + <i>or</i>&nbsp;<b>%1</b> <i>или</i>&nbsp;<b>%1</b> - + </b>&nbsp;(%1)<b> </b>&nbsp;(%1)<b> - + Sonic Visualiser: Key and Mouse Reference Справка по использованию клавиатуры и мыши @@ -1252,17 +1301,17 @@ LabelCounterInputDialog - + Set Counters Установка счётчиков - + Fine counter (beats): Точный счётчик (доли): - + Coarse counter (bars): Грубый счётчик (такты): @@ -1270,77 +1319,77 @@ Labeller - + No numbering Без нумерации - + Simple counter Простой счетчик - + Cyclical counter Циклический счетчик - + Cyclical two-level counter (bar/beat) Циклический двухуровневый счетчик (такт/доля) - + Audio sample frame number Номер выборки звукового сэмпла - + Time in seconds Время в секундах - + Duration to the following item Длительность до следующей отметки - + Tempo (bpm) based on duration to following item Темп (bpm) на основе длительности до следующей отметки - + Duration since the previous item Длительность после предыдущей отметки - + Tempo (bpm) based on duration since previous item Темп (bpm) на основе длительности после предыдущей отметки - + Same as the nearest previous item Как и ближайший предыдущий объект - + Value extracted from the item's label (where possible) Значение, извлечённое из метки объекта (если возможно) - + %1.%2 %1.%2 - + %1 %1 - + Label Points @@ -1348,103 +1397,111 @@ Layer - + Waveform Волновая форма - - - + + + Spectrogram Спектрограмма - + Ruler Линейка - + Time Instants Отметки времени - + Time Values Значения времени - + Notes Ноты - + Text Текст - + Colour 3D Plot Цветной 3D-график - + Layer Слой - + Spectrum Спектр - + Time Slice - + Images Изображения - + Regions Области + + + Make Measurement + Создать замер + + + + Delete Measurement + Удалить замер + Layer::AddMeasurementRectCommand - Make Measurement - Создать замер + Создать замер Layer::DeleteMeasurementRectCommand - Delete Measurement - Удалить замер + Удалить замер LayerTreeDialog - + Layer Summary Сводка по слою - + Audio Data Sources Источники звуковых данных - + Panes and Layers Окна и слои @@ -1452,22 +1509,22 @@ LayerTreeModel - + Layer Слой - + Model Модель - + Shown Отображение - + Played Воспризведение @@ -1475,27 +1532,27 @@ MIDIFileImportDialog - + Merge all tracks Объединить все дорожки - + Merge all non-percussion tracks Объединить все неперкуссионные дорожки - + Select track or tracks to import Выберите одну или несколько дорожек для импорта - + <b>Select track to import</b><p>You can only import this file as a single annotation layer, but the file contains more than one track, or notes on more than one channel.<p>Please select the track or merged tracks you wish to import: <b>Выберите импортируемую дорожку</b><p>Вы можете импортировать этот файл лишь как одиночный слой аннотации, но в файле либо больше одной дорожки, либо ноты в более чем одном канале.<p>Выберите одну дорожку или несколько объединяемых дорожек для импорта: - + Error in MIDI file import Ошибка при импорте файла MIDI @@ -1503,89 +1560,89 @@ MIDIFileReader - + Wrong length for long data in MIDI stream (%1, should be %2) Неправильная длительность больших данных в потоке MIDI (%1, должно быть %2) - + Wrong length for int data in MIDI stream (%1, should be %2) Неправильная длительность int-данных в потоке MIDI (%1, должно быть %2) - + getMIDIByte called but no MIDI file open Функция getMIDIByte вызвана, но ни один файл MIDI не открыт - - + + End of MIDI file encountered while reading При чтении обнаружен конец файла MIDI - + Attempt to get more bytes than expected on Track Попытка получить из дорожки больше байтов, чем ожидалось - - + + Attempt to read past MIDI file end Попытка прочитать файл MIDI после его окончания - + getMIDIBytes called but no MIDI file open Функция getMIDIBytes вызвана, но ни один файл MIDI не открыт - + Attempt to get more bytes than available on Track (%1, only have %2) Попытка получить из дорожки больше байтов, чем ожидалось (%1, а есть лишь %2) - + getNumberFromMIDIBytes called but no MIDI file open Функция getNumberFromMIDIBytes вызвана, но ни один файл MIDI не открыт - + skipToNextTrack called but no MIDI file open Функция skipToNextTrack вызвана, но ни один файл MIDI не открыт - + Invalid event code %1 found Обнаружен некорректный код события %1 - + Running status used for first event in track - + MIDI file "%1" has no notes in any track Ни в одной дорожке файла MIDI "%1" нет нот - + - uses GM percussion channel — использует канал перкуссии GM - + Track %1 (%2)%3 Дорожка %1 (%2)%3 - + Track %1 (untitled)%3 Дорожка %1 (без имени)%3 - + %1 - vel %2 %1 - vel %2 @@ -1593,7 +1650,7 @@ MIDIInput - + Input Вход @@ -1601,7 +1658,7 @@ MP3FileReader - + Decoding %1... Декодируется %1... @@ -1609,980 +1666,981 @@ MainWindow - - + + Sonic Visualiser Sonic Visualiser - - + + + &Layer С&лой - + &File &Файл - + File Toolbar Панель файлов - + &New Session &Создать сеанс - + Ctrl+N Ctrl+N - + &Open Session... &Открыть сеанс... - + Ctrl+O Ctrl+O - + Open a previously saved Sonic Visualiser session file Открыть файл сохранённого ранее сеанса Sonic Visualiser - + &Open... О&ткрыть... - + Open a session file, audio file, or layer Открыть файл сеанса, звуковой файл или слой - + &Save Session Сохр&анить сеанс - + Ctrl+S Ctrl+S - + Save the current session into a Sonic Visualiser session file Сохранить в файл текущий сеанс Sonic Visualiser - + Save Session &As... Сохранить сеанс &как... - + Save the current session into a new Sonic Visualiser session file Сохранить текущий сеанс Sonic Visualiser в файл с другим именем - + &Import Audio File... &Импортировать звуковой файл... - + Ctrl+I Ctrl+I - + Import an existing audio file Импортировать существующий звуковой файл - + Import Secondary Audio File... Импортировать второй звуковой файл... - + Ctrl+Shift+I Ctrl+Shift+I - + Import an extra audio file as a separate layer Импортировать ещё один звуковой файл в отдельный слой - + &Export Audio File... Э&кспортировать звуковой файл... - + Export selection as an audio file Экспортировать выделенное в звуковой файл - + Import Annotation &Layer... И&мпортировать слой аннотаций... - + Ctrl+L Ctrl+L - + Import layer data from an existing file Импортировать данные слоя из существующего файла - + Export Annotation Layer... Экспортировать слой аннотаций... - + Export layer data to a file Экспортировать данные слоя в файл - + &Quit В&ыход - + Ctrl+Q Ctrl+Q - + &Edit &Правка - + Cu&t &Вырезать - + Ctrl+X Ctrl+X - + &Copy С&копировать - + Ctrl+C Ctrl+C - + &Paste Вст&авить - + Ctrl+V Ctrl+V - - + + &Delete Selected Items &Удалить выбранное - + Del Del - + Select &All В&ыделить всё - + Ctrl+A Ctrl+A - + Select &Visible Range Вы&делить всё видимое - + Ctrl+Shift+A Ctrl+Shift+A - + Select to &Start Выделить до &начала - + Shift+Left Shift+Left - + Select to &End Выделить до &конца - + Shift+Right Shift+Right - + C&lear Selection Сн&ять выделение - + Esc Esc - + &Insert Instant at Playback Position Вставить &отметку в точку воспроизведения - + Enter Enter - + &View &Вид - + 0 0 - + 9 9 - + 8 8 - + Scroll &Left Прокрутить в&лево - + Left Влево - + Scroll the current pane to the left Прокрутить активное окно влево - + Scroll &Right Прокрутить в&право - + Right Вправо - + Scroll the current pane to the right Прокрутить активное окно вправо - + Ctrl+Left Ctrl+Влево - + Scroll the current pane a big step to the left Сделать большой шаг прокрутки влево - + Ctrl+Right Ctrl+Вправо - + Scroll the current pane a big step to the right Сделать большой шаг прокрутки вправо - + Zoom &In При&близить - + Up Вверх - + Increase the zoom level Увеличить масштаб отображения - + Zoom &Out &Отдалить - + Down Вниз - + Decrease the zoom level Уменьшить масштаб отображения - + Restore &Default Zoom &Восстановить обычный масштаб - + Zoom to &Fit &Уместить в окне - + Zoom to show the whole file Увидеть весь файл - + &Pane &Окно - + Add &New Pane Добавить &новое окно - + Add a new pane containing only a time ruler Добавить новое окно, содержащее только линейку времени - + Add New %1 Layer Добавить новый слой «%1» - + Add a new empty layer of type %1 Добавить новый пустой слой типа «%1» - + Add &Waveform Добавить &волновую форму - + Add a new pane showing a waveform view Добавить новое окно с видом волновой формы - + Add a new layer showing a waveform view Добавить новый слой с видом волновой формы - + Add &Melodic Range Spectrogram Добавить спектограмму &мелодического диапазона - + Add a new pane showing a spectrogram set up for tracking frequencies Добавить новое окно, отображающее спектрограмму для отслеживания частот - + Add a new layer showing a spectrogram set up for tracking frequencies Добавить новый слой, отображающий спектрограмму для отслеживания частот - + &All Channels Mixed Все &каналы сведены - + &All Channels &Все каналы - + Channel &%1 Канал &%1 - + &Delete Pane У&далить окно - + Add &Time Ruler Добавить линейку &времени - + Add a new layer showing a time ruler Добавить новый слой с линейкой - + Add &Existing Layer Добавить &существующий слой - + &Rename Layer... &Переименовать слой... - + Rename the currently active layer Переименовать активный слой - + &Delete Layer &Удалить слой - + Delete the currently active layer Удалить активный слой - + &Help &Справка - + &Help Reference &Руководство пользователя - + Open the Sonic Visualiser reference manual Открыть справку по Sonic Visualiser - + Sonic Visualiser on the &Web &Веб-сайт Sonic Visualiser - + Open the Sonic Visualiser website Открыть веб-сайт Sonic Visualiser - + &About Sonic Visualiser &О Sonic Visualiser - + Show information about Sonic Visualiser Показать информацию о Sonic Visualiser - + Rewind to Start Перемотать в начало - + Home Домой - + Rewind to the start Перемотать в начало - - - + + + Rewind Перемотать назад - + Rewind to the previous time instant in the current layer Перемотать до предыдущей отметки времени в текущем слое - + Play / Pause Воспроизвести / Приостановить - + Space Пробел - + Start or stop playback from the current position Запустить или остановить воспроизведение с текущей позиции - - + + Fast Forward Перемотать вперёд - + Fast forward to the next time instant in the current layer Перемотать до следующей отметки времени в текущем слое - + Fast Forward to End Перемотать до конца - + End Конец - + Fast-forward to the end Перемотать до конца - + Play Mode Toolbar Панель режима воспроизведения - + Constrain Playback to Selection Ограничить воспроизведение выделением - + s с - + Loop Playback Воспроизведение в цикле - + l l - + Loop playback Воспроизведение в цикле - + Edit Toolbar Панель правки - + Tools Toolbar Панель инструментов - - + + Navigate Перемещение - + 1 1 - + Select Выделение - + 2 2 - + Edit Правка - + 3 3 - + Draw Рисование - + 4 4 - + No audio file loaded. Ни один звуковой файл не загружен. - + %1Hz (resampling to %2Hz) %1 Гц (ресэмплирование до %2 Гц) - - - - - - - + + + + + + + Failed to open file Не удалось открыть файл - + Export the selected region only Экспортировать только выделенную область - - + + Export the whole audio file Экспортировать весь звуковой файл - - - + + + Select region to export Выделите область для экспорта - + Which region from the original audio file do you want to export? Какую область исходного звукового файла вы хотите экспортировать? - + Export the selected regions into a single audio file Экспортировать выделенные области в один звуковой файл - + Export the selected regions into separate files Экспортировать выделенные области в разные звуковые файлы - + Multiple regions of the original audio file are selected. What do you want to export? Выбрано несколько областей исходного звукового файла. Какую из них вы хотите экспортировать? - + Fragment file %1 already exists, aborting Файл фрагмента %1 уже существует, прерывание - - + + Failed to write file Не удалось записать файл - + Failed to open file %1 for writing Не удалось открыть файл %1 для записи - + Sonic Visualiser: %1 Sonic Visualiser: %1 - + Session modified Сеанс изменен - - + + Failed to save file Не удалось сохранить файл - + Rename Layer Переименовать слой - + New name for this layer: Новое имя этого слоя: - + Sample rate mismatch Несоответствие частоты дискретизации - - + + Failed to regenerate layer Не удалось повторно создать слой - + http://www.sonicvisualiser.org/ http://www.sonicvisualiser.org/ - + Release %1 : Revision %2 Версия %1 : Редакция %2 - + Release %1 Версия %1 - + Unreleased : Revision %1 Не выпущено : редакция %1 - + <h3>About Sonic Visualiser</h3> <h3>О программе Sonic Visualiser</h3> - + Debug Отладка - + Release Версия - + <br>With Ogg file decoder (oggz v%1, fishsound v%2) &copy; CSIRO Australia <br>С декодером Ogg (oggz v%1, fishsound v%2) &copy; CSIRO Australia - + <br>With LADSPA plugin support (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld <br>С поддержкой расширений LADSPA (API v%1) &copy; Richard Furse, Paul Davis, Stefan Westerfeld - + <br>With DSSI plugin support (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton <br>С поддержкой расширений DSSI (API v%1) &copy; Chris Cannam, Steve Harris, Sean Bolton - + About Sonic Visualiser О программе Sonic Visualiser - - + + Failed to generate layer Не удалось создать слой - + Adjust the application preferences Изменить параметры работы приложения - + &Recent Files Н&едавние файлы - + &Preferences... &Параметры... - + ; ; - + Show &Zoom Wheels Показывать &колёса масштабирования - + Z Z - + Show thumbwheels for zooming horizontally and vertically Показывать колёса для масштабирования по горизонтали и вертикали - + %1 by Category %1 по категории - - + + Unclassified Неклассифицированные - + %1 by Maker %1 по имени создателя - - + + Unknown Неизвестен - + %1 by Plugin Name %1 по названию расширения - - + + %1... %1... - + Add Spectr&um Добавить &график спектральной функции - + Add a new pane showing a frequency spectrum Добавить новое окно с частотой спектра - + Add a new layer showing a frequency spectrum Добавить новый слой с частотой спектра - + Playback Speedup Ускорение воспроизведения - - + + &Transform Пр&еобразования - + %1: %2 %1: %2 - + &Recent Transforms &Недавние преобразования - - + + [\(<].*$ [\(<].*$ - - + + Audio processing overload Перегрузка в обработке звука - + Show Property Bo&xes Показывать панели с&войств - + X X - + Show the layer property boxes at the side of the main window Показывать панели свойств слоёв сбоку от основного окна @@ -2592,1294 +2650,1347 @@ Добавить окно %1 - + Abandon the current Sonic Visualiser session and start a new one Отказаться от текущего сеанса Sonic Visualiser и начать новый - + Open Lo&cation... Открыть &местоположение... - + Ctrl+Shift+O Ctrl+Shift+O - + Open or import a file from a remote URL Открыть или импортировать файл с удалённого узла - + Exit Sonic Visualiser Завершить работу с Sonic Visualiser - + Cut the selection from the current layer to the clipboard Вырезать выделение из активного слоя в буфер обмена - + Copy the selection from the current layer to the clipboard Скопировать выделение из активного слоя в буфер обмена - + Paste from the clipboard to the current layer Вставить содержимое буфера обмена в активный слой - + Select the whole duration of the current session Выбрать данные по всей длительности активнонр сеанса - + Select the time range corresponding to the current window width Сделать временной диапазон равным активной ширине окна - + Select from the start of the session to the current playback position Выделить от начала сеанса до текущей точки воспроизведения - + Select from the current playback position to the end of the session Выделить от текущей точки воспроизведения до конца сеанса - + Clear the selection Очистить выделение - + Insert a new time instant at the current playback position, in a new layer if necessary Вставить новую отметку времени в точку воспроизведения, при необходимости — в новый слой - + Insert Instants at Selection &Boundaries Вставить отметки времени по &краям выделения - + Shift+Enter Shift+Enter - + &Jump Left Перескочить в&лево - + J&ump Right П&ерескочить вправо - + Restore the zoom level to the default Восстановить обычный масштаб отображения - + Show &No Overlays Не по&казывать перекрытия совсем - + Hide centre indicator, frame times, layer names and scale Спрятать индикацию центра, времён выделения, имена слоёв и масштаб - + Show &Minimal Overlays Показывать &минимум перекрытий - + Show centre indicator only Показывать только индикатор центра - + Show &Standard Overlays Показывать о&бычные перекрытия - + Show centre indicator, frame times and scale Показывать индикатор центра, времена выделений, имена слоёв и масштаб - + Show &All Overlays Показывать в&се перекрытия - + 7 7 - + Show all texts and scale Показывать весь текст и масштаб - + Show Status &Bar Показывать статусную &строку - + Show context help information in the status bar at the bottom of the window Показывать контекстную справку в статусной строке, находящейся внизу окна программы - + Add a new pane showing a spectrogram Добавить новое окно с отображением спектрограммы - + Add a new layer showing a spectrogram Добавить новый слой с отображением спектрограммы - + Add a new pane showing a spectrogram set up for an overview of note pitches Добавить новое окно, отображающее спектрограмму для обзора высоты тона нот - + Add a new layer showing a spectrogram set up for an overview of note pitches Добавить новый слой, отображающий спектрограмму для обзора высоты тона нот - + Delete the currently active pane Удалить активное окно - + Add S&lice of Layer Добавить &фрагмент слоя - + Select ranges Выбрать диапазон - + Edit items in layer Изменить объекты слоя - + Draw new items in layer Нарисовать новые объекты в слое - + Open Location Открыть местоположение - + Please enter the URL of the location to open: Введите URL открываемого местоположения: - - - - + + + + Failed to open location Не удалось открыть местоположение - + Visible: %1 to %2 (duration %3) Видимая область: от %1 до %2 (длительность %3) - + Adjust the master playback level Изменить общую громкость воспроизведения - + Adjust the master playback speed Изменить общую скорость воспроизведения - + <br>With Ogg file decoder &copy; CSIRO Australia <br>С декодером Ogg &copy; CSIRO Australia - + <br>With MAD mp3 decoder &copy; Underbit Technologies Inc <br>С декодером MAD mp3 &copy; Underbit Technologies Inc - + <br>With libsamplerate &copy; Erik de Castro Lopo <br>С libsamplerate &copy; Erik de Castro Lopo - + <br>With libsndfile &copy; Erik de Castro Lopo <br>С libsndfile &copy; Erik de Castro Lopo - + <br>With FFTW3 &copy; Matteo Frigo and MIT <br>С FFTW3 &copy; Matteo Frigo и MIT - + <br>With Vamp plugin support (API v%1, host SDK v%2) &copy; Chris Cannam <br>С поддержкой расширений Vamp (API v%1, host SDK v%2) &copy; Chris Cannam - + <br>With liblo Lite OSC library &copy; Steve Harris <br>С liblo Lite OSC library &copy; Steve Harris - + Export Image File... Экспортировать в файл изображения... - + Export a single pane to an image file Экспортировать всё окно в файл изображения - + Export the whole pane (%1x%2 pixels) Экспортировать всё окно (%1x%2 пикселов) - + Export the visible area only (%1x%2 pixels) Экспортировать только видимую часть (%1x%2 пикселов) - + Export the selection extent (%1x%2 pixels) Экспортировать выделение (%1x%2 пикселов) - + Export the selection extent Экспортировать выделение - + Which region of the current pane do you want to export as an image? Какую область текущего окна вы хотите экспортировать как изображение? - + Note: the whole pane is too wide to be exported as a single image. Примечание: всё окно слишком широко, чтобы сохранить его как изображение. - + Failed to save image file Не удалось сохранить файл изображения - + Failed to save image file %1 Не удалось сохранить файл изображения %1 - + Selection: %1 to %2 (duration %3) Выделение: %1 до %2 (длительность %3) - + Black Чёрный - + Red Красный - + Blue Синий - - - + + + Green Зелёный - + Purple Пурпурный - + Orange Оранжевый - + White Белый - + Bright Red Ярко-красный - + Bright Blue Ярко-синий - - - + + + Bright Green Ярко-зелёный - + Bright Purple Ярко-пурпурный - + Bright Orange Ярко-оранжевый - + File and Session Management Файлы и управление сеансами - + Editing Редактирование - - + + Paste at Playback Position + + + + + Ctrl+Shift+V + + + + + Paste from the clipboard to the current layer, placing the first item at the playback position + + + + + Delete items in current selection from the current layer Удалить объекты в активном выделении текущего слоя - + Selection Выделение - + Tapping Time Instants - + Insert new time instants at the start and end of the current selected regions, in a new layer if necessary - + Number New Instants with Способ нумерации новых отметок - + Cycle size Размер цикла - + Set Numbering Counters... Установить счетчики нумерации... - + Set the counters used for counter-based labelling Устанолвить счетчики для меток на основе подсчета - + Renumber Selected Instants Перенумеровать выбранные отметки - + Renumber the selected instants using the current labelling scheme - + Panning and Navigation Прокрутка и перемещение - + Zoom Масштаб просмотра - + F F - + Display Features Отображение элементов - + + Show All Time Rulers + + + + + # + + + + + Show or hide all time rulers + + + + Show La&yer Summary &Показать сводку по слою - + Y Y - + Open a window displaying the hierarchy of panes and layers in this session Открыть окно, в котором отобразится иерархия окон и слоев активного сеанса - + Managing Panes and Layers Управление окнами и слоями - + N N - + T T - + W W - + + Shift+W + + + + Add Spectro&gram Добавить &спектограмму - + G G - + + Shift+G + + + + M M - + + Shift+M + + + + Add Pea&k Frequency Spectrogram Добавить спектограмму &пиковой частоты - + K K - + + Shift+K + + + + U U - + + Shift+U + + + + Switch to Previous Pane Перейти к предыдущему окну - + [ [ - + Make the next pane up in the pane stack current - + Switch to Next Pane Перейти к следующему окну - + ] ] - + Make the next pane down in the pane stack current - + Ctrl+Shift+D Ctrl+Shift+D - + R R - + Edit Layer Data Изменить данные слоя - + E E - + Edit the currently active layer as a data grid Изменить активный слой как сетку данных - + Ctrl+D Ctrl+D - + Help Справка - + F1 F1 - + &Key and Mouse Reference &Использование клавиатуры и мыши - + F2 F2 - + Open a window showing the keystrokes you can use in Sonic Visualiser Открыть окно, в котором перечисляются клавиатурные комбинации Sonic Visualiser - + Ctrl+R Ctrl+R - + Re-open Повторно открыть - + Re-open the current or most recently opened file Повторно открыть активный или недавно открывавшийся файл - + Ctrl+T Ctrl+T - + Repeat Transform Повторить преобразование - + Re-select the most recently run transform Повторно запустить самое последнее выполнявшееся преобразование - + Playback and Transport Controls Управление воспроизведением и перемоткой - + Play&back Воспро&изведение - + Playback Воспроизведение - + Playback Toolbar Панель воспроизведения - + PgUp PgUp - + Rewind to the previous time instant or time ruler notch - + PgDown PgDown - + Fast-forward to the next time instant or time ruler notch - + Constrain playback to the selected regions - + Solo Current Pane Соло активного окна - + o o - + Solo the current pane during playback При воспроизведении звучит лишь активное окно - + Align File Timelines Выровнять линейки времени - + Treat multiple audio files as versions of the same work, and align their timelines - + Speed Up Ускорить - + Ctrl+PgUp Ctrl+PgUp - + Time-stretch playback to speed it up without changing pitch Сжать время воспроизведения, не меняя высоту тона - + Slow Down Замедлить - + Ctrl+PgDown Ctrl+PgDown - + Time-stretch playback to slow it down without changing pitch Расширить время воспроизведения, не меняя высоту тона - + Restore Normal Speed Восстановить обычную скорость - + Ctrl+Home Ctrl+Home - + Restore non-time-stretched playback Восстановить естественную скорость воспроизведения - + Tool Selection Выбор инструмента - + Erase Стерка - + 5 5 - + Erase items from layer Стирать объекты слоя - + Measure Измеритель - + 6 6 - + Make measurements in layer Выполнять измерения в слое - + &Delete Current Measurement &Удалить активный замер - + Delete the measurement currently under the mouse pointer Удалить замер, находящийся под курсором мыши - + Fast Forward to Next Instant - + Rewind to Previous Instant - + Fast Forward to Next Point - + Fast forward to the next point in the current layer - + Rewind to Previous Point - + Rewind to the previous point in the current layer - + Fast forward Быстрый вперед - - + + <b>File open failed</b><p>Audio file "%1" could not be opened <b>Не удалось открыть файл</b><p>Не удалось открыть звуковой файл "%1" - + <b>File open failed</b><p>Layer file %1 could not be opened. <b>Не удалось открыть файл</b><p>Не удалось открыть файл слоя "%1" - + Can't export non-note layers to MIDI Невозможно экспортировать ненотные слои в MIDI - + <b>File open failed</b><p>Session file "%1" could not be opened <b>Не удалось открыть файл</b><p>Не удалось открыть файл сеанса "%1" - + <b>File open failed</b><p>File "%1" could not be opened <b>Не удалось открыть файл</b><p>Не удалось открыть файл "%1" - + <b>Open failed</b><p>URL "%1" could not be opened <b>Не удалось открыть ссылку</b><p>Не удалось открыть URL "%1" - + <b>Open failed</b><p>File or URL "%1" could not be opened <b>Не удалось открыть ссылку</b><p>Не удалось открыть файл или URL "%1" - - + + Failed to open dropped URL Не удалось открыть URL, перемещенный мышью в окно программы - + <b>Open failed</b><p>Dropped URL "%1" could not be opened <b>Не удалось открыть ссылку</b><p>Не удалось открыть файл URL "%1", перетащенный в окно программы мышью - + <b>Session modified</b><p>The current session has been modified.<br>Do you want to save it? <b>Сеанс изменился</b><p>Активный сеанс изменился<br>Вы хотите сохранить его? - - + + <b>Save failed</b><p>Session file "%1" could not be saved. <b>Не удалось сохранить файл</b><p>Не удалось сохранить файл сеанса "%1" - + Playback speed: Normal Скорость воспроизведения: обычная - + Playback speed: %1%2% Скорость воспроизведения: %1%2% - + <b>Wrong sample rate</b><p>The sample rate of this audio file (%1 Hz) does not match the current playback rate (%2 Hz).<p>The file will play at the wrong speed and pitch.<p>Change the <i>Resample mismatching files on import</i> option under <i>File</i> -> <i>Preferences</i> if you want to alter this behaviour. - + <b>Overloaded</b><p>Audio effects plugin auditioning has been disabled due to a processing overload. - + Reset Counters Обнуление счетчиков - + <b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform "%1" failed:<p>%2 - + <b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform "%1" failed.<p>No error information is available. - - + + Warning Предупреждение - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed:<p>%3 - + <b>Layer generation failed</b><p>Failed to regenerate derived layer "%1" using new data model as input.<p>The layer transform "%2" failed.<p>No error information is available. - + <b>Warning when regenerating layer</b><p>When regenerating the derived layer "%1" using new data model as input:<p>%2 - + Failed to calculate alignment Не удалось рассчитать выравнивание - + <b>Alignment calculation failed</b><p>Failed to calculate an audio alignment using transform "%1":<p>%2 - + <br>With JACK audio output library &copy; Paul Davis and Jack O'Quin <br>С библиотекой JACK &copy; Paul Davis и Jack O'Quin - + <br>With PortAudio audio output library &copy; Ross Bencina and Phil Burk <br>С библиотекой PortAudio &copy; Ross Bencina и Phil Burk - + <br>With PulseAudio audio output library &copy; Lennart Poettering and Pierre Ossman <br>С библиотекой PulseAudio &copy; Lennart Poettering и Pierre Ossman - + <b>Overloaded</b><p>Audio playback speed processing has been reduced to a single channel, due to a processing overload. - + <br>With Rubber Band &copy; Chris Cannam <br>С Rubber Band &copy; Chris Cannam - + Find a Transform... Найти эффект трансформации... - + Search for a transform from the installed plugins, by name or description Найти эффект трансформации среди установленных расширений по названию или описанию - + Ctrl+M Ctrl+M - + <p>Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> <p>Sonic Visualiser — программа для просмотра и исследования звукозаписей с целью семантического анализа и аннотации музыки.<br><a href="http://www.sonicvisualiser.org/">http://www.sonicvisualiser.org/</a></p> - + <p><small>%1 : %2 configuration</small></p> - - - - + <p><small>%1 : конфигурация %2</small></p> + + + With Qt v%1 &copy; Nokia Corporation С использованием Qt v%1 &copy; Nokia Corporation - + <br>With JACK audio output library v%1 &copy; Paul Davis and Jack O'Quin <br>С библиотекой JACK v%1 &copy; Paul Davis и Jack O'Quin - + <br>With PulseAudio audio output library v%1 &copy; Lennart Poettering and Pierre Ossman <br>С библиотекой PulseAudio v%1 &copy; Lennart Poettering и Pierre Ossman - + <br>With MAD mp3 decoder v%1 &copy; Underbit Technologies Inc <br>С декодером mp3 MAD v%1 &copy; Underbit Technologies Inc - + <br>With libsamplerate v%1 &copy; Erik de Castro Lopo <br>С libsamplerate v%1 &copy; Erik de Castro Lopo - + <br>With libsndfile v%1 &copy; Erik de Castro Lopo <br>С libsndfile v%1 &copy; Erik de Castro Lopo - + <br>With FFTW3 v%1 &copy; Matteo Frigo and MIT <br>С FFTW3 v%1 &copy; Matteo Frigo и MIT - + <br>With Rubber Band v%1 &copy; Chris Cannam <br>С Rubber Band v%1 &copy; Chris Cannam - + <br>With Raptor RDF parser v%1 &copy; Dave Beckett and the University of Bristol <br>С парсером RDF Raptor v%1 &copy; Dave Beckett и Бристольский университет - + <br>With Raptor RDF parser &copy; Dave Beckett and the University of Bristol <br>С парсером RDF Raptor &copy; Dave Beckett и Бристольский университет - + <br>With Rasqal RDF query engine v%1 &copy; Dave Beckett and the University of Bristol <br>С движком запросов RDF Rasqal v%1 &copy; Dave Beckett и Бристольский университет - + <br>With Rasqal RDF query engine &copy; Dave Beckett and the University of Bristol <br>С движком запросов RDF Rasqal &copy; Dave Beckett и Бристольский университет - + <br>With Redland RDF datastore v%1 &copy; Dave Beckett and the University of Bristol <br>C хранилищем данных RDF Redland v%1 &copy; Dave Beckett и Бристольский университет - + <br>With Redland RDF datastore &copy; Dave Beckett and the University of Bristol <br>C хранилищем данных RDF Redland &copy; Dave Beckett и Бристольский университет - + <br>With liblo Lite OSC library v%1 &copy; Steve Harris <br>С библиотекой OSC liblo v%1 &copy; Steve Harris - + </small><p><small>The OSC URL for this instance is: "%1" - - - - + </small><p><small>Адрес OSC для этого сеанса: "%1" + + + With С - + Using Используя - + Peek Left Глянуть влево - + Alt+Left Alt+влево - + Scroll the current pane to the left without moving the playback cursor or other panes - + Peek Right Глянуть вправо - + Alt+Right Alt+вправо - + Scroll the current pane to the right without moving the playback cursor or other panes - + Show Acti&vity Log Показать &журнал действий - + Open a window listing interactions and other events Открыть окно со списком всех действий в сеансе - + Export multiple audio files Экспортировать несколько звуковых файлов - + Export audio to "%1" Экспорт звука в "%1" - - - - - + + + + + <b>Audio required</b><p>Unable to load layer data from "%1" without an audio file.<br>Please load at least one audio file before importing annotations. - + Export layer to "%1" Экспорт слоя в "%1" - + Export image to "%1" Экспорт изображения в "%1" - + Close the current session and create a new one - + Add this data to the current session Добавить эти данные в активный сеанс - + Select target for import Выбрать цель для импорта - + <b>Select a target for import</b><p>This RDF document refers to one or more audio files.<br>You already have an audio waveform loaded.<br>What would you like to do with the new data? <b>Выберите цель импорта</b><p>Этот документ RDF ссылается на один или более звуковых файлов.<br>У вас уже есть один загруженный звуковой файл.<br>Что вы хотите сделать с новыми данными? - + Save session as "%1" Сохранение сеанса как "%1" - + Add Point Добавить точку - + http://www.sonicvisualiser.org/doc/reference/%1/en/ http://www.sonicvisualiser.org/doc/reference/%1/en/ - + <br>With RtMidi &copy; Gary P. Scavone <br>С RtMidi &copy; Gary P. Scavone - + Ctrl+Shift+S Ctrl+Shift+S - + Insert Item at Selection Вставить объект в выделение - + Ctrl+Shift+Enter Ctrl+Shift+Enter - + Insert a new note or region item corresponding to the current selection - + Rewind to Similar Point Назад к первой схожей точке - + Shift+PgUp Shift+PgUp - + Rewind to the previous similarly valued time instant - + Fast Forward to Similar Point Вперед к первой схожей точке - + Shift+PgDown Shift+PgDown - + Fast-forward to the next similarly valued time instant - 1. %2 - 1. %2 - - - + 1. %2 + + %1. %2 - %1. %2 - - - + %1. %2 + + + Select audio file to export Укажите экспортируемый звуковой файл - + Which audio file do you want to export from? Какой звуковой файл вы хотите экспортировать? - + Newer version available Доступна более новая версия - + <h3>Newer version available</h3><p>You are using version %1 of Sonic Visualiser, but version %3 is now available.</p><p>Please see the <a href="http://sonicvisualiser.org/">Sonic Visualiser website</a> for more information.</p> <h3>Доступна более новая версия</h3><p>Вы используетее Sonic Visualiser версии %1, но уже доступна версия %3.</p><p>Загляните на <a href="http://sonicvisualiser.org/">сайт Sonic Visualiser</a> за подробностями.</p> @@ -3887,184 +3998,194 @@ MainWindowBase - + %1 (modified) %1 (изменен) - + (modified) (изменен) - + Cut Вырезать - + Paste Вставить - - - - + + + + Add Point Добавить точку - + Add Point at %1 s Добавить точку по отметке %1 с - + Opening file or URL... Открывается файл или URL... - + Replace the existing main waveform Заменить существующую основную волновую форму - + Load this file into a new waveform pane Загрузить этот файл в новое окно волновой формы - + Select target for import Выбрать цель для импорта - - - + + + %1: %2 %1: %2 - + %1: %2 [%3] %1: %2 [%3] - - + + Import "%1" Импортировать "%1" - + Opening playlist... Открывается список воспроизведения... - + Opening session... Открывается сеанс... - + SV XML file read error: %1 Ошибка чтения XML-файла SV: %1 - + <b>Failed to import RDF</b><p>No suitable data models found for import from RDF document at "%1"</p> - - + + Couldn't open audio device Не удалось открыть звуковое устройство - + Failed to write file Не удалось записать файл - + <b>Save failed</b><p>Failed to write to file "%1": %2 <b>Не удалось сохранить</b><p>Не удалось записать файл "%1": %2 - - + + Add Pane + Добавить окно + + + + Remove Pane + Удалить окно + + + + Delete Pane Удалить окно - + Playing: %1 of %2 (%3 remaining) Воспроизводится: %1 из %2 (осталось %3) - + <b>No audio available</b><p>Could not open an audio device for playback.<p>Automatic audio device detection failed. Audio playback will not be available during this session.</p> <b>Беззвучный режим</b><p>Не удалось открыть звуковое устройство для воспроизведения.<p>Не удалось автоматически определить звуковое устройство. На этот раз придется обойтись без воспроизведения звука.</p> - + <b>No audio available</b><p>Failed to open your preferred audio device ("%1").<p>Audio playback will not be available during this session.</p> <b>Беззвучный режим</b><p>Не удалось открыть предпочитаемое звуковое устройство («%1»).<p>На этот раз придется обойтись без воспроизведения звука.</p> - - + + Importing from RDF... Выполняется импорт из RDF... - + <b>Select a target for import</b><p>You already have an audio waveform loaded.<br>What would you like to do with the new audio file? <b>Выберите цель импорта</b><p>У вас уже есть один загруженный звуковой файл.<br>Что вы хотите сделать с новыми звуковыми данными? - + Import audio file "%1" Импорт звукового файла "%1" - + Import layer XML file "%1" Импорт XML-файла слоя "%1" - + Import MIDI file "%1" Импорт файла MIDI "%1" - + Import session file "%1" Импорт файла сеанса "%1" - - + + Failed to import RDF Не удалось импортировать RDF - + <b>Failed to import RDF</b><p>Importing data from RDF document at "%1" failed: %2</p> <b>Не удалось импортировать RDF</b><p>Не удалось импортировать данные из документа RDF "%1": %2</p> - + Import RDF document "%1" Импорт документа RDF "%1" - + Add Item at %1 s Добавить объект в позицию %1с @@ -4072,106 +4193,114 @@ MainWindowBase::AddPaneCommand - Add Pane - Добавить окно + Добавить окно MainWindowBase::RemovePaneCommand - Remove Pane - Удалить окно + Удалить окно ModelDataTableDialog - + Data Editor Редактор данных - + Playback Toolbar Панель воспроизведения - + Play Mode Toolbar Панель режима воспроизведения - + Track Playback Переключить воспроизведение - + Toggle tracking of playback position Переключить отслеживание позиции воспроизведения - + Edit Toolbar Панель правки - + Insert New Item Вставить новый объект - + Insert Вставить - + Insert a new item Вставить новый объект - + Delete Selected Items Удалить выбранные объекты - + Delete Удалить - + Delete the selected item or items Удалить выбранные объекты - + Data in Layer Данные в слое + + + Find: + Искать: + + + + + + ModelMetadataModel - + Type Тип - + Name Название - + Maker Создатель - + Source Источник @@ -4179,12 +4308,12 @@ ModelTransformerFactory - + %1 <%2> %1 <%2> - + %1: %2 %1: %2 @@ -4192,35 +4321,35 @@ NoteLayer - - - + + + New Point Новая точка - + Vertical Scale Верт. масштаб - + Auto-Align Автовыравнивание - + In progress В процессе - - + + No local points Нет локальных точек - + Time: %1 Pitch: %2 Duration: %3 @@ -4231,7 +4360,7 @@ Без метки - + Time: %1 Pitch: %2 Duration: %3 @@ -4242,108 +4371,108 @@ Метка: %4 - + Draw Point Нарисовать точку - + Drag Point Перетащить точку - - + + Edit Point Изменить точку - + Relocate Point Переместить точку - + Change Point Value Изменить значение точки - + Drag Selection Перетащить выделение - + Resize Selection Изменить размер выделения - + Delete Selected Points Удалить выбранные точки - + Paste Вставить - + Scale Units Единицы шкалы - + Scale Масштаб - + Linear Линейный - + Log Логарифмический - + MIDI Notes Ноты MIDI - + %1 %2 %1 %2 - + Erase Point Стереть точку - + Re-align pasted items? Заново выровнять вставленные объекты? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Record Note - + %1 (%2, %3 Hz) - %1 (%2, %3Гц) - - - + %1 (%2, %3 Гц) + + + %1 Hz (%2, %3) %1Гц (%2, %3) @@ -4351,47 +4480,47 @@ NoteModel - + Note Нота - + Time Время - + Frame Выборка - + Pitch Высота тона - + Duration Длительность - + Level Уровень - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -4399,7 +4528,7 @@ OggVorbisFileReader - + Decoding %1... Декодируется %1... @@ -4407,12 +4536,12 @@ Overview - + Overview Обзор - + Click and drag to navigate; double-click to jump Щёлкните и потащите для перемещения по окну; щёлкните дважды для скачка @@ -4420,490 +4549,523 @@ Pane - + Some lengthy prefix: Некий длинный префикс: - + (R) (R) - + (X) (X) - + %1 / %2Hz%3 %1 / %2 Гц%3 - + Drag Selection Перетащить выделение - + Resize Selection Изменить выделение - + Horizontal Zoom Горизонтальное масштабирование - + Vertical Zoom Вертикальное масштабирование - + Enter new range Введите новый диапазон - + New vertical display range, from %1 to %2 %4: Новый диапазон отображения по вертикали, от %1 до %2 %4: - + Click and drag to navigate Щёлкните и потащите для перемещения по окну - + Click and drag to select a range; hold Shift to avoid snapping to items; hold Ctrl for multi-select; middle-click and drag to navigate Щёлкните и потащите для выделения области; + Shift — для отключения прилипания к объектам; + Ctrl — для выделения нескольких объектов, + средняя клавиша мыши — для перемещения по окну - + Click and drag to select a range; hold Ctrl for multi-select; middle-click and drag to navigate Щёлкните и потащите для выделения диапазона; + Ctrl — для выделения нескольких объектов, + средняя клавиша мыши — для перемещения по окну - + Click and drag to move the selection boundary Щёлкните и потащите для перемещения границ выделения - + Click and drag to select a range; hold Shift to avoid snapping to items; middle-click to navigate Щёлкните и потащите для выделения области; + Shift — для отключения прилипания к объектам; + средняя клавиша мыши — для перемещения по окну - + Click and drag to select a range; middle-click and drag to navigate Щёлкните и потащите для выделения области; + средняя клавиша мыши — для перемещения по окну - + Click to add a new item in the active layer Щёлкните для добавления нового объекта на активный слой - + Click and drag to move all items in the selected range Щёлкните и потащите все объекты в выделенной области - + Click and drag to adjust the visible range of the vertical scale Щёлкните и потащите для смены видимого диапазона масштабирования по вертикали - + Click and drag to adjust the vertical zoom level Щёлкните и потащите для смены уровня масштабирования по вертикали - + Click and drag to adjust the horizontal zoom level Щёлкните и потащите для смены уровня масштабирования по горизонтали - + Reset horizontal and vertical zoom levels to their defaults Сбросить уровни масштабирования по горизонтали и вертикали до исходных значений - + Reference - - + + Unaligned - + Aligning: %1% - + Aligned - + %1 - %2 %1 - %2 - - + + + +%1 + + + + + Zoom Масштабирование отображения - + Zoom In Приблизить - + Wheel Up Колесом вверх - + Zoom Out Отдалить - + Wheel Down Колесом вниз - + General Pane Mouse Actions Использование мыши в окнах - + Wheel Колесо - + Zoom in or out in time axis Приближение и отдаление по временной шкале - + Ctrl+Wheel Ctrl+прокрутка - + Scroll Прокручивать окно сеанса - + Scroll rapidly left or right in time axis Быстро перемещаться вправо и влево по временной шкале - + Zoom Vertically Вертикальный масштаб - + Shift+Wheel Shift+прокрутка - + Zoom in or out in the vertical axis Масштабировать отображение по вертикальной оси - + Scroll Vertically Прокрутка по вертикали - + Alt+Wheel Alt+Колесо - + Scroll up or down in the vertical axis Прокручивать отображение по вертикальной оси - - + + Navigate Перемещение - + Middle - + Click middle button and drag to navigate with any tool - - + + Relocate Перемещение скачком - + Double-Click Middle Двойной щелчок средней клавишей - + Double-click middle button to relocate with any tool Перескочить вправо или влево в зависимости от положения курсора - + Menu Меню - + Right Правая клавиша - + Show pane context menu Показать контекстное меню окна - + Navigate Tool Mouse Actions Использование мыши с инструментом навигации - - - - - + + + + + Left Левая клавиша - + Click left button and drag to move around - - + + Zoom to Area Масштабировать в выделение - - - + + + Shift+Left Shift+Left - - + + Shift-click left button and drag to zoom to a rectangular area - - - - + + + + Double-Click Left Двойной щелчок левой клавишей - + Double-click left button to jump to clicked location - - + + Edit Изменить - - + + Double-click left button on an item to edit it - + Select Tool Mouse Actions Использование мыши с инструментом выделения - + Select Выделить - + Click left button and drag to select region; drag region edge to resize - + Multi Select Множественное выделение - + Ctrl+Left Ctrl+Влево - + Ctrl-click left button and drag to select an additional region - + Fine Select Выделить точно - + Shift-click left button and drag to select without snapping to items or grid - + Edit Tool Mouse Actions Использование мыши с инструментом редактирования - + Move Переместить - + Click left button on an item or selected region and drag to move - + Draw Tool Mouse Actions Использование мыши с инструментом рисования - + Draw Рисовать - + Click left button and drag to create new item Щелкните левой клавишей мыши и перетащите курсор для создания нового объекта - + Measure Tool Mouse Actions Использование мыши с инструментом измерения - + Measure Area Измерить область - + Click left button and drag to measure a rectangular area - + Measure Item Измерить объект - + Click left button and drag to measure extents of an item or shape - + Click to erase an item from the active layer - + Reset zoom to default - + Click and drag an item in the active layer to move it; hold Shift to override initial resistance + PlayParameterRepository + + + Adjust Playback Parameters + Коррекция параметров воспроизведения + + + + Change Playback Mute State + Смена состояния приглушенности воспроизведения + + + + Change Playback Gain + Смена громкости воспроизведения + + + + Change Playback Pan + Смена панорамы при воспроизведении + + + + Change Playback Plugin + Смена расширения воспроизведения + + + + Configure Playback Plugin + Смена параметров расширения воспроизведения + + + PlayParameterRepository::EditCommand - Adjust Playback Parameters - Коррекция параметров воспроизведения - - - + Коррекция параметров воспроизведения + + Change Playback Mute State - Смена состояния приглушенности воспроизведения - - - + Смена состояния приглушенности воспроизведения + + Change Playback Gain - Смена громкости воспроизведения - - - + Смена громкости воспроизведения + + Change Playback Pan - Смена панорамы при воспроизведении - - - + Смена панорамы при воспроизведении + + Change Playback Plugin - Смена расширения воспроизведения - - - + Смена расширения воспроизведения + + Configure Playback Plugin - Смена параметров расширения воспроизведения + Смена параметров расширения воспроизведения PluginParameterBox - + This plugin has no adjustable parameters. У этого расширения нет изменяемых параметров. - + Program Программа @@ -4911,58 +5073,58 @@ PluginParameterDialog - + Name: Название: - + Maker: Автор: - + Copyright: Авторские права: - + Version: Версия: - - + + Plugin Parameters Параметры расширения - + Channel mismatch Несовпадение каналов - + This plugin requires at least %1 input channels, but only %2 %3 available. The plugin probably will not work correctly. Этому расширению нужно хотя бы %1 вхдных каналовs, но лишь %2 %3 доступны. Вероятно, расширение не сработает как должно. - + are являются - + is является - + Channels Каналы - + This plugin accepts no more than %1 input channels, but %2 are available. Only the first %3 will be used. @@ -4971,70 +5133,70 @@ - + This plugin only has a single channel input, but the source has %1 channels. Это расширение может обрабатывать только один канал, но у источника %1 каналов. - + Use mean of source channels Использовать среднее значение каналов источника - + Use channel %1 only Использовать только канал %1 - + Output: Выход: - + Processing Обработка - + Window size: Размер оконной функции: - + Audio frames per block: Выборок звука на блок: - + Window increment: Шаг: - + Window shape: Форма: - - + + Advanced >> Больше >> - + Advanced << Меньше << - + Input Material - + Restrict to selection extents Только выделение @@ -5042,214 +5204,214 @@ Preferences - + Frequency of concert A Частота условной ноты Ля (A) - + Property box layout Внешний вид панели свойств - + Spectral analysis window shape Форма оконной функции при спектральном анализе - + Show boxes for all panes Показывать панели для всех окон - + Show box for current pane only Показывать панель только для активного окна - + Rectangular Прямоугольная - + Triangular Треугольная - + Hamming Хамминга - + Blackman Блэкмена - + Gaussian Гауссова - + Parzen Парзена - + Nuttall Нутталла - + Blackman-Harris Блэкмена-Харриса - + Preferences Параметры - + Playback resampler type Тип ресэмплирования при воспроизведении - + Fastest Самый быстрый - + Standard Обычный - + Highest quality Наивысшего качества - + Spectrogram y-axis interpolation: Интерполяция оси Y спектрограммы: - + Omit temporaries from Recent Files menu Пропускать временные файлы в меню недавно открывавшихся - + Resample mismatching files on import Ресэмплировать файлы при импорте - + Location for cache file directory Расположение каталога с кэшем - + Background colour preference Предпочитаемый цвет фона - + Font size for text overlays Кегль шрифта для текстовых перекрытий - + Show splash screen on startup Показывать заставку при старте программы - + Hann Хэнна - + Follow desktop theme Использовать параметры окружения - + Dark background Темный фон - + Light background Светлый фон - + Spectrogram x-axis interpolation: Интерполяция спектрограммы по оси X: - - + + None Нет - - + + Linear interpolation Линейная интерполяция - + 4 x Oversampling 4 × пересэмплированная - + 4 x Oversampling with interpolation 4 × пересэмплированная с интерполяцией - + Time display format Формат отображения времени - + Standard (to millisecond) Обычный (до мс) - + High resolution (to microsecond) Высокое разрешение (до мкс) - + 24 FPS 24 кадра/с - + 25 FPS 25 кадров/с - + 30 FPS 30 кадров/с - + 50 FPS 50 кадров/с - + 60 FPS 60 кадров/с @@ -5347,7 +5509,7 @@ ProgressDialog - + Cancel Отменить @@ -5355,78 +5517,78 @@ PropertyBox - + Show Показать - + Play Воспроизвести - - + + Playback Pan / Balance Панорама/баланс при воспроизведении - + Playback Gain Усиление воспроизведения - + dB Дб - + (current value: %1%2) (текущее значение: %1%2) - + (current value: %1) (текущее значение: %1) - + Toggle Visibility of %1 Переключить видимость %1 - + Toggle Playback of %1 Переключить воспроизведение %1 - + Toggle %1 property of %2 Переключить %1 свойство %2 - + Adjust %1 property of %2%3 Скорректировать %1 свойство %2%3 - + Add New Colour... Добавить новый цвет... - + Name New Colour Дайте цвету название - + Enter a name for the new colour: Введите название нового цвета: - + Prefer black background for this colour Предпочитать черный фон для этого цвета @@ -5434,53 +5596,57 @@ PropertyContainer - + yes да - + on вкл - + true правда - + no нет - + off выкл - + false ложь + + + Set %1 Property + Установить свойство %1 + PropertyContainer::SetPropertyCommand - Set %1 Property - Установить свойство %1 + Установить свойство %1 PropertyStack - + Click to change the current active layer Щёлкните для смены активного слоя - + Change Layer Visibility Переключить видимость слоя @@ -5488,7 +5654,7 @@ QApplication - + Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. @@ -5515,7 +5681,7 @@ - + Sonic Visualiser Sonic Visualiser @@ -5523,22 +5689,22 @@ QFile - - - + + + File "%1" does not exist Файл "%1" не существует - - - + + + Failed to open file "%1" Не удалось открыть файл "%1" - - + + File or URL "%1" could not be retrieved Файл или URL "%1" не мог быть получен @@ -5546,26 +5712,26 @@ QMessageBox - - + + Failed to open file Не удалось открыть файл - + File or URL "%1" could not be opened Файл или URL "%1" не мог быть открыт - + <b>Audio required</b><p>Please load at least one audio file before importing annotation data - <b>Нужны звуковые данные</b><p>Загрузите хотя бы один звуковой файл перед импортом аннотаций + <b>Нужны звуковые данные</b><p>Загрузите хотя бы один звуковой файл перед импортом аннотаций QuickTimeFileReader - + Decoding %1... Декодируется %1... @@ -5573,17 +5739,17 @@ RDFImporter - + Importing audio referenced in RDF... - + Importing dense signal data from RDF... - + Importing event data from RDF... @@ -5591,7 +5757,7 @@ RangeInputDialog - + to до @@ -5599,7 +5765,7 @@ RangeSummarisableTimeValueModel - + Range-Summarisable Time-Value @@ -5607,73 +5773,73 @@ RegionLayer - + Vertical Scale Верт. масштаб - + Scale Units Единицы шкалы - + Plot Type Тип графика - + Scale Масштаб - + Bars Такты - + Segmentation Сегментация - + Auto-Align Автовыравнивание - + Equal Spaced Равные промежутки - + Linear Линейный - + Log Логарифмический - + In progress В процессе - - + + No local points Нет локальных точек - + %1 %2 %1 %2 - + Time: %1 Value: %2 Duration: %3 @@ -5684,7 +5850,7 @@ Без метки - + Time: %1 Value: %2 Duration: %3 @@ -5695,69 +5861,69 @@ Метка: %4 - + Change Point Value Изменить значение точки - + Drag Selection Перетащить выделение - + Resize Selection Изменить размер выделения - + Delete Selected Points Удалить выбранные точки - + Re-align pasted items? Заново выровнять вставленные объекты? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Paste Вставить - - + + New Region - + Draw Region - + Erase Region - + Drag Region - - + + Edit Region - + Relocate Region @@ -5765,42 +5931,42 @@ RegionModel - + Region Область - + Time Время - + Frame Выборка - + Value Значение - + Duration Длительность - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -5808,7 +5974,7 @@ RemoveLayerCommand - + Delete %1 Layer Удалить слой %1 @@ -5816,7 +5982,7 @@ ResamplingWavFileReader - + Resampling %1... Ресэмплирование %1... @@ -5824,13 +5990,13 @@ SVFileReader - - + + (derived model in SV-XML) (модель извлечена в SV-XML) - + Opening file or URL... Открывается файл или URL... @@ -5838,12 +6004,12 @@ SingleColourLayer - + Colour Цвет - + <unknown> <неизвестно> @@ -5851,113 +6017,113 @@ SliceLayer - - + + %1 - %2 %1 - %2 - + First - - + + Mean Усреднённо - - + + Peak Пик - + 0dB 0 Дб - + -Inf -Inf - + x10 x10 - + Plot Type Тип графика - - + + Scale Масштаб - + Normalize Нормализовать - + Gain Усиление - + Sampling Mode Режим сэмплирования - - + + Linear Линейный - + Meter Счетчик - - + + dB Дб - + Any Любые - + Lines Линии - + Steps Шаги - + Blocks Блоки - + Colours Цвета - + Time: %1 - %2 Range: %3 samples (%4) Bin: %5 @@ -5968,40 +6134,40 @@ %6 значение: %7 - + Time: %1 - %2 Range: %3 samples (%4) Время: %1 - %2 Диапазон: %3 сэмплов (%4) - + Threshold Порог - + Bin Scale - + Bins Бины - - + + Log - + Absolute - + Rev Log @@ -6009,70 +6175,91 @@ SparseModel - Add Point - Добавить точку - - - + Добавить точку + + Delete Point - Удалить точку - - - + Удалить точку + + Re-Label Point - Переразметить точку - - - + Переразметить точку + + + Sparse - + Edit Data Изменить данные - + Insert Data Point - + Delete Data Point + SparseModel::AddPointCommand + + + Add Point + Добавить точку + + + + SparseModel::DeletePointCommand + + + Delete Point + Удалить точку + + + + SparseModel::RelabelCommand + + + Re-Label Point + Переразметить точку + + + SparseOneDimensionalModel - + Sparse 1-D - + Time Время - + Frame Выборка - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -6080,37 +6267,37 @@ SparseTimeValueModel - + Sparse Time-Value - + Time Время - + Frame Выборка - + Value Значение - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -6118,7 +6305,7 @@ SparseValueModel - + Sparse Value @@ -6126,250 +6313,250 @@ SpectrogramLayer - - + + Colour Цвет - + Colour Scale - + Window Size Размер окна - + Normalize Columns Нормализовать столбцы - + Bin Display - + Threshold Порог - + Gain Усиление - + Colour Rotation Вращение цвета - + Min Frequency Мин. частота - + Max Frequency Макс. частота - + Frequency Scale - + Window Окно - + Scale Масштаб - - + + Linear Линейный - + Meter Счетчик - - + + dB Дб - + Phase Фаза - + No min Без минимума - + 10 Hz 10 Гц - + 20 Hz 20 Гц - + 40 Hz 40 Гц - + 100 Hz 100 Гц - + 250 Hz 250 Гц - - + + 500 Hz 500 Гц - - + + 1 KHz 1 КГц - - + + 4 KHz 4 КГц - + 10 KHz 10 КГц - + 1.5 KHz 1,5 КГц - + 2 KHz 2 КГц - + 6 KHz 6 КГц - + 8 KHz 8 КГц - + 12 KHz 12 КГц - + 16 KHz 16 КГц - + No max Без максимума - + Log Логарифм. - + All Bins Все бины - + Peak Bins Пиковые бины - + Frequencies Частоты - + <unknown> <неизвестно> - + Peak Frequency: %1 - %2 Hz Пиковая частота: %1 - %2 Гц - + Peak Frequency: %1 Hz Пиковая частота: %1 Гц - + Peak Pitch: %3 - %4 Пиковая высота тона: %3 - %4 - + Peak Pitch: %2 Пиковая высота тона: %2 - + Time: %1 - %2 Время: %1 - %2 - + Time: %1 Время: %1 - + %1Bin Frequency: %2 - %3 Hz %4Bin Pitch: %5 - %6 @@ -6378,7 +6565,7 @@ - + %1Bin Frequency: %2 Hz %3Bin Pitch: %4 @@ -6387,115 +6574,115 @@ - - + + -Inf -Inf - + dB: %1 - %2 Дб: %1 - %2 - + dB: %1 Дб: %1 - + Phase: %1 - %2 Фаза: %1 - %2 - + Phase: %1 Фаза: %1 - + Window Overlap Перекрытие окон - + Smoothing - - + + None Нет - + 25 % 25 % - + 50 % 50 % - + 75 % 75 % - + 87.5 % 87,5 % - + 93.75 % 93,75 % - + Normalize Visible Area Нормализовать видимую область - + Bins Бины - + FFT cache failed Не удалось кэшировать FFT - + Failed to create the FFT model for this spectrogram. There may be insufficient memory or disc space to continue. Не удалось создать FFT-модель этой спектрограммы. Вероятно, не хватает памяти или дискового порстранства для продолжения. - + dBV^2 ДбВ^2 - + dBV ДбВ - + 43Hz 43 Гц - + %1Hz %1 Гц @@ -6503,85 +6690,90 @@ SpectrumLayer - + Window Size Размер окна - + Window Overlap Перекрытие окон - + Window Окно - + Mean Усреднённо - + None Ничего - + + Bins + Бины + + + 25 % 25 % - + 50 % 50 % - + 75 % 75 % - + 87.5 % 87,5 % - + 93.75 % 93,75 % - - - + + + %1 - %2 %1 - %2 - + %1 - %2 Hz %1 - %2 Гц - + %1 Hz %1 Гц - - + + -Inf -Inf - + %1 %1 - + %1 Bin: %2 (%3) %4 value: %5 @@ -6592,17 +6784,17 @@ Дб: %6 - + First - + Peak Пик - + %1 Bin: %2 (%3) Value: %4 @@ -6613,20 +6805,19 @@ Дб: %5 - + Show Peak Frequencies Показывать пиковые частоты - Plot Type - Тип графика + Тип графика SubdividingMenu - + %1 - %2 %1 - %2 @@ -6647,24 +6838,24 @@ TextLayer - - + + Empty Label Очистить метку - - + + <no text> <без текста> - + In progress В процессе - + Time: %1 Height: %2 Label: %3 @@ -6673,74 +6864,74 @@ Метка: %3 - - + + Enter label Введите метку - - + + Please enter a new label: Введите текст новой метки: - + Drag Label Перетащите метку - + Move Label Переместите метку - + Move Label Horizontally Переместите по горизонтали - + Move Label Vertically Переместите по вертикали - + Drag Selection Перетащите выделение - + Resize Selection Смените размер выделения - + Delete Selection Удалите выделение - + Paste Вставить - + New Point Новая точка - + Erase Point Удалить точку - + Re-align pasted items? Заново выровнять вставленные объекты? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? @@ -6748,37 +6939,37 @@ TextModel - + Text Текст - + Time Время - + Frame Выборка - + Height Высота - + Label Метка - + Unknown Неизвестно - + Edit Data Изменить данные @@ -6786,39 +6977,39 @@ Thumbwheel - + %1: %2%3 %1: %2%3 - + %2%3 %2%3 - + New value for %1, from %2 to %3 %4: Новое значение для %1, от %2 до %3 %4: - + New value for %1, from %2 to %3: Новое значение для %1, от %2 до %3: - + Enter a new value from %1 to %2 %3: Введите новое значение от %1 до %2 %3: - - + + Enter a new value from %1 to %2: Введите новое значение от %1 до %2: - - + + Enter new value Введите новое значение @@ -6826,107 +7017,107 @@ TimeInstantLayer - - + + New Point Новая точка - + Plot Type Тип графика - + Instants - + Segmentation Сегментация - + In progress В процессе - + No local points Нет локальных точек - + Time: %1 No label Время: %1 Без метки - + Time: %1 Label: %2 Время: %1 Метка: %2 - + Draw Point Нарисовать точку - + Add Point at %1 s Добавить точку в %1 с - + Drag Point Перетащить точку - + Move Point to %1 s Перетащить точку к %1 с - + Edit Point Изменить точку - + Drag Selection Перетащить выделение - + Resize Selection Изменить размер выделения - + Delete Selection Удалить выделение - + Paste Вставить - + Erase Point Удалить точку - + Re-align pasted instants? Заново выровнять вставленные объекты? - + The instants you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? @@ -6934,75 +7125,80 @@ TimeValueLayer - - - + + + New Point Новая точка - - + + Plot Type Тип графика - + Vertical Scale Верт. масштаб - + Scale Units Единицы шкалы - + + Show Derivative + + + + Points Точки - + Stems Ножки - + Connected Points Соединённые точки - + Lines Линии - + Curve Кривая - + Segmentation Сегментация - + Auto-Align Автовыравнивание - + In progress В процессе - + No local points Нет локальных точек - + Time: %1 Value: %2%3 No label @@ -7011,7 +7207,7 @@ Без метки - + Time: %1 Value: %2%3 Label: %4 @@ -7020,121 +7216,121 @@ Метка: %4 - + Draw Point Нарисовать точку - + Drag Point Перетащить точку - - + + Edit Point Изменить точку - + Relocate Point Переместить точку - + Change Point Value Изменить значение точки - + Drag Selection Перетащить выделение - + Resize Selection Изменить размер выделения - + Delete Selected Points Удалить выбранные точки - + Paste Вставить - + The items you are pasting do not have values. What values do you want to use for these items? У вставляемых объектов нет значений. Какие значения вы хотите для них использовать? - + Some of the items you are pasting do not have values. What values do you want to use for these items? У некоторых вставляемых объектов нет значений.Какие значения вы хотите для них использовать? - + Zero for all items Ноль для всех объектов - + Choose value calculation Выбрать вычисление значения - + Scale Масштаб - + Linear Линейный - + Log Логарифмический - + +/-1 +/-1 - + Erase Point Стереть точку - + Re-align pasted items? Заново выровнять вставленные объекты? - + The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer? - + Select cycle size - + Cycle size: - + Draw Segment Division Lines @@ -7142,27 +7338,27 @@ TipDialog - + Tip of the Day Совет дня - + Show tip on startup Показывать советы при запуске - + << Previous << Предыдущий - + Next >> Следующий >> - + Close Закрыть @@ -7170,136 +7366,136 @@ TransformFactory - - + + %1: %2 %1: %2 - + %1: Output %2 %1: Выход %2 - + Analysis Анализ - + Effects Data Данные эффектов - + Effects Эффекты - + [\(<].*$ [\(<].*$ - - + + <unknown maker> <неизвестный производитель> - - + + Extract features using "%1" plugin (from %2) Извлечь данные при помощи "%1" (из %2) - - + + Extract features using "%1" output of "%2" plugin (from %3) Извлечь данные при помощи "%1" вывода из расширения "%2" (из %3) - - + + %1 using "%2" plugin (from %3) %1 используя расширение "%2" (из %3) - - + + %1 using "%2" output of "%3" plugin (from %4) %1 используя вывод "%2" расширения "%3" (из %4) - + Extract "%1" data output from "%2" effect plugin (from %3) Извлечь "%1" данные вывода из расширения эффектов "%2" (из %3) - + Extract data output %1 from "%2" effect plugin (from %3) Извлечь данные вывода %1 из расширения эффектов "%2" (из %3) - + Transform audio signal with "%1" effect plugin (from %2) Трансформировать звуковой сигнал расширением эффектов "%1" (из %2) - + Generate audio signal using "%1" plugin (from %2) Создать звуковой сигнал при помощи расширения "%1" (из %2) - - + + Plugin type Тип расширения - - + + Category Категория - - + + System Identifier Системный идентификатор - - + + Name Название - - + + Description Описание - - + + Maker Создатель - - + + Units Единица измерения - + Generator Генератор - - + + Other Прочее @@ -7307,129 +7503,129 @@ TransformFinder - + Find a Transform Поиск расширений для трансформации - + Find: Искать: - + <br>&nbsp;&nbsp;No results found <br>&nbsp;&nbsp;Ничего не найдено - - + + Up Вверх - - + + Down Вниз - + Found %n description(s) containing <b>%1</b>, showing the first %2 only - - - - + + Найдено %n описание, содержащее <b>%1</b>, показаны первые %2 + Найдено %n описания, содержащих <b>%1</b>, показаны первые %2 + Найдено %n описаний, содержащих <b>%1</b>, показаны первые %2 - + Found %n description(s) containing <b>%1</b> - - - - + + Найдено %n описание, содержащее <b>%1</b> + Найдено %n описания, содержащих <b>%1</b> + Найдено %n описаний, содержащих <b>%1</b> - + <i> (not installed)</i> <i> (не установлено)</i> - + %1%2<br><small> %1%2<br><small> - - + + </small> </small> - + <b>%1</b>%2<br> <b>%1</b>%2<br> - - + + <small>%1</small> <small>%1</small> - + <small> <small> - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Plugin type: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Тип расширения: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Category: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Категория: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; System identifier: %1 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Системный идентификатор: %1 - + <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; More information: <a href="%1">%1</a> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&mdash; Подробная информация: <a href="%1">%1</a> - + <p>Type some text into the search box to search the descriptions of:<ul><li>All currently installed <a href="http://www.vamp-plugins.org/">Vamp</a> audio feature extraction plugins</li><li>All currently installed <a href="http://www.ladspa.org/">LADSPA</a> audio effects plugins</li><li>Vamp plugins that are not currently installed but that have descriptions published via the semantic web</li></ul> - <p>Введите текст для поиска по описаниям среди:<ul><li>всех установленных расширений <a href="http://www.vamp-plugins.org/">Vamp</a> для извлечения анализируемых данных;</li><li>всех установленных эффектов<a href="http://www.ladspa.org/">LADSPA</a>;</li><li>еще не установленных расширений Vamp, чье описание опубликовано в семантической сети.</li></ul> - - - + <p>Введите текст для поиска по описаниям среди:<ul><li>всех установленных расширений <a href="http://www.vamp-plugins.org/">Vamp</a> для извлечения анализируемых данных;</li><li>всех установленных эффектов<a href="http://www.ladspa.org/">LADSPA</a>;</li><li>еще не установленных расширений Vamp, чьё описание опубликовано в семантической сети.</li></ul> + + + <b>Unable to retrieve published descriptions from network!</b> <b>Не удалось получить опубликованные в сети описания!</b> - + <b>No plugins are currently installed!</b> <b>Ни одно расширение не установлено!</b> - + <p>%1<br>Perhaps the network connection is down, services are responding too slowly, or a processing problem has occurred.<br>Only the descriptions of installed plugins will be searched. <p>%1<br>Вероятно, не работает сетевое соединение, либо службы отзываются слишком медленно, либо произошла неполадка при обработке.<br>Будет выполнен поиск только по описаниям уже установленных расширений. - + <p>%1<br>Only the published descriptions of Vamp feature extraction plugins will be searched. <p>%1<br>Выдет выполнен поиск только по описаниям расширений Vamp, предназначенных для извлечения анализируемых данных. - + <p>%1<br>%2<br>Perhaps the network connection is down, or services are responding too slowly.<br>No search results will be available. <p>%1<br>%2<br>Вероятно, не работает сетевое соединение, либо службы отзываются слишком медленно.<br>Результаты поиска будут недоступны. @@ -7437,58 +7633,58 @@ View - + Global Scroll Глобальная прокрутка - + Global Zoom Глобальный масштаб - + Follow Playback Следовать за воспроизведением - + Scroll Прокручивать - + Page Постранично - + Off Выключить - + <unknown> <неизвестно> - + Waiting for layers to be ready... Ожидание готовности слоёв... - - + + Cancel Отменить - + Rendering image... Отрисовывается изображение... - + Alignment Выравнивание @@ -7496,91 +7692,104 @@ ViewManager - + + Clear Selection + Снять выделение + + + + Select Multiple Regions + Выделить несколько областей + + + + Select Region + Выделить область + + + Enter Navigate mode - + Enter Select mode - + Enter Edit mode - + Enter Draw mode - + Enter Erase mode - + Enter Measure mode - + Switch on Loop mode - + Switch off Loop mode - + Switch on Play Selection mode - + Switch off Play Selection mode - + Switch on Play Solo mode - + Switch off Play Solo mode - + Switch on Alignment mode - + Switch off Alignment mode - + Scroll to %1 - + Zoom to %n sample(s) per pixel - - - + Change overlay level @@ -7588,25 +7797,22 @@ ViewManager::SetSelectionCommand - Clear Selection - Снять выделение - - - + Снять выделение + + Select Multiple Regions - Выделить несколько областей - - - + Выделить несколько областей + + Select Region - Выделить область + Выделить область WaveFileModel - + Wave File Звуковой файл @@ -7614,112 +7820,112 @@ WaveformLayer - - + + Scale Масштаб по Y - + Gain Усиление - + Normalize Visible Area Нормализовать видимую область - + Channels Каналы - + Linear Линейный - + Meter Счетчик - - + + dB Дб - + Separate Отдельно - + Mean Усреднённо - + Butterfly V-образно - + Time: %1 - %2 Время: %1 - %2 - + Time: %1 Время: %1 - + Level: Уровень: - + Left: Левый: - + Right: Правый: - + Channel %1 Канал %1 - + %1 %2 - %3 (%4 dB peak) %1 %2 - %3 (пик в %4 Дб) - + %1 %2 (%3 dB peak) %1 %2 (пик в %3 Дб) - - - + + + 0dB 0 Дб - - - + + + -Inf -Inf @@ -7727,12 +7933,12 @@ WindowShapePreview - + V / time V / время - + dB / freq Дб / частота @@ -7740,7 +7946,7 @@ WritableWaveFileModel - + Writable Wave File Записываемый звуковой файл diff -r d70890996156 -r b3b9cc8f5466 main/MainWindow.cpp --- a/main/MainWindow.cpp Tue Mar 22 14:29:38 2011 +0000 +++ b/main/MainWindow.cpp Mon Jul 25 19:38:50 2011 +0100 @@ -22,6 +22,7 @@ #include "view/PaneStack.h" #include "data/model/WaveFileModel.h" #include "data/model/SparseOneDimensionalModel.h" +#include "data/model/RangeSummarisableTimeValueModel.h" #include "data/model/NoteModel.h" #include "data/model/Labeller.h" #include "data/osc/OSCQueue.h" @@ -29,6 +30,7 @@ #include "framework/TransformUserConfigurator.h" #include "view/ViewManager.h" #include "base/Preferences.h" +#include "base/ResourceFinder.h" #include "layer/WaveformLayer.h" #include "layer/TimeRulerLayer.h" #include "layer/TimeInstantLayer.h" @@ -111,6 +113,8 @@ #include #include #include +#include +#include #include #include @@ -136,6 +140,7 @@ m_sliceMenu(0), m_recentFilesMenu(0), m_recentTransformsMenu(0), + m_templatesMenu(0), m_rightButtonMenu(0), m_rightButtonLayerMenu(0), m_rightButtonTransformsMenu(0), @@ -157,7 +162,8 @@ m_preferencesDialog(0), m_layerTreeDialog(0), m_activityLog(new ActivityLog()), - m_keyReference(new KeyReference()) + m_keyReference(new KeyReference()), + m_templateWatcher(0) { Profiler profiler("MainWindow::MainWindow"); @@ -309,12 +315,12 @@ MainWindow::~MainWindow() { -// std::cerr << "MainWindow::~MainWindow" << std::endl; +// SVDEBUG << "MainWindow::~MainWindow" << endl; delete m_keyReference; delete m_preferencesDialog; delete m_layerTreeDialog; Profiles::getInstance()->dump(); -// std::cerr << "MainWindow::~MainWindow finishing" << std::endl; +// SVDEBUG << "MainWindow::~MainWindow finishing" << endl; } void @@ -387,7 +393,7 @@ m_keyReference->registerShortcut(action); menu->addAction(action); toolbar->addAction(action); - +/* icon = il.load("fileopensession"); action = new QAction(icon, tr("&Open Session..."), this); action->setShortcut(tr("Ctrl+O")); @@ -395,14 +401,39 @@ connect(action, SIGNAL(triggered()), this, SLOT(openSession())); m_keyReference->registerShortcut(action); menu->addAction(action); - +*/ icon = il.load("fileopen"); icon.addPixmap(il.loadPixmap("fileopen-22")); - action = new QAction(icon, tr("&Open..."), this); + action->setShortcut(tr("Ctrl+O")); action->setStatusTip(tr("Open a session file, audio file, or layer")); connect(action, SIGNAL(triggered()), this, SLOT(openSomething())); toolbar->addAction(action); + menu->addAction(action); + + // We want this one to go on the toolbar now, if we add it at all, + // but on the menu later + QAction *iaction = new QAction(tr("&Import More Audio..."), this); + iaction->setShortcut(tr("Ctrl+I")); + iaction->setStatusTip(tr("Import an extra audio file into a new pane")); + connect(iaction, SIGNAL(triggered()), this, SLOT(importMoreAudio())); + connect(this, SIGNAL(canImportMoreAudio(bool)), iaction, SLOT(setEnabled(bool))); + m_keyReference->registerShortcut(iaction); + + action = new QAction(tr("Open Lo&cation..."), this); + action->setShortcut(tr("Ctrl+Shift+O")); + action->setStatusTip(tr("Open or import a file from a remote URL")); + connect(action, SIGNAL(triggered()), this, SLOT(openLocation())); + m_keyReference->registerShortcut(action); + menu->addAction(action); + + m_recentFilesMenu = menu->addMenu(tr("Open &Recent")); + m_recentFilesMenu->setTearOffEnabled(true); + setupRecentFilesMenu(); + connect(&m_recentFiles, SIGNAL(recentChanged()), + this, SLOT(setupRecentFilesMenu())); + + menu->addSeparator(); icon = il.load("filesave"); icon.addPixmap(il.loadPixmap("filesave-22")); @@ -426,6 +457,7 @@ menu->addSeparator(); +/* icon = il.load("fileopenaudio"); action = new QAction(icon, tr("&Import Audio File..."), this); action->setShortcut(tr("Ctrl+I")); @@ -433,14 +465,10 @@ connect(action, SIGNAL(triggered()), this, SLOT(importAudio())); m_keyReference->registerShortcut(action); menu->addAction(action); - - action = new QAction(tr("Import Secondary Audio File..."), this); - action->setShortcut(tr("Ctrl+Shift+I")); - action->setStatusTip(tr("Import an extra audio file as a separate layer")); - connect(action, SIGNAL(triggered()), this, SLOT(importMoreAudio())); - connect(this, SIGNAL(canImportMoreAudio(bool)), action, SLOT(setEnabled(bool))); - m_keyReference->registerShortcut(action); - menu->addAction(action); +*/ + + // the Import action we made earlier + menu->addAction(iaction); /* //removes the Export Audio File functionnality from the File menu action = new QAction(tr("&Export Audio File..."), this); @@ -476,22 +504,28 @@ menu->addSeparator(); - action = new QAction(tr("Open Lo&cation..."), this); - action->setShortcut(tr("Ctrl+Shift+O")); - action->setStatusTip(tr("Open or import a file from a remote URL")); - connect(action, SIGNAL(triggered()), this, SLOT(openLocation())); - m_keyReference->registerShortcut(action); + QString templatesMenuLabel = tr("Apply Session Template"); + m_templatesMenu = menu->addMenu(templatesMenuLabel); + m_templatesMenu->setTearOffEnabled(true); + // We need to have a main model for this option to be useful: + // canExportAudio captures that + connect(this, SIGNAL(canExportAudio(bool)), m_templatesMenu, SLOT(setEnabled(bool))); + + // Set up the menu in a moment, after m_manageTemplatesAction constructed + + action = new QAction(tr("Export Session as Template..."), this); + connect(action, SIGNAL(triggered()), this, SLOT(saveSessionAsTemplate())); + // We need to have something in the session for this to be useful: + // canDeleteCurrentLayer captures that + connect(this, SIGNAL(canExportAudio(bool)), action, SLOT(setEnabled(bool))); menu->addAction(action); - menu->addSeparator(); - - m_recentFilesMenu = menu->addMenu(tr("&Recent Files")); - m_recentFilesMenu->setTearOffEnabled(true); - setupRecentFilesMenu(); - connect(&m_recentFiles, SIGNAL(recentChanged()), - this, SLOT(setupRecentFilesMenu())); - - menu->addSeparator(); + m_manageTemplatesAction = new QAction(tr("Manage Exported Templates"), this); + connect(m_manageTemplatesAction, SIGNAL(triggered()), this, SLOT(manageSavedTemplates())); + menu->addAction(m_manageTemplatesAction); + + setupTemplatesMenu(); + action = new QAction(tr("&Preferences..."), this); action->setStatusTip(tr("Adjust the application preferences")); connect(action, SIGNAL(triggered()), this, SLOT(preferences())); @@ -552,6 +586,15 @@ menu->addAction(action); m_rightButtonMenu->addAction(action); + action = new QAction(tr("Paste at Playback Position"), this); + action->setShortcut(tr("Ctrl+Shift+V")); + action->setStatusTip(tr("Paste from the clipboard to the current layer, placing the first item at the playback position")); + connect(action, SIGNAL(triggered()), this, SLOT(pasteAtPlaybackPosition())); + connect(this, SIGNAL(canPaste(bool)), action, SLOT(setEnabled(bool))); + m_keyReference->registerShortcut(action); + menu->addAction(action); + m_rightButtonMenu->addAction(action); + m_deleteSelectedAction = new QAction(tr("&Delete Selected Items"), this); m_deleteSelectedAction->setShortcut(tr("Del")); m_deleteSelectedAction->setStatusTip(tr("Delete items in current selection from the current layer")); @@ -1189,7 +1232,11 @@ submenu->addAction(action); } - if (isDefault && menuType == layerMenuType) { + if (isDefault && menuType == layerMenuType && + mi == candidateModels.begin()) { + // only add for one model, one channel, one menu on + // right button -- the action itself will discover + // which model is the correct one (based on pane) action = new QAction(icon, mainText, this); action->setStatusTip(tipText); connect(action, SIGNAL(triggered()), @@ -1447,7 +1494,7 @@ QString name = transforms[i].name; if (name == "") name = transforms[i].identifier; -// std::cerr << "Plugin Name: " << name.toStdString() << std::endl; +// std::cerr << "Plugin Name: " << name << std::endl; TransformDescription::Type type = transforms[i].type; QString typeStr = factory->getTransformTypeName(type); @@ -1483,8 +1530,8 @@ if (categoryMenus[type].find(category) == categoryMenus[type].end()) { std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " << "No category menu for transform \"" - << name.toStdString() << "\" (category = \"" - << category.toStdString() << "\")" << std::endl; + << name << "\" (category = \"" + << category << "\")" << std::endl; } else { categoryMenus[type][category]->addAction(action); } @@ -1492,8 +1539,8 @@ if (makerMenus[type].find(maker) == makerMenus[type].end()) { std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " << "No maker menu for transform \"" - << name.toStdString() << "\" (maker = \"" - << maker.toStdString() << "\")" << std::endl; + << name << "\" (maker = \"" + << maker << "\")" << std::endl; } else { makerMenus[type][maker]->addAction(action); } @@ -1504,7 +1551,7 @@ connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool))); action->setStatusTip(transforms[i].longDescription); -// cerr << "Transform: \"" << name.toStdString() << "\": plugin name \"" << pluginName.toStdString() << "\"" << endl; +// cerr << "Transform: \"" << name << "\": plugin name \"" << pluginName << "\"" << endl; if (pluginNameMenus[type].find(pluginName) == pluginNameMenus[type].end()) { @@ -1605,6 +1652,57 @@ } void +MainWindow::setupTemplatesMenu() +{ + m_templatesMenu->clear(); + + QAction *defaultAction = new QAction(tr("Standard Waveform"), this); + defaultAction->setObjectName("default"); + connect(defaultAction, SIGNAL(triggered()), this, SLOT(applyTemplate())); + m_templatesMenu->addAction(defaultAction); + + m_templatesMenu->addSeparator(); + + QAction *action = 0; + + QStringList templates = ResourceFinder().getResourceFiles("templates", "svt"); + + bool havePersonal = false; + + // (ordered by name) + std::set byName; + foreach (QString t, templates) { + if (!t.startsWith(":")) havePersonal = true; + byName.insert(QFileInfo(t).baseName()); + } + + foreach (QString t, byName) { + if (t.toLower() == "default") continue; + action = new QAction(t, this); + connect(action, SIGNAL(triggered()), this, SLOT(applyTemplate())); + m_templatesMenu->addAction(action); + } + + if (!templates.empty()) m_templatesMenu->addSeparator(); + + if (!m_templateWatcher) { + m_templateWatcher = new QFileSystemWatcher(this); + m_templateWatcher->addPath(ResourceFinder().getResourceSaveDir("templates")); + connect(m_templateWatcher, SIGNAL(directoryChanged(const QString &)), + this, SLOT(setupTemplatesMenu())); + } + + QAction *setDefaultAction = new QAction(tr("Choose Default Template..."), this); + setDefaultAction->setObjectName("set_default_template"); + connect(setDefaultAction, SIGNAL(triggered()), this, SLOT(preferences())); + m_templatesMenu->addSeparator(); + m_templatesMenu->addAction(setDefaultAction); + + m_manageTemplatesAction->setEnabled(havePersonal); +} + + +void MainWindow::setupRecentTransformsMenu() { m_recentTransformsMenu->clear(); @@ -1636,7 +1734,7 @@ { if (!m_existingLayersMenu) return; // should have been created by setupMenus -// std::cerr << "MainWindow::setupExistingLayersMenu" << std::endl; +// SVDEBUG << "MainWindow::setupExistingLayersMenu" << endl; m_existingLayersMenu->clear(); m_existingLayerActions.clear(); @@ -1667,7 +1765,7 @@ } // std::cerr << "found new layer " << layer << " (name = " -// << layer->getLayerPresentationName().toStdString() << ")" << std::endl; +// << layer->getLayerPresentationName() << ")" << std::endl; orderedLayers.push_back(layer); observedLayers.insert(layer); @@ -2137,7 +2235,7 @@ QString path = getOpenFileName(FileFinder::AudioFile); if (path != "") { - if (openAudio(path, ReplaceMainModel) == FileOpenFailed) { + if (openAudio(path, ReplaceSession) == FileOpenFailed) { emit hideSplash(); QMessageBox::critical(this, tr("Failed to open file"), tr("File open failed

Audio file \"%1\" could not be opened").arg(path)); @@ -2175,12 +2273,12 @@ for (int j = 0; j < pane->getLayerCount(); ++j) { Layer *layer = pane->getLayer(j); if (!layer) continue; - cerr << "layer = " << layer->objectName().toStdString() << endl; + cerr << "layer = " << layer->objectName() << endl; Model *m = layer->getModel(); RangeSummarisableTimeValueModel *wm = dynamic_cast(m); if (wm) { - cerr << "found: " << wm->objectName().toStdString() << endl; + cerr << "found: " << wm->objectName() << endl; otherModels.insert(wm); if (pane == m_paneStack->getCurrentPane()) { current = wm; @@ -2295,7 +2393,8 @@ WavFileWriter subwriter(subpath, model->getSampleRate(), - model->getChannelCount()); + model->getChannelCount(), + WavFileWriter::WriteToTemporary); subwriter.writeModel(model, &subms); ok = subwriter.isOK(); @@ -2310,7 +2409,8 @@ if (!multiple) { WavFileWriter writer(path, model->getSampleRate(), - model->getChannelCount()); + model->getChannelCount(), + WavFileWriter::WriteToTemporary); writer.writeModel(model, selectionToWrite); ok = writer.isOK(); error = writer.getError(); @@ -2661,7 +2761,7 @@ if (path.isEmpty()) return; - FileOpenStatus status = open(path, AskUser); + FileOpenStatus status = open(path, ReplaceSession); if (status == FileOpenFailed) { emit hideSplash(); @@ -2693,7 +2793,7 @@ if (text.isEmpty()) return; - FileOpenStatus status = open(text); + FileOpenStatus status = open(text, AskUser); if (status == FileOpenFailed) { emit hideSplash(); @@ -2721,7 +2821,7 @@ QString path = action->text(); if (path == "") return; - FileOpenStatus status = open(path); + FileOpenStatus status = open(path, ReplaceSession); if (status == FileOpenFailed) { emit hideSplash(); @@ -2735,6 +2835,70 @@ } void +MainWindow::applyTemplate() +{ + QObject *s = sender(); + QAction *action = qobject_cast(s); + + if (!action) { + std::cerr << "WARNING: MainWindow::applyTemplate: sender is not an action" + << std::endl; + return; + } + + QString n = action->objectName(); + if (n == "") n = action->text(); + + if (n == "") { + std::cerr << "WARNING: MainWindow::applyTemplate: sender has no name" + << std::endl; + return; + } + + QString mainModelLocation; + WaveFileModel *mm = getMainModel(); + if (mm) mainModelLocation = mm->getLocation(); + if (mainModelLocation != "") { + openAudio(mainModelLocation, ReplaceSession, n); + } else { + openSessionTemplate(n); + } +} + +void +MainWindow::saveSessionAsTemplate() +{ + QString name = QInputDialog::getText + (this, tr("Enter template name"), + tr("Please enter a name for the saved template:")); + if (name == "") return; + + name.replace(QRegExp("[^\\w\\s\\.\"'-]"), "_"); + + ResourceFinder rf; + QString dir = rf.getResourceSaveDir("templates"); + QString filename = QString("%1/%2.svt").arg(dir).arg(name); + if (QFile(filename).exists()) { + if (QMessageBox::warning(this, + tr("Template file exists"), + tr("Template file exists

The template \"%1\" already exists.
Overwrite it?").arg(name), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel) != QMessageBox::Ok) { + return; + } + } + + saveSessionTemplate(filename); +} + +void +MainWindow::manageSavedTemplates() +{ + ResourceFinder rf; + QDesktopServices::openUrl("file:" + rf.getResourceSaveDir("templates")); +} + +void MainWindow::paneAdded(Pane *pane) { if (m_overview) m_overview->registerView(pane); @@ -2805,7 +2969,7 @@ void MainWindow::closeEvent(QCloseEvent *e) { -// std::cerr << "MainWindow::closeEvent" << std::endl; +// SVDEBUG << "MainWindow::closeEvent" << endl; if (m_openingAudioFile) { // std::cerr << "Busy - ignoring close event" << std::endl; @@ -2814,7 +2978,7 @@ } if (!m_abandoning && !checkSaveModified()) { -// std::cerr << "Ignoring close event" << std::endl; +// SVDEBUG << "Ignoring close event" << endl; e->ignore(); return; } @@ -3022,13 +3186,13 @@ void MainWindow::propertyStacksResized(int width) { -// std::cerr << "MainWindow::propertyStacksResized(" << width << ")" << std::endl; +// SVDEBUG << "MainWindow::propertyStacksResized(" << width << ")" << endl; if (!m_playControlsSpacer) return; int spacerWidth = width - m_playControlsWidth - 4; -// std::cerr << "resizing spacer from " << m_playControlsSpacer->width() << " to " << spacerWidth << std::endl; +// SVDEBUG << "resizing spacer from " << m_playControlsSpacer->width() << " to " << spacerWidth << endl; m_playControlsSpacer->setFixedSize(QSize(spacerWidth, 2)); } @@ -3049,7 +3213,7 @@ if (i == m_paneActions.end()) { std::cerr << "WARNING: MainWindow::addPane: unknown action " - << action->objectName().toStdString() << std::endl; + << action->objectName() << std::endl; return; } @@ -3081,7 +3245,7 @@ (LayerFactory::TimeRuler); } -// std::cerr << "adding time ruler layer " << m_timeRulerLayer << std::endl; +// SVDEBUG << "adding time ruler layer " << m_timeRulerLayer << endl; m_document->addLayerToView(pane, m_timeRulerLayer); } @@ -3121,8 +3285,8 @@ m_paneStack->setCurrentPane(pane); m_paneStack->setCurrentLayer(pane, newLayer); -// std::cerr << "MainWindow::addPane: global centre frame is " -// << m_viewManager->getGlobalCentreFrame() << std::endl; +// SVDEBUG << "MainWindow::addPane: global centre frame is " +// << m_viewManager->getGlobalCentreFrame() << endl; // pane->setCentreFrame(m_viewManager->getGlobalCentreFrame()); CommandHistory::getInstance()->endCompoundOperation(); @@ -3186,7 +3350,7 @@ if (i == m_layerActions.end()) { std::cerr << "WARNING: MainWindow::addLayer: unknown action " - << action->objectName().toStdString() << std::endl; + << action->objectName() << std::endl; return; } @@ -3208,22 +3372,21 @@ Model *model = i->second.sourceModel; + cerr << "model = "<< model << endl; + if (!model) { if (type == LayerFactory::TimeRuler) { newLayer = m_document->createMainModelLayer(type); } else { // if model is unspecified and this is not a - // time-ruler layer, use the topmost plausible - // model from the current pane (if any) -- this is - // the case for right-button menu layer additions - for (int i = pane->getLayerCount(); i > 0; --i) { - Layer *el = pane->getLayer(i-1); - if (el && - el->getModel() && - dynamic_cast - (el->getModel())) { - model = el->getModel(); - } + // time-ruler layer, use any plausible model from + // the current pane -- this is the case for + // right-button menu layer additions + Pane::ModelSet ms = pane->getModels(); + foreach (Model *m, ms) { + RangeSummarisableTimeValueModel *r = + dynamic_cast(m); + if (r) model = m; } if (!model) model = getMainModel(); } @@ -3329,7 +3492,7 @@ if (!input.getModel()) return; -// std::cerr << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName().toStdString() << "\"" << std::endl << "transform:" << std::endl << transform.toXmlString().toStdString() << std::endl; +// SVDEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl; Layer *newLayer = m_document->createDerivedLayer(transform, input); @@ -3873,7 +4036,7 @@ void MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position) { -// std::cerr << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << std::endl; +// SVDEBUG << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl; m_paneStack->setCurrentPane(pane); m_rightButtonMenu->popup(position); } @@ -3903,9 +4066,15 @@ void MainWindow::preferences() { + bool goToTemplateTab = + (sender() && sender()->objectName() == "set_default_template"); + if (!m_preferencesDialog.isNull()) { m_preferencesDialog->show(); m_preferencesDialog->raise(); + if (goToTemplateTab) { + m_preferencesDialog->switchToTab(PreferencesDialog::TemplateTab); + } return; } @@ -3920,6 +4089,9 @@ m_preferencesDialog->setAttribute(Qt::WA_DeleteOnClose); m_preferencesDialog->show(); + if (goToTemplateTab) { + m_preferencesDialog->switchToTab(PreferencesDialog::TemplateTab); + } } void @@ -4089,7 +4261,7 @@ #endif aboutText += - "

Sonic Visualiser Copyright © 2005–2010 Chris Cannam and " + "

Sonic Visualiser Copyright © 2005–2011 Chris Cannam and " "Queen Mary, University of London.

" "

This program is free software; you can redistribute it and/or " "modify it under the terms of the GNU General Public License as " diff -r d70890996156 -r b3b9cc8f5466 main/MainWindow.h --- a/main/MainWindow.h Tue Mar 22 14:29:38 2011 +0000 +++ b/main/MainWindow.h Mon Jul 25 19:38:50 2011 +0100 @@ -58,6 +58,7 @@ class KeyReference; class Labeller; class ActivityLog; +class QFileSystemWatcher; class MainWindow : public MainWindowBase { @@ -83,7 +84,8 @@ virtual void openSomething(); virtual void openLocation(); virtual void openRecentFile(); - //virtual void exportAudio(); //removes the Export Audio File functionnality from the File menu + virtual void applyTemplate(); + virtual void importLayer(); virtual void exportLayer(); virtual void exportImage(); @@ -140,6 +142,7 @@ virtual void setupRecentFilesMenu(); virtual void setupRecentTransformsMenu(); + virtual void setupTemplatesMenu(); virtual void playSpeedChanged(int); virtual void playSoloToggled(); @@ -169,6 +172,9 @@ virtual void midiEventsAvailable(); virtual void playStatusChanged(bool); + virtual void saveSessionAsTemplate(); + virtual void manageSavedTemplates(); + virtual void website(); virtual void help(); virtual void about(); @@ -190,6 +196,7 @@ QMenu *m_sliceMenu; QMenu *m_recentFilesMenu; QMenu *m_recentTransformsMenu; + QMenu *m_templatesMenu; QMenu *m_rightButtonMenu; QMenu *m_rightButtonLayerMenu; QMenu *m_rightButtonTransformsMenu; @@ -206,6 +213,7 @@ QAction *m_playAction; QAction *m_playSelectionAction; QAction *m_playLoopAction; + QAction *m_manageTemplatesAction; bool m_soloModified; bool m_prevSolo; @@ -221,6 +229,8 @@ ActivityLog *m_activityLog; KeyReference *m_keyReference; + QFileSystemWatcher *m_templateWatcher; + struct LayerConfiguration { LayerConfiguration(LayerFactory::LayerType _layer = LayerFactory::TimeRuler, diff -r d70890996156 -r b3b9cc8f5466 main/OSCHandler.cpp --- a/main/OSCHandler.cpp Tue Mar 22 14:29:38 2011 +0000 +++ b/main/OSCHandler.cpp Mon Jul 25 19:38:50 2011 +0100 @@ -35,8 +35,8 @@ void MainWindow::handleOSCMessage(const OSCMessage &message) { - std::cerr << "MainWindow::handleOSCMessage: thread id = " - << QThread::currentThreadId() << std::endl; + SVDEBUG << "MainWindow::handleOSCMessage: thread id = " + << QThread::currentThreadId() << endl; // This large function should really be abstracted out. @@ -47,7 +47,7 @@ QString path = message.getArg(0).toString(); if (open(path, ReplaceMainModel) != FileOpenSucceeded) { std::cerr << "MainWindow::handleOSCMessage: File open failed for path \"" - << path.toStdString() << "\"" << std::endl; + << path << "\"" << std::endl; } //!!! we really need to spin here and not return until the // file has been completely decoded... @@ -60,7 +60,7 @@ QString path = message.getArg(0).toString(); if (open(path, CreateAdditionalModel) != FileOpenSucceeded) { std::cerr << "MainWindow::handleOSCMessage: File open failed for path \"" - << path.toStdString() << "\"" << std::endl; + << path << "\"" << std::endl; } } @@ -77,7 +77,7 @@ if (n >= 0 && n < int(recent.size())) { if (open(recent[n], ReplaceMainModel) != FileOpenSucceeded) { std::cerr << "MainWindow::handleOSCMessage: File open failed for path \"" - << recent[n].toStdString() << "\"" << std::endl; + << recent[n] << "\"" << std::endl; } } @@ -88,7 +88,7 @@ message.getArg(0).canConvert(QVariant::String)) { path = message.getArg(0).toString(); if (QFileInfo(path).exists()) { - std::cerr << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << std::endl; + SVDEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << endl; } else { saveSessionFile(path); } @@ -102,11 +102,12 @@ message.getArg(0).canConvert(QVariant::String)) { path = message.getArg(0).toString(); if (QFileInfo(path).exists()) { - std::cerr << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << std::endl; + SVDEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << endl; } else { WavFileWriter writer(path, getMainModel()->getSampleRate(), - getMainModel()->getChannelCount()); + getMainModel()->getChannelCount(), + WavFileWriter::WriteToTemporary); MultiSelection ms = m_viewManager->getSelection(); if (!ms.getSelections().empty()) { writer.writeModel(getMainModel(), &ms); @@ -306,7 +307,7 @@ if (type == LayerFactory::UnknownLayer) { std::cerr << "WARNING: MainWindow::handleOSCMessage: unknown layer " - << "type " << str.toStdString() << std::endl; + << "type " << str << std::endl; } else { LayerConfiguration configuration(type, @@ -430,7 +431,7 @@ } else { - std::cerr << "WARNING: MainWindow::handleOSCMessage: Unknown delete target " << target.toStdString() << std::endl; + std::cerr << "WARNING: MainWindow::handleOSCMessage: Unknown delete target " << target << std::endl; } } diff -r d70890996156 -r b3b9cc8f5466 main/PreferencesDialog.cpp --- a/main/PreferencesDialog.cpp Tue Mar 22 14:29:38 2011 +0000 +++ b/main/PreferencesDialog.cpp Mon Jul 25 19:38:50 2011 +0100 @@ -31,12 +31,16 @@ #include #include #include +#include #include +#include + #include "widgets/WindowTypeSelector.h" #include "widgets/IconLoader.h" #include "base/Preferences.h" #include "audioio/AudioTargetFactory.h" +#include "base/ResourceFinder.h" PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WFlags flags) : QDialog(parent, flags), @@ -50,10 +54,10 @@ QGridLayout *grid = new QGridLayout; setLayout(grid); - QTabWidget *tab = new QTabWidget; - grid->addWidget(tab, 0, 0); + m_tabs = new QTabWidget; + grid->addWidget(m_tabs, 0, 0); - tab->setTabPosition(QTabWidget::North); + m_tabs->setTabPosition(QTabWidget::North); // Create this first, as slots that get called from the ctor will // refer to it @@ -257,7 +261,8 @@ subgrid->setRowStretch(row, 10); - tab->addTab(frame, tr("&General")); + m_tabOrdering[GeneralTab] = m_tabs->count(); + m_tabs->addTab(frame, tr("&General")); // Appearance tab @@ -295,7 +300,8 @@ subgrid->setRowStretch(row, 10); - tab->addTab(frame, tr("&Appearance")); + m_tabOrdering[AppearanceTab] = m_tabs->count(); + m_tabs->addTab(frame, tr("&Appearance")); // Analysis tab @@ -328,7 +334,53 @@ subgrid->setRowStretch(row, 10); - tab->addTab(frame, tr("Anal&ysis")); + m_tabOrdering[AnalysisTab] = m_tabs->count(); + m_tabs->addTab(frame, tr("Anal&ysis")); + + // Template tab + + frame = new QFrame; + subgrid = new QGridLayout; + frame->setLayout(subgrid); + row = 0; + + subgrid->addWidget(new QLabel(tr("Default session template for audio files:")), row++, 0); + + QListWidget *lw = new QListWidget(); + subgrid->addWidget(lw, row, 0); + subgrid->setRowStretch(row, 10); + row++; + + settings.beginGroup("MainWindow"); + m_currentTemplate = settings.value("sessiontemplate", "").toString(); + settings.endGroup(); + + lw->addItem(tr("Standard Waveform")); + if (m_currentTemplate == "" || m_currentTemplate == "default") { + lw->setCurrentRow(lw->count()-1); + } + m_templates.push_back(""); + + QStringList templates = ResourceFinder().getResourceFiles("templates", "svt"); + + std::set byName; + foreach (QString t, templates) { + byName.insert(QFileInfo(t).baseName()); + } + + foreach (QString t, byName) { + if (t.toLower() == "default") continue; + m_templates.push_back(t); + lw->addItem(t); + if (m_currentTemplate == t) { + lw->setCurrentRow(lw->count()-1); + } + } + + connect(lw, SIGNAL(currentRowChanged(int)), this, SLOT(defaultTemplateChanged(int))); + + m_tabOrdering[TemplateTab] = m_tabs->count(); + m_tabs->addTab(frame, tr("Session &Template")); QDialogButtonBox *bb = new QDialogButtonBox(Qt::Horizontal); grid->addWidget(bb, 1, 0); @@ -347,7 +399,15 @@ PreferencesDialog::~PreferencesDialog() { - std::cerr << "PreferencesDialog::~PreferencesDialog()" << std::endl; + SVDEBUG << "PreferencesDialog::~PreferencesDialog()" << endl; +} + +void +PreferencesDialog::switchToTab(Tab t) +{ + if (m_tabOrdering.contains(t)) { + m_tabs->setCurrentIndex(m_tabOrdering[t]); + } } void @@ -417,6 +477,13 @@ } void +PreferencesDialog::defaultTemplateChanged(int i) +{ + m_currentTemplate = m_templates[i]; + m_applyButton->setEnabled(true); +} + +void PreferencesDialog::tempDirRootChanged(QString r) { m_tempDirRoot = r; @@ -488,10 +555,15 @@ AudioTargetFactory::getInstance()->getCallbackTargetNames(); QSettings settings; + settings.beginGroup("Preferences"); settings.setValue("audio-target", devices[m_audioDevice]); settings.endGroup(); + settings.beginGroup("MainWindow"); + settings.setValue("sessiontemplate", m_currentTemplate); + settings.endGroup(); + m_applyButton->setEnabled(false); if (m_changesOnRestart) { diff -r d70890996156 -r b3b9cc8f5466 main/PreferencesDialog.h --- a/main/PreferencesDialog.h Tue Mar 22 14:29:38 2011 +0000 +++ b/main/PreferencesDialog.h Mon Jul 25 19:38:50 2011 +0100 @@ -17,12 +17,14 @@ #define _PREFERENCES_DIALOG_H_ #include +#include #include "base/Window.h" class WindowTypeSelector; class QPushButton; class QLineEdit; +class QTabWidget; class PreferencesDialog : public QDialog { @@ -32,6 +34,14 @@ PreferencesDialog(QWidget *parent = 0, Qt::WFlags flags = 0); virtual ~PreferencesDialog(); + enum Tab { + GeneralTab, + AppearanceTab, + AnalysisTab, + TemplateTab + }; + void switchToTab(Tab tab); + public slots: void applicationClosing(bool quickly); @@ -49,6 +59,7 @@ void timeToTextModeChanged(int mode); void viewFontSizeChanged(int sz); void showSplashChanged(int state); + void defaultTemplateChanged(int); void tempDirButtonClicked(); @@ -60,7 +71,13 @@ WindowTypeSelector *m_windowTypeSelector; QPushButton *m_applyButton; + QTabWidget *m_tabs; + QMap m_tabOrdering; + QLineEdit *m_tempDirRootEdit; + + QString m_currentTemplate; + QStringList m_templates; WindowType m_windowType; int m_spectrogramSmoothing; diff -r d70890996156 -r b3b9cc8f5466 main/main.cpp --- a/main/main.cpp Tue Mar 22 14:29:38 2011 +0000 +++ b/main/main.cpp Mon Jul 25 19:38:50 2011 +0100 @@ -36,6 +36,7 @@ #include #include #include +#include #include "../version.h" @@ -188,7 +189,10 @@ public: SVApplication(int &argc, char **argv) : QApplication(argc, argv), - m_mainWindow(0) { } + m_readyForFiles(false), + m_filepathQueue(QStringList()), + m_mainWindow(0) + { } virtual ~SVApplication() { } void setMainWindow(MainWindow *mw) { m_mainWindow = mw; } @@ -202,8 +206,15 @@ if (!success) manager.cancel(); } + void handleFilepathArgument(QString path, QSplashScreen *splash); + + bool m_readyForFiles; + QStringList m_filepathQueue; + protected: MainWindow *m_mainWindow; + bool event(QEvent *); + }; int @@ -286,7 +297,7 @@ QTranslator qtTranslator; QString qtTrName = QString("qt_%1").arg(language); - std::cerr << "Loading " << qtTrName.toStdString() << "... "; + SVDEBUG << "Loading " << qtTrName << "... "; bool success = false; if (!(success = qtTranslator.load(qtTrName))) { QString qtDir = getenv("QTDIR"); @@ -296,7 +307,7 @@ } } if (!success) { - std::cerr << "Failed\nFailed to load Qt translation for locale" << std::endl; + SVDEBUG << "Failed\nFailed to load Qt translation for locale" << endl; } else { std::cerr << "Done" << std::endl; } @@ -304,9 +315,9 @@ QTranslator svTranslator; QString svTrName = QString("sonic-visualiser_%1").arg(language); - std::cerr << "Loading " << svTrName.toStdString() << "... "; + SVDEBUG << "Loading " << svTrName << "... "; svTranslator.load(svTrName, ":i18n"); - std::cerr << "Done" << std::endl; + SVDEBUG << "Done" << endl; application.installTranslator(&svTranslator); StoreStartupLocale(); @@ -347,59 +358,21 @@ // complete. As a lazy hack, apply it explicitly from here gui->preferenceChanged("Property Box Layout"); - bool haveSession = false; - bool haveMainModel = false; - bool havePriorCommandLineModel = false; + application.m_readyForFiles = true; // Ready to receive files from e.g. Apple Events for (QStringList::iterator i = args.begin(); i != args.end(); ++i) { - MainWindow::FileOpenStatus status = MainWindow::FileOpenFailed; - if (i == args.begin()) continue; if (i->startsWith('-')) continue; QString path = *i; - if (path.endsWith("sv")) { - if (!haveSession) { - status = gui->openSessionFile(path); - if (status == MainWindow::FileOpenSucceeded) { - haveSession = true; - haveMainModel = true; - } - } else { - std::cerr << "WARNING: Ignoring additional session file argument \"" << path.toStdString() << "\"" << std::endl; - status = MainWindow::FileOpenSucceeded; - } - } - if (status != MainWindow::FileOpenSucceeded) { - if (!haveMainModel) { - status = gui->open(path, MainWindow::ReplaceMainModel); - if (status == MainWindow::FileOpenSucceeded) { - haveMainModel = true; - } - } else { - if (haveSession && !havePriorCommandLineModel) { - status = gui->open(path, MainWindow::AskUser); - if (status == MainWindow::FileOpenSucceeded) { - havePriorCommandLineModel = true; - } - } else { - status = gui->open(path, MainWindow::CreateAdditionalModel); - } - } - } - if (status == MainWindow::FileOpenFailed) { - if (splash) splash->hide(); - QMessageBox::critical - (gui, QMessageBox::tr("Failed to open file"), - QMessageBox::tr("File or URL \"%1\" could not be opened").arg(path)); - } else if (status == MainWindow::FileOpenWrongMode) { - if (splash) splash->hide(); - QMessageBox::critical - (gui, QMessageBox::tr("Failed to open file"), - QMessageBox::tr("Audio required

Please load at least one audio file before importing annotation data")); - } + application.handleFilepathArgument(path, splash); + } + + for (QStringList::iterator i = application.m_filepathQueue.begin(); i != application.m_filepathQueue.end(); ++i) { + QString path = *i; + application.handleFilepathArgument(path, splash); } #ifdef HAVE_FFTW3F @@ -457,3 +430,68 @@ return rv; } + +bool SVApplication::event(QEvent *event){ + QString thePath; + switch (event->type()) { + case QEvent::FileOpen: + thePath = static_cast(event)->file(); + if(m_readyForFiles) + handleFilepathArgument(thePath, NULL); + else + m_filepathQueue.append(thePath); + return true; + default: + return QApplication::event(event); + } +} + +/** Application-global handler for filepaths passed in, e.g. as command-line arguments or apple events */ +void SVApplication::handleFilepathArgument(QString path, QSplashScreen *splash){ + static bool haveSession = false; + static bool haveMainModel = false; + static bool havePriorCommandLineModel = false; + + MainWindow::FileOpenStatus status = MainWindow::FileOpenFailed; + + if (path.endsWith("sv")) { + if (!haveSession) { + status = m_mainWindow->openSessionFile(path); + if (status == MainWindow::FileOpenSucceeded) { + haveSession = true; + haveMainModel = true; + } + } else { + std::cerr << "WARNING: Ignoring additional session file argument \"" << path << "\"" << std::endl; + status = MainWindow::FileOpenSucceeded; + } + } + if (status != MainWindow::FileOpenSucceeded) { + if (!haveMainModel) { + status = m_mainWindow->open(path, MainWindow::ReplaceSession); + if (status == MainWindow::FileOpenSucceeded) { + haveMainModel = true; + } + } else { + if (haveSession && !havePriorCommandLineModel) { + status = m_mainWindow->open(path, MainWindow::AskUser); + if (status == MainWindow::FileOpenSucceeded) { + havePriorCommandLineModel = true; + } + } else { + status = m_mainWindow->open(path, MainWindow::CreateAdditionalModel); + } + } + } + if (status == MainWindow::FileOpenFailed) { + if (splash) splash->hide(); + QMessageBox::critical + (m_mainWindow, QMessageBox::tr("Failed to open file"), + QMessageBox::tr("File or URL \"%1\" could not be opened").arg(path)); + } else if (status == MainWindow::FileOpenWrongMode) { + if (splash) splash->hide(); + QMessageBox::critical + (m_mainWindow, QMessageBox::tr("Failed to open file"), + QMessageBox::tr("Audio required

Please load at least one audio file before importing annotation data")); + } +} diff -r d70890996156 -r b3b9cc8f5466 misc/debian-dependencies.sh --- a/misc/debian-dependencies.sh Tue Mar 22 14:29:38 2011 +0000 +++ b/misc/debian-dependencies.sh Mon Jul 25 19:38:50 2011 +0100 @@ -13,7 +13,7 @@ trap "rm -f $pfile $rfile" 0 echo -ldd "$target" | awk '{ print $3; }' | while read lib; do +ldd "$target" | awk '{ print $3; }' | grep '^/' | while read lib; do if test -n "$lib" ; then dpkg-query -S "$lib" fi @@ -24,6 +24,7 @@ echo for p in `cat $pfile`; do + echo Looking at $p 1>&2 apt-cache showpkg "$p" | grep '^ ' | grep ',' | awk -F, '{ print $1; }' | \ while read d; do if grep -q '^'$d'$' $pfile; then diff -r d70890996156 -r b3b9cc8f5466 misc/superconfigure --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/misc/superconfigure Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,24 @@ +#!/bin/sh +subdirs="svcore svgui svapp sonic-visualiser" +echo +echo " *** Preparing to configure in: $subdirs" +echo +for dir in $subdirs; do + echo " *** Configuring in: $dir" + echo + ( cd "$dir" && ./configure "$@" ) || exit 1 + echo +done +cat > Makefile <samples/kick.wav samples/organ.wav samples/piano.wav + samples/silent.wav samples/snare.wav samples/stick.wav samples/strike.wav samples/tap.wav + templates/default.svt + templates/Scrolling Waveforms.svt + templates/Spectrograms.svt + templates/Waveform and Melodic Range Spectrogram.svt i18n/sonic-visualiser_ru.qm i18n/sonic-visualiser_en_GB.qm i18n/sonic-visualiser_en_US.qm diff -r d70890996156 -r b3b9cc8f5466 templates/Scrolling Waveforms.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Scrolling Waveforms.svt Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d70890996156 -r b3b9cc8f5466 templates/Spectrograms.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Spectrograms.svt Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d70890996156 -r b3b9cc8f5466 templates/Waveform and Melodic Range Spectrogram.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/Waveform and Melodic Range Spectrogram.svt Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d70890996156 -r b3b9cc8f5466 templates/default.svt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/default.svt Mon Jul 25 19:38:50 2011 +0100 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +