From f6e182b937efda6ed0ba50dbc02af98524beb61c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 16 Jul 2017 22:13:46 +0200 Subject: Move Gtkmm2ext widgets into libwidget --- gtk2_ardour/ardour_ui.cc | 6 +++--- gtk2_ardour/ardour_ui.h | 1 - gtk2_ardour/ardour_ui2.cc | 1 - gtk2_ardour/automation_controller.cc | 7 +++---- gtk2_ardour/automation_controller.h | 4 ++-- gtk2_ardour/automation_time_axis.cc | 1 - gtk2_ardour/editor.h | 1 - gtk2_ardour/gain_meter.cc | 5 ++--- gtk2_ardour/gain_meter.h | 28 ++++++++++++---------------- gtk2_ardour/generic_pluginui.cc | 9 ++++----- gtk2_ardour/keyeditor.h | 5 +++-- gtk2_ardour/latency_gui.h | 5 ++--- gtk2_ardour/level_meter.cc | 2 +- gtk2_ardour/level_meter.h | 21 ++++++++++----------- gtk2_ardour/luadialog.cc | 6 +++--- gtk2_ardour/mixer_strip.cc | 1 - gtk2_ardour/mixer_strip.h | 2 -- gtk2_ardour/option_editor.cc | 2 +- gtk2_ardour/option_editor.h | 4 ++-- gtk2_ardour/panner_ui.h | 7 ------- gtk2_ardour/plugin_pin_dialog.h | 6 +++--- gtk2_ardour/plugin_ui.cc | 6 ++---- gtk2_ardour/plugin_ui.h | 9 +++------ gtk2_ardour/processor_box.h | 7 +++---- gtk2_ardour/rc_option_editor.cc | 1 - gtk2_ardour/route_time_axis.h | 1 - gtk2_ardour/route_ui.cc | 1 - gtk2_ardour/time_axis_view.cc | 2 +- gtk2_ardour/time_axis_view.h | 8 ++++---- 29 files changed, 64 insertions(+), 95 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 19745ede31..f956161b06 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -74,11 +74,11 @@ #include "gtkmm2ext/bindings.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/utils.h" -#include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/fastmeter.h" #include "gtkmm2ext/popup.h" #include "gtkmm2ext/window_title.h" +#include "widgets/fastmeter.h" + #include "ardour/ardour.h" #include "ardour/audio_backend.h" #include "ardour/audio_track.h" @@ -867,7 +867,7 @@ ARDOUR_UI::~ARDOUR_UI () delete gui_object_state; gui_object_state = 0; delete main_window_visibility; FastMeter::flush_pattern_cache (); - PixFader::flush_pattern_cache (); + ArdourFader::flush_pattern_cache (); } #ifndef NDEBUG diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index eeebb5f422..937328e323 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -55,7 +55,6 @@ #include #include "gtkmm2ext/gtk_ui.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/stateful_button.h" #include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/bindings.h" diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 0bad50de0b..3b633b297d 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -37,7 +37,6 @@ #include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/window_title.h" #include "ardour/profile.h" diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 5fc86e9276..fb7a75f4b6 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -47,8 +47,8 @@ using PBD::Controllable; AutomationBarController::AutomationBarController ( boost::shared_ptr ac, Adjustment* adj) - : Gtkmm2ext::BarController(*adj, ac) - , _controllable(ac) + : ArdourWidgets::BarController (*adj, ac) + , _controllable (ac) { } @@ -344,7 +344,6 @@ AutomationController::disable_vertical_scroll () AutomationBarController* bar = dynamic_cast(_widget); if (bar) { bar->set_tweaks ( - Gtkmm2ext::PixFader::Tweaks(bar->tweaks() | - Gtkmm2ext::PixFader::NoVerticalScroll)); + ArdourWidgets::ArdourFader::Tweaks(bar->tweaks() | ArdourWidgets::ArdourFader::NoVerticalScroll)); } } diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h index 7c3641b2df..c2d225b2db 100644 --- a/gtk2_ardour/automation_controller.h +++ b/gtk2_ardour/automation_controller.h @@ -31,9 +31,9 @@ #include #include -#include "gtkmm2ext/barcontroller.h" #include "pbd/signals.h" #include "evoral/Parameter.hpp" +#include "widgets/barcontroller.h" namespace ARDOUR { class Session; @@ -41,7 +41,7 @@ namespace ARDOUR { class AutomationControl; } -class AutomationBarController : public Gtkmm2ext::BarController { +class AutomationBarController : public ArdourWidgets::BarController { public: AutomationBarController(boost::shared_ptr ac, Gtk::Adjustment* adj); diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index a0052032b0..22f38c0545 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index b09e027832..382aa0be8c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -35,7 +35,6 @@ #include #include "gtkmm2ext/bindings.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/pane.h" #include "gtkmm2ext/selector.h" diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 4a17d4f640..696e57f7bd 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -31,7 +31,6 @@ #include "gtkmm/style.h" #include "gdkmm/color.h" #include "gtkmm2ext/utils.h" -#include "gtkmm2ext/fastmeter.h" #include "gtkmm2ext/gtk_ui.h" #include "widgets/tooltips.h" @@ -122,7 +121,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press)); meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK); - gain_slider->set_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll)); + gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll)); gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch)); gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch)); gain_slider->set_name ("GainFader"); @@ -645,7 +644,7 @@ void GainMeterBase::update_gain_sensitive () { bool x = !(_control->alist()->automation_state() & Play); - static_cast(gain_slider)->set_sensitive (x); + static_cast(gain_slider)->set_sensitive (x); } gint diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 5517151ebb..18c8647518 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -39,10 +39,8 @@ #include "ardour/session_handle.h" #include "widgets/ardour_button.h" - -#include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/focus_entry.h" -#include "gtkmm2ext/slider_controller.h" +#include "widgets/focus_entry.h" +#include "widgets/slider_controller.h" #include "enums.h" #include "level_meter.h" @@ -57,9 +55,7 @@ namespace ARDOUR { class Amp; class Automatable; } -namespace Gtkmm2ext { - class FastMeter; -} + namespace Gtk { class Menu; } @@ -97,7 +93,7 @@ public: boost::shared_ptr get_controllable(); LevelMeterHBox& get_level_meter() const { return *level_meter; } - Gtkmm2ext::SliderController& get_gain_slider() const { return *gain_slider; } + ArdourWidgets::SliderController& get_gain_slider() const { return *gain_slider; } /** Emitted in the GUI thread when a button is pressed over the level meter; * return true if the event is handled. @@ -123,14 +119,14 @@ protected: bool ignore_toggle; bool next_release_selects; - Gtkmm2ext::SliderController *gain_slider; - Gtk::Adjustment gain_adjustment; - Gtkmm2ext::FocusEntry gain_display; - Gtkmm2ext::FocusEntry peak_display; - Gtk::DrawingArea meter_metric_area; - Gtk::DrawingArea meter_ticks1_area; - Gtk::DrawingArea meter_ticks2_area; - LevelMeterHBox *level_meter; + ArdourWidgets::SliderController* gain_slider; + Gtk::Adjustment gain_adjustment; + ArdourWidgets::FocusEntry gain_display; + ArdourWidgets::FocusEntry peak_display; + Gtk::DrawingArea meter_metric_area; + Gtk::DrawingArea meter_ticks1_area; + Gtk::DrawingArea meter_ticks2_area; + LevelMeterHBox* level_meter; sigc::connection gain_watching; diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 4b30388087..5cb9901b74 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -32,14 +32,13 @@ #include "pbd/xml++.h" #include "pbd/failed_constructor.h" -#include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/fastmeter.h" -#include "gtkmm2ext/barcontroller.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/doi.h" -#include "gtkmm2ext/slider_controller.h" #include "widgets/ardour_knob.h" +#include "widgets/click_box.h" +#include "widgets/fastmeter.h" +#include "widgets/slider_controller.h" #include "widgets/tooltips.h" #include "ardour/plugin.h" @@ -756,7 +755,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, Adjustment* adj = control_ui->controller->adjustment(); if (desc.integer_step && !desc.toggled) { - control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true); + control_ui->clickbox = new ArdourWidgets::ClickBox (adj, "PluginUIClickBox", true); Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2); if (desc.unit == ParameterDescriptor::MIDI_NOTE) { control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui)); diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h index 7df6491e80..9bf90547ac 100644 --- a/gtk2_ardour/keyeditor.h +++ b/gtk2_ardour/keyeditor.h @@ -27,7 +27,8 @@ #include #include #include -#include "gtkmm2ext/searchbar.h" + +#include "widgets/searchbar.h" #include "ardour_window.h" @@ -109,7 +110,7 @@ private: Gtk::HBox reset_box; Gtk::Button reset_button; Gtk::Label reset_label; - Gtkmm2ext::SearchBar filter_entry; + ArdourWidgets::SearchBar filter_entry; std::string filter_string; Gtk::Button print_button; Gtk::Label print_label; diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h index 9723b66e7d..2fe95be06b 100644 --- a/gtk2_ardour/latency_gui.h +++ b/gtk2_ardour/latency_gui.h @@ -28,10 +28,9 @@ #include #include -#include #include "pbd/controllable.h" - #include "ardour/types.h" +#include "widgets/barcontroller.h" #include "ardour_dialog.h" @@ -41,7 +40,7 @@ namespace ARDOUR { class LatencyGUI; -class LatencyBarController : public Gtkmm2ext::BarController +class LatencyBarController : public ArdourWidgets::BarController { public: LatencyBarController (Gtk::Adjustment& adj, LatencyGUI* g) diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 2658352790..3b73f4c37c 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -37,7 +37,7 @@ using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; using namespace PBD; -using namespace Gtkmm2ext; +using namespace ArdourWidgets; using namespace Gtk; using namespace std; diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h index fe9fc1b7a5..f3ff2a8550 100644 --- a/gtk2_ardour/level_meter.h +++ b/gtk2_ardour/level_meter.h @@ -34,10 +34,9 @@ #include "ardour/chan_count.h" #include "ardour/session_handle.h" -#include -#include -#include -#include +#include "widgets/fastmeter.h" +#include "widgets/focus_entry.h" +#include "widgets/slider_controller.h" #include "enums.h" @@ -53,7 +52,7 @@ class LevelMeterBase : public ARDOUR::SessionHandlePtr, virtual public sigc::tra { public: LevelMeterBase (ARDOUR::Session*, PBD::EventLoop::InvalidationRecord* ir, - Gtkmm2ext::FastMeter::Orientation o = Gtkmm2ext::FastMeter::Vertical); + ArdourWidgets::FastMeter::Orientation o = ArdourWidgets::FastMeter::Vertical); virtual ~LevelMeterBase (); virtual void set_meter (ARDOUR::PeakMeter* meter); @@ -82,16 +81,16 @@ protected: private: PBD::EventLoop::InvalidationRecord* parent_invalidator; ARDOUR::PeakMeter* _meter; - Gtkmm2ext::FastMeter::Orientation _meter_orientation; + ArdourWidgets::FastMeter::Orientation _meter_orientation; Width _width; struct MeterInfo { - Gtkmm2ext::FastMeter *meter; - gint16 width; - int length; - bool packed; - float max_peak; + ArdourWidgets::FastMeter* meter; + gint16 width; + int length; + bool packed; + float max_peak; MeterInfo() { meter = 0; diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc index ce34e121fd..04040c8201 100644 --- a/gtk2_ardour/luadialog.cc +++ b/gtk2_ardour/luadialog.cc @@ -21,10 +21,10 @@ #include "ardour/dB.h" #include "ardour/rc_configuration.h" -#include "gtkmm2ext/slider_controller.h" #include "gtkmm2ext/utils.h" #include "widgets/ardour_dropdown.h" +#include "widgets/slider_controller.h" #include "ardour_dialog.h" #include "luadialog.h" @@ -178,7 +178,7 @@ public: : LuaDialogWidget (key, title) , _db_adjustment (ARDOUR::gain_to_slider_position_with_max (1.0, ARDOUR::Config->get_max_gain ()), 0, 1, 0.01, 0.1) { - _db_slider = Gtk::manage (new Gtkmm2ext::HSliderController (&_db_adjustment, boost::shared_ptr (), 220, 18)); + _db_slider = Gtk::manage (new ArdourWidgets::HSliderController (&_db_adjustment, boost::shared_ptr (), 220, 18)); _fader_centering_box.pack_start (*_db_slider, true, false); @@ -239,7 +239,7 @@ protected: } Gtk::Adjustment _db_adjustment; - Gtkmm2ext::HSliderController* _db_slider; + ArdourWidgets::HSliderController* _db_slider; Gtk::Entry _db_display; Gtk::HBox _box; Gtk::VBox _fader_centering_box; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index ac80fbea4f..5d73bb641b 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -32,7 +32,6 @@ #include "gtkmm2ext/utils.h" #include "gtkmm2ext/choice.h" #include "gtkmm2ext/doi.h" -#include "gtkmm2ext/slider_controller.h" #include "gtkmm2ext/bindable_button.h" #include "widgets/tooltips.h" diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 7197f42285..2e35481c57 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -34,8 +34,6 @@ #include #include -#include "gtkmm2ext/auto_spin.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/stateful_button.h" diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index f635624928..e639dd3a14 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -485,7 +485,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot , _get (g) , _set (s) { - _db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr(), 220, 18)); + _db_slider = manage (new ArdourWidgets::HSliderController (&_db_adjustment, boost::shared_ptr(), 220, 18)); _label.set_text (n + ":"); _label.set_alignment (0, 0.5); diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index 93e217f7e7..68b389601b 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -26,7 +26,7 @@ #include #include -#include "gtkmm2ext/slider_controller.h" +#include "widgets/slider_controller.h" #include "ardour_window.h" #include "audio_clock.h" @@ -544,7 +544,7 @@ private: bool on_key_press (GdkEventKey* ev); Gtk::Adjustment _db_adjustment; - Gtkmm2ext::HSliderController* _db_slider; + ArdourWidgets::HSliderController* _db_slider; Gtk::Entry _db_display; Gtk::Label _label; Gtk::HBox _box; diff --git a/gtk2_ardour/panner_ui.h b/gtk2_ardour/panner_ui.h index fda57f47b1..90c3f5ecaa 100644 --- a/gtk2_ardour/panner_ui.h +++ b/gtk2_ardour/panner_ui.h @@ -29,9 +29,6 @@ #include #include -#include -#include - #include "ardour/session_handle.h" #include "enums.h" @@ -49,10 +46,6 @@ namespace ARDOUR { class AutomationControl; } -namespace Gtkmm2ext { - class FastMeter; -} - namespace Gtk { class Menu; class Menuitem; diff --git a/gtk2_ardour/plugin_pin_dialog.h b/gtk2_ardour/plugin_pin_dialog.h index c1da44c53b..cf6da3965b 100644 --- a/gtk2_ardour/plugin_pin_dialog.h +++ b/gtk2_ardour/plugin_pin_dialog.h @@ -29,12 +29,12 @@ #include -#include "gtkmm2ext/pixfader.h" #include "gtkmm2ext/persistent_tooltip.h" -#include "gtkmm2ext/slider_controller.h" #include "widgets/ardour_button.h" #include "widgets/ardour_dropdown.h" +#include "widgets/ardour_fader.h" +#include "widgets/slider_controller.h" #include "ardour_window.h" #include "io_selector.h" @@ -210,7 +210,7 @@ private: boost::weak_ptr _control; Gtk::Adjustment _adjustment; - Gtkmm2ext::HSliderController _slider; + ArdourWidgets::HSliderController _slider; Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip; bool _ignore_ui_adjustment; diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 32e7fb18c9..eb1dd55ece 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -32,15 +32,13 @@ #include "gtkmm/widget.h" #include "gtkmm/box.h" -#include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/fastmeter.h" -#include "gtkmm2ext/barcontroller.h" + #include "gtkmm2ext/utils.h" #include "gtkmm2ext/doi.h" -#include "gtkmm2ext/slider_controller.h" #include "gtkmm2ext/application.h" #include "widgets/tooltips.h" +#include "widgets/fastmeter.h" #include "ardour/session.h" #include "ardour/plugin.h" diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index b7c6866867..cbc0f72700 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -69,12 +69,9 @@ namespace PBD { class Controllable; } -namespace Gtkmm2ext { - class HSliderController; - class BarController; +namespace ArdourWidgets { class ClickBox; class FastMeter; - class PixmapButton; } class LatencyGUI; @@ -206,7 +203,7 @@ private: bool is_scrollable; struct MeterInfo { - Gtkmm2ext::FastMeter *meter; + ArdourWidgets::FastMeter* meter; bool packed; MeterInfo () { @@ -231,7 +228,7 @@ private: ArdourWidgets::ArdourButton automate_button; Gtk::Label label; ArdourWidgets::ArdourDropdown* combo; - Gtkmm2ext::ClickBox* clickbox; + ArdourWidgets::ClickBox* clickbox; Gtk::FileChooserButton* file_button; ArdourWidgets::ArdourSpinner* spin_box; diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 0d378456e4..66585c88ec 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -30,12 +30,9 @@ #include #include -#include "gtkmm2ext/auto_spin.h" #include "gtkmm2ext/bindings.h" -#include "gtkmm2ext/click_box.h" #include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndvbox.h" -#include "gtkmm2ext/pixfader.h" #include "gtkmm2ext/persistent_tooltip.h" #include "pbd/stateful.h" @@ -53,6 +50,8 @@ #include "pbd/fastlog.h" #include "widgets/ardour_button.h" +#include "widgets/ardour_fader.h" +#include "widgets/slider_controller.h" #include "plugin_interest.h" #include "io_selector.h" @@ -227,7 +226,7 @@ private: boost::weak_ptr _control; /* things for a slider */ Gtk::Adjustment _adjustment; - Gtkmm2ext::HSliderController _slider; + ArdourWidgets::HSliderController _slider; Gtkmm2ext::PersistentTooltip _slider_persistant_tooltip; /* things for a button */ ArdourWidgets::ArdourButton _button; diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index be0b1c16d0..edc85643d2 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -34,7 +34,6 @@ #include #include "gtkmm2ext/utils.h" -#include "gtkmm2ext/slider_controller.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/paths_dialog.h" #include "gtkmm2ext/window_title.h" diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 50070c537a..f3f3c810a3 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -33,7 +33,6 @@ #include #include -#include #include "widgets/ardour_button.h" diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 92fdbd3892..ec71ffe28a 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -24,7 +24,6 @@ #include "gtkmm2ext/choice.h" #include "gtkmm2ext/doi.h" #include "gtkmm2ext/bindable_button.h" -#include "gtkmm2ext/barcontroller.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/utils.h" diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 403ab88eb6..bd81c766c4 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -149,7 +149,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie set_tooltip (name_label, _("Track/Bus name (double click to edit)")); { - std::auto_ptr an_entry (new Gtkmm2ext::FocusEntry); + std::auto_ptr an_entry (new FocusEntry); an_entry->set_name (X_("TrackNameEditor")); Gtk::Requisition req; an_entry->size_request (req); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 7f9e562ee1..10701563bf 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -33,19 +33,19 @@ #include #include -#include - #include "pbd/stateful.h" #include "pbd/signals.h" +#include "evoral/Parameter.hpp" + #include "ardour/types.h" #include "ardour/presentation_info.h" #include "ardour/region.h" -#include "evoral/Parameter.hpp" - #include "canvas/line.h" +#include "widgets/focus_entry.h" + #include "prompter.h" #include "axis_view.h" #include "enums.h" -- cgit v1.2.3