summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/automation_region_view.cc2
-rw-r--r--gtk2_ardour/editor.cc11
-rw-r--r--gtk2_ardour/export_channel_selector.cc3
-rw-r--r--gtk2_ardour/gain_meter.cc7
-rw-r--r--gtk2_ardour/gain_meter.h2
-rw-r--r--gtk2_ardour/level_meter.h3
-rw-r--r--gtk2_ardour/mixer_strip.cc1
-rw-r--r--gtk2_ardour/mixer_strip.h2
-rw-r--r--gtk2_ardour/mixer_ui.cc7
-rw-r--r--gtk2_ardour/mixer_ui.h1
-rw-r--r--gtk2_ardour/panner2d.cc2
-rw-r--r--gtk2_ardour/panner_ui.h4
-rw-r--r--gtk2_ardour/port_group.cc20
-rw-r--r--gtk2_ardour/processor_box.h2
-rw-r--r--gtk2_ardour/route_params_ui.h2
-rw-r--r--gtk2_ardour/route_time_axis.cc7
-rw-r--r--gtk2_ardour/route_time_axis.h6
-rw-r--r--gtk2_ardour/send_ui.cc4
18 files changed, 51 insertions, 35 deletions
diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 5eae11463f..200a1e2fb2 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -18,6 +18,8 @@
*/
#include <pbd/memento_command.h>
+#include <ardour/session.h>
+#include <ardour/automation_control.h>
#include "automation_region_view.h"
#include "public_editor.h"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8f1c1917c1..0932a046e0 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -46,19 +46,20 @@
#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/choice.h>
-#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
-#include <ardour/plugin_manager.h>
-#include <ardour/location.h>
+#include <ardour/audio_track.h>
#include <ardour/audioplaylist.h>
#include <ardour/audioregion.h>
+#include <ardour/location.h>
#include <ardour/midi_region.h>
-#include <ardour/session_route.h>
+#include <ardour/plugin_manager.h>
+#include <ardour/profile.h>
+#include <ardour/route_group.h>
#include <ardour/session_directory.h>
+#include <ardour/session_route.h>
#include <ardour/session_state_utils.h>
#include <ardour/tempo.h>
#include <ardour/utils.h>
-#include <ardour/profile.h>
#include <control_protocol/control_protocol.h>
diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 62380c1604..1f1472d830 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -24,12 +24,13 @@
#include <pbd/convert.h>
+#include <ardour/audio_port.h>
+#include <ardour/audio_track.h>
#include <ardour/audioengine.h>
#include <ardour/export_channel_configuration.h>
#include <ardour/export_handler.h>
#include <ardour/io.h>
#include <ardour/route.h>
-#include <ardour/audio_port.h>
#include <ardour/session.h>
#include <sstream>
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 8438147746..f90e28a9ac 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -924,3 +924,10 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev)
return true;
}
+boost::shared_ptr<PBD::Controllable>
+GainMeterBase::get_controllable()
+{
+ return _io->gain_control();
+}
+
+
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 820e9ef0e7..0c4e52b7c5 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -74,7 +74,7 @@ class GainMeterBase : virtual public sigc::trackable
virtual void setup_meters (int len=0);
- boost::shared_ptr<PBD::Controllable> get_controllable() { return _io->gain_control(); }
+ boost::shared_ptr<PBD::Controllable> get_controllable();
LevelMeter& get_level_meter() const { return *level_meter; }
Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; }
diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h
index 521b9d1d8f..0273a075c8 100644
--- a/gtk2_ardour/level_meter.h
+++ b/gtk2_ardour/level_meter.h
@@ -21,7 +21,6 @@
#define __ardour_gtk_track_meter_h__
#include <vector>
-#include <map>
#include <gtkmm/box.h>
#include <gtkmm/adjustment.h>
@@ -93,7 +92,7 @@ class LevelMeter : public Gtk::HBox
guint16 regular_meter_width;
static const guint16 thin_meter_width = 2;
- vector<MeterInfo> meters;
+ std::vector<MeterInfo> meters;
float max_peak;
void hide_all_meters ();
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 365a26f948..1bee8268ae 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -36,6 +36,7 @@
#include <ardour/session.h>
#include <ardour/audioengine.h>
#include <ardour/route.h>
+#include <ardour/route_group.h>
#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
#include <ardour/panner.h>
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 45b650172b..e859e52026 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -42,9 +42,7 @@
#include <ardour/types.h>
#include <ardour/ardour.h>
-#include <ardour/io.h>
#include <ardour/processor.h>
-#include <ardour/io_processor.h>
#include <pbd/fastlog.h>
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 2c223f5bda..8da14e2f46 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -30,11 +30,12 @@
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
-#include <ardour/session.h>
-#include <ardour/audio_track.h>
-#include <ardour/session_route.h>
#include <ardour/audio_diskstream.h>
+#include <ardour/audio_track.h>
#include <ardour/plugin_manager.h>
+#include <ardour/route_group.h>
+#include <ardour/session.h>
+#include <ardour/session_route.h>
#include "keyboard.h"
#include "mixer_ui.h"
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index f5e1ae211d..2dbddc9dd0 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -35,7 +35,6 @@
#include <pbd/stateful.h>
#include <ardour/ardour.h>
-#include <ardour/io.h>
#include "route_processor_selection.h"
#include "enums.h"
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 91ca15b7b7..97f7fcd123 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -633,7 +633,7 @@ Panner2d::on_button_release_event (GdkEventButton *ev)
for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) {
- Target* puck = i->second;
+ //Target* puck = i->second;
/* XXX DO SOMETHING TO SET PUCK BACK TO "normal" */
}
diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h
index 6be92f9c5a..b6c439fd6a 100644
--- a/gtk2_ardour/panner_ui.h
+++ b/gtk2_ardour/panner_ui.h
@@ -114,8 +114,8 @@ class PannerUI : public Gtk::HBox
void panning_link_direction_clicked ();
- vector<Gtk::Adjustment*> pan_adjustments;
- vector<PannerBar*> pan_bars;
+ std::vector<Gtk::Adjustment*> pan_adjustments;
+ std::vector<PannerBar*> pan_bars;
void pan_adjustment_changed (uint32_t which);
void pan_value_changed (uint32_t which);
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index 4bf565a3e9..405d503016 100644
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -17,17 +17,21 @@
*/
-#include "port_group.h"
-#include "port_matrix.h"
-#include "i18n.h"
-#include "ardour/session.h"
+#include <cstring>
+#include <boost/shared_ptr.hpp>
+
#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
#include "ardour/audioengine.h"
-#include "ardour/port.h"
#include "ardour/bundle.h"
-#include <boost/shared_ptr.hpp>
-#include <cstring>
+#include "ardour/io_processor.h"
+#include "ardour/midi_track.h"
+#include "ardour/port.h"
+#include "ardour/session.h"
+
+#include "port_group.h"
+#include "port_matrix.h"
+
+#include "i18n.h"
using namespace std;
using namespace Gtk;
diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index e47c28ec10..0a6399caad 100644
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -36,7 +36,6 @@
#include <ardour/types.h>
#include <ardour/ardour.h>
-#include <ardour/io.h>
#include <ardour/plugin_insert.h>
#include <ardour/port_insert.h>
#include <ardour/processor.h>
@@ -56,6 +55,7 @@ class RouteRedirectSelection;
namespace ARDOUR {
class Connection;
+ class IO;
class Insert;
class Plugin;
class PluginInsert;
diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h
index a41a092440..484c4f28a8 100644
--- a/gtk2_ardour/route_params_ui.h
+++ b/gtk2_ardour/route_params_ui.h
@@ -35,8 +35,6 @@
#include <pbd/stateful.h>
#include <ardour/ardour.h>
-#include <ardour/io.h>
-#include <ardour/io_processor.h>
#include "io_selector.h"
#include "ardour_dialog.h"
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index e544122ccd..f8b34bd459 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -40,19 +40,20 @@
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>
-#include <ardour/playlist.h>
#include <ardour/audioplaylist.h>
#include <ardour/diskstream.h>
-#include <ardour/processor.h>
#include <ardour/ladspa_plugin.h>
#include <ardour/location.h>
#include <ardour/panner.h>
#include <ardour/playlist.h>
+#include <ardour/playlist.h>
+#include <ardour/processor.h>
+#include <ardour/profile.h>
+#include <ardour/route_group.h>
#include <ardour/session.h>
#include <ardour/session_playlist.h>
#include <ardour/utils.h>
#include <evoral/Parameter.hpp>
-#include <ardour/profile.h>
#include "ardour_ui.h"
#include "route_time_axis.h"
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 9e40c511a6..da1ee711d6 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -20,6 +20,9 @@
#ifndef __ardour_route_time_axis_h__
#define __ardour_route_time_axis_h__
+#include <list>
+#include <set>
+
#include <gtkmm/table.h>
#include <gtkmm/button.h>
#include <gtkmm/box.h>
@@ -31,7 +34,6 @@
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/slider_controller.h>
-#include <list>
#include <ardour/playlist.h>
#include <ardour/types.h>
@@ -305,7 +307,7 @@ protected:
ProcessorAutomationCurves processor_automation_curves;
// Set from XML so context menu automation buttons can be correctly initialized
- set<Evoral::Parameter> _show_automation;
+ std::set<Evoral::Parameter> _show_automation;
AutomationTracks _automation_tracks;
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index fc05c08c2a..3fb6e8af47 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -17,9 +17,11 @@
*/
-#include <ardour/send.h>
#include <gtkmm2ext/doi.h>
+#include <ardour/io.h>
+#include <ardour/send.h>
+
#include "utils.h"
#include "send_ui.h"
#include "io_selector.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-30 00:54:41 +0000