summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/bundle_manager.h7
-rw-r--r--libs/ardour/ardour/click.h5
-rw-r--r--libs/ardour/ardour/export_channel.h3
-rw-r--r--libs/ardour/ardour/midi_ui.h2
-rw-r--r--libs/ardour/ardour/session.h13
-rw-r--r--libs/ardour/ardour/slave.h1
-rw-r--r--libs/ardour/audio_track_importer.cc3
-rw-r--r--libs/ardour/midi_model.cc17
-rw-r--r--libs/ardour/midi_region.cc11
-rw-r--r--libs/ardour/panner_shell.cc1
-rw-r--r--libs/ardour/session_click.cc7
-rw-r--r--libs/ardour/session_state.cc1
-rw-r--r--libs/ardour/session_transport.cc1
-rw-r--r--libs/audiographer/audiographer/sndfile/sndfile_writer.h4
14 files changed, 44 insertions, 32 deletions
diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index dc9b73c8fc..ff42ad7fb8 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -20,9 +20,12 @@
#ifndef __ardour_ui_bundle_manager_h__
#define __ardour_ui_bundle_manager_h__
-#include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
#include <gtkmm/entry.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treeview.h>
+
+#include "ardour/user_bundle.h"
+
#include "ardour_dialog.h"
#include "port_matrix.h"
diff --git a/libs/ardour/ardour/click.h b/libs/ardour/ardour/click.h
index b4c2f7d9cc..1047540a74 100644
--- a/libs/ardour/ardour/click.h
+++ b/libs/ardour/ardour/click.h
@@ -28,7 +28,8 @@
namespace ARDOUR {
-struct Click {
+class Click {
+public:
framepos_t start;
framecnt_t duration;
framecnt_t offset;
@@ -48,8 +49,6 @@ private:
static Pool pool;
};
-typedef std::list<Click*> Clicks;
-
class ClickIO : public IO
{
public:
diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h
index a73d04aa36..c13580e25c 100644
--- a/libs/ardour/ardour/export_channel.h
+++ b/libs/ardour/ardour/export_channel.h
@@ -23,9 +23,8 @@
#include <set>
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
#include "pbd/signals.h"
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index 95e97c64ea..51e3ca2544 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -2,7 +2,7 @@
#define __libardour_midi_ui_h__
#include <list>
-#include <boost/signals2.hpp>
+
#include "pbd/abstract_ui.h"
#include "pbd/signals.h"
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d6edaf6a0e..d96d8fc828 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -42,19 +42,19 @@
#include "pbd/signals.h"
#include "pbd/undo.h"
+#include "evoral/types.hpp"
+
#include "midi++/types.h"
#include "timecode/time.h"
#include "ardour/ardour.h"
-#include "ardour/click.h"
#include "ardour/chan_count.h"
#include "ardour/rc_configuration.h"
#include "ardour/session_configuration.h"
#include "ardour/session_event.h"
#include "ardour/location.h"
#include "ardour/interpolation.h"
-#include "ardour/speakers.h"
#ifdef HAVE_JACK_SESSION
#include <jack/session.h>
@@ -92,16 +92,18 @@ class AuxInput;
class BufferSet;
class Bundle;
class Butler;
+class Click;
class Diskstream;
class ExportHandler;
class ExportStatus;
+class Graph;
class IO;
class IOProcessor;
class ImportStatus;
+class MidiControlUI;
class MidiRegion;
class MidiSource;
class MidiTrack;
-class MidiControlUI;
class NamedSelection;
class Playlist;
class PluginInsert;
@@ -122,9 +124,8 @@ class Slave;
class Source;
class Speakers;
class TempoMap;
-class VSTPlugin;
-class Graph;
class Track;
+class VSTPlugin;
extern void setup_enum_writer ();
@@ -1369,7 +1370,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
XMLNode& state(bool);
/* click track */
-
+ typedef std::list<Click*> Clicks;
Clicks clicks;
bool _clicking;
boost::shared_ptr<IO> _click_io;
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 8400472921..9bd3124e23 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -23,7 +23,6 @@
#include <vector>
#include <glibmm/thread.h>
-#include <boost/signals2.hpp>
#include <jack/jack.h>
diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc
index a831e480db..4e28df9f87 100644
--- a/libs/ardour/audio_track_importer.cc
+++ b/libs/ardour/audio_track_importer.cc
@@ -24,8 +24,9 @@
#include "ardour/audio_diskstream.h"
#include "ardour/session.h"
-#include "pbd/failed_constructor.h"
+#include "pbd/controllable.h"
#include "pbd/convert.h"
+#include "pbd/failed_constructor.h"
#include <sstream>
#include <algorithm>
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 17645a1994..d6f21f1f4c 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -18,23 +18,28 @@
*/
-#include <set>
-#include <iostream>
#include <algorithm>
+#include <iostream>
+#include <set>
#include <stdexcept>
#include <stdint.h>
-#include "pbd/error.h"
-#include "pbd/enumwriter.h"
+
#include "pbd/compose.h"
+#include "pbd/enumwriter.h"
+#include "pbd/error.h"
+
+#include "evoral/Control.hpp"
+
#include "midi++/events.h"
+#include "ardour/automation_control.h"
+#include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_model.h"
#include "ardour/midi_source.h"
#include "ardour/midi_state_tracker.h"
+#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour/types.h"
-#include "ardour/session.h"
-#include "ardour/midi_automation_list_binder.h"
#include "i18n.h"
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index f67617da62..61b1459c17 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -30,15 +30,16 @@
#include "pbd/xml++.h"
#include "pbd/enumwriter.h"
-#include "ardour/midi_region.h"
-#include "ardour/session.h"
-#include "ardour/gain.h"
+#include "ardour/automation_control.h"
#include "ardour/dB.h"
-#include "ardour/playlist.h"
+#include "ardour/gain.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_source.h"
+#include "ardour/playlist.h"
#include "ardour/region_factory.h"
+#include "ardour/session.h"
#include "ardour/types.h"
-#include "ardour/midi_ring_buffer.h"
#include "i18n.h"
#include <locale.h>
diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 8c0236bd9f..bffcb0cccb 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -53,6 +53,7 @@
#include "ardour/panner_shell.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
+#include "ardour/speakers.h"
#include "ardour/utils.h"
#include "i18n.h"
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc
index 8e57d7578c..22f9de449d 100644
--- a/libs/ardour/session_click.cc
+++ b/libs/ardour/session_click.cc
@@ -21,11 +21,12 @@
#include <cerrno>
#include "ardour/ardour.h"
+#include "ardour/audio_buffer.h"
+#include "ardour/buffer_set.h"
+#include "ardour/click.h"
+#include "ardour/io.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
-#include "ardour/io.h"
-#include "ardour/buffer_set.h"
-#include "ardour/audio_buffer.h"
#include <sndfile.h>
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 7084b81f05..d66b07c334 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -116,6 +116,7 @@
#include "ardour/sndfile_helpers.h"
#include "ardour/sndfilesource.h"
#include "ardour/source_factory.h"
+#include "ardour/speakers.h"
#include "ardour/template_utils.h"
#include "ardour/tempo.h"
#include "ardour/ticker.h"
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 4534339d18..de295a8e8a 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -40,6 +40,7 @@
#include "ardour/audioengine.h"
#include "ardour/auditioner.h"
#include "ardour/butler.h"
+#include "ardour/click.h"
#include "ardour/debug.h"
#include "ardour/location.h"
#include "ardour/session.h"
diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h
index 7b3c2968ff..6e8ecc2567 100644
--- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h
+++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h
@@ -1,10 +1,10 @@
#ifndef AUDIOGRAPHER_SNDFILE_WRITER_H
#define AUDIOGRAPHER_SNDFILE_WRITER_H
-#include <boost/signals2.hpp>
-#include <boost/format.hpp>
#include <string>
+#include <boost/format.hpp>
+
#include "audiographer/flag_debuggable.h"
#include "audiographer/sink.h"
#include "audiographer/types.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 20:25:24 +0000