# HG changeset patch # User Chris Cannam # Date 1154354722 0 # Node ID 40116f709d3bb35b614a3a5564fe3de3e31f44ed # Parent cd5d7ff8ef38db407306e8ed02a77901db8d0289 * Reorganising code base. This revision probably should compile once more. diff -r cd5d7ff8ef38 -r 40116f709d3b audioio/AudioCallbackPlaySource.cpp --- a/audioio/AudioCallbackPlaySource.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/audioio/AudioCallbackPlaySource.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -17,11 +17,11 @@ #include "AudioGenerator.h" -#include "base/Model.h" -#include "base/ViewManager.h" +#include "data/model/Model.h" +#include "view/ViewManager.h" #include "base/PlayParameterRepository.h" -#include "model/DenseTimeValueModel.h" -#include "model/SparseOneDimensionalModel.h" +#include "data/model/DenseTimeValueModel.h" +#include "data/model/SparseOneDimensionalModel.h" #include "IntegerTimeStretcher.h" #include diff -r cd5d7ff8ef38 -r 40116f709d3b audioio/AudioGenerator.cpp --- a/audioio/AudioGenerator.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/audioio/AudioGenerator.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -21,9 +21,9 @@ #include "base/Pitch.h" #include "base/Exceptions.h" -#include "model/NoteModel.h" -#include "model/DenseTimeValueModel.h" -#include "model/SparseOneDimensionalModel.h" +#include "data/model/NoteModel.h" +#include "data/model/DenseTimeValueModel.h" +#include "data/model/SparseOneDimensionalModel.h" #include "plugin/RealTimePluginFactory.h" #include "plugin/RealTimePluginInstance.h" diff -r cd5d7ff8ef38 -r 40116f709d3b document/Document.cpp --- a/document/Document.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/document/Document.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -15,11 +15,11 @@ #include "Document.h" -#include "model/WaveFileModel.h" -#include "base/Layer.h" +#include "data/model/WaveFileModel.h" +#include "layer/Layer.h" #include "base/CommandHistory.h" #include "base/Command.h" -#include "base/View.h" +#include "view/View.h" #include "base/PlayParameterRepository.h" #include "base/PlayParameters.h" #include "transform/TransformFactory.h" diff -r cd5d7ff8ef38 -r 40116f709d3b document/SVFileReader.cpp --- a/document/SVFileReader.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/document/SVFileReader.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -15,23 +15,23 @@ #include "SVFileReader.h" -#include "base/Layer.h" -#include "base/View.h" +#include "layer/Layer.h" +#include "view/View.h" #include "base/PlayParameters.h" #include "base/PlayParameterRepository.h" -#include "AudioFileReaderFactory.h" +#include "data/fileio/AudioFileReaderFactory.h" -#include "model/WaveFileModel.h" -#include "model/DenseThreeDimensionalModel.h" -#include "model/SparseOneDimensionalModel.h" -#include "model/SparseTimeValueModel.h" -#include "model/NoteModel.h" -#include "model/TextModel.h" +#include "data/model/WaveFileModel.h" +#include "data/model/DenseThreeDimensionalModel.h" +#include "data/model/SparseOneDimensionalModel.h" +#include "data/model/SparseTimeValueModel.h" +#include "data/model/NoteModel.h" +#include "data/model/TextModel.h" -#include "widgets/Pane.h" +#include "view/Pane.h" -#include "main/Document.h" +#include "Document.h" #include #include diff -r cd5d7ff8ef38 -r 40116f709d3b i18n/sonic-visualiser_ru.qm Binary file i18n/sonic-visualiser_ru.qm has changed diff -r cd5d7ff8ef38 -r 40116f709d3b i18n/sonic-visualiser_ru.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/sonic-visualiser_ru.ts Mon Jul 31 14:05:22 2006 +0000 @@ -0,0 +1,2713 @@ + + + AudioDial + + Enter new value + Введите новое значение + + + Select a new value in the range %1 to %2: + Выберите новое значение в диапазоне от %1 до %2: + + + + 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 + + + + CSVFileWriter + + Failed to open file %1 for writing + Не удалось открыть файл %1 для записи + + + + CSVFormatDialog + + Select Data Format + Выберите формат данных + + + +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) + Данные (строки последовательны во времени) + + + Audio sample rate (Hz): + Частота сэмплирования звука (Гц): + + + Frame increment between rows: + + + + +Example data from file: + +Пример данных из файла: + + + OK + ОК + + + Cancel + Отменить + + + + Colour3DPlotLayer + + Time:%1 - %2 +Bin:%3 +Value:%4 + Время:%1 - %2 +Bin:%3 +Значение:%4 + + + + CommandHistory + + &Undo + + + + Ctrl+Z + Ctrl+Z + + + Re&do + + + + Ctrl+Shift+Z + Ctrl+Shift+Z + + + Nothing to undo + Нет отменяемых действий + + + Nothing to redo + Нет повторяемых действий + + + &Undo %1 + + + + Re&do %1 + + + + + Document::AddLayerCommand + + Add %1 Layer + Добавить %1 слой + + + + Document::RemoveLayerCommand + + Delete %1 Layer + Удалить %1 слой + + + + Fader + + Level: Off + Уровень: выкл + + + Level: %1%2.%3%4 dB + Уровень: %1%2.%3%4 Дб + + + + ItemEditDialog + + Timing + Тайминг + + + Time: + Время: + + + frames + выборок + + + sec + с + + + usec + мс + + + Duration: + Длительность: + + + Properties + Свойства + + + Value: + Значение: + + + Text: + Текст: + + + OK + ОК + + + Reset + Сбросить + + + Cancel + Отменить + + + + Layer + + Waveform + Волновая форма + + + Spectrogram + Спектрограмма + + + Ruler + Линейка + + + Time Instants + Моменты времени + + + Time Values + Значения времени + + + Notes + Ноты + + + Text + Текст + + + Colour 3D Plot + Цветной 3D-график + + + Layer + Слой + + + + LayerTreeModel + + Layer + Слой + + + Model + Модель + + + + 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 + + + + No notes in MIDI file + + + + MIDI file "%1" has no notes in any track + + + + Merge all tracks + + + + Merge all non-percussion tracks + + + + - uses GM percussion channel + + + + Track %1 (%2)%3 + + + + Track %1 (untitled)%3 + + + + Select track or tracks to import + + + + 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. + +Please select the track or merged tracks you wish to import: + + + + %1 - vel %2 + + + + + MainWindow + + Sonic Visualiser + Sonic Visualiser + + + Playback speed: Full + Скорость воспроизведения: нормальная + + + &Layer + С&лой + + + &File + &Файл + + + File Toolbar + + + + &New Session + &Создать сессию + + + Ctrl+N + Ctrl+N + + + Clear the current Sonic Visualiser session and start a new one + + + + &Open Session... + &Открыть сессию... + + + Ctrl+O + Ctrl+O + + + Open a previously saved Sonic Visualiser session file + + + + &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 + + + + Save Session &As... + + + + Save the current session into a new Sonic Visualiser session file + + + + &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 + + + + &View + &Вид + + + &No Text Overlays + + + + 0 + + + + Show no texts for frame times, layer names etc + + + + Basic &Text Overlays + + + + 9 + + + + Show texts for frame times etc, but not layer names etc + + + + &All Text Overlays + + + + 8 + + + + Show texts for frame times, layer names etc + + + + 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 + + + + Jump Right + + + + Ctrl+Right + + + + 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 + + + + Alt+N + + + + Add a new pane containing only a time ruler + + + + Add New %1 Layer + + + + Add a new empty layer of type %1 + + + + Alt+T + + + + Add &Waveform + + + + Alt+W + + + + Add a new pane showing a waveform view + + + + Add a new layer showing a waveform view + + + + Add &Spectrogram + + + + Alt+S + + + + Add a new pane showing a dB spectrogram + + + + Add a new layer showing a dB spectrogram + + + + Add &Melodic Range Spectrogram + + + + Alt+M + + + + Add a new pane showing a spectrogram set up for a pitch overview + + + + Add a new layer showing a spectrogram set up for a pitch overview + + + + Add &Peak Frequency Spectrogram + + + + Alt+P + + + + 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 + + + + &Delete Pane + + + + Alt+D + + + + Delete the currently selected pane + + + + Add &Time Ruler + + + + Add a new layer showing a time ruler + + + + Add &Existing Layer + + + + &Rename Layer... + + + + Alt+R + + + + Rename the currently active layer + + + + &Delete Layer + + + + Alt+Shift+D + + + + Delete the currently active layer + + + + &Help + &Справка + + + &Help Reference + + + + Open the Sonic Visualiser reference manual + + + + Sonic Visualiser on the &Web + + + + Open the Sonic Visualiser website + + + + &About Sonic Visualiser + + + + Show information about Sonic Visualiser + + + + Transport Toolbar + + + + Rewind to Start + + + + Home + + + + Rewind to the start + + + + Rewind + + + + PageUp + + + + Rewind to the previous time instant in the current layer + + + + Play / Pause + + + + Space + + + + Start or stop playback from the current position + + + + Fast Forward + + + + PageDown + + + + 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 + + + + Constrain playback to the selected area + + + + Loop Playback + + + + l + + + + Loop playback + + + + Edit Toolbar + + + + Tools Toolbar + + + + Navigate + + + + 1 + + + + Select + Выделить + + + 2 + + + + Edit + + + + 3 + + + + Draw + + + + 4 + + + + No audio file loaded. + + + + %1Hz (resampling to %2Hz) + + + + %1 (modified) + + + + (modified) + + + + Cut + + + + Add Point + + + + Add Points + + + + Select an audio file + + + + Audio files (%1) +All files (*.*) + Щвуковые файлы (%1) +Все файлы (*.*) + + + Failed to open file + Не удалось открыть файл + + + Audio file "%1" could not be opened + + + + Select a file to export to + + + + WAV audio files (*.wav) +All files (*.*) + + + + 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 + + + + Failed to write file + + + + Select file + + + + All supported files (%1) +Sonic Visualiser Layer XML files (*.svl) +Comma-separated data files (*.csv) +Space-separated .lab files (*.lab) +MIDI files (*.mid) +Text files (*.txt) +All files (*.*) + + + + File %1 could not be opened. + + + + Sonic Visualiser Layer XML files (*.svl) +Comma-separated data files (*.csv) +Text files (*.txt) +All files (*.*) + + + + Failed to open file %1 for writing + Не удалось открыть файл %1 для записи + + + Replace the existing main waveform + + + + Load this file into a new waveform pane + + + + Select target for import + + + + You already have an audio waveform. +What would you like to do with the new audio file? + + + + Sonic Visualiser: %1 + + + + Sonic Visualiser: %1 [%2] + + + + Import "%1" + + + + Couldn't open audio device + + + + Could not open an audio device for playback. +Audio playback will not be available during this session. + + + + + Select a session file + + + + Sonic Visualiser session files (*.sv) +All files (*.*) + + + + File "%1" does not exist or is not a readable file + + + + Session file "%1" could not be opened + + + + All supported files (*.sv %1 %2) +Sonic Visualiser session files (*.sv) +Audio files (%1) +Layer files (%2) +All files (*.*) + + + + All supported files (*.sv %1) +Sonic Visualiser session files (*.sv) +Audio files (%1) +All files (*.*) + + + + Select a file to open + + + + File "%1" could not be opened + Не удалось открыть файл "%1" + + + SV XML file read error: +%1 + + + + Session modified + + + + The current session has been modified. +Do you want to save it? + + + + Failed to save file + + + + Session file "%1" could not be saved. + + + + Select a file to save to + + + + Directory selected + + + + File "%1" is a directory + + + + File exists + + + + The file "%1" already exists. +Do you want to overwrite it? + + + + Failed to write to file "%1": %2 + + + + Delete Pane + + + + Rename Layer + + + + New name for this layer: + + + + Playback speed: %1 + + + + Full + + + + Sample rate mismatch + + + + The sample rate of this audio file (%1 Hz) does not match +the current playback rate (%2 Hz). + +The file will play at the wrong speed. + + + + Failed to regenerate layer + + + + Failed to regenerate derived layer "%1". +The layer transform "%2" failed to run. +This probably means the layer used a plugin that is not currently available. + + + + http://www.sonicvisualiser.org/ + + + + http://www.sonicvisualiser.org/doc/reference/en/ + + + + Release %1 : Revision %2 + + + + Release %1 + + + + Unreleased : Revision %1 + + + + <h3>About Sonic Visualiser</h3> + + + + Sonic Visualiser is a program for viewing and exploring audio data for semantic music analysis and annotation. + + + + %1 : %2 build + + + + Debug + + + + Release + + + + Statically linked + + + + With Qt (v%1) © Trolltech AS + + + + With JACK audio output (v%1) © Paul Davis and Jack O'Quin + + + + With PortAudio audio output © Ross Bencina and Phil Burk + + + + With Ogg file decoder (oggz v%1, fishsound v%2) © CSIRO Australia + + + + With MAD mp3 decoder (v%1) © Underbit Technologies Inc + + + + With libsamplerate (v%1) © Erik de Castro Lopo + + + + With libsndfile (v%1) © Erik de Castro Lopo + + + + With FFTW3 (v%1) © Matteo Frigo and MIT + + + + With Vamp plugin support (API v%1, SDK v%2) © Chris Cannam + + + + With LADSPA plugin support (API v%1) © Richard Furse, Paul Davis, Stefan Westerfeld + + + + With DSSI plugin support (API v%1) © Chris Cannam, Steve Harris, Sean Bolton + + + + About Sonic Visualiser + + + + Failed to generate layer + + + + The layer transform "%1" failed to run. +This probably means that a plugin failed to initialise. + + + + + MainWindow::AddPaneCommand + + Add Pane + Добавить панель + + + + MainWindow::RemovePaneCommand + + Remove Pane + Удалить панель + + + + NoteLayer + + New Point + Новая точка + + + Colour + Цвет + + + Vertical Scale + Верт. масштаб + + + Pitch Units + Единицы высоты тона + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + Auto-Align + Автовыравнивание + + + Linear Scale + Линейная шкала + + + Log Scale + Логарифм. шкала + + + MIDI Note Range + Диапазон MIDI-нот + + + <unknown> + <неизвестно> + + + In progress + В процессе + + + No local points + Нет локальных точек + + + Time:%1 +Pitch:%2 +Duration:%3 +No label + Время:%1 +Высота тона:%2 +Длительность:%3 +Без метки + + + Time:%1 +Pitch:%2 +Duration:%3 +Label:%4 + Время:%1 +Высота тона:%2 +Длительность:%3 +Метка:%4 + + + Draw Point + Нарисовать точку + + + Drag Point + Перетащить точку + + + Edit Point + Изменить точку + + + Relocate Point + Переместить точку + + + Change Point Value + Изменить значение точки + + + Drag Selection + Перетащить выделение + + + Resize Selection + Изменить размер выделения + + + Delete Selected Points + Удалить выбранные точки + + + Paste + Вставить + + + Scale Units + + + + + Pane + + Some lengthy prefix: + Некий длинный префикс: + + + (R) + (R) + + + (X) + (X) + + + %1 / %2Hz%3 + %1 / %2Гц%3 + + + Drag Selection + Перетащить выделение + + + Resize Selection + Изменить выделение + + + + Panner + + Panner + + + + + PluginParameterBox + + This plugin has no adjustable parameters. + У этого расширения нет изменяемых параметров. + + + Program + Программа + + + + PluginParameterDialog + + Plugin + Расширение + + + Name: + Имя: + + + Type: + Тип: + + + 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. + + + + + This plugin only has a single channel input, +but the source has %1 channels. + + + + Use mean of source channels + + + + Use channel %1 only + Использовать только канал %1 + + + OK + ОК + + + Cancel + Отменить + + + Output: + + + + + PropertyBox + + Show + Показать + + + Play + Воспроизвести + + + Playback Level + Уровень воспр. + + + Playback Pan / Balance + Панорама/баланс при воспроизведении + + + + PropertyContainer::SetPropertyCommand + + Set %1 Property + Установить свойство %1 + + + + QFile + + File "%1" does not exist + Файл "%1" не существует + + + Failed to open file "%1" + Не удалось открыть файл "%1" + + + + QFileDialog + + Locate file "%1" + Найти файл "%1" + + + Audio files (%1) +All files (*.*) + Щвуковые файлы (%1) +Все файлы (*.*) + + + + QMessageBox + + Failed to open file + Не удалось открыть файл + + + Audio file "%1" could not be opened. +Locate it? + Не удалось открыть звуковой файл "%1". +Найти его? + + + File "%1" could not be opened + Не удалось открыть файл "%1" + + + + QObject + + Decoding MP3 file... + Декодируется файл MP3... + + + Stop + Остановить + + + Decoding Ogg file... + Декодируется файл Ogg Vorbis... + + + + SparseModel + + Add Point + + + + Delete Point + + + + Re-Label Point + + + + + SpectrogramLayer + + Colour + Цвет + + + Colour Scale + + + + Window Type + + + + Window Size + + + + Normalize Columns + + + + Bin Display + + + + Threshold + + + + Gain + + + + Colour Rotation + + + + Min Frequency + + + + Max Frequency + + + + Frequency Scale + + + + Window + + + + Scale + + + + Range + + + + Default + + + + White on Black + + + + Black on White + + + + Red on Blue + + + + Yellow on Black + + + + Blue on Black + + + + Fruit Salad + + + + Linear + + + + Meter + + + + dB + + + + Phase + + + + Rectangle + + + + Bartlett + + + + Hamming + + + + Hanning + + + + Blackman + + + + Gaussian + + + + Parzen + + + + 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> + <неизвестно> + + + 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 + + + + -90 + + + + Window Overlap + + + + Smoothing + + + + None + + + + 25 % + + + + 50 % + + + + 75 % + + + + 87.5 % + + + + 93.75 % + + + + + TextLayer + + Empty Label + + + + Colour + Цвет + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + <unknown> + <неизвестно> + + + <no text> + + + + In progress + В процессе + + + Time:%1 +Height:%2 +Label:%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 + Новая точка + + + + TimeInstantLayer + + New Point + Новая точка + + + Colour + Цвет + + + Plot Type + + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + Instants + + + + Segmentation + + + + <unknown> + <неизвестно> + + + In progress + В процессе + + + No local points + Нет локальных точек + + + Time:%1 +No label + + + + Time:%1 +Label:%2 + + + + Draw Point + Нарисовать точку + + + Add Point at %1 s + + + + Drag Point + Перетащить точку + + + Move Point to %1 s + + + + Edit Point + Изменить точку + + + Drag Selection + Перетащить выделение + + + Resize Selection + + + + Delete Selection + + + + Paste + Вставить + + + + TimeRulerLayer + + Colour + Цвет + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + <unknown> + <неизвестно> + + + + TimeValueLayer + + New Point + Новая точка + + + Colour + Цвет + + + Plot Type + + + + Vertical Scale + Верт. масштаб + + + Scale Units + + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + Points + + + + Stems + + + + Connected Points + + + + Lines + + + + Curve + + + + Segmentation + + + + Auto-Align + Автовыравнивание + + + Linear Scale + Линейная шкала + + + Log Scale + Логарифм. шкала + + + +/-1 Scale + + + + <unknown> + <неизвестно> + + + In progress + В процессе + + + No local points + Нет локальных точек + + + Time:%1 +Value:%2%3 +No label + + + + Time:%1 +Value:%2%3 +Label:%4 + + + + Draw Point + Нарисовать точку + + + Drag Point + Перетащить точку + + + Edit Point + Изменить точку + + + Relocate Point + Переместить точку + + + Change Point Value + Изменить значение точки + + + Drag Selection + Перетащить выделение + + + Resize Selection + + + + Delete Selected Points + Удалить выбранные точки + + + Paste + Вставить + + + + TransformFactory + + Analysis Plugins + + + + %1: %2 + + + + %1: Output %2 + + + + Other Plugins + + + + + View + + Global Scroll + + + + Global Zoom + + + + Follow Playback + + + + Scroll + + + + Page + + + + Off + + + + <unknown> + <неизвестно> + + + + ViewManager::SetSelectionCommand + + Clear Selection + Снять выделение + + + Select + Выделить + + + + WaveformLayer + + Colour + Цвет + + + Scale + + + + Gain + + + + Normalize Visible Area + + + + Channels + Каналы + + + Black + Чёрный + + + Red + Красный + + + Blue + Синий + + + Green + Зелёный + + + Purple + Пурпурный + + + Orange + Оранжевый + + + Linear + + + + Meter + + + + dB + + + + Separate + + + + Mean + + + + Butterfly + + + + <unknown> + <неизвестно> + + + Time:%1 - %2 + + + + Time:%1 + + + + Level: + + + + Left: + + + + Right: + + + + Channel %1 + + + + +%1%2 - %3 (%4 dB peak) + + + + +%1%2 (%3 dB peak) + + + + 0dB + + + + -Inf + + + + diff -r cd5d7ff8ef38 -r 40116f709d3b icons/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/icons/README Mon Jul 31 14:05:22 2006 +0000 @@ -0,0 +1,3 @@ +Icons are from various GPL'd sources, including the GIMP image editor, +KDE crystalsvg icon set, Rosegarden audio and MIDI sequencer, and Hydrogen +drum machine. Some modifications and new drawings by Chris Cannam. diff -r cd5d7ff8ef38 -r 40116f709d3b icons/annotation.png Binary file icons/annotation.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/colour3d.png Binary file icons/colour3d.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/draw-curve.png Binary file icons/draw-curve.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/draw.png Binary file icons/draw.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/editcopy.png Binary file icons/editcopy.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/editcut.png Binary file icons/editcut.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/editdelete.png Binary file icons/editdelete.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/editpaste.png Binary file icons/editpaste.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/exit.png Binary file icons/exit.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fader_background.png Binary file icons/fader_background.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fader_knob.png Binary file icons/fader_knob.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fader_knob_red.png Binary file icons/fader_knob_red.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fader_leds.png Binary file icons/fader_leds.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/faders.png Binary file icons/faders.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/ffwd-end.png Binary file icons/ffwd-end.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/ffwd.png Binary file icons/ffwd.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fileclose.png Binary file icons/fileclose.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filenew-22.png Binary file icons/filenew-22.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filenew.png Binary file icons/filenew.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fileopen-22.png Binary file icons/fileopen-22.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/fileopen.png Binary file icons/fileopen.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filesave-22.png Binary file icons/filesave-22.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filesave.png Binary file icons/filesave.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filesaveas-22.png Binary file icons/filesaveas-22.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/filesaveas.png Binary file icons/filesaveas.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/hh.gif Binary file icons/hh.gif has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/hh.png Binary file icons/hh.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/info.png Binary file icons/info.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/instants.png Binary file icons/instants.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/move.png Binary file icons/move.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/navigate.png Binary file icons/navigate.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/new.png Binary file icons/new.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/notes.png Binary file icons/notes.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/pane.png Binary file icons/pane.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/playloop.png Binary file icons/playloop.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/playpause-orig.png Binary file icons/playpause-orig.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/playpause.png Binary file icons/playpause.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/playselection.png Binary file icons/playselection.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/playselectionloop.png Binary file icons/playselectionloop.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/redo.png Binary file icons/redo.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/rewind-start.png Binary file icons/rewind-start.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/rewind.png Binary file icons/rewind.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/select.png Binary file icons/select.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/speaker.png Binary file icons/speaker.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/spectrogram-22x22.png Binary file icons/spectrogram-22x22.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/spectrogram.png Binary file icons/spectrogram.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/text.png Binary file icons/text.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/timeruler.png Binary file icons/timeruler.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/undo.png Binary file icons/undo.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/values.png Binary file icons/values.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/waveform.png Binary file icons/waveform.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/zoom-in.png Binary file icons/zoom-in.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/zoom-out.png Binary file icons/zoom-out.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b icons/zoom.png Binary file icons/zoom.png has changed diff -r cd5d7ff8ef38 -r 40116f709d3b main/MainWindow.cpp --- a/main/MainWindow.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/main/MainWindow.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -13,17 +13,17 @@ COPYING included with this distribution for more information. */ -#include "../version.h" +#include "version.h" #include "MainWindow.h" -#include "Document.h" +#include "document/Document.h" #include "PreferencesDialog.h" -#include "widgets/Pane.h" -#include "widgets/PaneStack.h" -#include "model/WaveFileModel.h" -#include "model/SparseOneDimensionalModel.h" -#include "base/ViewManager.h" +#include "view/Pane.h" +#include "view/PaneStack.h" +#include "data/model/WaveFileModel.h" +#include "data/model/SparseOneDimensionalModel.h" +#include "view/ViewManager.h" #include "base/Preferences.h" #include "layer/WaveformLayer.h" #include "layer/TimeRulerLayer.h" @@ -31,7 +31,7 @@ #include "layer/TimeValueLayer.h" #include "layer/Colour3DPlotLayer.h" #include "widgets/Fader.h" -#include "widgets/Panner.h" +#include "view/Panner.h" #include "widgets/PropertyBox.h" #include "widgets/PropertyStack.h" #include "widgets/AudioDial.h" @@ -40,12 +40,12 @@ #include "audioio/AudioCallbackPlaySource.h" #include "audioio/AudioCallbackPlayTarget.h" #include "audioio/AudioTargetFactory.h" -#include "fileio/AudioFileReaderFactory.h" -#include "fileio/DataFileReaderFactory.h" -#include "fileio/WavFileWriter.h" -#include "fileio/CSVFileWriter.h" -#include "fileio/BZipFileDevice.h" -#include "fileio/RecentFiles.h" +#include "data/fileio/AudioFileReaderFactory.h" +#include "data/fileio/DataFileReaderFactory.h" +#include "data/fileio/WavFileWriter.h" +#include "data/fileio/CSVFileWriter.h" +#include "data/fileio/BZipFileDevice.h" +#include "base/RecentFiles.h" #include "transform/TransformFactory.h" #include "base/PlayParameterRepository.h" #include "base/XmlExportable.h" diff -r cd5d7ff8ef38 -r 40116f709d3b main/MainWindow.h --- a/main/MainWindow.h Mon Jul 31 12:03:45 2006 +0000 +++ b/main/MainWindow.h Mon Jul 31 14:05:22 2006 +0000 @@ -22,11 +22,11 @@ #include #include "base/Command.h" -#include "base/ViewManager.h" +#include "view/ViewManager.h" #include "base/PropertyContainer.h" #include "layer/LayerFactory.h" #include "transform/Transform.h" -#include "fileio/SVFileReader.h" +#include "document/SVFileReader.h" #include class Document; diff -r cd5d7ff8ef38 -r 40116f709d3b main/PreferencesDialog.cpp --- a/main/PreferencesDialog.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/main/PreferencesDialog.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -31,7 +31,7 @@ #include #include "base/Preferences.h" -#include "fileio/ConfigFile.h" +#include "base/ConfigFile.h" PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WFlags flags) : QDialog(parent, flags) diff -r cd5d7ff8ef38 -r 40116f709d3b main/main.cpp --- a/main/main.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/main/main.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -15,11 +15,12 @@ #include "MainWindow.h" -#include "base/System.h" +#include "system/System.h" +#include "system/Init.h" #include "base/TempDirectory.h" #include "base/PropertyContainer.h" #include "base/Preferences.h" -#include "fileio/ConfigFile.h" +#include "base/ConfigFile.h" #include #include @@ -47,8 +48,6 @@ exit(0); // without releasing mutex } -extern void svSystemSpecificInitialisation(); - int main(int argc, char **argv) { diff -r cd5d7ff8ef38 -r 40116f709d3b main/systeminit.cpp --- a/main/systeminit.cpp Mon Jul 31 12:03:45 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ - -/* - Sonic Visualiser - An audio file viewer and annotation editor. - Centre for Digital Music, Queen Mary, University of London. - This file copyright 2006 Chris Cannam. - - This program 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. -*/ - -#include -#include - -#include - -#ifdef Q_WS_X11 -#include -#include -#include -#include - -static int handle_x11_error(Display *dpy, XErrorEvent *err) -{ - char errstr[256]; - XGetErrorText(dpy, err->error_code, errstr, 256); - if (err->error_code != BadWindow) { - std::cerr << "waveform: X Error: " - << errstr << " " << int(err->error_code) - << "\nin major opcode: " - << int(err->request_code) << std::endl; - } - return 0; -} -#endif - -#ifdef Q_WS_WIN32 - -#include - -// Set default file open mode to binary -#undef _fmode -int _fmode = _O_BINARY; - -void redirectStderr() -{ - HANDLE stderrHandle = GetStdHandle(STD_ERROR_HANDLE); - if (!stderrHandle) return; - - AllocConsole(); - - CONSOLE_SCREEN_BUFFER_INFO info; - GetConsoleScreenBufferInfo(stderrHandle, &info); - info.dwSize.Y = 1000; - SetConsoleScreenBufferSize(stderrHandle, info.dwSize); - - int h = _open_osfhandle((long)stderrHandle, _O_TEXT); - if (h) { - FILE *fd = _fdopen(h, "w"); - if (fd) { - *stderr = *fd; - setvbuf(stderr, NULL, _IONBF, 0); - } - } -} - -#endif - -extern void svSystemSpecificInitialisation() -{ -#ifdef Q_WS_X11 - XSetErrorHandler(handle_x11_error); -#endif - -#ifdef Q_WS_WIN32 - redirectStderr(); - QFont fn = qApp->font(); - fn.setFamily("Tahoma"); - qApp->setFont(fn); -#else -#ifdef Q_WS_X11 - QFont fn = qApp->font(); - fn.setPointSize(fn.pointSize() + 2); - qApp->setFont(fn); -#endif -#endif -} - diff -r cd5d7ff8ef38 -r 40116f709d3b samples/README --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/README Mon Jul 31 14:05:22 2006 +0000 @@ -0,0 +1,2 @@ +Samples from standard Hydrogen drum machine kits, except for piano.wav +(ancestry unknown) and click.wav (random noise). diff -r cd5d7ff8ef38 -r 40116f709d3b samples/bass.wav Binary file samples/bass.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/beep.wav Binary file samples/beep.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/bounce.wav Binary file samples/bounce.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/clap.wav Binary file samples/clap.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/click.wav Binary file samples/click.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/cowbell.wav Binary file samples/cowbell.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/hihat.wav Binary file samples/hihat.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/kick.wav Binary file samples/kick.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/organ.wav Binary file samples/organ.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/piano.wav Binary file samples/piano.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/snare.wav Binary file samples/snare.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/stick.wav Binary file samples/stick.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/strike.wav Binary file samples/strike.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b samples/tap.wav Binary file samples/tap.wav has changed diff -r cd5d7ff8ef38 -r 40116f709d3b sonic-visualiser.qrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sonic-visualiser.qrc Mon Jul 31 14:05:22 2006 +0000 @@ -0,0 +1,67 @@ + + + icons/waveform.png + icons/spectrogram.png + icons/timeruler.png + icons/pane.png + icons/instants.png + icons/notes.png + icons/values.png + icons/colour3d.png + icons/playpause.png + icons/ffwd.png + icons/ffwd-end.png + icons/rewind.png + icons/rewind-start.png + icons/playselection.png + icons/playloop.png + icons/fader_background.png + icons/fader_knob.png + icons/fader_knob_red.png + icons/fader_leds.png + icons/faders.png + icons/select.png + icons/text.png + icons/draw.png + icons/draw-curve.png + icons/move.png + icons/navigate.png + icons/zoom.png + icons/zoom-in.png + icons/zoom-out.png + icons/undo.png + icons/redo.png + icons/new.png + icons/exit.png + icons/speaker.png + icons/annotation.png + icons/fileopen.png + icons/fileopen-22.png + icons/fileclose.png + icons/filenew.png + icons/filenew-22.png + icons/filesave.png + icons/filesave-22.png + icons/filesaveas.png + icons/filesaveas-22.png + icons/editdelete.png + icons/editcut.png + icons/editcopy.png + icons/editpaste.png + samples/bass.wav + samples/beep.wav + samples/bounce.wav + samples/clap.wav + samples/click.wav + samples/cowbell.wav + samples/hihat.wav + samples/kick.wav + samples/organ.wav + samples/piano.wav + samples/snare.wav + samples/stick.wav + samples/strike.wav + samples/tap.wav + i18n/sonic-visualiser_ru.qm + + diff -r cd5d7ff8ef38 -r 40116f709d3b sv.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sv.pro Mon Jul 31 14:05:22 2006 +0000 @@ -0,0 +1,55 @@ + +TEMPLATE = app + +SV_UNIT_PACKAGES = fftw3f samplerate jack portaudio mad oggz fishsound lrdf raptor sndfile +load(../sv.prf) + +CONFIG += sv qt thread warn_on stl rtti exceptions +QT += xml + +TARGET = sonic-visualiser + +DEPENDPATH += . .. audioio document i18n main transform +INCLUDEPATH += . .. audioio document transform main +LIBPATH = ../view ../layer ../data ../widgets ../plugin ../base ../system $$LIBPATH +LIBS = -lsvview -lsvlayer -lsvdata -lsvwidgets -lsvplugin -lsvbase -lsvsystem $$LIBS + +OBJECTS_DIR = tmp_obj +MOC_DIR = tmp_moc + +# Input +HEADERS += audioio/AudioCallbackPlaySource.h \ + audioio/AudioCallbackPlayTarget.h \ + audioio/AudioCoreAudioTarget.h \ + audioio/AudioGenerator.h \ + audioio/AudioJACKTarget.h \ + audioio/AudioPortAudioTarget.h \ + audioio/AudioTargetFactory.h \ + audioio/IntegerTimeStretcher.h \ + document/Document.h \ + document/SVFileReader.h \ + main/MainWindow.h \ + main/PreferencesDialog.h \ + transform/FeatureExtractionPluginTransform.h \ + transform/RealTimePluginTransform.h \ + transform/Transform.h \ + transform/TransformFactory.h +SOURCES += audioio/AudioCallbackPlaySource.cpp \ + audioio/AudioCallbackPlayTarget.cpp \ + audioio/AudioCoreAudioTarget.cpp \ + audioio/AudioGenerator.cpp \ + audioio/AudioJACKTarget.cpp \ + audioio/AudioPortAudioTarget.cpp \ + audioio/AudioTargetFactory.cpp \ + audioio/IntegerTimeStretcher.cpp \ + document/Document.cpp \ + document/SVFileReader.cpp \ + main/main.cpp \ + main/MainWindow.cpp \ + main/PreferencesDialog.cpp \ + transform/FeatureExtractionPluginTransform.cpp \ + transform/RealTimePluginTransform.cpp \ + transform/Transform.cpp \ + transform/TransformFactory.cpp +RESOURCES += sonic-visualiser.qrc +TRANSLATIONS += i18n/sonic-visualiser_ru.ts diff -r cd5d7ff8ef38 -r 40116f709d3b transform/FeatureExtractionPluginTransform.cpp --- a/transform/FeatureExtractionPluginTransform.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/transform/FeatureExtractionPluginTransform.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -19,14 +19,14 @@ #include "plugin/PluginXml.h" #include "vamp-sdk/Plugin.h" -#include "base/Model.h" +#include "data/model/Model.h" #include "base/Window.h" -#include "model/SparseOneDimensionalModel.h" -#include "model/SparseTimeValueModel.h" -#include "model/DenseThreeDimensionalModel.h" -#include "model/DenseTimeValueModel.h" -#include "model/NoteModel.h" -#include "fileio/FFTFuzzyAdapter.h" +#include "data/model/SparseOneDimensionalModel.h" +#include "data/model/SparseTimeValueModel.h" +#include "data/model/DenseThreeDimensionalModel.h" +#include "data/model/DenseTimeValueModel.h" +#include "data/model/NoteModel.h" +#include "data/fft/FFTFuzzyAdapter.h" #include diff -r cd5d7ff8ef38 -r 40116f709d3b transform/RealTimePluginTransform.cpp --- a/transform/RealTimePluginTransform.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/transform/RealTimePluginTransform.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -20,9 +20,9 @@ #include "plugin/RealTimePluginInstance.h" #include "plugin/PluginXml.h" -#include "base/Model.h" -#include "model/SparseTimeValueModel.h" -#include "model/DenseTimeValueModel.h" +#include "data/model/Model.h" +#include "data/model/SparseTimeValueModel.h" +#include "data/model/DenseTimeValueModel.h" #include diff -r cd5d7ff8ef38 -r 40116f709d3b transform/RealTimePluginTransform.h --- a/transform/RealTimePluginTransform.h Mon Jul 31 12:03:45 2006 +0000 +++ b/transform/RealTimePluginTransform.h Mon Jul 31 14:05:22 2006 +0000 @@ -17,7 +17,7 @@ #define _REAL_TIME_PLUGIN_TRANSFORM_H_ #include "Transform.h" -#include "RealTimePluginInstance.h" +#include "plugin/RealTimePluginInstance.h" class DenseTimeValueModel; diff -r cd5d7ff8ef38 -r 40116f709d3b transform/Transform.h --- a/transform/Transform.h Mon Jul 31 12:03:45 2006 +0000 +++ b/transform/Transform.h Mon Jul 31 14:05:22 2006 +0000 @@ -16,9 +16,9 @@ #ifndef _TRANSFORM_H_ #define _TRANSFORM_H_ -#include "Thread.h" +#include "base/Thread.h" -#include "base/Model.h" +#include "data/model/Model.h" typedef QString TransformName; diff -r cd5d7ff8ef38 -r 40116f709d3b transform/TransformFactory.cpp --- a/transform/TransformFactory.cpp Mon Jul 31 12:03:45 2006 +0000 +++ b/transform/TransformFactory.cpp Mon Jul 31 14:05:22 2006 +0000 @@ -24,7 +24,7 @@ #include "widgets/PluginParameterDialog.h" -#include "model/DenseTimeValueModel.h" +#include "data/model/DenseTimeValueModel.h" #include #include