Mercurial > hg > sonic-visualiser
diff main/MainWindow.h @ 677:bfd68cc71a25 imaf_enc
Merge from default branch, fix build
author | Chris Cannam |
---|---|
date | Thu, 05 Dec 2013 10:57:51 +0000 |
parents | f45af8d8091e d4f908163c60 |
children | 5e6e1e074080 |
line wrap: on
line diff
--- a/main/MainWindow.h Thu Dec 05 10:11:17 2013 +0000 +++ b/main/MainWindow.h Thu Dec 05 10:57:51 2013 +0000 @@ -16,48 +16,13 @@ #ifndef _MAIN_WINDOW_H_ #define _MAIN_WINDOW_H_ -#include <QFrame> -#include <QString> -#include <QUrl> -#include <QPointer> +#include "framework/MainWindowBase.h" -#include "framework/MainWindowBase.h" -#include "base/Command.h" -#include "view/ViewManager.h" -#include "base/PropertyContainer.h" -#include "base/RecentFiles.h" -#include "layer/LayerFactory.h" -#include "transform/Transform.h" -#include "framework/SVFileReader.h" -#include "data/fileio/FileFinder.h" -#include "data/fileio/FileSource.h" -#include "widgets/LayerTreeDialog.h" -#include <map> +class VersionTester; +class Surveyer; +class LayerTreeDialog; +class ActivityLog; -class Document; -class PaneStack; -class Pane; -class View; -class Fader; -class Overview; -class Layer; -class WaveformLayer; -class WaveFileModel; -class AudioCallbackPlaySource; -class AudioCallbackPlayTarget; -class CommandHistory; -class QMenu; -class AudioDial; -class QLabel; -class QCheckBox; -class PreferencesDialog; -class QTreeView; -class QPushButton; -class OSCQueue; -class OSCMessage; -class KeyReference; -class Labeller; -class ActivityLog; class QFileSystemWatcher; class QScrollArea; @@ -251,15 +216,18 @@ QFileSystemWatcher *m_templateWatcher; + Surveyer *m_surveyer; + VersionTester *m_versionTester; + struct LayerConfiguration { LayerConfiguration(LayerFactory::LayerType _layer = LayerFactory::TimeRuler, Model *_source = 0, int _channel = -1) : layer(_layer), sourceModel(_source), channel(_channel) { } - LayerFactory::LayerType layer; + LayerFactory::LayerType layer; Model *sourceModel; - int channel; + int channel; }; typedef std::map<QAction *, LayerConfiguration> PaneActionMap;